summaryrefslogtreecommitdiff
path: root/branches
diff options
context:
space:
mode:
Diffstat (limited to 'branches')
-rw-r--r--branches/1.x_Branch/src/main/java/org/mockftpserver/stub/StubFtpServer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/branches/1.x_Branch/src/main/java/org/mockftpserver/stub/StubFtpServer.java b/branches/1.x_Branch/src/main/java/org/mockftpserver/stub/StubFtpServer.java
index d297326..d664c24 100644
--- a/branches/1.x_Branch/src/main/java/org/mockftpserver/stub/StubFtpServer.java
+++ b/branches/1.x_Branch/src/main/java/org/mockftpserver/stub/StubFtpServer.java
@@ -268,7 +268,9 @@ public final class StubFtpServer implements Runnable {
LOG.debug("Cleaning up server...");
try {
- serverSocket.close();
+ if (serverSocket != null) {
+ serverSocket.close();
+ }
for (Iterator iter = sessions.keySet().iterator(); iter.hasNext();) {
Session session = (Session) iter.next();