svn commit: r1676919 - /tomcat/native/trunk/native/src/sslcontext.c

[ma...@apache.org]

Author: markt
Date: Thu Apr 30 08:03:28 2015
New Revision: 1676919

URL: http://svn.apache.org/r1676919
Log:
Review from schultz & Chuck

Modified:
    tomcat/native/trunk/native/src/sslcontext.c

Modified: tomcat/native/trunk/native/src/sslcontext.c
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1676919&r1=1676918&r2=1676919&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Thu Apr 30 08:03:28 2015
@@ -70,6 +70,8 @@ static jmethodID sni_java_callback;
  */
 int ssl_callback_ServerNameIndication(SSL *ssl, int *al, tcn_ssl_ctxt_t *c)
 {
+    // TODO: Is it better to cache the JNIEnv* during the call to handshake?
+    
     // Get the JNI environment for this callback
     JavaVM *javavm = tcn_get_java_vm();
     JNIEnv *env;
@@ -232,7 +234,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
     SSL_CTX_set_info_callback(c->ctx, SSL_callback_handshake);
     
     /* Cache Java side SNI callback if not already cached */
-    if (ssl_context_class == 0) {
+    if (ssl_context_class == NULL) {
         ssl_context_class = (*e)->NewGlobalRef(e, o);
         sni_java_callback = (*e)->GetStaticMethodID(e, ssl_context_class,
                                                     "sniCallBack", "(JLjava/lang/String;)J");



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org