Repository: ignite Updated Branches: refs/heads/master 0db011d4a -> 0766ad709
Ignite-2064 Fixed issues related to IGNITE-1272 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/599d2edc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/599d2edc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/599d2edc Branch: refs/heads/master Commit: 599d2edc6c4f3ce60654a53bb431d36db982bc87 Parents: 18fef56 Author: Anton Vinogradov <a...@apache.org> Authored: Thu Dec 10 14:19:59 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Thu Dec 10 14:19:59 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/portable/BinaryObjectImpl.java | 1 - .../ignite/internal/portable/BinaryObjectOffheapImpl.java | 6 ++++-- .../internal/portable/builder/BinaryObjectBuilderImpl.java | 3 +-- .../ignite/internal/portable/builder/PortableBuilderEnum.java | 3 +-- .../internal/portable/builder/PortableBuilderReader.java | 5 +++-- .../internal/portable/builder/PortableEnumArrayLazyValue.java | 3 +-- .../portable/builder/PortableObjectArrayLazyValue.java | 3 +-- .../internal/processors/platform/PlatformContextImpl.java | 7 +++++-- .../context/IgniteCacheAbstractExecutionContextTest.java | 3 --- 9 files changed, 16 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/599d2edc/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java index c8528d9..5b9bd90 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java @@ -546,7 +546,6 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern * @return Object. */ private Object deserializeValue(@Nullable CacheObjectContext coCtx) { - // TODO: IGNITE-1272 - Deserialize with proper class loader. BinaryReaderExImpl reader = reader(null); Object obj0 = reader.deserialize(); http://git-wip-us.apache.org/repos/asf/ignite/blob/599d2edc/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java index 6de0432..7d2fb7c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java @@ -409,7 +409,6 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter * @return Deserialized value. */ private Object deserializeValue() { - // TODO: IGNITE-1272 - Deserialize with proper class loader. return reader(null).deserialize(); } @@ -424,6 +423,9 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter stream.position(start); - return new BinaryReaderExImpl(ctx, stream, null, rCtx); + return new BinaryReaderExImpl(ctx, + stream, + ctx.configuration().getClassLoader(), + rCtx); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/599d2edc/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java index c4ce9e6..3382f43 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/BinaryObjectBuilderImpl.java @@ -154,8 +154,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder { Class cls; try { - // TODO: IGNITE-1272 - Is class loader needed here? - cls = U.forName(clsNameToWrite, null); + cls = U.forName(clsNameToWrite, ctx.configuration().getClassLoader()); } catch (ClassNotFoundException e) { throw new BinaryInvalidTypeException("Failed to load the class: " + clsNameToWrite, e); http://git-wip-us.apache.org/repos/asf/ignite/blob/599d2edc/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderEnum.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderEnum.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderEnum.java index 6f79e73..ecf5bef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderEnum.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderEnum.java @@ -57,8 +57,7 @@ public class PortableBuilderEnum implements PortableBuilderSerializationAware { Class cls; try { - // TODO: IGNITE-1272 - Is class loader needed here? - cls = U.forName(reader.readString(), null); + cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader()); } catch (ClassNotFoundException e) { throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e); http://git-wip-us.apache.org/repos/asf/ignite/blob/599d2edc/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java index 0b7e0b5..249af63 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderReader.java @@ -67,8 +67,9 @@ public class PortableBuilderReader implements PortablePositionReadable { arr = objImpl.array(); pos = objImpl.start(); - // TODO: IGNITE-1272 - Is class loader needed here? - reader = new BinaryReaderExImpl(ctx, PortableHeapInputStream.create(arr, pos), null); + reader = new BinaryReaderExImpl(ctx, + PortableHeapInputStream.create(arr, pos), + ctx.configuration().getClassLoader()); objMap = new HashMap<>(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/599d2edc/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableEnumArrayLazyValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableEnumArrayLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableEnumArrayLazyValue.java index 91c1c87..1b927e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableEnumArrayLazyValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableEnumArrayLazyValue.java @@ -50,8 +50,7 @@ class PortableEnumArrayLazyValue extends PortableAbstractLazyValue { Class cls; try { - // TODO: IGNITE-1272 - Is class loader needed here? - cls = U.forName(reader.readString(), null); + cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader()); } catch (ClassNotFoundException e) { throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e); http://git-wip-us.apache.org/repos/asf/ignite/blob/599d2edc/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableObjectArrayLazyValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableObjectArrayLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableObjectArrayLazyValue.java index 8c8022b..cce1cf2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableObjectArrayLazyValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableObjectArrayLazyValue.java @@ -49,8 +49,7 @@ class PortableObjectArrayLazyValue extends PortableAbstractLazyValue { Class cls; try { - // TODO: IGNITE-1272 - Is class loader needed here? - cls = U.forName(reader.readString(), null); + cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader()); } catch (ClassNotFoundException e) { throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e); http://git-wip-us.apache.org/repos/asf/ignite/blob/599d2edc/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java index 71f42e2..565a854 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java @@ -175,8 +175,11 @@ public class PlatformContextImpl implements PlatformContext { /** {@inheritDoc} */ @Override public BinaryRawReaderEx reader(PlatformInputStream in) { - // TODO: IGNITE-1272 - Is class loader needed here? - return new BinaryReaderExImpl(marsh.context(), in, null, null, true); + return new BinaryReaderExImpl(marsh.context(), + in, + ctx.config().getClassLoader(), + null, + true); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/599d2edc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java index cc4d228..b909615 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java @@ -65,9 +65,6 @@ public abstract class IgniteCacheAbstractExecutionContextTest extends IgniteCach * @throws Exception If failed. */ public void testUsersClassLoader() throws Exception { - if (F.eq(GridTestProperties.getProperty(GridTestProperties.MARSH_CLASS_NAME), BinaryMarshaller.class.getName())) - fail("https://issues.apache.org/jira/browse/IGNITE-1272";); - UsersClassLoader testClassLdr = (UsersClassLoader)grid(0).configuration().getClassLoader(); Object val = testClassLdr.loadClass(TEST_VALUE).newInstance();
