[fizzed#15] Writing data on closed socket causes unnecessary exception

kornefalk · Oct 5, 2017 · 1fdc96c · 1fdc96c
1 parent 55713b3
commit 1fdc96c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/com/cloudhopper/smpp/impl/DefaultSmppSession.java b/src/main/java/com/cloudhopper/smpp/impl/DefaultSmppSession.java
@@ -507,6 +507,11 @@ public WindowFuture<Integer,PduRequest,PduResponse> sendRequestPdu(PduRequest pd
             }
         }
 
+        if (!this.channel.isOpen()) {
+            logger.info("Channel closed.");
+            return future;
+        }
+
         // write the pdu out & wait timeout amount of time
         ChannelFuture channelFuture = this.channel.writeAndFlush(buffer);
         if (configuration.getWriteTimeout() > 0){

diff --git a/src/test/java/com/cloudhopper/smpp/impl/DefaultSmppServerTest.java b/src/test/java/com/cloudhopper/smpp/impl/DefaultSmppServerTest.java
@@ -461,8 +461,9 @@ public void serverSessionTimesOutWithNoBindRequest() throws Exception {
             try {
                 BaseBindResp bindResponse = session0.bind(bindRequest, 200);
                 Assert.fail();
-            } catch (SmppChannelException e) {
+            } catch (SmppTimeoutException e) {
                 // correct behavior
+                logger.debug("Got expected timeout exception {}", e.getMessage());
             }
 
             // verify everything after the session timed out