Author: markt
Date: Tue Oct 20 14:18:13 2015
New Revision: 1709605
URL: http://svn.apache.org/viewvc?rev=1709605&view=rev
Log:
Fix issue in connector refactoring identified by Gump.
Ensure UpgradeProcessors are unmapped from sockets once the connection
is closed.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java?rev=1709605&r1=1709604&r2=1709605&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java Tue
Oct 20 14:18:13 2015
@@ -70,4 +70,11 @@ public class WsFrameServer extends WsFra
// Overridden to make it visible to other classes in this package
return super.getTransformation();
}
+
+
+ @Override
+ protected boolean isOpen() {
+ // Overridden to make it visible to other classes in this package
+ return super.isOpen();
+ }
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1709605&r1=1709604&r2=1709605&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Tue Oct 20 14:18:13 2015
@@ -183,7 +183,11 @@ public class WsHttpUpgradeHandler implem
return SocketState.CLOSED;
}
- return SocketState.UPGRADED;
+ if (wsFrame.isOpen()) {
+ return SocketState.UPGRADED;
+ } else {
+ return SocketState.CLOSED;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
