Author: remm
Date: Mon Mar 14 12:36:03 2016
New Revision: 1734931
URL: http://svn.apache.org/viewvc?rev=1734931&view=rev
Log:
Port 1734928
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 12:36:03 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845
+/tomcat/trunk:1734785,1734799,1734845,1734928
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1734931&r1=1734930&r2=1734931&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
Mon Mar 14 12:36:03 2016
@@ -197,9 +197,10 @@ public final class OpenSSLEngine extends
throw new
IllegalArgumentException(sm.getString("engine.noSSLContext"));
}
session = new OpenSSLSession();
+ destroyed = 1;
ssl = SSL.newSSL(sslCtx, !clientMode);
networkBIO = SSL.makeNetworkBIO(ssl);
- DESTROYED_UPDATER.compareAndSet(this, 0, 1);
+ destroyed = 0;
this.fallbackApplicationProtocol = fallbackApplicationProtocol;
this.clientMode = clientMode;
this.sessionContext = sessionContext;
@@ -215,7 +216,7 @@ public final class OpenSSLEngine extends
* Destroys this engine.
*/
public synchronized void shutdown() {
- if (DESTROYED_UPDATER.compareAndSet(this, 1, 2)) {
+ if (DESTROYED_UPDATER.compareAndSet(this, 0, 1)) {
SSL.freeSSL(ssl);
SSL.freeBIO(networkBIO);
ssl = networkBIO = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
