You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/11/19 17:21:49 UTC
ignite git commit: IGNITE-1945 - Rebuilt classes and fixed test.
Repository: ignite
Updated Branches:
refs/heads/ignite-1945 e54cac058 -> db99074b4
IGNITE-1945 - Rebuilt classes and fixed test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/db99074b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/db99074b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/db99074b
Branch: refs/heads/ignite-1945
Commit: db99074b41106919753b3f3813b18c396457d584
Parents: e54cac0
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Nov 19 19:21:39 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Nov 19 19:21:39 2015 +0300
----------------------------------------------------------------------
modules/core/src/main/resources/META-INF/classnames.properties | 3 ++-
.../cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/db99074b/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 197090e..94deec2 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -299,6 +299,7 @@ org.apache.ignite.internal.portable.BinaryObjectOffheapImpl
org.apache.ignite.internal.portable.BinaryReaderExImpl$Flag
org.apache.ignite.internal.portable.PortableClassDescriptor$Mode
org.apache.ignite.internal.portable.PortableContext
+org.apache.ignite.internal.portable.PortableSchema
org.apache.ignite.internal.portable.builder.PortableLazyMap$1$1$1
org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion
org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
@@ -743,7 +744,7 @@ org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorI
org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl$5
org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl$MetaDataEntryFilter
org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl$MetaDataPredicate
-org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl$MetaDataProcessor
+org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl$MetadataProcessor
org.apache.ignite.internal.processors.cache.portable.PortableMetadataKey
org.apache.ignite.internal.processors.cache.query.CacheQueryType
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$1
http://git-wip-us.apache.org/repos/asf/ignite/blob/db99074b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index 01c2db2..e5c9425 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.lang.IgniteBiPredicate;
+import org.apache.ignite.marshaller.portable.BinaryMarshaller;
/**
* Checks behavior on exception while unmarshalling key.
@@ -90,8 +91,9 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm
* @return {@code True} if portable marshaller is configured.
*/
private boolean portableMarshaller() {
- IgniteEx kernal = (IgniteKernal)ignite(0);
+ IgniteEx kernal = (IgniteEx)ignite(0);
- return "PortableMarshaller".equals(kernal.context().config().getMarshaller().getClass().getSimpleName());
+ return BinaryMarshaller.class.getSimpleName().equals(kernal.context().config().getMarshaller().getClass()
+ .getSimpleName());
}
}
\ No newline at end of file