# HG changeset patch
# User asaha
# Date 1386984259 28800
# Node ID 13ca8f1a9eba716295fb7d9c2ddad81390931919
# Parent  9d49b100b3d36c35027ea84eff09e4acdce7923b# Parent  dd59e60accdd539f5ce16c30479e65fe96ddee31
Merge

diff -r 9d49b100b3d3 -r 13ca8f1a9eba .hgtags
--- a/.hgtags	Sun Dec 08 22:05:02 2013 -0800
+++ b/.hgtags	Fri Dec 13 17:24:19 2013 -0800
@@ -229,3 +229,4 @@
 1db3d4e4d18913e853d7bebf86816e87fda00a71 jdk8-b117
 8d014b039b44c23fa520ce20c2c27f7aa91441e9 jdk8-b118
 c3343930c73c58a22c1d58719bb988aeb25a871f jdk8-b119
+55cbc2d00c93f82513ce33819d41dc67e71aaefd jdk8-b120
diff -r 9d49b100b3d3 -r 13ca8f1a9eba src/jdk/nashorn/internal/runtime/DebuggerSupport.java
--- a/src/jdk/nashorn/internal/runtime/DebuggerSupport.java	Sun Dec 08 22:05:02 2013 -0800
+++ b/src/jdk/nashorn/internal/runtime/DebuggerSupport.java	Fri Dec 13 17:24:19 2013 -0800
@@ -243,7 +243,7 @@
             return value.toString();
 
         case STRING:
-            return escape((String)value);
+            return escape(value.toString());
 
         case NUMBER:
             return JSType.toString(((Number)value).doubleValue());