Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 189c5fc9e -> 90300adf1
IGNITE-45 - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c08f427e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c08f427e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c08f427e Branch: refs/heads/ignite-45 Commit: c08f427e711c8b2cb61a42f7824f6c27b803b441 Parents: 0db778b Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Mar 20 14:55:51 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Mar 20 14:55:51 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/cache/CacheTypeFieldMetadata.java | 7 ++++++- .../main/java/org/apache/ignite/cache/CacheTypeMetadata.java | 6 +++++- .../ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java | 4 +++- .../jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c08f427e/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java index 625873b..399128d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeFieldMetadata.java @@ -19,10 +19,15 @@ package org.apache.ignite.cache; import org.apache.ignite.internal.util.typedef.internal.*; +import java.io.Serializable; + /** * Type field metadata. */ -public class CacheTypeFieldMetadata { +public class CacheTypeFieldMetadata implements Serializable { + /** */ + private static final long serialVersionUID = 0L; + /** Column name in database. */ private String dbName; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c08f427e/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java index f25d9f4..7527f69 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java @@ -20,12 +20,16 @@ package org.apache.ignite.cache; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.lang.*; +import java.io.Serializable; import java.util.*; /** * Type metadata. */ -public class CacheTypeMetadata { +public class CacheTypeMetadata implements Serializable { + /** */ + private static final long serialVersionUID = 0L; + /** Schema name in database. */ private String dbSchema; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c08f427e/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java index 119f5f5..1ecde17 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshallerObjectInputStream.java @@ -17,6 +17,8 @@ package org.apache.ignite.marshaller.jdk; +import org.apache.ignite.internal.util.typedef.internal.U; + import java.io.*; /** @@ -47,7 +49,7 @@ class JdkMarshallerObjectInputStream extends ObjectInputStream { // Must have 'Class.forName()' instead of clsLoader.loadClass() // due to weird ClassNotFoundExceptions for arrays of classes // in certain cases. - return Class.forName(desc.getName(), true, clsLdr); + return U.forName(desc.getName(), clsLdr); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c08f427e/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java index 770c901..e060cea 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java @@ -145,7 +145,7 @@ public abstract class CacheJdbcStoreAbstractMultithreadedSelfTest<T extends Cach springCtx.refresh(); - Collection<CacheTypeMetadata> tp = springCtx.getBeansOfType(CacheTypeMetadata.class).values(); + Collection<CacheTypeMetadata> tp = new ArrayList<>(springCtx.getBeansOfType(CacheTypeMetadata.class).values()); cc.setTypeMetadata(tp); }
