Merge
authorduke
Wed, 05 Jul 2017 19:25:24 +0200
changeset 21995 6dd736ac3686
parent 21994 364ebc8a25e1 (diff)
parent 21990 a928afcad305 (current diff)
child 21999 5dbdadd0751a
Merge
jdk/make/data/cryptopolicy/limited/LIMITED
jdk/make/data/cryptopolicy/unlimited/UNLIMITED
jdk/test/com/sun/jmx/snmp/NoInfoLeakTest.java
jdk/test/com/sun/tools/attach/AgentSetup.sh
jdk/test/com/sun/tools/attach/ApplicationSetup.sh
jdk/test/com/sun/tools/attach/BasicTests.sh
jdk/test/com/sun/tools/attach/CommonSetup.sh
jdk/test/com/sun/tools/attach/PermissionTests.sh
jdk/test/com/sun/tools/attach/ProviderTests.sh
jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh
jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdParallelGC.sh
jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdSerialGC.sh
jdk/test/java/rmi/reliability/benchmark/runRmiBench.sh
jdk/test/java/rmi/reliability/benchmark/runSerialBench.sh
--- a/nashorn/.hgtags	Wed Jul 05 19:25:20 2017 +0200
+++ b/nashorn/.hgtags	Wed Jul 05 19:25:24 2017 +0200
@@ -228,3 +228,4 @@
 0fb1a427fbf6e04c77cebbbf99b6631c664ed793 jdk8-b116
 1db3d4e4d18913e853d7bebf86816e87fda00a71 jdk8-b117
 8d014b039b44c23fa520ce20c2c27f7aa91441e9 jdk8-b118
+c3343930c73c58a22c1d58719bb988aeb25a871f jdk8-b119
--- a/nashorn/src/jdk/nashorn/internal/runtime/DebuggerSupport.java	Wed Jul 05 19:25:20 2017 +0200
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DebuggerSupport.java	Wed Jul 05 19:25:24 2017 +0200
@@ -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());