infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-21 07:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2013-04-17 12:31:34 -07:00
commit 35ff6ba00e
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh
View File

@ -68,11 +68,12 @@ cp "${TESTSRC}"/RedefineMethodWithAnnotationsAnnotations.java \
RedefineMethodWithAnnotationsAnnotations.java
"${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodWithAnnotationsAgent.jar \
-XX:+StressLdcRewrite -XX:+IgnoreUnrecognizedVMOptions \
-cp "${TESTCLASSES}" RedefineMethodWithAnnotationsApp > output.log 2>&1
cat output.log
MESG="Exception"
grep "$MESG" output.log
MESG="Exception|fatal"
egrep "$MESG" output.log
result=$?
if [ "$result" = 0 ]; then
echo "FAIL: found '$MESG' in the test output"

10
jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java
View File

@ -27,7 +27,13 @@
*/
public class RedefineMethodWithAnnotationsTarget {
public void annotatedMethod(@ParameterAnnotation(
value = ParameterAnnotation.STRING_VALUE_1) String parameter) { }
value = ParameterAnnotation.STRING_VALUE_1) String parameter) {
System.out.println("First version of annotatedMethod(String)");
System.out.println("parameter is " + parameter);
}
public void annotatedMethod(@ParameterAnnotation(
value = ParameterAnnotation.INT_VALUE_1) int parameter) { }
value = ParameterAnnotation.INT_VALUE_1) int parameter) {
System.out.println("First version of annotatedMethod(int)");
System.out.println("parameter is " + parameter);
}
}

10
jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java
View File

@ -29,7 +29,13 @@
*/
public class RedefineMethodWithAnnotationsTarget {
public void annotatedMethod(@ParameterAnnotation(
value = ParameterAnnotation.INT_VALUE_2) int parameter) { }
value = ParameterAnnotation.INT_VALUE_2) int parameter) {
System.out.println("Second version of annotatedMethod(int)");
System.out.println("parameter is " + parameter);
}
public void annotatedMethod(@ParameterAnnotation(
value = ParameterAnnotation.STRING_VALUE_2) String parameter) { }
value = ParameterAnnotation.STRING_VALUE_2) String parameter) {
System.out.println("Second version of annotatedMethod(String)");
System.out.println("parameter is " + parameter);
}
}