Merge jdk8-b120

Thu, 05 Dec 2013 10:34:55 -0800

author
lana
date
Thu, 05 Dec 2013 10:34:55 -0800
changeset 687
55cbc2d00c93
parent 684
7fa32e7d755f
parent 686
c14fe3f90616
child 688
32631eed0fad

Merge

     1.1 --- a/src/jdk/nashorn/internal/runtime/DebuggerSupport.java	Wed Dec 04 23:11:52 2013 -0800
     1.2 +++ b/src/jdk/nashorn/internal/runtime/DebuggerSupport.java	Thu Dec 05 10:34:55 2013 -0800
     1.3 @@ -243,7 +243,7 @@
     1.4              return value.toString();
     1.5  
     1.6          case STRING:
     1.7 -            return escape((String)value);
     1.8 +            return escape(value.toString());
     1.9  
    1.10          case NUMBER:
    1.11              return JSType.toString(((Number)value).doubleValue());

mercurial