Repository: incubator-ignite Updated Branches: refs/heads/ignite-42 dde7f7a77 -> 1f73287a1
# ignite-42 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1f73287a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1f73287a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1f73287a Branch: refs/heads/ignite-42 Commit: 1f73287a1326e05ec63d6c3ba82bb05777657bd8 Parents: dde7f7a Author: sboikov <sboi...@gridgain.com> Authored: Thu Jan 22 13:11:27 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jan 22 13:11:27 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 2 -- .../IgniteNullArgumentCheckedException.java | 32 -------------------- .../dht/atomic/GridDhtAtomicCache.java | 4 --- 3 files changed, 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f73287a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index cc88eb2..2b9793b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -1033,8 +1033,6 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements private CacheException cacheException(IgniteCheckedException e) { if (e instanceof GridCachePartialUpdateException) return new CachePartialUpdateException((GridCachePartialUpdateException)e); - else if (e instanceof IgniteNullArgumentCheckedException) - throw new NullPointerException(e.getMessage()); if (e.getCause() instanceof CacheException) return (CacheException)e.getCause(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f73287a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteNullArgumentCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteNullArgumentCheckedException.java b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteNullArgumentCheckedException.java deleted file mode 100644 index 42cc75a..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteNullArgumentCheckedException.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal; - -import org.apache.ignite.*; - -/** - * - */ -public class IgniteNullArgumentCheckedException extends IgniteCheckedException { - /** - * @param msg Message. - */ - public IgniteNullArgumentCheckedException(String msg) { - super(msg); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f73287a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 8b848ba..9d9f41a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -874,10 +874,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { // Optimistically expect that all keys are available locally (avoid creation of get future). for (K key : keys) { - if (key == null) - return new GridFinishedFuture<>(ctx.kernalContext(), - new IgniteNullArgumentCheckedException("Key is null.")); - GridCacheEntryEx<K, V> entry = null; while (true) {
