IGNITE-443 Fixed javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2cbf4406 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2cbf4406 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2cbf4406 Branch: refs/heads/ignite-443 Commit: 2cbf4406dccfcfef2229caf1ba9336ee64a9d83d Parents: 163297e Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Mar 11 17:52:55 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Mar 11 18:23:43 2015 +0300 ---------------------------------------------------------------------- .../ignite/cache/CacheConflictResolverMode.java | 16 ++++++++-------- .../ignite/internal/GridKernalContextImpl.java | 5 ++--- .../processors/cache/GridCacheProcessor.java | 6 +++--- 3 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2cbf4406/modules/core/src/main/java/org/apache/ignite/cache/CacheConflictResolverMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConflictResolverMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConflictResolverMode.java index e0ed100..d98e7b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConflictResolverMode.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConflictResolverMode.java @@ -17,17 +17,17 @@ package org.apache.ignite.cache; +import org.apache.ignite.configuration.*; import org.jetbrains.annotations.*; /** * Cache conflict resolver mode. * <p> * Each cache entry has data center ID. In case cache update is performed and either old or new cache entry has data - * center ID which differs from local data center ID defined by {@link org.apache.ignite.configuration.IgniteConfiguration#getDataCenterId()}, then - * we consider such situation as conflict. + * center ID which differs from local data center ID defined, then we consider such situation as conflict. * <p> - * If both entries participating in conflict have the same data cneter ID (i.e. they both were replicated from the same - * remote data center), then GridGain can potentially resolve this conflict automatically based on entry metadata. + * If both entries participating in conflict have the same data center ID (i.e. they both were replicated from the same + * remote data center), then Ignite can potentially resolve this conflict automatically based on entry metadata. * <p> * But in case old and new entries have different data center IDs (i.e. in active-active scenario when cache is updated * in both data centers participating in data center replication, or when cache is updated from multiple remote data @@ -40,19 +40,19 @@ public enum CacheConflictResolverMode { * Ignite will automatically resolve conflicts when possible (i.e. when both old and new entries have the same * data center ID). In all other situations, conflict resolution will be delegated to * {@link CacheConflictResolver} configured through - * {@link DrReceiverCacheConfiguration#getConflictResolver()}. In case conflict resolver is not configured, - * GridGain will overwrite old entry with a new one. + * {@link CacheConfiguration#getConflictResolver()}. In case conflict resolver is not configured, + * Ignite will overwrite old entry with a new one. * <p> * This mode is default. */ AUTO, /** - * GridGain will always delegate to conflict resolver. This applies to all possible cases, even if both old and new + * Ignite will always delegate to conflict resolver. This applies to all possible cases, even if both old and new * entries have local data center ID and therefore are not considered conflicting when cache is not data center * replication receiver. * <p> - * In this mode {@link DrReceiverCacheConfiguration#getConflictResolver()} is mandatory. + * In this mode {@link CacheConfiguration#getConflictResolver()} is mandatory. */ ALWAYS; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2cbf4406/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 99c6d21..2060514 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -801,7 +801,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable return (T)new GridOsCacheDrManager(); else if (cls.equals(IgniteCacheObjectProcessor.class)) return (T)new IgniteCacheObjectProcessorImpl(this); - else if (cls.equals(CacheConflictResolver.class)) + else if (cls.equals(CacheConflictResolverManager.class)) return (T)new IgniteCacheConflictResolverManager(); throw new IgniteException("Unsupported component type: " + cls); @@ -820,8 +820,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable } /** {@inheritDoc} */ - @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { stash.set(U.readString(in)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2cbf4406/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 2a05214..631b5d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -274,7 +274,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { // Suppress warning if at least one ATOMIC cache found. perf.add("Enable ATOMIC mode if not using transactions (set 'atomicityMode' to ATOMIC)", - cfg.getAtomicityMode() == ATOMIC); + cfg.getAtomicityMode() == ATOMIC); // Suppress warning if at least one non-FULL_SYNC mode found. perf.add("Disable fully synchronous writes (set 'writeSynchronizationMode' to PRIMARY_SYNC or FULL_ASYNC)", @@ -332,8 +332,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (cc.getCacheMode() == PARTITIONED || cc.getCacheMode() == REPLICATED) { if (cc.getAtomicityMode() == ATOMIC && cc.getWriteSynchronizationMode() == FULL_ASYNC) U.warn(log, "Cache write synchronization mode is set to FULL_ASYNC. All single-key 'put' and " + - "'remove' operations will return 'null', all 'putx' and 'removex' operations will return" + - " 'true' [cacheName=" + cc.getName() + ']'); + "'remove' operations will return 'null', all 'putx' and 'removex' operations will return" + + " 'true' [cacheName=" + cc.getName() + ']'); } DeploymentMode depMode = c.getDeploymentMode();
