Repository: incubator-ignite Updated Branches: refs/heads/ignite-141 75b231f74 -> d8036ee22
# IGNITE-141 - Marshallers refactoring Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d8036ee2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d8036ee2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d8036ee2 Branch: refs/heads/ignite-141 Commit: d8036ee228ae95ee81fcf6b285ce6b48df167906 Parents: 75b231f Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Mar 3 22:09:50 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Mar 3 22:09:50 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/MarshallerContextImpl.java | 4 +++- .../main/java/org/apache/ignite/internal/classnames.properties | 3 +++ .../ignite/visor/commands/tasks/VisorTasksCommandSpec.scala | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8036ee2/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java index 8d0e95a..295d8e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java @@ -57,7 +57,9 @@ public class MarshallerContextImpl implements MarshallerContext { if (line.isEmpty() || line.startsWith("#")) continue; - clsNameById.put(line.hashCode(), line.trim()); + String clsName = line.trim(); + + clsNameById.put(clsName.hashCode(), clsName); } } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8036ee2/modules/core/src/main/java/org/apache/ignite/internal/classnames.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/classnames.properties b/modules/core/src/main/java/org/apache/ignite/internal/classnames.properties index c5480d6..3f4596d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/classnames.properties +++ b/modules/core/src/main/java/org/apache/ignite/internal/classnames.properties @@ -22,6 +22,9 @@ [I [J [Lorg.apache.ignite.lang.IgnitePredicate; +[Ljava.lang.Object; +[Lorg.apache.ignite.lang.IgniteFuture; +[Lorg.apache.ignite.lang.IgniteBiTuple; [S [Z java.lang.AbstractMethodError http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8036ee2/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala index 2fd2843..320a6bb 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala @@ -39,13 +39,14 @@ class VisorTasksCommandSpec extends FlatSpec with Matchers with BeforeAndAfterAl * Open visor and execute several tasks before all tests. */ override def beforeAll() { - Ignition.start(config("grid-1")) + val ignite = Ignition.start(config("grid-1")) + Ignition.start(config("grid-2")) visor.open(config("visor-demo-node"), "n/a") try { - val compute = visor.ignite.compute().withAsync + val compute = ignite.compute().withAsync compute.withName("TestTask1").execute(new TestTask1(), null)
