Merge

make/common/shared/Defs.gmk

@@ -218,11 +218,7 @@ ifdef OPENJDK
 else
   LAUNCHER_NAME = java
   PRODUCT_NAME = Java(TM)
-  ifeq ($(J4B), true)
-    PRODUCT_SUFFIX = SE Runtime Environment for Business
-  else
-    PRODUCT_SUFFIX = SE Runtime Environment
-  endif
+  PRODUCT_SUFFIX = SE Runtime Environment
   JDK_RC_PLATFORM_NAME = Platform SE
   COMPANY_NAME = Oracle Corporation
 endif

test/java/lang/invoke/ClassValueTest.java

@@ -52,9 +52,9 @@ public class ClassValueTest {
     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 @@ public class ClassValueTest {
     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) {