Ported JM-1323 from branch.

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

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