Fri, 13 Dec 2013 17:24:19 -0800
Merge
1.1 --- a/.hgtags Sun Dec 08 22:05:02 2013 -0800 1.2 +++ b/.hgtags Fri Dec 13 17:24:19 2013 -0800 1.3 @@ -229,3 +229,4 @@ 1.4 1db3d4e4d18913e853d7bebf86816e87fda00a71 jdk8-b117 1.5 8d014b039b44c23fa520ce20c2c27f7aa91441e9 jdk8-b118 1.6 c3343930c73c58a22c1d58719bb988aeb25a871f jdk8-b119 1.7 +55cbc2d00c93f82513ce33819d41dc67e71aaefd jdk8-b120
2.1 --- a/src/jdk/nashorn/internal/runtime/DebuggerSupport.java Sun Dec 08 22:05:02 2013 -0800 2.2 +++ b/src/jdk/nashorn/internal/runtime/DebuggerSupport.java Fri Dec 13 17:24:19 2013 -0800 2.3 @@ -243,7 +243,7 @@ 2.4 return value.toString(); 2.5 2.6 case STRING: 2.7 - return escape((String)value); 2.8 + return escape(value.toString()); 2.9 2.10 case NUMBER: 2.11 return JSType.toString(((Number)value).doubleValue());