changeset 7326:521761df8dea

8013809: deadlock in SSLSocketImpl between between write and close Reviewed-by: wetmore
author xuelei
date Mon, 12 Aug 2013 02:34:25 -0700
parents a982f3aa40ed
children 6e281ef7f2b7
files src/share/classes/sun/security/ssl/SSLSocketImpl.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/ssl/SSLSocketImpl.java	Wed May 21 15:52:15 2014 +0100
+++ b/src/share/classes/sun/security/ssl/SSLSocketImpl.java	Mon Aug 12 02:34:25 2013 -0700
@@ -172,7 +172,7 @@
     /*
      * Drives the protocol state machine.
      */
-    private int                 connectionState;
+    private volatile int        connectionState;
 
     /*
      * Flag indicating if the next record we receive MUST be a Finished
@@ -1443,7 +1443,7 @@
      * Return whether the socket has been explicitly closed by the application.
      */
     public boolean isClosed() {
-        return getConnectionState() == cs_APP_CLOSED;
+        return connectionState == cs_APP_CLOSED;
     }
 
     /**