From 1f103c24d3dca9eb6bbc31e023f9ce8b050761f5 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 20 Sep 2012 13:48:39 +0200
Subject: [PATCH] OO-360, removing warning ifan IM listener is not found (it
can happen), remove support for SSL connection to openfire to save memory
---
pom.xml | 6 +++---
.../java/org/olat/instantMessaging/ClientManagerImpl.java | 8 +-------
.../org/olat/instantMessaging/InstantMessagingModule.java | 7 +++++++
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1d703e68ff5..27a899f65f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1182,17 +1182,17 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
- <version>1.6.0</version>
+ <version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15</artifactId>
- <version>1.44</version>
+ <version>1.46</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
- <version>1.44</version>
+ <version>1.46</version>
</dependency>
<dependency>
<groupId>jdom</groupId>
diff --git a/src/main/java/org/olat/instantMessaging/ClientManagerImpl.java b/src/main/java/org/olat/instantMessaging/ClientManagerImpl.java
index 011d8a6036e..e939563bdc0 100644
--- a/src/main/java/org/olat/instantMessaging/ClientManagerImpl.java
+++ b/src/main/java/org/olat/instantMessaging/ClientManagerImpl.java
@@ -159,8 +159,6 @@ public class ClientManagerImpl extends BasicManager implements ClientManager {
if (listener != null){
listener.event(new InstantMessagingEvent(packet, "message"));
if (isLogDebugEnabled()) logDebug("routing message event to controller of: "+packet.getTo());
- } else {
- logWarn("could not find listener for IM message for username: "+username, null);
}
}
};
@@ -176,12 +174,8 @@ public class ClientManagerImpl extends BasicManager implements ClientManager {
public void processPacket(Packet packet) {
try {
GenericEventListener listener = listeners.get(username);
- if (listener == null) {
- logWarn("could not route presence event as presence listener is null for user: "+username, null);
- } else {
+ if (listener != null) {
listener.event(new InstantMessagingEvent(packet, "presence"));
- Presence presence = (Presence) packet;
- if (isLogDebugEnabled()) logDebug("routing presence event to controller of: "+presence.getTo());
}
} catch(Throwable th){
logWarn("Presence package", th);
diff --git a/src/main/java/org/olat/instantMessaging/InstantMessagingModule.java b/src/main/java/org/olat/instantMessaging/InstantMessagingModule.java
index 5f57f6c352d..f6a06d04c5a 100644
--- a/src/main/java/org/olat/instantMessaging/InstantMessagingModule.java
+++ b/src/main/java/org/olat/instantMessaging/InstantMessagingModule.java
@@ -26,7 +26,10 @@
package org.olat.instantMessaging;
+import javax.net.SocketFactory;
+
import org.jivesoftware.smack.ConnectionConfiguration;
+import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode;
import org.jivesoftware.smack.XMPPConnection;
import org.olat.admin.user.delete.service.UserDeletionManager;
import org.olat.core.commons.persistence.DB;
@@ -157,6 +160,10 @@ public class InstantMessagingModule implements Initializable, Destroyable, UserD
connConfig.setNotMatchingDomainCheckEnabled(false);
connConfig.setSASLAuthenticationEnabled(false);
connConfig.setReconnectionAllowed(false);
+ //disable the SSL connection to save a lot of memory
+ connConfig.setSecurityMode(SecurityMode.disabled);
+ //make sure that smackx doesn't use the SSLSocketFactory
+ connConfig.setSocketFactory(SocketFactory.getDefault());
}
return connConfig;
}
--
GitLab