Author: markt
Date: Fri Feb 15 16:50:30 2013
New Revision: 1446683

URL: http://svn.apache.org/r1446683
Log:
TODO: IOE on sending close message
Solution: Rethrow

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1446683&r1=1446682&r2=1446683&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri Feb 15 
16:50:30 2013
@@ -287,22 +287,19 @@ public class WsSession implements Sessio
             try {
                 wsRemoteEndpoint.startMessageBlock(
                         Constants.OPCODE_CLOSE, msg, true);
-            } catch (IOException ioe) {
-                // Unable to send close message.
-                // TODO - Ignore?
-            }
-
-            webSocketContainer.unregisterSession(
-                    localEndpoint.getClass(), this);
-
-            // Fire the onClose event
-            Thread t = Thread.currentThread();
-            ClassLoader cl = t.getContextClassLoader();
-            t.setContextClassLoader(applicationClassLoader);
-            try {
-                localEndpoint.onClose(this, closeReason);
             } finally {
-                t.setContextClassLoader(cl);
+                webSocketContainer.unregisterSession(
+                        localEndpoint.getClass(), this);
+
+                // Fire the onClose event
+                Thread t = Thread.currentThread();
+                ClassLoader cl = t.getContextClassLoader();
+                t.setContextClassLoader(applicationClassLoader);
+                try {
+                    localEndpoint.onClose(this, closeReason);
+                } finally {
+                    t.setContextClassLoader(cl);
+                }
             }
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to