ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [30/50] [abbrv] incubator-ignite git commit: ignite-42 review
Date Thu, 22 Jan 2015 20:54:58 GMT
ignite-42 review


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

Branch: refs/heads/ignite-53
Commit: 5e01febcd3936860862dc3227835d98f95fdab29
Parents: 87998ad
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Thu Jan 22 14:08:50 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Thu Jan 22 14:08:50 2015 +0300

----------------------------------------------------------------------
 .../kernal/processors/cache/GridCacheAdapter.java     | 13 ++++---------
 .../kernal/processors/cache/GridCacheContext.java     | 14 ++++++--------
 .../processors/cache/GridCacheStoreManager.java       |  4 ++--
 3 files changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e01febc/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index 116cefd..7992cd3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -3469,17 +3469,12 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter
im
      * @param replaceExisting Replace existing values flag.
      * @return Load future.
      */
-    public IgniteFuture<?> loadAll(final Set<? extends K> keys,
-        boolean replaceExisting) {
+    public IgniteFuture<?> loadAll(
+        final Set<? extends K> keys,
+        boolean replaceExisting
+    ) {
         A.notNull(keys, "keys");
 
-        if (keys.size() < 10) {
-            for (K key : keys) {
-                if (key == null)
-                    throw new NullPointerException("Key to load is null.");
-            }
-        }
-
         if (!ctx.store().configured())
             return new GridFinishedFuture<>(ctx.kernalContext());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e01febc/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
index b61b4cf..169e6bc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
@@ -1760,14 +1760,12 @@ public class GridCacheContext<K, V> implements Externalizable
{
 
             return unwrapped ? F.t(key, val) : o;
         }
-        else {
-            if (o instanceof Collection)
-                return unwrapPortablesIfNeeded((Collection<Object>)o, false);
-            else if (o instanceof Map)
-                return unwrapPortablesIfNeeded((Map<Object, Object>)o, false);
-            else if (o instanceof PortableObject)
-                return ((PortableObject)o).deserialize();
-        }
+        else if (o instanceof Collection)
+            return unwrapPortablesIfNeeded((Collection<Object>)o, false);
+        else if (o instanceof Map)
+            return unwrapPortablesIfNeeded((Map<Object, Object>)o, false);
+        else if (o instanceof PortableObject)
+            return ((PortableObject)o).deserialize();
 
         return o;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e01febc/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
index a35f817..60e2425 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
@@ -589,8 +589,8 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K,
V> {
                         Object v = locStore ? e.getValue() : e.getValue().get1();
 
                         entries.add(new CacheEntryImpl<>(
-                                (K)cctx.unwrapPortableIfNeeded(k, false),
-                                (V)cctx.unwrapPortableIfNeeded(v, false)));
+                            (K)cctx.unwrapPortableIfNeeded(k, false),
+                            (V)cctx.unwrapPortableIfNeeded(v, false)));
                     }
                 }
                 else {


Mime
View raw message