ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsetrak...@apache.org
Subject incubator-ignite git commit: ignite-201 - Removed DataStructureRemovedException in favor of IllegalStateException.
Date Sun, 08 Feb 2015 21:30:56 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-201 db5e5d362 -> 0a2125eb1


ignite-201 - Removed DataStructureRemovedException in favor of IllegalStateException.


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

Branch: refs/heads/ignite-201
Commit: 0a2125eb1fd1b2eb5b39f9027ede40df2fedece0
Parents: db5e5d3
Author: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Authored: Sun Feb 8 13:30:38 2015 -0800
Committer: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Committed: Sun Feb 8 13:30:38 2015 -0800

----------------------------------------------------------------------
 .../DataStructureRemovedException.java          | 61 --------------------
 .../datastructures/GridCacheAtomicLongImpl.java |  7 +--
 .../GridCacheAtomicReferenceImpl.java           |  7 +--
 .../GridCacheAtomicSequenceImpl.java            |  7 +--
 .../GridCacheAtomicStampedImpl.java             |  7 +--
 .../datastructures/GridCacheQueueAdapter.java   |  9 ++-
 .../datastructures/GridCacheSetImpl.java        |  5 +-
 .../datastructures/GridCacheSetProxy.java       |  3 +-
 .../org/apache/ignite/lang/IgniteBiTuple.java   |  4 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |  3 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |  3 +-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |  3 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |  3 +-
 .../GridCacheSetAbstractSelfTest.java           |  7 +--
 .../IgniteAtomicLongApiAbstractSelfTest.java    |  3 +-
 15 files changed, 29 insertions(+), 103 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/main/java/org/apache/ignite/datastructures/DataStructureRemovedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/datastructures/DataStructureRemovedException.java
