Remove cycles in CompositeException

tomrozb · tomrozb · commit eea2afa29541 · 2014-07-11T15:06:48.000+02:00
diff --git a/rxjava-core/src/main/java/rx/exceptions/CompositeException.java b/rxjava-core/src/main/java/rx/exceptions/CompositeException.java
@@ -38,9 +38,9 @@ public final class CompositeException extends RuntimeException {
     public CompositeException(String messagePrefix, Collection<Throwable> errors) {
         List<Throwable> _exceptions = new ArrayList<Throwable>();
         CompositeExceptionCausalChain _cause = new CompositeExceptionCausalChain();
-        int count = 0;
+        int count = errors.size();
+        errors = removeDuplicatedCauses(errors);
         for (Throwable e : errors) {
-            count++;
             attachCallingThreadStack(_cause, e);
             _exceptions.add(e);
         }
@@ -73,6 +73,29 @@ public synchronized Throwable getCause() {
         return cause;
     }
 
+    private Collection<Throwable> removeDuplicatedCauses(Collection<Throwable> errors) {
+        Set<Throwable> duplicated = new HashSet<Throwable>();
+        for (Throwable cause : errors) {
+            for (Throwable error : errors) {
+                if(cause == error || duplicated.contains(error)) {
+                    continue;
+                }
+                while (error.getCause() != null) {
+                    error = error.getCause();
+                    if (error == cause) {
+                        duplicated.add(cause);
+                        break;
+                    }
+                }
+            }
+        }
+        if (!duplicated.isEmpty()) {
+            errors = new ArrayList<Throwable>(errors);
+            errors.removeAll(duplicated);
+        }
+        return errors;
+    }
+
     @SuppressWarnings("unused")
     // useful when debugging but don't want to make part of publicly supported API
     private static String getStackTraceAsString(StackTraceElement[] stack) {
diff --git a/rxjava-core/src/test/java/rx/exceptions/CompositeExceptionTest.java b/rxjava-core/src/test/java/rx/exceptions/CompositeExceptionTest.java
@@ -53,6 +53,16 @@ public void testMultipleWithSameCause() {
         
     }
 
+    @Test(timeout = 1000)
+    public void testOneIsCauseOfAnother() {
+        Throwable rootCause = new Throwable("RootCause");
+        Throwable throwable = new Throwable("1", rootCause);
+        CompositeException ce = new CompositeException("One is the cause of another",
+                Arrays.asList(rootCause, throwable));
+
+        assertEquals(1, ce.getExceptions().size());
+    }
+
     @Test(timeout = 1000)
     public void testAttachCallingThreadStackParentThenChild() {
         CompositeException.attachCallingThreadStack(ex1, ex2);
