Fix compilation errors in netty4 branch. Issue #25

RestComm · Mar 13, 2018 · 736145b · 736145b
1 parent 3e695e7
commit 736145b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/cloudhopper/smpp/impl/DefaultSmppClient.java b/src/main/java/com/cloudhopper/smpp/impl/DefaultSmppClient.java
@@ -310,7 +310,7 @@ protected Channel createConnectedChannel(String host, int port, long connectTime
         logger.debug("Waiting for client connection to {}", socketAddr);
         if (!connectFuture.await(connectTimeoutMillis + 1000)) {
             logger.error("connectFuture did not finish in expected time! Try to cancel the connectFuture");
-            boolean isCanceled = connectFuture.cancel();
+            boolean isCanceled = connectFuture.cancel(true);
             logger.error("connectFuture: isCanceled {} isDone {} isSuccess {}", isCanceled, connectFuture.isDone(), connectFuture.isSuccess());
             throw new SmppChannelConnectTimeoutException("Could not connect to the server within timeout");
         }

diff --git a/src/main/java/com/cloudhopper/smpp/impl/DefaultSmppSession.java b/src/main/java/com/cloudhopper/smpp/impl/DefaultSmppSession.java
@@ -520,7 +520,7 @@ public WindowFuture<Integer,PduRequest,PduResponse> sendRequestPdu(PduRequest pd
         // check if the write was a success
         if (!channelFuture.isSuccess()) {
             // the write failed, make sure to throw an exception
-            throw new SmppChannelException(channelFuture.cause() != null ? channelFuture.getCause().getMessage()
+            throw new SmppChannelException(channelFuture.cause() != null ? channelFuture.cause().getCause().getMessage()
                     : "ChannelFuture failed without cause.", channelFuture.cause());
         }