# HG changeset patch
# User kizune
# Date 1386958438 -14400
# Node ID dd59e60accdd539f5ce16c30479e65fe96ddee31
# Parent  39a3e5a4d6d4393d3f9fe58e87e17ac0575de8ae# Parent  32631eed0fad2b31346eb41b29a50227bd29e2ec
Merge

diff -r 39a3e5a4d6d4 -r dd59e60accdd .hgtags
--- a/.hgtags	Thu Dec 05 16:37:35 2013 +0400
+++ b/.hgtags	Fri Dec 13 22:13:58 2013 +0400
@@ -229,3 +229,4 @@
 1db3d4e4d18913e853d7bebf86816e87fda00a71 jdk8-b117
 8d014b039b44c23fa520ce20c2c27f7aa91441e9 jdk8-b118
 c3343930c73c58a22c1d58719bb988aeb25a871f jdk8-b119
+55cbc2d00c93f82513ce33819d41dc67e71aaefd jdk8-b120
diff -r 39a3e5a4d6d4 -r dd59e60accdd src/jdk/nashorn/internal/runtime/DebuggerSupport.java
--- a/src/jdk/nashorn/internal/runtime/DebuggerSupport.java	Thu Dec 05 16:37:35 2013 +0400
+++ b/src/jdk/nashorn/internal/runtime/DebuggerSupport.java	Fri Dec 13 22:13:58 2013 +0400
@@ -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());