commit b5f8f6c53e4c52dd37ac49617db5258e0f265cdc
author cl <none@none> Wed Apr 20 16:05:52 2011 -0700
committer cl <none@none> Wed Apr 20 16:05:52 2011 -0700
tree 2b3e5e47c2db52fef9904247d4484dfeab3a9077
parent b4393508be40163250633edb2f74fab19a4256ea
parent d2c301981644693c473d8a894547b6a486986e45

Merge

test/java/lang/invoke/ClassValueTest.java

diff --git a/test/java/lang/invoke/ClassValueTest.java b/test/java/lang/invoke/ClassValueTest.java
index 59c5a65..121c260 100644
--- a/test/java/lang/invoke/ClassValueTest.java
+++ b/test/java/lang/invoke/ClassValueTest.java
@@ -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) {