# HG changeset patch
# User trims
# Date 1303262091 25200
# Node ID 24f45d5bc7d264eb135c3272516a5fe1d983b9be
# Parent  268137cdd00209a84a429e542ca8148ae2314214# Parent  8f574b2bae87c933d8365443a28606e8a36bf4e1
Merge

diff -r 268137cdd002 -r 24f45d5bc7d2 jdk/test/java/lang/invoke/ClassValueTest.java
--- a/jdk/test/java/lang/invoke/ClassValueTest.java	Thu Apr 14 15:21:59 2011 -0700
+++ b/jdk/test/java/lang/invoke/ClassValueTest.java	Tue Apr 19 18:14:51 2011 -0700
@@ -52,9 +52,9 @@
     static String nameForCV1(Class<?> type) {
         return "CV1:" + type.getName();
     }
-    static int countForCV1;
-    static final ClassValue<String> CV1 = new CV1();
-    private static class CV1 extends ClassValue<String> {
+    int countForCV1;
+    final ClassValue<String> CV1 = new CV1();
+    private class CV1 extends ClassValue<String> {
         protected String computeValue(Class<?> type) {
             countForCV1++;
             return nameForCV1(type);
@@ -103,8 +103,8 @@
     static String nameForCVN(Class<?> type, int n) {
         return "CV[" + n + "]" + type.getName();
     }
-    static int countForCVN;
-    static class CVN extends ClassValue<String> {
+    int countForCVN;
+    class CVN extends ClassValue<String> {
         final int n;
         CVN(int n) { this.n = n; }
         protected String computeValue(Class<?> type) {