Fix another NPE observed in logs during unit test runs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1655812 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 29, 2015 · a895591 · a895591
1 parent c9db3fe
commit a895591
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -27,9 +27,13 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.apache.tomcat.util.buf.ByteBufferHolder;
+import org.apache.tomcat.util.res.StringManager;
 
 public abstract class SocketWrapperBase<E> {
 
+    protected static final StringManager sm = StringManager.getManager(
+            SocketWrapperBase.class.getPackage().getName());
+
     private volatile E socket;
     private final AbstractEndpoint<E> endpoint;
 
@@ -284,6 +288,9 @@ public boolean isReadyForWrite() {
 
 
     public boolean canWrite() {
+        if (socketBufferHandler == null) {
+            throw new IllegalStateException(sm.getString("socket.closed"));
+        }
         return socketBufferHandler.isWriteBufferWritable() && bufferedWrites.size() == 0;
     }
 

diff --git a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
@@ -115,9 +115,9 @@ public void onWritePossible(boolean useDispatch) {
                     break;
                 }
             }
-        } catch (IOException ioe) {
+        } catch (IOException | IllegalStateException e) {
             wsWriteTimeout.unregister(this);
-            clearHandler(ioe, useDispatch);
+            clearHandler(e, useDispatch);
             close();
         }