Ignite-642: resolves merge conflict.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5791924 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5791924 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5791924 Branch: refs/heads/ignite-642 Commit: b5791924b520e34f9b62fd85e7a790a9a2deb3f0 Parents: 7190f24 Author: vladisav <[email protected]> Authored: Fri Mar 18 15:46:43 2016 +0100 Committer: vladisav <[email protected]> Committed: Fri Mar 18 15:46:43 2016 +0100 ---------------------------------------------------------------------- .../datastructures/DataStructuresProcessor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b5791924/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 72937cb..71a0f1d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -194,7 +194,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { for (GridCacheRemovable ds : dsMap.values()) { if (ds instanceof GridCacheSemaphoreEx) ((GridCacheSemaphoreEx)ds).onNodeRemoved(leftNodeId); - else if(ds instanceof GridCacheLockEx) + else if (ds instanceof GridCacheLockEx) ((GridCacheLockEx)ds).onNodeRemoved(leftNodeId); } @@ -269,13 +269,13 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { super.onKernalStop(cancel); for (GridCacheRemovable ds : dsMap.values()) { - if (ds instanceof GridCacheSemaphoreEx) + if (ds instanceof GridCacheSemaphoreEx) { ((GridCacheSemaphoreEx)ds).stop(); - } + } - for (GridCacheRemovable ds : dsMap.values()) { - if (ds instanceof GridCacheLockEx) + if (ds instanceof GridCacheLockEx) { ((GridCacheLockEx)ds).onStop(); + } } if (initLatch.getCount() > 0) {
