stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8168921: Inconsistent Annotation.toString()

Browse Source 
Reviewed-by: darcy, redestad
This commit is contained in:
Ivan Gerasimov 2016-11-02 20:53:56 +03:00
parent 4541ef3ed7
commit d86b93b397
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
View File

@ -253,20 +253,20 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
}
private static String toSourceString(char c) {
StringBuilder sb = new StringBuilder();
sb.append("'");
StringBuilder sb = new StringBuilder(4);
sb.append('\'');
if (c == '\'')
sb.append("\\'");
else
sb.append(c);
sb.append("'");
return sb.toString();
return sb.append('\'')
.toString();
}
private static String toSourceString(long ell) {
return (Math.abs(ell) <= Integer.MAX_VALUE) ?
String.valueOf(ell) :
(String.valueOf(ell) + "L");
String str = String.valueOf(ell);
return (ell < Integer.MIN_VALUE || ell > Integer.MAX_VALUE)
? (str + 'L') : str;
}
/**
@ -278,10 +278,7 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
sb.append('"');
// Escape embedded quote characters, if present, but don't do
// anything more heroic.
if (s.indexOf('"') != -1) {
s = s.replace("\"", "\\\"");
}
sb.append(s);
sb.append(s.replace("\"", "\\\""));
sb.append('"');
return sb.toString();
}

14
jdk/test/java/lang/annotation/AnnotationToStringTest.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8162817
* @bug 8162817 8168921
* @summary Test of toString on normal annotations
*/
@ -70,6 +70,8 @@ public class AnnotationToStringTest {
"d1=1.0/0.0, " +
"l0=5, " +
"l1=9223372036854775807L, " +
"l2=-9223372036854775808L, " +
"l3=-2147483648, " +
"s0=\"Hello world.\", " +
"s1=\"a\\\"b\", " +
"class0=Obj[].class)")
@ -84,6 +86,8 @@ public class AnnotationToStringTest {
d1=2.0/0.0,
l0=5,
l1=Long.MAX_VALUE,
l2=Long.MIN_VALUE,
l3=Integer.MIN_VALUE,
s0="Hello world.",
s1="a\"b",
class0=Obj[].class
@ -185,8 +189,10 @@ public class AnnotationToStringTest {
public int[] f6;
@ExpectedString(
"@LongArray(value={-2147483647, 2147483648L, 9223372036854775807L})")
@LongArray(value={-Integer.MAX_VALUE, Integer.MAX_VALUE+1L, Long.MAX_VALUE})
"@LongArray(value={-9223372036854775808L, -2147483649L, -2147483648," +
" -2147483647, 2147483648L, 9223372036854775807L})")
@LongArray(value={Long.MIN_VALUE, Integer.MIN_VALUE-1L, Integer.MIN_VALUE,
-Integer.MAX_VALUE, Integer.MAX_VALUE+1L, Long.MAX_VALUE})
public long[] f7;
@ExpectedString(
@ -287,6 +293,8 @@ class Obj {}
double d1();
long l0();
long l1();
long l2();
long l3();
String s0();
String s1();
Class<?> class0();