diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-04-10 16:07:24 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-04-10 16:07:24 -0700 |
| commit | 3e136a83aa21a186cec5451655842e7bb9f47231 (patch) | |
| tree | 9eafc9e68f7e1167f6e91a32e445d2533c60a717 | |
| parent | 001171ea16e108f80a08b94c760d793ee1a2c943 (diff) | |
| parent | 66300787c31be3b327531f5aa9122f818750a289 (diff) | |
| download | libcore-3e136a83aa21a186cec5451655842e7bb9f47231.zip libcore-3e136a83aa21a186cec5451655842e7bb9f47231.tar.gz libcore-3e136a83aa21a186cec5451655842e7bb9f47231.tar.bz2 | |
Merge commit '7dbf57f6' into manualmerge
Conflicts:
libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
Change-Id: I7cf63f6a1ca7c7604301cb8bb947633ad704a2c0
| -rw-r--r-- | x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp b/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp index cb275b7..da91a99 100644 --- a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp +++ b/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp @@ -2047,7 +2047,8 @@ static void org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl_close( * let the Java layer know about this by throwing an * exception. */ - throwIOExceptionWithSslErrors(env, ret, 0, "SSL shutdown failed."); + int sslErrorCode = SSL_get_error(ssl, ret); + throwIOExceptionWithSslErrors(env, ret, sslErrorCode, "SSL shutdown failed"); break; } |