Cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28c4d930 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28c4d930 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28c4d930 Branch: refs/heads/ignite-2649 Commit: 28c4d93012ef46a740f5d71d237d9089f59e1655 Parents: acf0705 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Aug 24 16:23:47 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Aug 24 16:23:47 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/marshaller/MarshallerUtils.java | 17 ----------------- .../processors/query/h2/IgniteH2Indexing.java | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/28c4d930/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java index c1dc373..5651766 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java @@ -132,23 +132,6 @@ public final class MarshallerUtils { } /** - * Unmarshal object. - * <p>Use only when grid name is not available, f.e. in tests.</p> - * - * @param marshaller Marshaller. - * @param arr Bianry data. - * @param clsLdr Class loader. - * @param <T> Target type. - * @return Unmarshalled object. - * @throws IgniteCheckedException If fail. - */ - public static <T> T unmarshal(final Marshaller marshaller, byte[] arr, @Nullable ClassLoader clsLdr) - throws IgniteCheckedException { - // This method used to keep marshaller usages in one place. - return marshaller.unmarshal(arr, clsLdr); - } - - /** * Unmarshal object and set grid name thread local. * * @param marshaller Marshaller. http://git-wip-us.apache.org/repos/asf/ignite/blob/28c4d930/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 0b4e086..a3d3249 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -1548,7 +1548,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { U.resolveClassLoader(ctx.config()), ctx.gridName()); } else - return MarshallerUtils.unmarshal(marshaller, bytes, null); + return marshaller.unmarshal(bytes, null); } }; }
