[JM-1323] Fixed s2s lockup issues.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@10239 b35dd754-fafc-0310-a699-88a17e54d16e

openfire_3_5_1/src/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java

@@ -208,7 +208,8 @@ public class OutgoingSessionPromise implements RoutableChannelHandler {
             // Create a connection to the remote server from the domain where the packet has been sent
             boolean created;
             // Make sure that only one cluster node is creating the outgoing connection
-            Lock lock = CacheFactory.getLock(domain, serversCache);
+            // TODO: Evaluate why removing the oss part causes nasty s2s and lockup issues.
+            Lock lock = CacheFactory.getLock(domain+"oss", serversCache);
             try {
                 lock.lock();
                 created = LocalOutgoingServerSession