You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2007/01/17 14:55:34 UTC
svn commit: r497032 -
/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java
Author: ngn
Date: Wed Jan 17 06:55:33 2007
New Revision: 497032
URL: http://svn.apache.org/viewvc?view=rev&rev=497032
Log:
Adding some NPE checks
Modified:
incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java?view=diff&rev=497032&r1=497031&r2=497032
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java Wed Jan 17 06:55:33 2007
@@ -91,7 +91,16 @@
catch(Exception ex) {
log.warn("FtpDataConnection.closeDataSocket()", ex);
}
- serverContext.getDataConnectionConfig().releasePassivePort(port);
+
+ FtpServerContext ctx = serverContext;
+
+ if(ctx != null) {
+ DataConnectionConfig dcc = ctx.getDataConnectionConfig();
+ if(dcc != null) {
+ dcc.releasePassivePort(port);
+ }
+ }
+
servSoc = null;
}