Mercurial > hg > openjdk > jdk7 > jdk
changeset 4035:5f5015099e73
Merge
author | mfang |
---|---|
date | Wed, 20 Apr 2011 23:15:59 -0700 |
parents | 8bbe05da5656 (current diff) d80954a89b49 (diff) |
children | 832c57d6557b |
files | |
diffstat | 2 files changed, 6 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Defs.gmk Tue Apr 19 21:44:52 2011 -0700 +++ b/make/common/shared/Defs.gmk Wed Apr 20 23:15:59 2011 -0700 @@ -218,11 +218,7 @@ 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
--- a/test/java/lang/invoke/ClassValueTest.java Tue Apr 19 21:44:52 2011 -0700 +++ b/test/java/lang/invoke/ClassValueTest.java Wed Apr 20 23:15:59 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) {