Formatting.

apache · Jan 11, 2017 · 12a4af6 · 12a4af6
1 parent 2185adc
commit 12a4af6
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 36 deletions.
diff --git a/...src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java b/...src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
@@ -110,8 +110,11 @@ public GridCacheConcurrentMapImpl(
 
     /** {@inheritDoc} */
     @Nullable @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(final AffinityTopologyVersion topVer,
-        KeyCacheObject key, @Nullable final CacheObject val, final boolean create, final boolean touch) {
-
+        KeyCacheObject key,
+        @Nullable final CacheObject val,
+        final boolean create,
+        final boolean touch)
+    {
         GridCacheMapEntry cur = null;
         GridCacheMapEntry created = null;
         GridCacheMapEntry created0 = null;

diff --git a/...n/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/...n/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
@@ -93,7 +93,7 @@ public GridDhtCacheEntry(
 
         locPart = ctx.topology().localPartition(p, topVer, true);
 
-        assert locPart != null : locPart;
+        assert locPart != null : p;
     }
 
     /** {@inheritDoc} */

diff --git a/...va/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/...va/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -355,8 +355,11 @@ public boolean valid() {
 
     /** {@inheritDoc} */
     @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(
-        AffinityTopologyVersion topVer, KeyCacheObject key,
-        @Nullable CacheObject val, boolean create, boolean touch) {
+        AffinityTopologyVersion topVer,
+        KeyCacheObject key,
+        @Nullable CacheObject val,
+        boolean create,
+        boolean touch) {
         return map.putEntryIfObsoleteOrAbsent(topVer, key, val, create, touch);
     }
 
@@ -702,7 +705,7 @@ private boolean addEvicting() {
      *
      */
     private void clearEvicting() {
-       boolean free = false;
+       boolean free;
 
         while (true) {
             int cnt = evictGuard.get();

diff --git a/...rg/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/...rg/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -3272,36 +3272,36 @@ private void processDhtAtomicUpdateRequest(UUID nodeId, GridDhtAtomicAbstractUpd
                             long ttl = req.ttl(i);
                             long expireTime = req.conflictExpireTime(i);
 
-                        GridCacheUpdateAtomicResult updRes = entry.innerUpdate(
-                            ver,
-                            nodeId,
-                            nodeId,
-                            op,
-                            op == TRANSFORM ? entryProcessor : val,
-                            op == TRANSFORM ? req.invokeArguments() : null,
-                            /*write-through*/(ctx.store().isLocal() && !ctx.shared().localStorePrimaryOnly())
-                                && writeThrough() && !req.skipStore(),
-                            /*read-through*/false,
-                            /*retval*/false,
-                            req.keepBinary(),
-                            /*expiry policy*/null,
-                            /*event*/true,
-                            /*metrics*/true,
-                            /*primary*/false,
-                            /*check version*/!req.forceTransformBackups(),
-                            req.topologyVersion(),
-                            CU.empty0(),
-                            replicate ? DR_BACKUP : DR_NONE,
-                            ttl,
-                            expireTime,
-                            req.conflictVersion(i),
-                            false,
-                            intercept,
-                            req.subjectId(),
-                            taskName,
-                            prevVal,
-                            updateIdx,
-                            null);
+                            GridCacheUpdateAtomicResult updRes = entry.innerUpdate(
+                                ver,
+                                nodeId,
+                                nodeId,
+                                op,
+                                op == TRANSFORM ? entryProcessor : val,
+                                op == TRANSFORM ? req.invokeArguments() : null,
+                                /*write-through*/(ctx.store().isLocal() && !ctx.shared().localStorePrimaryOnly())
+                                    && writeThrough() && !req.skipStore(),
+                                /*read-through*/false,
+                                /*retval*/false,
+                                req.keepBinary(),
+                                /*expiry policy*/null,
+                                /*event*/true,
+                                /*metrics*/true,
+                                /*primary*/false,
+                                /*check version*/!req.forceTransformBackups(),
+                                req.topologyVersion(),
+                                CU.empty0(),
+                                replicate ? DR_BACKUP : DR_NONE,
+                                ttl,
+                                expireTime,
+                                req.conflictVersion(i),
+                                false,
+                                intercept,
+                                req.subjectId(),
+                                taskName,
+                                prevVal,
+                                updateIdx,
+                                null);
 
                             if (updRes.removeVersion() != null)
                                 ctx.onDeferredDelete(entry, updRes.removeVersion());