commit 87778fb754e6e9bf04e1d8e10fd13f49cc2aa608
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Tue Jul 14 14:51:37 2015 +0100
committer Narayan Kamath <narayan@google.com> Thu Nov 12 09:09:47 2015 +0000
tree 88fd7b569b09f1d31ed598a08f1887a0a696a96f
parent 035c91d75c90c5cdc049606649586140202d697a

Fix ClassCastExceptionText.

Updated ClassCastException message to contain more
information.

Change-Id: I5a944f57daa417d5009db4d2acb904f0007b31e9

luni/src/test/java/libcore/java/lang/ClassCastExceptionTest.java

diff --git a/luni/src/test/java/libcore/java/lang/ClassCastExceptionTest.java b/luni/src/test/java/libcore/java/lang/ClassCastExceptionTest.java
index 3c10aa8..06c2ea9 100644
--- a/luni/src/test/java/libcore/java/lang/ClassCastExceptionTest.java
+++ b/luni/src/test/java/libcore/java/lang/ClassCastExceptionTest.java
@@ -29,7 +29,7 @@
             String.class.cast(o);
             fail();
         } catch (ClassCastException ex) {
-            assertEquals("java.lang.Exception cannot be cast to java.lang.String", ex.getMessage());
+            assertEquals("Cannot cast java.lang.Exception to java.lang.String", ex.getMessage());
         }
     }
 

ojluni/src/main/java/java/lang/Class.java

diff --git a/ojluni/src/main/java/java/lang/Class.java b/ojluni/src/main/java/java/lang/Class.java
index 14e4c25..13c8620 100755
--- a/ojluni/src/main/java/java/lang/Class.java
+++ b/ojluni/src/main/java/java/lang/Class.java
@@ -2405,7 +2405,11 @@
         if (clazz.isAssignableFrom(this))
             return (Class<? extends U>) this;
         else
-            throw new ClassCastException(this.toString());
+            /* ----- BEGIN android -----
+            // Add more context
+            throw new ClassCastException(this.toString());*/
+            throw new ClassCastException(this.toString() +
+                " cannot be cast to " + clazz.getName());
     }
 
     /**