Author: rjung
Date: Mon Nov  9 17:55:47 2015
New Revision: 1713495

URL: http://svn.apache.org/viewvc?rev=1713495&view=rev
Log:
Fix the signature of the implementation of the
native SSLSocket method getInfoB() to return
jbyteArray instead of jobject.

This is consistent with what it actually
returns and how the native Java method is
declared.

Modified:
    tomcat/native/trunk/native/src/sslinfo.c
    tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/trunk/native/src/sslinfo.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1713495&r1=1713494&r2=1713495&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Mon Nov  9 17:55:47 2015
@@ -197,8 +197,8 @@ static char *lookup_ssl_cert_dn(X509_NAM
     return result;
 }
 
-TCN_IMPLEMENT_CALL(jobject, SSLSocket, getInfoB)(TCN_STDARGS, jlong sock,
-                                                 jint what)
+TCN_IMPLEMENT_CALL(jbyteArray, SSLSocket, getInfoB)(TCN_STDARGS, jlong sock,
+                                                    jint what)
 {
     tcn_socket_t   *a = J2P(sock, tcn_socket_t *);
     tcn_ssl_conn_t *s;

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1713495&r1=1713494&r2=1713495&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Mon Nov  9 17:55:47 
2015
@@ -50,6 +50,12 @@
       Fix the signature of the implementation of the native SSL method
       newSSL() in the case when OPENSSL is not available. (rjung)
     </fix>
+    <fix>
+      Fix the signature of the implementation of the native SSLSocket
+      method getInfoB() to return jbyteArray instead of jobject.
+      This is consistent with what it actually returns and how
+      the native Java method is declared. (rjung)
+    </fix>
   </changelog>
 </section>
 <section name="Changes in 1.2.2">



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

Reply via email to