Repository: incubator-ignite Updated Branches: refs/heads/ignite-141 3a5aa3871 -> 095f31d32
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/095f31d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/095f31d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/095f31d3 Branch: refs/heads/ignite-141 Commit: 095f31d328ad0bed93f7baceb6b21b86ffaadf20 Parents: 3a5aa38 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Sun Mar 1 07:23:58 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Sun Mar 1 07:23:58 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/IgniteKernal.java | 10 +++++++--- .../ignite/marshaller/optimized/classnames.properties | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/095f31d3/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index f1ec712..71c9a5e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -2742,7 +2742,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { cache = ctx.cache().marshallerCache(); // TODO: IGNITE-141 - Do not create thread. - Thread t = new Thread(new MarshallerCacheUpdater(cache, id, clsName)); + Thread t = new Thread(new MarshallerCacheUpdater(ctx.log(), cache, id, clsName)); t.start(); @@ -2772,6 +2772,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { */ private static class MarshallerCacheUpdater implements Runnable { /** */ + private final IgniteLogger log; + + /** */ private final GridCacheAdapter<Integer, String> cache; /** */ @@ -2785,7 +2788,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { * @param typeId Type ID. * @param clsName Class name. */ - private MarshallerCacheUpdater(GridCacheAdapter<Integer, String> cache, int typeId, String clsName) { + private MarshallerCacheUpdater(IgniteLogger log, GridCacheAdapter<Integer, String> cache, int typeId, String clsName) { + this.log = log; this.cache = cache; this.typeId = typeId; this.clsName = clsName; @@ -2795,7 +2799,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { @Override public void run() { try { // TODO: IGNITE-141 - Remove debug - U.debug(">>> REGISTER: " + clsName); + U.debug(log, ">>> REGISTER: " + clsName); String old = cache.putIfAbsent(typeId, clsName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/095f31d3/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/classnames.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/classnames.properties b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/classnames.properties index ff7ddb2..a88959b 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/classnames.properties +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/classnames.properties @@ -1,3 +1,4 @@ +[B [Lorg.apache.ignite.lang.IgnitePredicate; java.lang.Boolean java.lang.Integer
