Refactoring: Added helper function exceptionCauseIsInstanceOf

smtp2006 · May 10, 2013 · 1761546 · 1761546
1 parent 43053a7
commit 1761546
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/jvm/backtype/storm/utils/Utils.java b/src/jvm/backtype/storm/utils/Utils.java
@@ -357,4 +357,15 @@ public static byte[] toByteArray(ByteBuffer buffer) {
         buffer.get(ret, 0, ret.length);
         return ret;
     }
+
+    public static boolean exceptionCauseIsInstanceOf(Class klass, Throwable throwable) {
+        Throwable t = throwable;
+        while(t != null) {
+            if(klass.isInstance(t)) {
+                return true;
+            }
+            t = t.getCause();
+        }
+        return false;
+    }
 }
diff --git a/src/jvm/storm/trident/topology/state/RotatingTransactionalState.java b/src/jvm/storm/trident/topology/state/RotatingTransactionalState.java
@@ -1,5 +1,6 @@
 package storm.trident.topology.state;
 
+import backtype.storm.utils.Utils;
 import org.apache.zookeeper.KeeperException;
 
 import java.util.HashSet;
@@ -103,11 +104,10 @@ public void cleanupBefore(long txid) {
             } catch(RuntimeException e) {
                 // Ignore NoNodeExists exceptions because when sync() it may populate _curr with stale data since
                 // zookeeper reads are eventually consistent.
-                if(!(e.getCause() instanceof KeeperException.NoNodeException)) {
+                if(!Utils.exceptionCauseIsInstanceOf(KeeperException.NoNodeException.class, e)) {
                     throw e;
                 }
             }
-
         }
     }