b/modules/core/src/main/java/org/apache/ignite/datastructures/DataStructureRemovedException.java
deleted file mode 100644
index c91fb5a..0000000
--- a/modules/core/src/main/java/org/apache/ignite/datastructures/DataStructureRemovedException.java
+++ /dev/null
@@ -1,61 +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.apache.ignite.datastructures;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-/**
- * This runtime exception gets thrown if attempt to access a removed data structure has been
made.
- * <p>
- * Note that data structures throw runtime exceptions out of methods that don't have
- * checked exceptions in the signature.
- */
-public class DataStructureRemovedException extends IgniteException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates new exception with given error message.
-     *
-     * @param msg Error message.
-     */
-    public DataStructureRemovedException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates new exception with given throwable as a nested cause and
-     * source of error message.
-     *
-     * @param cause Non-null throwable cause.
-     */
-    public DataStructureRemovedException(Throwable cause) {
-        this(cause.getMessage(), cause);
-    }
-
-    /**
-     * Creates a new exception with given error message and optional nested cause exception.
-     *
-     * @param msg Error message.
-     * @param cause Optional nested exception (can be {@code null}).
-     */
-    public DataStructureRemovedException(String msg, @Nullable Throwable cause) {
-        super(msg, cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
index 4eb8a43..0783d31 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -333,11 +332,11 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx,
Ext
     /**
      * Check removed flag.
      *
-     * @throws DataStructureRemovedException If removed.
+     * @throws IllegalStateException If removed.
      */
-    private void checkRemoved() throws DataStructureRemovedException {
+    private void checkRemoved() throws IllegalStateException {
         if (rmvd)
-            throw new DataStructureRemovedException("Atomic long was removed from cache:
" + name);
+            throw new IllegalStateException("Atomic long was removed from cache: " + name);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
index 29a647d..486be57 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -291,11 +290,11 @@ public final class GridCacheAtomicReferenceImpl<T> implements
GridCacheAtomicRef
     /**
      * Check removed status.
      *
-     * @throws DataStructureRemovedException If removed.
+     * @throws IllegalStateException If removed.
      */
-    private void checkRemoved() throws DataStructureRemovedException {
+    private void checkRemoved() throws IllegalStateException {
         if (rmvd)
-            throw new DataStructureRemovedException("Atomic reference was removed from cache:
" + name);
+            throw new IllegalStateException("Atomic reference was removed from cache: " +
name);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
index 0d0c4cc..24df5fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -388,11 +387,11 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc
     /**
      * Check removed status.
      *
-     * @throws DataStructureRemovedException If removed.
+     * @throws IllegalStateException If removed.
      */
-    private void checkRemoved() throws DataStructureRemovedException {
+    private void checkRemoved() throws IllegalStateException {
         if (rmvd)
-            throw new DataStructureRemovedException("Sequence was removed from cache: " +
name);
+            throw new IllegalStateException("Sequence was removed from cache: " + name);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
index 318efe7..25f85dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -366,11 +365,11 @@ public final class GridCacheAtomicStampedImpl<T, S> implements
GridCacheAtomicSt
     /**
      * Check removed status.
      *
-     * @throws DataStructureRemovedException If removed.
+     * @throws IllegalStateException If removed.
      */
-    private void checkRemoved() throws DataStructureRemovedException {
+    private void checkRemoved() throws IllegalStateException {
         if (rmvd)
-            throw new DataStructureRemovedException("Atomic stamped was removed from cache:
" + name);
+            throw new IllegalStateException("Atomic stamped was removed from cache: " + name);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
index 8e22196..644b839 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;
@@ -419,7 +418,7 @@ public abstract class GridCacheQueueAdapter<T> extends AbstractCollection<T>
imp
     }
 
     /**
-     * Checks result of closure modifying queue header, throws {@link DataStructureRemovedException}
+     * Checks result of closure modifying queue header, throws {@link IllegalStateException}
      * if queue was removed.
      *
      * @param idx Result of closure execution.
@@ -430,7 +429,7 @@ public abstract class GridCacheQueueAdapter<T> extends AbstractCollection<T>
imp
     }
 
     /**
-     * Checks queue state, throws {@link DataStructureRemovedException} if queue was removed.
+     * Checks queue state, throws {@link IllegalStateException} if queue was removed.
      *
      * @param hdr Queue hdr.
      */
@@ -442,7 +441,7 @@ public abstract class GridCacheQueueAdapter<T> extends AbstractCollection<T>
imp
     /**
      * Marks queue as removed.
      *
-     * @param throw0 If {@code true} then throws {@link DataStructureRemovedException}.
+     * @param throw0 If {@code true} then throws {@link IllegalStateException}.
      */
     public void onRemoved(boolean throw0) {
         rmvd = true;
@@ -450,7 +449,7 @@ public abstract class GridCacheQueueAdapter<T> extends AbstractCollection<T>
imp
         releaseSemaphores();
 
         if (throw0)
-            throw new DataStructureRemovedException("Queue has been removed from cache: "
+ this);
+            throw new IllegalStateException("Queue has been removed from cache: " + this);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
index f5470e9..46b4f0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cluster.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.query.*;
 import org.apache.ignite.internal.util.*;
@@ -459,11 +458,11 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T>
implements Ignite
     }
 
     /**
-     * Throws {@link DataStructureRemovedException} if set was removed.
+     * Throws {@link IllegalStateException} if set was removed.
      */
     private void checkRemoved() {
         if (rmvd)
-            throw new DataStructureRemovedException("Set has been removed from cache: " +
this);
+            throw new IllegalStateException("Set has been removed from cache: " + this);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
index e29de99..ba43da7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.processors.datastructures;
 
 import org.apache.ignite.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.util.*;
@@ -512,7 +511,7 @@ public class GridCacheSetProxy<T> implements IgniteSet<T>,
Externalizable {
      */
     private void enterBusy() {
         if (!busyLock.enterBusy())
-            throw new DataStructureRemovedException("Set has been removed from cache: " +
delegate);
+            throw new IllegalStateException("Set has been removed from cache: " + delegate);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
index 885105d..d1b75a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
@@ -73,7 +73,7 @@ public class IgniteBiTuple<V1, V2> implements Map<V1, V2>, Map.Entry<V1,
V2>,
      *
      * @return First value.
      */
-    @Nullable public V1 get1() {
+    public V1 get1() {
         return val1;
     }
 
@@ -82,7 +82,7 @@ public class IgniteBiTuple<V1, V2> implements Map<V1, V2>, Map.Entry<V1,
V2>,
      *
      * @return Second value.
      */
-    @Nullable public V2 get2() {
+    public V2 get2() {
         return val2;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
index c31b979..aaf6ca5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.*;
-import org.apache.ignite.datastructures.*;
 
 import java.util.*;
 
@@ -64,7 +63,7 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends
Ignite
 
             fail();
         }
-        catch (DataStructureRemovedException e) {
+        catch (IllegalStateException e) {
             info("Caught expected exception: " + e.getMessage());
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
index f254fcf..71d5469 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.*;
-import org.apache.ignite.datastructures.*;
 
 import java.util.*;
 
@@ -64,7 +63,7 @@ public abstract class GridCacheAtomicStampedApiSelfAbstractTest extends
IgniteAt
 
             fail();
         }
-        catch (DataStructureRemovedException e) {
+        catch (IllegalStateException e) {
             info("Caught expected exception: " + e.getMessage());
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
index 06dd36a..f45d860 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
@@ -177,7 +176,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends
Ignite
 
                 return null;
             }
-        }, DataStructureRemovedException.class, null);
+        }, IllegalStateException.class, null);
 
         info("Queue was removed: " + queue);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
index a6ba729..13f501f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.datastructures.*;
@@ -342,7 +341,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends IgniteAtomics
 
             fail("Exception expected.");
         }
-        catch (DataStructureRemovedException e) {
+        catch (IllegalStateException e) {
             info("Caught expected exception: " + e);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
index 8c91cfb..e76cff1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java
@@ -21,11 +21,10 @@ import junit.framework.*;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.processors.cache.query.*;
+import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;
@@ -770,7 +769,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr
                                 set.add(val.incrementAndGet());
                         }
                     }
-                    catch (DataStructureRemovedException e) {
+                    catch (IllegalStateException e) {
                         log.info("Set removed: " + e);
                     }
 
@@ -814,7 +813,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr
 
                     return null;
                 }
-            }, DataStructureRemovedException.class, null);
+            }, IllegalStateException.class, null);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a2125eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
index e0c26da..e7d371e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.datastructures.*;
 import org.apache.ignite.transactions.*;
 
 import java.util.*;
@@ -91,7 +90,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest extends IgniteAtomicsA
 
             fail();
         }
-        catch (DataStructureRemovedException e) {
+        catch (IllegalStateException e) {
             info("Caught expected exception: " + e.getMessage());
         }
     }


Mime
View raw message