Commit 82fe19bf authored by Matt Tucker's avatar Matt Tucker Committed by matt

Enable SSL by default.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@398 b35dd754-fafc-0310-a699-88a17e54d16e
parent 0ffa0b11
...@@ -43,7 +43,6 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana ...@@ -43,7 +43,6 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
} }
private void createSocket() { private void createSocket() {
if (!isStarted || isSocketStarted || auditManager == null || if (!isStarted || isSocketStarted || auditManager == null ||
sessionManager == null || deliverer == null || sessionManager == null || deliverer == null ||
router == null || serverName == null || packetFactory == null) router == null || serverName == null || packetFactory == null)
...@@ -63,8 +62,8 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana ...@@ -63,8 +62,8 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
} }
} }
// Start SSL if it's been enabled. // Start SSL unless it's been disabled.
if (JiveGlobals.getBooleanProperty("xmpp.socket.ssl.active")) { if (JiveGlobals.getBooleanProperty("xmpp.socket.ssl.active", true)) {
try { try {
sslSocketThread = new SSLSocketAcceptThread(this); sslSocketThread = new SSLSocketAcceptThread(this);
String algorithm = JiveGlobals.getProperty("xmpp.socket.ssl.algorithm"); String algorithm = JiveGlobals.getProperty("xmpp.socket.ssl.algorithm");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment