Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#15] Fix Writing data on closed socket causes exceptions #18

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[#15] Fix Writing data on closed socket causes exceptions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fe26b6
[#15] Fix Writing data on closed socket causes exceptions
kornefalk Oct 4, 2017
94563c9
Wrong exception test in serverSessionTimesOutWithNoBindRequest
kornefalk Oct 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ target/
.classpath
.project
.settings/

.idea/
5 changes: 5 additions & 0 deletions src/main/java/com/cloudhopper/smpp/impl/DefaultSmppSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,11 @@ public WindowFuture<Integer,PduRequest,PduResponse> sendRequestPdu(PduRequest pd
}
}

if (!this.channel.isOpen()) {
logger.info("Channel closed.");
return future;
}

// we need to log the PDU after encoding since some things only happen
// during the encoding process such as looking up the result message
if (configuration.getLoggingOptions().isLogPduEnabled()) {
Expand Down
6 changes: 4 additions & 2 deletions src/test/java/com/cloudhopper/smpp/impl/DefaultSmppServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import com.cloudhopper.smpp.type.SmppChannelException;
import com.cloudhopper.smpp.type.SmppProcessingException;
import java.util.HashSet;

import com.cloudhopper.smpp.type.SmppTimeoutException;
import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -456,9 +458,9 @@ public void serverSessionTimesOutWithNoBindRequest() throws Exception {
BaseBind bindRequest = client0.createBindRequest(sessionConfig0);

try {
BaseBindResp bindResponse = session0.bind(bindRequest, 200);
BaseBindResp bindResponse = session0.bind(bindRequest, 50);
Assert.fail();
} catch (SmppChannelException e) {
} catch (SmppTimeoutException e) {
// correct behavior
}

Expand Down