#IGNITE-443 Fixed code style.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d014b82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d014b82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d014b82 Branch: refs/heads/ignite-424 Commit: 2d014b8299b88bf8c773500cf8938cbe69b8b4ec Parents: 82b3419 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Mar 31 11:36:41 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Mar 31 11:36:41 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/version/CacheVersionConflictResolver.java | 3 ++- .../cache/version/CacheVersionConflictResolverImpl.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d014b82/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java index f570634..1fe4c9e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java @@ -35,5 +35,6 @@ public interface CacheVersionConflictResolver { public <K, V> GridCacheVersionConflictContext<K, V> resolve( GridCacheVersionedEntryEx<K, V> oldEntry, GridCacheVersionedEntryEx<K, V> newEntry, - boolean atomicVerComparator) throws IgniteCheckedException; + boolean atomicVerComparator + ) throws IgniteCheckedException; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d014b82/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java index 175a451..9f316a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolverImpl.java @@ -28,7 +28,8 @@ public class CacheVersionConflictResolverImpl implements CacheVersionConflictRes @Override public <K, V> GridCacheVersionConflictContext<K, V> resolve( GridCacheVersionedEntryEx<K, V> oldEntry, GridCacheVersionedEntryEx<K, V> newEntry, - boolean atomicVerComparator) throws IgniteCheckedException { + boolean atomicVerComparator + ) throws IgniteCheckedException { GridCacheVersionConflictContext<K, V> ctx = new GridCacheVersionConflictContext<>(oldEntry, newEntry); resolve0(ctx, oldEntry, newEntry, atomicVerComparator); @@ -49,7 +50,8 @@ public class CacheVersionConflictResolverImpl implements CacheVersionConflictRes GridCacheVersionConflictContext<K, V> ctx, GridCacheVersionedEntryEx<K, V> oldEntry, GridCacheVersionedEntryEx<K, V> newEntry, - boolean atomicVerComparator) throws IgniteCheckedException { + boolean atomicVerComparator + ) throws IgniteCheckedException { if (newEntry.dataCenterId() != oldEntry.dataCenterId()) ctx.useNew(); else {
