Author: remy.maucherat(a)jboss.com Date: 2014-05-26 18:49:55 -0400 (Mon, 26 May 2014) New Revision: 2423 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/Constants.java branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java Log: Flip the default (no change besides that). Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/Constants.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/Constants.java 2014-05-26 22:13:36 UTC (rev 2422) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/Constants.java 2014-05-26 22:49:55 UTC (rev 2423) @@ -60,9 +60,9 @@ public static final boolean STRICT_SPEC_COMPLIANCE = Boolean.getBoolean( "org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE"); - public static final boolean STRICT_SPEC_CLOSE_EVENT = + public static final boolean RELAXED_CLOSE_EVENT = Boolean.getBoolean( - "org.apache.tomcat.websocket.STRICT_SPEC_CLOSE_EVENT"); + "org.apache.tomcat.websocket.RELAXED_CLOSE_EVENT"); private Constants() { // Hide default constructor Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-05-26 22:13:36 UTC (rev 2422) +++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-05-26 22:49:55 UTC (rev 2423) @@ -406,7 +406,7 @@ state = State.CLOSING; - if (Constants.STRICT_SPEC_CLOSE_EVENT) { + if (!Constants.RELAXED_CLOSE_EVENT) { sendCloseMessage(closeReasonMessage); fireEndpointOnClose(closeReasonLocal); } else { @@ -434,7 +434,7 @@ synchronized (stateLock) { if (state == State.OPEN) { - if (Constants.STRICT_SPEC_CLOSE_EVENT) { + if (!Constants.RELAXED_CLOSE_EVENT) { sendCloseMessage(closeReason); fireEndpointOnClose(closeReason); } else {