diff options
Diffstat (limited to 'luni/src/main/native')
| -rw-r--r-- | luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp b/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp index 21489a2..b91c8e6 100644 --- a/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp +++ b/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp @@ -1421,6 +1421,11 @@ static void info_callback(const SSL *ssl, int where, int ret __attribute__ ((unu JNI_TRACE("ssl=%p info_callback env error", ssl); return; } + if (env->ExceptionCheck()) { + JNI_TRACE("ssl=%p info_callback already pending exception", ssl); + return; + } + jobject sslHandshakeCallbacks = appData->sslHandshakeCallbacks; jclass cls = env->GetObjectClass(sslHandshakeCallbacks); |