Author: norman
Date: Thu Jun 3 07:30:47 2010
New Revision: 950899
URL: http://svn.apache.org/viewvc?rev=950899&view=rev
Log:
Fix NPE
Modified:
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractAsyncServer.java
Modified:
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractAsyncServer.java?rev=950899&r1=950898&r2=950899&view=diff
==============================================================================
---
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractAsyncServer.java
(original)
+++
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractAsyncServer.java
Thu Jun 3 07:30:47 2010
@@ -432,7 +432,7 @@ public abstract class AbstractAsyncServe
*/
private void buildSSLContext() throws Exception {
- if (useStartTLS) {
+ if (useStartTLS || useSSL) {
String algorithm = "SunX509";
KeyStore ks = KeyStore.getInstance("JKS");
ks.load(new FileInputStream(fileSystem.getFile(keystore)),
secret.toCharArray());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
