summaryrefslogtreecommitdiff
path: root/branches
diff options
context:
space:
mode:
authorchrismair <chrismair@531de8e6-9941-0410-b38b-9a92acbe0330>2008-09-01 16:56:17 +0000
committerchrismair <chrismair@531de8e6-9941-0410-b38b-9a92acbe0330>2008-09-01 16:56:17 +0000
commitf42bbca6a2ef51f5632a31b9857699692050013d (patch)
tree664d1c3e8f515e5ff64e420b401e9645ca43ca61 /branches
parent0b92a4802c313851d15dad79c9914fd11fb2bdac (diff)
downloadmockftpserver-f42bbca6a2ef51f5632a31b9857699692050013d.tar.gz
Only close serverSocket if it was initialized
git-svn-id: svn://svn.code.sf.net/p/mockftpserver/code@105 531de8e6-9941-0410-b38b-9a92acbe0330
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();