# HG changeset patch
# User lana
# Date 1366227094 25200
# Node ID 2fa9b0fd9dd6323d86c14f14d68ab1ce3c1fefd9
# Parent  e72c5f9cc6912128cb44d12ed648ef63d6ef5128# Parent  e42763b1ea55b95463116d6daec9d2d06f52793d
Merge

diff -r e72c5f9cc691 -r 2fa9b0fd9dd6 jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh
--- a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh	Wed Apr 17 12:14:16 2013 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh	Wed Apr 17 12:31:34 2013 -0700
@@ -68,11 +68,12 @@
     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"
diff -r e72c5f9cc691 -r 2fa9b0fd9dd6 jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java
--- a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java	Wed Apr 17 12:14:16 2013 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java	Wed Apr 17 12:31:34 2013 -0700
@@ -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);
+    }
 }
diff -r e72c5f9cc691 -r 2fa9b0fd9dd6 jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java
--- a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java	Wed Apr 17 12:14:16 2013 -0700
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java	Wed Apr 17 12:31:34 2013 -0700
@@ -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);
+    }
 }