Merge

2 files changed, 2 insertions, 1 deletions

diff --git a/.hgtags b/.hgtags
index 5b352935..0d739aa6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -229,3 +229,4 @@ f0d3ac2474ee755b1180ec71bcdfa190845b17eb jdk8-b115
 1db3d4e4d18913e853d7bebf86816e87fda00a71 jdk8-b117
 8d014b039b44c23fa520ce20c2c27f7aa91441e9 jdk8-b118
 c3343930c73c58a22c1d58719bb988aeb25a871f jdk8-b119
+55cbc2d00c93f82513ce33819d41dc67e71aaefd jdk8-b120
diff --git a/src/jdk/nashorn/internal/runtime/DebuggerSupport.java b/src/jdk/nashorn/internal/runtime/DebuggerSupport.java
index 9f7783ea..c288a963 100644
--- a/src/jdk/nashorn/internal/runtime/DebuggerSupport.java
+++ b/src/jdk/nashorn/internal/runtime/DebuggerSupport.java
@@ -243,7 +243,7 @@ final class DebuggerSupport {
             return value.toString();
 
         case STRING:
-            return escape((String)value);
+            return escape(value.toString());
 
         case NUMBER:
             return JSType.toString(((Number)value).doubleValue());