Author: markt
Date: Thu Oct 17 11:04:08 2013
New Revision: 1533046
URL: http://svn.apache.org/r1533046
Log:
Revert r1533035. A better solution is required.
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java?rev=1533046&r1=1533045&r2=1533046&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Thu Oct 17 11:04:08 2013
@@ -316,9 +316,7 @@ public final class Room {
public void run() {
closed = true;
drawmessageBroadcastTimer.cancel();
- if (!ShutdownDetection.hasShutdownStarted()) {
- roomGraphics.dispose();
- }
+ roomGraphics.dispose();
}
});
}
@@ -414,23 +412,4 @@ public final class Room {
client.sendMessage(new StringWebsocketMessage(completeMsg));
}
}
-
-
- static {
- Runtime.getRuntime().addShutdownHook(new ShutdownDetection());
- }
-
-
- private static class ShutdownDetection extends Thread {
- private static volatile boolean shutdownStarted = false;
-
- private static boolean hasShutdownStarted() {
- return shutdownStarted;
- }
-
- @Override
- public void run() {
- shutdownStarted = true;
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
