You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/08/25 12:17:19 UTC
ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1093
Repository: ignite
Updated Branches:
refs/heads/ignite-1093 35f3b5d6d -> 96e9a97eb
Merge remote-tracking branch 'remotes/origin/master' into ignite-1093
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/96e9a97e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/96e9a97e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/96e9a97e
Branch: refs/heads/ignite-1093
Commit: 96e9a97eb16d1d512a4e6a6c9c020fb81ef2087e
Parents: 35f3b5d
Author: Anton Vinogradov <vi...@gmail.com>
Authored: Tue Aug 25 13:17:06 2015 +0300
Committer: Anton Vinogradov <vi...@gmail.com>
Committed: Tue Aug 25 13:17:06 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheIoManager.java | 2 +-
.../cache/distributed/dht/preloader/GridDhtPartitionDemander.java | 2 +-
.../distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/96e9a97e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index a3a0a4e..9e8f8ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -502,7 +502,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
break;
- case 113: {
+ case 114: {
GridDhtPartitionSupplyMessageV2 req = (GridDhtPartitionSupplyMessageV2)msg;
U.error(log, "Supply message v2 cannot be unmarshalled.", req.classError());
http://git-wip-us.apache.org/repos/asf/ignite/blob/96e9a97e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index e1b70e3..9d244ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -239,7 +239,7 @@ public class GridDhtPartitionDemander {
syncFut.init(assigns);
if (assigns.isEmpty() || topologyChanged(topVer)) {
- syncFut.onDone();
+ syncFut.onCancel();
return;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96e9a97e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
index 93d0db6..01056ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
@@ -405,7 +405,7 @@ public class GridDhtPartitionSupplyMessageV2 extends GridCacheMessage implements
/** {@inheritDoc} */
@Override public byte directType() {
- return 113;
+ return 114;
}
/** {@inheritDoc} */