From ddc3324ca8c265915006c4479f22c5d3ad141b6e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 30 Jul 2012 14:18:56 +0200
Subject: [PATCH] OO-310: allow username like _instanceId for the IM server
---
.../org/olat/instantMessaging/IMNameHelper.java | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/src/main/java/org/olat/instantMessaging/IMNameHelper.java b/src/main/java/org/olat/instantMessaging/IMNameHelper.java
index 67795be8741..917242a4906 100644
--- a/src/main/java/org/olat/instantMessaging/IMNameHelper.java
+++ b/src/main/java/org/olat/instantMessaging/IMNameHelper.java
@@ -19,12 +19,7 @@
*/
package org.olat.instantMessaging;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-
import org.olat.core.logging.LogDelegator;
-import org.olat.core.logging.OLATRuntimeException;
import org.olat.core.logging.StartupException;
@@ -68,15 +63,6 @@ public class IMNameHelper extends LogDelegator {
// replace "@" by "_at_" --> this allows "@" also for olat-usernames
String imUsername = olatUsername.replace("@", config.getReplaceStringForEmailAt());
if (config.isMultipleInstances()) {
- if (olatUsername.contains(USERNAME_INSTANCE_DELIMITER + instanceID)){
- // build stacktrace to find bad places in code:
- OLATRuntimeException ore = new OLATRuntimeException("stacktrace for calls to IMNameHelper.getIMUsernameByOlatUsername()", null);
- final Writer result = new StringWriter();
- final PrintWriter printWriter = new PrintWriter(result);
- ore.printStackTrace(printWriter);
- logError("Double wrapping of olat-username! check the usage of it, as this IMUser (given olat-username: " + olatUsername + " imUsername: " + imUsername + " ) already contained the instanceID!! Calling Stack: " + result.toString(), null);
- return olatUsername.toLowerCase();
- }
return (imUsername + USERNAME_INSTANCE_DELIMITER + instanceID).toLowerCase();
}
else {
--
GitLab