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

[markt]

Author: markt
Date: Thu Mar 31 07:19:00 2016
New Revision: 1737184

URL: http://svn.apache.org/viewvc?rev=1737184&view=rev
Log:
Simplify / remove goto
Review from 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=1737184&r1=1737183&r2=1737184&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Thu Mar 31 07:19:00 2016
@@ -1150,10 +1150,7 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
         ERR_error_string(ERR_get_error(), err);
         tcn_Throw(e, "Error reading certificate (%s)", err);
         rv = JNI_FALSE;
-        goto cleanup;
-    }
-
-    if (SSL_CTX_add0_chain_cert(c->ctx, certs) <= 0) {
+    } else if (SSL_CTX_add0_chain_cert(c->ctx, certs) <= 0) {
         ERR_error_string(ERR_get_error(), err);
         tcn_Throw(e, "Error setting certificate (%s)", err);
         rv = JNI_FALSE;



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