Author: norman
Date: Tue Oct 5 10:48:51 2010
New Revision: 1004607
URL: http://svn.apache.org/viewvc?rev=1004607&view=rev
Log:
only call stop() if the Server implementation is enabled. This prevent a NPE on
shutdown
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java?rev=1004607&r1=1004606&r2=1004607&view=diff
==============================================================================
---
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java
(original)
+++
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java
Tue Oct 5 10:48:51 2010
@@ -66,7 +66,7 @@ public class NioLMTPServer extends Abstr
@Override
public String getServiceType() {
- return "LMTP";
+ return "LMTP Service";
}
public void doConfigure(final HierarchicalConfiguration configuration)
throws ConfigurationException {
Modified:
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java?rev=1004607&r1=1004606&r2=1004607&view=diff
==============================================================================
---
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java
Tue Oct 5 10:48:51 2010
@@ -244,7 +244,9 @@ public abstract class AbstractConfigurab
@PreDestroy
public final void destroy() {
getLogger().info("Dispose " + getServiceType());
- super.stop();
+ if (isEnabled()) {
+ stop();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
