[exo-jcr-commits] exo-jcr SVN: r2111 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2010-03-24 12:42:33 -0400 (Wed, 24 Mar 2010)
New Revision: 2111

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java
Log:
EXOJCR-608: XaSessionImpl as XA resource should be unique per user, workspace and repository

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java	2010-03-24 16:19:38 UTC (rev 2110)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java	2010-03-24 16:42:33 UTC (rev 2111)
@@ -279,7 +279,12 @@
       if (resource instanceof XASessionImpl)
       {
          XASessionImpl session = (XASessionImpl)resource;
-         boolean isSame = getUserID().equals(session.getUserID());
+         boolean isSame =
+            getUserID().equals(session.getUserID())
+               && getWorkspace().getName().equals(session.getWorkspace().getName())
+               && ((RepositoryImpl)getRepository()).getName().equals(
+                  ((RepositoryImpl)session.getRepository()).getName());
+
          if (LOG.isDebugEnabled())
          {
             LOG.debug("isSameRM: " + getSessionInfo() + " -- " + session.getSessionInfo() + " : " + isSame + ", "