Fixed deployment test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eeb91429 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eeb91429 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eeb91429 Branch: refs/heads/ignite-1956 Commit: eeb91429f09c3525779e2d67e9e1bf4f24da72d1 Parents: 3ca58d7 Author: Alexey Goncharuk <[email protected]> Authored: Mon Nov 23 20:03:50 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Nov 23 20:03:50 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheObjectContext.java | 2 +- .../processors/cache/GridCacheDeploymentManager.java | 6 +++++- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +- .../cache/portable/CacheObjectBinaryProcessorImpl.java | 11 ++++++++++- 4 files changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb91429/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java index d49a029..928a662 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java @@ -238,7 +238,7 @@ import org.apache.ignite.internal.util.typedef.F; CacheObject co = (CacheObject)o; if (!keepPortable || co.isPlatformType()) - return unwrapPortable(co.value(this, true), keepPortable, cpy); + return unwrapPortable(co.value(this, cpy), keepPortable, cpy); } return o; http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb91429/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java index 35e8b75..d7f7521 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java @@ -179,8 +179,12 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap /** * @param ignore {@code True} to ignore. */ - public void ignoreOwnership(boolean ignore) { + public boolean ignoreOwnership(boolean ignore) { + boolean old = ignoreOwnership.get(); + ignoreOwnership.set(ignore); + + return old; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb91429/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index a8807e1..b3155a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -1049,6 +1049,6 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid /** {@inheritDoc} */ @Override public String toString() { - return S.toString(GridDhtAtomicUpdateRequest.class, this); + return S.toString(GridDhtAtomicUpdateRequest.class, this, "super", super.toString()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb91429/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java index 483b6ce..dd9d43f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java @@ -217,7 +217,16 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public void onUtilityCacheStarted() throws IgniteCheckedException { - metaDataCache = (IgniteCacheProxy)ctx.cache().jcache(CU.UTILITY_CACHE_NAME).withNoRetries(); + IgniteCacheProxy<Object, Object> proxy = ctx.cache().jcache(CU.UTILITY_CACHE_NAME); + + boolean old = proxy.context().deploy().ignoreOwnership(true); + + try { + metaDataCache = (IgniteCacheProxy)proxy.withNoRetries(); + } + finally { + proxy.context().deploy().ignoreOwnership(old); + } if (clientNode) { assert !metaDataCache.context().affinityNode();
