ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [34/50] [abbrv] ignite git commit: ignite-1.5 Reverted BinaryContext.readResolve since it does not work from user thread and breaks tests
Date Mon, 28 Dec 2015 14:21:55 GMT
ignite-1.5 Reverted BinaryContext.readResolve since it does not work from user thread and breaks
tests


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/61c072e5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/61c072e5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/61c072e5

Branch: refs/heads/ignite-961
Commit: 61c072e51b16f6776e3e73252bfd5d7f09c0f21e
Parents: 8f5445a
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Dec 24 10:47:50 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Dec 24 10:47:50 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/internal/binary/BinaryContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/61c072e5/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index a27a3d0..5c63fbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -743,7 +743,7 @@ public class BinaryContext implements Externalizable {
      */
     protected Object readResolve() throws ObjectStreamException {
         try {
-            IgniteKernal g = IgnitionEx.localIgnite();
+            IgniteKernal g = IgnitionEx.gridx(gridName);
 
             if (g == null)
                 throw new IllegalStateException("Failed to find grid for name: " + gridName);


Mime
View raw message