tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1607479 - in /tomcat/native/branches/1.1.x: ./ native/src/ssl.c
Date Wed, 02 Jul 2014 20:41:19 GMT
Author: markt
Date: Wed Jul  2 20:41:18 2014
New Revision: 1607479

URL: http://svn.apache.org/r1607479
Log:
Fix compilation failure. Thanks to Chuck Caldarale.

Modified:
    tomcat/native/branches/1.1.x/   (props changed)
    tomcat/native/branches/1.1.x/native/src/ssl.c

Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
  Merged /tomcat/native/trunk:r1607477

Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1607479&r1=1607478&r2=1607479&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jul  2 20:41:18 2014
@@ -884,8 +884,9 @@ static int jbs_write(BIO *b, const char 
     if (b->init && in != NULL) {
         BIO_JAVA *j = (BIO_JAVA *)b->ptr;
         JNIEnv   *e = NULL;
+        jbyteArray jb;
         tcn_get_java_env(&e);
-        jbyteArray jb = (*e)->NewByteArray(e, inl);
+        jb = (*e)->NewByteArray(e, inl);
         if (!(*e)->ExceptionOccurred(e)) {
             (*e)->SetByteArrayRegion(e, jb, 0, inl, (jbyte *)in);
             ret = (*e)->CallIntMethod(e, j->cb.obj,
@@ -903,8 +904,9 @@ static int jbs_read(BIO *b, char *out, i
     if (b->init && out != NULL) {
         BIO_JAVA *j = (BIO_JAVA *)b->ptr;
         JNIEnv   *e = NULL;
+        jbyteArray jb;
         tcn_get_java_env(&e);
-        jbyteArray jb = (*e)->NewByteArray(e, outl);
+        jb = (*e)->NewByteArray(e, outl);
         if (!(*e)->ExceptionOccurred(e)) {
             ret = (*e)->CallIntMethod(e, j->cb.obj,
                                       j->cb.mid[1], jb);



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


Mime
View raw message