Author: markt Date: Mon Jan 4 19:16:05 2016 New Revision: 1722944 URL: http://svn.apache.org/viewvc?rev=1722944&view=rev Log: Fix a couple of IDE warnings
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1722944&r1=1722943&r2=1722944&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java Mon Jan 4 19:16:05 2016 @@ -171,6 +171,7 @@ public class OpenSSLContext implements o } } + @Override public synchronized void destroy() { // Guard against multiple destroyPools() calls triggered by construction exception and finalize() later if (DESTROY_UPDATER.compareAndSet(this, 0, 1)) { Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1722944&r1=1722943&r2=1722944&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Mon Jan 4 19:16:05 2016 @@ -906,7 +906,7 @@ public final class OpenSSLEngine extends if (error != SSL.SSL_ERROR_NONE) { String err = SSL.getErrorString(error); if (logger.isDebugEnabled()) { - logger.debug(sm.getString("engine.openSSLError", error, err)); + logger.debug(sm.getString("engine.openSSLError", Long.toString(error), err)); } // Many errors can occur during handshake and need to be reported if (!handshakeFinished) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org