[04/35] ignite git commit: Ignite-1.5 - Fixing tests.

[vozerov]

Ignite-1.5 - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aee20d9d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aee20d9d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aee20d9d

Branch: refs/heads/ignite-1626
Commit: aee20d9d6822fd13fd437420b439ea18e99d0223
Parents: eed4b1c
Author: Alexey Goncharuk 
Authored: Mon Nov 30 17:27:41 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Nov 30 17:27:41 2015 +0300

--
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../distributed/dht/GridDhtLockFuture.java  |  17 ++-
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 .../IgniteCacheStoreValueAbstractTest.java  | 111 +++
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...eRebalancingUnmarshallingFailedSelfTest.java |  13 ++-
 6 files changed, 104 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index fabbcb2..5e30bf6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -145,11 +145,15 @@ public class GridDeploymentPerVersionStore extends 
GridDeploymentStoreAdapter {
 "nodes: " + dep);
 }
 }
-else if (log.isDebugEnabled())
-log.debug("Preserving deployment without 
node participants: " + dep);
+else {
+if (log.isDebugEnabled())
+log.debug("Preserving deployment 
without node participants: " + dep);
+}
+}
+else {
+if (log.isDebugEnabled())
+log.debug("Keeping deployment as it still 
has participants: " + dep);
 }
-else if (log.isDebugEnabled())
-log.debug("Keeping deployment as it still has 
participants: " + dep);
 }
 
 if (deps.isEmpty())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 2b5d5a4..f0d2e15 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -738,11 +738,22 @@ public final class GridDhtLockFuture extends 
GridCompoundIdentityFuture
 if (!success && !stopping)
 undoLocks(true);
 
-if (tx != null)
+boolean set = false;
+
+if (tx != null) {
 cctx.tm().txContext(tx);
 
-if (err == null && !stopping)
-loadMissingFromStore();
+set = cctx.tm().setTxTopologyHint(tx);
+}
+
+try {
+if (err == null && !stopping)
+loadMissingFromStore();
+}
+finally {
+if (set)
+cctx.tm().setTxTopologyHint(null);
+}
 
 if (super.onDone(success, err)) {
 if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index b2f0f65..9f8bae3 100644
--- 

[09/32] ignite git commit: Ignite-1.5 - Fixing tests.

[anovikov]

Ignite-1.5 - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aee20d9d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aee20d9d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aee20d9d

Branch: refs/heads/ignite-843-rc2
Commit: aee20d9d6822fd13fd437420b439ea18e99d0223
Parents: eed4b1c
Author: Alexey Goncharuk 
Authored: Mon Nov 30 17:27:41 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Nov 30 17:27:41 2015 +0300

--
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../distributed/dht/GridDhtLockFuture.java  |  17 ++-
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 .../IgniteCacheStoreValueAbstractTest.java  | 111 +++
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...eRebalancingUnmarshallingFailedSelfTest.java |  13 ++-
 6 files changed, 104 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index fabbcb2..5e30bf6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -145,11 +145,15 @@ public class GridDeploymentPerVersionStore extends 
GridDeploymentStoreAdapter {
 "nodes: " + dep);
 }
 }
-else if (log.isDebugEnabled())
-log.debug("Preserving deployment without 
node participants: " + dep);
+else {
+if (log.isDebugEnabled())
+log.debug("Preserving deployment 
without node participants: " + dep);
+}
+}
+else {
+if (log.isDebugEnabled())
+log.debug("Keeping deployment as it still 
has participants: " + dep);
 }
-else if (log.isDebugEnabled())
-log.debug("Keeping deployment as it still has 
participants: " + dep);
 }
 
 if (deps.isEmpty())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 2b5d5a4..f0d2e15 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -738,11 +738,22 @@ public final class GridDhtLockFuture extends 
GridCompoundIdentityFuture
 if (!success && !stopping)
 undoLocks(true);
 
-if (tx != null)
+boolean set = false;
+
+if (tx != null) {
 cctx.tm().txContext(tx);
 
-if (err == null && !stopping)
-loadMissingFromStore();
+set = cctx.tm().setTxTopologyHint(tx);
+}
+
+try {
+if (err == null && !stopping)
+loadMissingFromStore();
+}
+finally {
+if (set)
+cctx.tm().setTxTopologyHint(null);
+}
 
 if (super.onDone(success, err)) {
 if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index b2f0f65..9f8bae3 100644
--- 

[07/12] ignite git commit: Ignite-1.5 - Fixing tests.

[agoncharuk]

Ignite-1.5 - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aee20d9d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aee20d9d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aee20d9d

Branch: refs/heads/ignite-1.5.1
Commit: aee20d9d6822fd13fd437420b439ea18e99d0223
Parents: eed4b1c
Author: Alexey Goncharuk 
Authored: Mon Nov 30 17:27:41 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Nov 30 17:27:41 2015 +0300

--
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../distributed/dht/GridDhtLockFuture.java  |  17 ++-
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 .../IgniteCacheStoreValueAbstractTest.java  | 111 +++
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...eRebalancingUnmarshallingFailedSelfTest.java |  13 ++-
 6 files changed, 104 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index fabbcb2..5e30bf6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -145,11 +145,15 @@ public class GridDeploymentPerVersionStore extends 
GridDeploymentStoreAdapter {
 "nodes: " + dep);
 }
 }
-else if (log.isDebugEnabled())
-log.debug("Preserving deployment without 
node participants: " + dep);
+else {
+if (log.isDebugEnabled())
+log.debug("Preserving deployment 
without node participants: " + dep);
+}
+}
+else {
+if (log.isDebugEnabled())
+log.debug("Keeping deployment as it still 
has participants: " + dep);
 }
-else if (log.isDebugEnabled())
-log.debug("Keeping deployment as it still has 
participants: " + dep);
 }
 
 if (deps.isEmpty())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 2b5d5a4..f0d2e15 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -738,11 +738,22 @@ public final class GridDhtLockFuture extends 
GridCompoundIdentityFuture
 if (!success && !stopping)
 undoLocks(true);
 
-if (tx != null)
+boolean set = false;
+
+if (tx != null) {
 cctx.tm().txContext(tx);
 
-if (err == null && !stopping)
-loadMissingFromStore();
+set = cctx.tm().setTxTopologyHint(tx);
+}
+
+try {
+if (err == null && !stopping)
+loadMissingFromStore();
+}
+finally {
+if (set)
+cctx.tm().setTxTopologyHint(null);
+}
 
 if (super.onDone(success, err)) {
 if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index b2f0f65..9f8bae3 100644
--- 

[09/16] ignite git commit: Ignite-1.5 - Fixing tests.

[sboikov]

Ignite-1.5 - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aee20d9d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aee20d9d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aee20d9d

Branch: refs/heads/ignite-1537
Commit: aee20d9d6822fd13fd437420b439ea18e99d0223
Parents: eed4b1c
Author: Alexey Goncharuk 
Authored: Mon Nov 30 17:27:41 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Nov 30 17:27:41 2015 +0300

--
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../distributed/dht/GridDhtLockFuture.java  |  17 ++-
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 .../IgniteCacheStoreValueAbstractTest.java  | 111 +++
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...eRebalancingUnmarshallingFailedSelfTest.java |  13 ++-
 6 files changed, 104 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index fabbcb2..5e30bf6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -145,11 +145,15 @@ public class GridDeploymentPerVersionStore extends 
GridDeploymentStoreAdapter {
 "nodes: " + dep);
 }
 }
-else if (log.isDebugEnabled())
-log.debug("Preserving deployment without 
node participants: " + dep);
+else {
+if (log.isDebugEnabled())
+log.debug("Preserving deployment 
without node participants: " + dep);
+}
+}
+else {
+if (log.isDebugEnabled())
+log.debug("Keeping deployment as it still 
has participants: " + dep);
 }
-else if (log.isDebugEnabled())
-log.debug("Keeping deployment as it still has 
participants: " + dep);
 }
 
 if (deps.isEmpty())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 2b5d5a4..f0d2e15 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -738,11 +738,22 @@ public final class GridDhtLockFuture extends 
GridCompoundIdentityFuture
 if (!success && !stopping)
 undoLocks(true);
 
-if (tx != null)
+boolean set = false;
+
+if (tx != null) {
 cctx.tm().txContext(tx);
 
-if (err == null && !stopping)
-loadMissingFromStore();
+set = cctx.tm().setTxTopologyHint(tx);
+}
+
+try {
+if (err == null && !stopping)
+loadMissingFromStore();
+}
+finally {
+if (set)
+cctx.tm().setTxTopologyHint(null);
+}
 
 if (super.onDone(success, err)) {
 if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index b2f0f65..9f8bae3 100644
--- 

ignite git commit: Ignite-1.5 - Fixing tests.

[agoncharuk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 eed4b1c24 -> aee20d9d6


Ignite-1.5 - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aee20d9d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aee20d9d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aee20d9d

Branch: refs/heads/ignite-1.5
Commit: aee20d9d6822fd13fd437420b439ea18e99d0223
Parents: eed4b1c
Author: Alexey Goncharuk 
Authored: Mon Nov 30 17:27:41 2015 +0300
Committer: Alexey Goncharuk 
Committed: Mon Nov 30 17:27:41 2015 +0300

--
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../distributed/dht/GridDhtLockFuture.java  |  17 ++-
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 .../IgniteCacheStoreValueAbstractTest.java  | 111 +++
 .../cache/IgniteCacheTxPreloadNoWriteTest.java  |   2 +-
 ...eRebalancingUnmarshallingFailedSelfTest.java |  13 ++-
 6 files changed, 104 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index fabbcb2..5e30bf6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -145,11 +145,15 @@ public class GridDeploymentPerVersionStore extends 
GridDeploymentStoreAdapter {
 "nodes: " + dep);
 }
 }
-else if (log.isDebugEnabled())
-log.debug("Preserving deployment without 
node participants: " + dep);
+else {
+if (log.isDebugEnabled())
+log.debug("Preserving deployment 
without node participants: " + dep);
+}
+}
+else {
+if (log.isDebugEnabled())
+log.debug("Keeping deployment as it still 
has participants: " + dep);
 }
-else if (log.isDebugEnabled())
-log.debug("Keeping deployment as it still has 
participants: " + dep);
 }
 
 if (deps.isEmpty())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 2b5d5a4..f0d2e15 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -738,11 +738,22 @@ public final class GridDhtLockFuture extends 
GridCompoundIdentityFuture
 if (!success && !stopping)
 undoLocks(true);
 
-if (tx != null)
+boolean set = false;
+
+if (tx != null) {
 cctx.tm().txContext(tx);
 
-if (err == null && !stopping)
-loadMissingFromStore();
+set = cctx.tm().setTxTopologyHint(tx);
+}
+
+try {
+if (err == null && !stopping)
+loadMissingFromStore();
+}
+finally {
+if (set)
+cctx.tm().setTxTopologyHint(null);
+}
 
 if (super.onDone(success, err)) {
 if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/ignite/blob/aee20d9d/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 

[14/24] ignite git commit: ignite-1.5 - Fixing tests.

[agoncharuk]

ignite-1.5 - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/385668b3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/385668b3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/385668b3

Branch: refs/heads/ignite-1.5
Commit: 385668b3bd9a77f87c11e39a7d915a54a48e39be
Parents: 7680392
Author: Alexey Goncharuk 
Authored: Tue Nov 24 19:34:35 2015 +0300
Committer: Alexey Goncharuk 
Committed: Tue Nov 24 19:34:35 2015 +0300

--
 .../ignite/internal/NodeStoppingException.java  | 35 
 .../processors/cache/GridCacheIoManager.java|  4 +++
 .../processors/cache/GridCacheMvccManager.java  |  3 +-
 .../distributed/dht/GridDhtLockFuture.java  | 19 ++-
 .../CacheObjectBinaryProcessorImpl.java |  6 ++--
 5 files changed, 54 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
new file mode 100644
index 000..164983a
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import org.apache.ignite.IgniteCheckedException;
+
+/**
+ *
+ */
+public class NodeStoppingException extends IgniteCheckedException {
+/** */
+private static final long serialVersionUID = 0L;
+
+/**
+ * @param msg Exception message.
+ */
+public NodeStoppingException(String msg) {
+super(msg);
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/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 7b1d749..f7fe5bd 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
@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
@@ -1036,6 +1037,9 @@ public class GridCacheIoManager extends 
GridCacheSharedManagerAdapter {
 catch (IgniteCheckedException e) {
 cacheMsg.onClassError(e);
 }
+catch (BinaryObjectException e) {
+cacheMsg.onClassError(new IgniteCheckedException(e));
+}
 catch (Error e) {
 if (cacheMsg.ignoreClassErrors() && X.hasCause(e, 
NoClassDefFoundError.class,
 UnsupportedClassVersionError.class))

http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index 2449df1..dbc6992 100644
--- 

[14/38] ignite git commit: ignite-1.5 - Fixing tests.

[sboikov]

ignite-1.5 - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/385668b3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/385668b3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/385668b3

Branch: refs/heads/ignite-1537
Commit: 385668b3bd9a77f87c11e39a7d915a54a48e39be
Parents: 7680392
Author: Alexey Goncharuk 
Authored: Tue Nov 24 19:34:35 2015 +0300
Committer: Alexey Goncharuk 
Committed: Tue Nov 24 19:34:35 2015 +0300

--
 .../ignite/internal/NodeStoppingException.java  | 35 
 .../processors/cache/GridCacheIoManager.java|  4 +++
 .../processors/cache/GridCacheMvccManager.java  |  3 +-
 .../distributed/dht/GridDhtLockFuture.java  | 19 ++-
 .../CacheObjectBinaryProcessorImpl.java |  6 ++--
 5 files changed, 54 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
new file mode 100644
index 000..164983a
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import org.apache.ignite.IgniteCheckedException;
+
+/**
+ *
+ */
+public class NodeStoppingException extends IgniteCheckedException {
+/** */
+private static final long serialVersionUID = 0L;
+
+/**
+ * @param msg Exception message.
+ */
+public NodeStoppingException(String msg) {
+super(msg);
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/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 7b1d749..f7fe5bd 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
@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
@@ -1036,6 +1037,9 @@ public class GridCacheIoManager extends 
GridCacheSharedManagerAdapter {
 catch (IgniteCheckedException e) {
 cacheMsg.onClassError(e);
 }
+catch (BinaryObjectException e) {
+cacheMsg.onClassError(new IgniteCheckedException(e));
+}
 catch (Error e) {
 if (cacheMsg.ignoreClassErrors() && X.hasCause(e, 
NoClassDefFoundError.class,
 UnsupportedClassVersionError.class))

http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index 2449df1..dbc6992 100644
--- 

[1/2] ignite git commit: ignite-1.5 - Fixing tests.

[agoncharuk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1282 76803923d -> 8e1d6c0e8


ignite-1.5 - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/385668b3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/385668b3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/385668b3

Branch: refs/heads/ignite-1282
Commit: 385668b3bd9a77f87c11e39a7d915a54a48e39be
Parents: 7680392
Author: Alexey Goncharuk 
Authored: Tue Nov 24 19:34:35 2015 +0300
Committer: Alexey Goncharuk 
Committed: Tue Nov 24 19:34:35 2015 +0300

--
 .../ignite/internal/NodeStoppingException.java  | 35 
 .../processors/cache/GridCacheIoManager.java|  4 +++
 .../processors/cache/GridCacheMvccManager.java  |  3 +-
 .../distributed/dht/GridDhtLockFuture.java  | 19 ++-
 .../CacheObjectBinaryProcessorImpl.java |  6 ++--
 5 files changed, 54 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
new file mode 100644
index 000..164983a
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/NodeStoppingException.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import org.apache.ignite.IgniteCheckedException;
+
+/**
+ *
+ */
+public class NodeStoppingException extends IgniteCheckedException {
+/** */
+private static final long serialVersionUID = 0L;
+
+/**
+ * @param msg Exception message.
+ */
+public NodeStoppingException(String msg) {
+super(msg);
+}
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/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 7b1d749..f7fe5bd 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
@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
@@ -1036,6 +1037,9 @@ public class GridCacheIoManager extends 
GridCacheSharedManagerAdapter {
 catch (IgniteCheckedException e) {
 cacheMsg.onClassError(e);
 }
+catch (BinaryObjectException e) {
+cacheMsg.onClassError(new IgniteCheckedException(e));
+}
 catch (Error e) {
 if (cacheMsg.ignoreClassErrors() && X.hasCause(e, 
NoClassDefFoundError.class,
 UnsupportedClassVersionError.class))

http://git-wip-us.apache.org/repos/asf/ignite/blob/385668b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index 2449df1..dbc6992 100644
---