You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/12/14 08:07:46 UTC
[1/3] ignite git commit: Fix to GridBinaryWildcardsSelfTest.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 717dab259 -> ed27fbdab
Fix to GridBinaryWildcardsSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d96bb6a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d96bb6a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d96bb6a
Branch: refs/heads/ignite-1.5
Commit: 6d96bb6a3219255b62af826e6806b1aa564bb005
Parents: 6c61598
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 14 10:08:00 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 14 10:08:00 2015 +0300
----------------------------------------------------------------------
.../binary/GridBinaryWildcardsSelfTest.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d96bb6a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
index dc70f4d..2887afa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
@@ -213,7 +213,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
assertTrue(typeIds.containsKey("innerclass".hashCode()));
- assertFalse(typeIds.containsKey("gridbinarytestclass2".hashCode()));
+ assertFalse(typeIds.containsKey(100));
Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers");
@@ -225,7 +225,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
*/
public void testClassNamesJar() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
@@ -258,7 +258,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
return 0;
}
}, Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
@@ -277,7 +277,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
*/
public void testTypeConfigurationsJar() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
@@ -310,7 +310,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
return 0;
}
}, Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
@@ -343,7 +343,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
return 0;
}
}, Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
@@ -362,7 +362,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
*/
public void testOverrideJar() throws Exception {
BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(
- "org.apache.ignite.binary.testjar.GridBinaryTestClass2");
+ "org.apache.ignite.internal.binary.test.GridBinaryTestClass2");
typeCfg.setIdMapper(new BinaryIdMapper() {
@Override public int typeId(String clsName) {
@@ -375,7 +375,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
});
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
typeCfg));
BinaryContext ctx = binaryContext(marsh);
[3/3] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ed27fbda
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ed27fbda
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ed27fbda
Branch: refs/heads/ignite-1.5
Commit: ed27fbdab9d8307b4db427866ed1094526c117c8
Parents: 4ae6292 717dab2
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 14 10:08:47 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 14 10:08:47 2015 +0300
----------------------------------------------------------------------
.../TcpDiscoveryMulticastIpFinder.java | 106 +++++++++++++------
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 91 +++++++++++++++-
.../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +-
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 16 ++-
4 files changed, 174 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
[2/3] ignite git commit: Fixed failure in
BinaryObjectBuilderSelfTest.testCopyFromInnerObject.
Posted by vo...@apache.org.
Fixed failure in BinaryObjectBuilderSelfTest.testCopyFromInnerObject.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ae6292c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ae6292c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ae6292c
Branch: refs/heads/ignite-1.5
Commit: 4ae6292cface325f21237db5d18ce77dee380072
Parents: 6d96bb6
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 14 10:08:29 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 14 10:08:29 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/binary/BinaryUtils.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ae6292c/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 8b5ec68..9e5260b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -836,13 +836,18 @@ public class BinaryUtils {
if (oldFieldType == null)
changed = true;
- else if (!F.eq(oldFieldType, newField.getValue())) {
- throw new BinaryObjectException(
- "Binary type has different field types [" + "typeName=" + oldMeta.typeName() +
- ", fieldName=" + newField.getKey() +
- ", fieldTypeName1=" + fieldTypeName(oldFieldType) +
- ", fieldTypeName2=" + fieldTypeName(newField.getValue()) + ']'
- );
+ else {
+ String oldFieldTypeName = fieldTypeName(oldFieldType);
+ String newFieldTypeName = fieldTypeName(newField.getValue());
+
+ if (!F.eq(oldFieldTypeName, newFieldTypeName)) {
+ throw new BinaryObjectException(
+ "Binary type has different field types [" + "typeName=" + oldMeta.typeName() +
+ ", fieldName=" + newField.getKey() +
+ ", fieldTypeName1=" + oldFieldTypeName +
+ ", fieldTypeName2=" + newFieldTypeName + ']'
+ );
+ }
}
}