IGNITE-591 Make GridCacheXAResource shared.

apache · Jul 1, 2015 · 4b06e77 · 4b06e77
1 parent 1a21477
commit 4b06e77
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/...es/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/...es/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
@@ -30,7 +30,7 @@
  */
 public class CacheJtaManager extends CacheJtaManagerAdapter {
     /** */
-    private final ThreadLocal<GridCacheXAResource> xaRsrc = new ThreadLocal<>();
+    private final static ThreadLocal<GridCacheXAResource> xaRsrc = new ThreadLocal<>();
 
     /** */
     private TransactionManager jtaTm;
@@ -89,7 +89,7 @@ public class CacheJtaManager extends CacheJtaManagerAdapter {
                             );
                         }
 
-                        rsrc = new GridCacheXAResource(tx, cctx);
+                        rsrc = new GridCacheXAResource(tx, cctx.kernalContext());
 
                         if (!jtaTx.enlistResource(rsrc))
                             throw new IgniteCheckedException("Failed to enlist XA resource to JTA user transaction.");

diff --git a/...ta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java b/...ta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.processors.cache.jta;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.transactions.*;
@@ -41,9 +41,6 @@ public final class GridCacheXAResource implements XAResource {
     /** */
     private static final Xid[] NO_XID = new Xid[] {};
 
-    /** Context. */
-    private GridCacheContext cctx;
-
     /** Cache transaction. */
     private IgniteInternalTx cacheTx;
 
@@ -52,17 +49,16 @@ public final class GridCacheXAResource implements XAResource {
 
     /**
      * @param cacheTx Cache jta.
-     * @param cctx Cache context.
+     * @param ctx Kernal context.
      */
-    public GridCacheXAResource(IgniteInternalTx cacheTx, GridCacheContext cctx) {
+    public GridCacheXAResource(IgniteInternalTx cacheTx, GridKernalContext ctx) {
         assert cacheTx != null;
-        assert cctx != null;
+        assert ctx != null;
 
-        this.cctx = cctx;
         this.cacheTx = cacheTx;
 
         if (log == null)
-            log = U.logger(cctx.kernalContext(), logRef, GridCacheXAResource.class);
+            log = U.logger(ctx, logRef, GridCacheXAResource.class);
     }
 
     /** {@inheritDoc} */
@@ -229,7 +225,7 @@ private StringBuilder addFlag(StringBuilder sb, int flags, int mask, String flag
 
         GridCacheXAResource other = (GridCacheXAResource)xar;
 
-        return cctx == other.cctx;
+        return cacheTx == other.cacheTx;
     }
 
     /**

diff --git a/...s/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/...s/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
@@ -151,8 +151,6 @@ public void testJta() throws Exception {
      */
     @SuppressWarnings("ConstantConditions")
     public void testJtaTwoCaches() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-591");
-
         UserTransaction jtaTx = jotm.getUserTransaction();
 
         IgniteEx ignite = grid(0);