ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: ignite-800: fix compilation
Date Fri, 24 Apr 2015 14:05:23 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-800 e79636aa2 -> 182db433e


ignite-800: fix compilation


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/182db433
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/182db433
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/182db433

Branch: refs/heads/ignite-800
Commit: 182db433e13cc542d0ad27531cbf6fa628a6cf70
Parents: e79636a
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Fri Apr 24 17:05:16 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Fri Apr 24 17:05:16 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/CacheInvokeResult.java  | 14 +++++++-------
 .../distributed/dht/atomic/GridDhtAtomicCache.java    |  2 +-
 .../cache/local/atomic/GridLocalAtomicCache.java      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/182db433/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
index f8fdc60..82f5d7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java
@@ -51,11 +51,11 @@ public class CacheInvokeResult<T> implements EntryProcessorResult<T>,
Externaliz
      * @return New instance.
      */
     public static <T> CacheInvokeResult<T> fromResult(T res) {
-        CacheInvokeResult<T> result = new CacheInvokeResult<>();
+        CacheInvokeResult<T> cacheRes = new CacheInvokeResult<>();
 
-        result.res = res;
+        cacheRes.res = res;
 
-        return result;
+        return cacheRes;
     }
 
     /**
@@ -64,12 +64,12 @@ public class CacheInvokeResult<T> implements EntryProcessorResult<T>,
Externaliz
      * @param err Exception thrown by {@link EntryProcessor#process(MutableEntry, Object...)}.
      * @return New instance.
      */
-    public static <T> CacheInvokeResult fromError(Exception err) {
-        CacheInvokeResult<T> result = new CacheInvokeResult<>();
+    public static <T> CacheInvokeResult<T> fromError(Exception err) {
+        CacheInvokeResult<T> res = new CacheInvokeResult<>();
 
-        result.err = err;
+        res.err = err;
 
-        return result;
+        return res;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/182db433/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 81ba0e8..f79bb61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -600,7 +600,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
         throws IgniteCheckedException {
         EntryProcessorResult<T> res = invokeAsync(key, entryProcessor, args).get();
 
-        return res != null ? res : new CacheInvokeResult<>();
+        return res != null ? res : new CacheInvokeResult<T>();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/182db433/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 1aee791..76fed6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -561,7 +561,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
         Object... args) throws IgniteCheckedException {
         EntryProcessorResult<T> res = invokeAsync(key, entryProcessor, args).get();
 
-        return res != null ? res : new CacheInvokeResult<>();
+        return res != null ? res : new CacheInvokeResult<T>();
     }
 
     /** {@inheritDoc} */


Mime
View raw message