Author: remm
Date: Mon Mar 14 12:20:17 2016
New Revision: 1734928
URL: http://svn.apache.org/viewvc?rev=1734928&view=rev
Log:
Fix r1734903, destroyed is used in a lot of places.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
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=1734928&r1=1734927&r2=1734928&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
Mar 14 12:20:17 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
