commit 82ae659392d5a3f2ecd8ef478e73319e86fed5dd
author kak <kak@google.com> Thu Aug 17 16:12:36 2017 -0700
committer Chris Povirk <cpovirk@google.com> Fri Aug 18 06:18:11 2017 -0700
tree 8652f123f146f38acf00c227074d0f9a9a9d95e5
parent 2eed29bd6a913e72c3eeae173b84948b0e3d2353

Use given throwable as the cause for the IAE that's thrown during loop
detection.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165643812

android/guava-tests/test/com/google/common/base/ThrowablesTest.java

diff --git a/android/guava-tests/test/com/google/common/base/ThrowablesTest.java b/android/guava-tests/test/com/google/common/base/ThrowablesTest.java
index 756642e..5ac365e 100644
--- a/android/guava-tests/test/com/google/common/base/ThrowablesTest.java
+++ b/android/guava-tests/test/com/google/common/base/ThrowablesTest.java
@@ -553,6 +553,7 @@
       Throwables.getRootCause(cause);
       fail("Should have throw IAE");
     } catch (IllegalArgumentException expected) {
+      assertThat(expected).hasCauseThat().isSameAs(cause);
     }
   }
 
@@ -641,6 +642,7 @@
       Throwables.getCausalChain(cause);
       fail("Should have throw IAE");
     } catch (IllegalArgumentException expected) {
+      assertThat(expected).hasCauseThat().isSameAs(cause);
     }
   }
 

android/guava/src/com/google/common/base/Throwables.java

diff --git a/android/guava/src/com/google/common/base/Throwables.java b/android/guava/src/com/google/common/base/Throwables.java
index 4cc913d..81dacba 100644
--- a/android/guava/src/com/google/common/base/Throwables.java
+++ b/android/guava/src/com/google/common/base/Throwables.java
@@ -262,7 +262,7 @@
       throwable = cause;
 
       if (throwable == slowPointer) {
-        throw new IllegalArgumentException("Loop in causal chain detected @ " + throwable);
+        throw new IllegalArgumentException("Loop in causal chain detected.", throwable);
       }
       if (advanceSlowPointer) {
         slowPointer = slowPointer.getCause();
@@ -305,7 +305,7 @@
       causes.add(throwable);
 
       if (throwable == slowPointer) {
-        throw new IllegalArgumentException("Loop in causal chain detected @ " + throwable);
+        throw new IllegalArgumentException("Loop in causal chain detected.", throwable);
       }
       if (advanceSlowPointer) {
         slowPointer = slowPointer.getCause();

guava-tests/test/com/google/common/base/ThrowablesTest.java

diff --git a/guava-tests/test/com/google/common/base/ThrowablesTest.java b/guava-tests/test/com/google/common/base/ThrowablesTest.java
index 756642e..5ac365e 100644
--- a/guava-tests/test/com/google/common/base/ThrowablesTest.java
+++ b/guava-tests/test/com/google/common/base/ThrowablesTest.java
@@ -553,6 +553,7 @@
       Throwables.getRootCause(cause);
       fail("Should have throw IAE");
     } catch (IllegalArgumentException expected) {
+      assertThat(expected).hasCauseThat().isSameAs(cause);
     }
   }
 
@@ -641,6 +642,7 @@
       Throwables.getCausalChain(cause);
       fail("Should have throw IAE");
     } catch (IllegalArgumentException expected) {
+      assertThat(expected).hasCauseThat().isSameAs(cause);
     }
   }
 

guava/src/com/google/common/base/Throwables.java

diff --git a/guava/src/com/google/common/base/Throwables.java b/guava/src/com/google/common/base/Throwables.java
index 4cc913d..81dacba 100644
--- a/guava/src/com/google/common/base/Throwables.java
+++ b/guava/src/com/google/common/base/Throwables.java
@@ -262,7 +262,7 @@
       throwable = cause;
 
       if (throwable == slowPointer) {
-        throw new IllegalArgumentException("Loop in causal chain detected @ " + throwable);
+        throw new IllegalArgumentException("Loop in causal chain detected.", throwable);
       }
       if (advanceSlowPointer) {
         slowPointer = slowPointer.getCause();
@@ -305,7 +305,7 @@
       causes.add(throwable);
 
       if (throwable == slowPointer) {
-        throw new IllegalArgumentException("Loop in causal chain detected @ " + throwable);
+        throw new IllegalArgumentException("Loop in causal chain detected.", throwable);
       }
       if (advanceSlowPointer) {
         slowPointer = slowPointer.getCause();