1.1 --- a/javap/src/main/java/sun/tools/javap/ClassData.java Thu Nov 15 08:12:11 2012 +0100
1.2 +++ b/javap/src/main/java/sun/tools/javap/ClassData.java Thu Nov 15 08:12:52 2012 +0100
1.3 @@ -508,6 +508,9 @@
1.4 if (x==null) return "<NULL>";
1.5 switch (tag) {
1.6 case CONSTANT_UTF8: {
1.7 + if (!textual) {
1.8 + return (String)x;
1.9 + }
1.10 StringBuilder sb=new StringBuilder();
1.11 String s=(String)x;
1.12 for (int k=0; k<s.length(); k++) {
1.13 @@ -556,7 +559,7 @@
1.14 }
1.15 return javaName(getClassName(cpx));
1.16 case CONSTANT_STRING:
1.17 - String sv = StringValue(((CPX)x).cpx);
1.18 + String sv = stringValue(((CPX)x).cpx, textual);
1.19 if (textual) {
1.20 return '"' + sv + '"';
1.21 } else {
2.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethod.java Thu Nov 15 08:12:11 2012 +0100
2.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethod.java Thu Nov 15 08:12:52 2012 +0100
2.3 @@ -95,7 +95,7 @@
2.4 }
2.5
2.6 @JavaScriptBody(
2.7 - args={"i","j"}, body="return (i + j).toString();"
2.8 + args={"i","j"}, body="\n\r\treturn (i + j).toString();"
2.9 )
2.10 public static String i2s(int i, int j) {
2.11 throw new IllegalStateException();