Refactoring: Added helper function exceptionCauseIsInstanceOf

Jason Jackson · Jason Jackson · commit 176154666fae · 2013-05-10T14:21:58.000-07:00
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;
                 }
             }
-
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package storm.trident.topology.state;`
`2`	`2`
	`3`	`+import backtype.storm.utils.Utils;`
`3`	`4`	`import org.apache.zookeeper.KeeperException;`
`4`	`5`
`5`	`6`	`import java.util.HashSet;`
`@@ -103,11 +104,10 @@ public void cleanupBefore(long txid) {`
`103`	`104`	`} catch(RuntimeException e) {`
`104`	`105`	`// Ignore NoNodeExists exceptions because when sync() it may populate _curr with stale data since`
`105`	`106`	`// zookeeper reads are eventually consistent.`
`106`		`- if(!(e.getCause() instanceof KeeperException.NoNodeException)) {`
	`107`	`+ if(!Utils.exceptionCauseIsInstanceOf(KeeperException.NoNodeException.class, e)) {`
`107`	`108`	`throw e;`
`108`	`109`	`}`
`109`	`110`	`}`
`110`		`-`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`