/hg/release/icedtea6-1.11: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 12 16:15:31 PDT 2012
changeset 6e6d7783aabb in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=6e6d7783aabb
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jun 07 19:32:39 2012 +0100
Security fixes: 2012/06/12
2012-06-07 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am,
* patches/ecj/override.patch:
Add additional cases from 7143872.
* patches/security/20120612/7079902.patch,
* patches/security/20120612/7110720.patch,
* patches/security/20120612/7143606.patch,
* patches/security/20120612/7143614.patch,
* patches/security/20120612/7143617.patch,
* patches/security/20120612/7143851.patch,
* patches/security/20120612/7143872.patch,
* patches/security/20120612/7145239.patch,
* patches/security/20120612/7152811.patch,
* patches/security/20120612/7157609.patch,
* patches/security/20120612/7160677.patch,
* patches/security/20120612/7160757.patch:
Security patches for 2012/06/12.
* NEWS: Updated.
changeset 2e95635aa80d in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=2e95635aa80d
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jun 07 19:39:14 2012 +0100
Bump to 1.11.3 proper.
2012-06-07 Andrew John Hughes <ahughes at redhat.com>
* configure.ac: Bump to 1.11.3 proper.
changeset a9b49bd3d0b5 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a9b49bd3d0b5
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 11 18:46:05 2012 +0100
Add CVE numbers.
2012-06-11 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add CVE numbers.
changeset 3317a5ef5b07 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=3317a5ef5b07
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 13 00:14:45 2012 +0100
Added tag icedtea6-1.11.3 for changeset a9b49bd3d0b5
diffstat:
.hgtags | 1 +
ChangeLog | 28 +
Makefile.am | 14 +-
NEWS | 17 +-
configure.ac | 2 +-
patches/ecj/override.patch | 22 +
patches/security/20120612/7079902.patch | 508 +++++++++++++++++++++++++
patches/security/20120612/7110720.patch | 129 ++++++
patches/security/20120612/7143606.patch | 644 ++++++++++++++++++++++++++++++++
patches/security/20120612/7143614.patch | 165 ++++++++
patches/security/20120612/7143617.patch | 72 +++
patches/security/20120612/7143851.patch | 74 +++
patches/security/20120612/7143872.patch | 400 +++++++++++++++++++
patches/security/20120612/7145239.patch | 68 +++
patches/security/20120612/7152811.patch | 107 +++++
patches/security/20120612/7157609.patch | 43 ++
patches/security/20120612/7160677.patch | 19 +
patches/security/20120612/7160757.patch | 26 +
18 files changed, 2335 insertions(+), 4 deletions(-)
diffs (truncated from 2450 to 500 lines):
diff -r e5b5280519ef -r 3317a5ef5b07 .hgtags
--- a/.hgtags Thu May 31 12:52:55 2012 +0200
+++ b/.hgtags Wed Jun 13 00:14:45 2012 +0100
@@ -25,3 +25,4 @@
746c78997ad9baaac7601686031f507936cebb88 icedtea6-1.11
24db244df0f369a66d922e2e01f089de9e44f06d icedtea6-1.11.1
ca61b2ffa966cac5c5d9ea217b7aec4a0da83ab8 icedtea6-1.11.2
+a9b49bd3d0b5c54eb368b5f9f9b96b8d1aef843d icedtea6-1.11.3
diff -r e5b5280519ef -r 3317a5ef5b07 ChangeLog
--- a/ChangeLog Thu May 31 12:52:55 2012 +0200
+++ b/ChangeLog Wed Jun 13 00:14:45 2012 +0100
@@ -1,3 +1,31 @@
+2012-06-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Add CVE numbers.
+
+2012-06-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * configure.ac: Bump to 1.11.3 proper.
+
+2012-06-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am,
+ * patches/ecj/override.patch:
+ Add additional cases from 7143872.
+ * patches/security/20120612/7079902.patch,
+ * patches/security/20120612/7110720.patch,
+ * patches/security/20120612/7143606.patch,
+ * patches/security/20120612/7143614.patch,
+ * patches/security/20120612/7143617.patch,
+ * patches/security/20120612/7143851.patch,
+ * patches/security/20120612/7143872.patch,
+ * patches/security/20120612/7145239.patch,
+ * patches/security/20120612/7152811.patch,
+ * patches/security/20120612/7157609.patch,
+ * patches/security/20120612/7160677.patch,
+ * patches/security/20120612/7160757.patch:
+ Security patches for 2012/06/12.
+ * NEWS: Updated.
+
2012-05-31 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/coverage-table.patch:
diff -r e5b5280519ef -r 3317a5ef5b07 Makefile.am
--- a/Makefile.am Thu May 31 12:52:55 2012 +0200
+++ b/Makefile.am Wed Jun 13 00:14:45 2012 +0100
@@ -209,7 +209,19 @@
patches/security/20120214/7110700.patch \
patches/security/20120214/7110704.patch \
patches/security/20120214/7118283.patch \
- patches/security/20120214/7126960.patch
+ patches/security/20120214/7126960.patch \
+ patches/security/20120612/7079902.patch \
+ patches/security/20120612/7110720.patch \
+ patches/security/20120612/7143606.patch \
+ patches/security/20120612/7143614.patch \
+ patches/security/20120612/7143617.patch \
+ patches/security/20120612/7143851.patch \
+ patches/security/20120612/7143872.patch \
+ patches/security/20120612/7145239.patch \
+ patches/security/20120612/7152811.patch \
+ patches/security/20120612/7157609.patch \
+ patches/security/20120612/7160677.patch \
+ patches/security/20120612/7160757.patch
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
diff -r e5b5280519ef -r 3317a5ef5b07 NEWS
--- a/NEWS Thu May 31 12:52:55 2012 +0200
+++ b/NEWS Wed Jun 13 00:14:45 2012 +0100
@@ -10,10 +10,23 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.11.3 (2012-XX-XX):
+New in release 1.11.3 (2012-06-12):
+* Security fixes
+ - S7079902, CVE-2012-1711: Refine CORBA data models
+ - S7110720: Issue with vm config file loadingIssue with vm config file loading
+ - S7143606, CVE-2012-1717: File.createTempFile should be improved for temporary files created by the platform.
+ - S7143614, CVE-2012-1716: SynthLookAndFeel stability improvement
+ - S7143617, CVE-2012-1713: Improve fontmanager layout lookup operations
+ - S7143851, CVE-2012-1719: Improve IIOP stub and tie generation in RMIC
+ - S7143872, CVE-2012-1718: Improve certificate extension processing
+ - S7145239: Finetune package definition restriction
+ - S7152811, CVE-2012-1723: Issues in client compiler
+ - S7157609, CVE-2012-1724: Issues with loop
+ - S7160677: missing else in fix for 7152811
+ - S7160757, CVE-2012-1725: Problem with hotspot/runtime_classfile
* Bug fixes
- - PR1018: JVM fails due to SEGV during rendering some Unicode characters
+ - PR1018: JVM fails due to SEGV during rendering some Unicode characters (part of 6886358)
New in release 1.11.2 (2012-05-11):
diff -r e5b5280519ef -r 3317a5ef5b07 configure.ac
--- a/configure.ac Thu May 31 12:52:55 2012 +0200
+++ b/configure.ac Wed Jun 13 00:14:45 2012 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.11.3pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.11.3],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r e5b5280519ef -r 3317a5ef5b07 patches/ecj/override.patch
--- a/patches/ecj/override.patch Thu May 31 12:52:55 2012 +0200
+++ b/patches/ecj/override.patch Wed Jun 13 00:14:45 2012 +0100
@@ -207,3 +207,25 @@
public void handshakeCompleted(HandshakeCompletedEvent event)
{
session = event.getSession();
+diff --git a/src/share/classes/sun/security/x509/X509CRLEntryImpl.java b/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
+--- openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
++++ openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
+@@ -464,7 +464,6 @@
+ getExtension(PKIXExtensions.CertificateIssuer_Id);
+ }
+
+- @Override
+ public int compareTo(X509CRLEntryImpl that) {
+ int compSerial = getSerialNumber().compareTo(that.getSerialNumber());
+ if (compSerial != 0) {
+diff --git a/src/share/classes/sun/security/x509/X509CRLImpl.java b/src/share/classes/sun/security/x509/X509CRLImpl.java
+--- openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java
++++ openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java
+@@ -1276,7 +1276,6 @@
+ return hashcode;
+ }
+
+- @Override
+ public int compareTo(X509IssuerSerial another) {
+ int cissuer = issuer.toString()
+ .compareTo(another.issuer.toString());
diff -r e5b5280519ef -r 3317a5ef5b07 patches/security/20120612/7079902.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/20120612/7079902.patch Wed Jun 13 00:14:45 2012 +0100
@@ -0,0 +1,508 @@
+# HG changeset patch
+# User mbankal
+# Date 1339072594 -3600
+# Node ID 0f2647f201d5879ed294348e36325c2cc2934749
+# Parent 2c6c90dae1670064c856830662ee84b1677d7d1b
+7079902: Refine CORBA data models
+Reviewed-by: asaha, coffeys
+
+diff --git a/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java b/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java
+--- openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java
++++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -215,7 +215,7 @@
+
+ // ClientRequestInfo validity table (see ptc/00-08-06 table 21-1).
+ // Note: These must be in the same order as specified in contants.
+- protected static final boolean validCall[][] = {
++ private static final boolean validCall[][] = {
+ // LEGEND:
+ // s_req = send_request r_rep = receive_reply
+ // s_pol = send_poll r_exc = receive_exception
+diff --git a/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java b/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java
+--- openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java
++++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -195,7 +195,7 @@
+
+ // ServerRequestInfo validity table (see ptc/00-08-06 table 21-2).
+ // Note: These must be in the same order as specified in contants.
+- protected static final boolean validCall[][] = {
++ private static final boolean validCall[][] = {
+ // LEGEND:
+ // r_rsc = receive_request_service_contexts
+ // r_req = receive_request
+diff --git a/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java b/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
+--- openjdk/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
++++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -130,10 +130,23 @@
+ private UtilSystemException utilWrapper = UtilSystemException.get(
+ CORBALogDomains.RPC_ENCODING);
+
+- public static Util instance = null;
++ private static Util instance = null;
+
+ public Util() {
+- instance = this;
++ setInstance(this);
++ }
++
++ private static void setInstance( Util util ) {
++ assert instance == null : "Instance already defined";
++ instance = util;
++ }
++
++ public static Util getInstance() {
++ return instance;
++ }
++
++ public static boolean isInstanceDefined() {
++ return instance != null;
+ }
+
+ // Used by TOAFactory.shutdown to unexport all targets for this
+diff --git a/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java b/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java
+--- openjdk/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java
++++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -93,7 +93,7 @@
+
+ activeObjectMap.putServant( servant, entry ) ;
+
+- if (Util.instance != null) {
++ if (Util.isInstanceDefined()) {
+ POAManagerImpl pm = (POAManagerImpl)poa.the_POAManager() ;
+ POAFactory factory = pm.getFactory() ;
+ factory.registerPOAForServant(poa, servant);
+@@ -133,7 +133,7 @@
+
+ activeObjectMap.remove(key);
+
+- if (Util.instance != null) {
++ if (Util.isInstanceDefined()) {
+ POAManagerImpl pm = (POAManagerImpl)poa.the_POAManager() ;
+ POAFactory factory = pm.getFactory() ;
+ factory.unregisterPOAForServant(poa, s);
+diff --git a/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java b/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java
+--- openjdk/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java
++++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -78,8 +78,8 @@
+
+ public void shutdown( boolean waitForCompletion )
+ {
+- if (Util.instance != null) {
+- Util.instance.unregisterTargetsForORB(orb);
++ if (Util.isInstanceDefined()) {
++ Util.getInstance().unregisterTargetsForORB(orb);
+ }
+ }
+
+diff --git a/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java b/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java
+--- openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java
++++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -106,7 +106,9 @@
+
+ public ParserData[] getParserData()
+ {
+- return parserData ;
++ ParserData[] parserArray = new ParserData[parserData.length];
++ System.arraycopy(parserData, 0, parserArray, 0, parserData.length);
++ return parserArray;
+ }
+
+ private ParserTable() {
+diff --git a/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java b/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java
+--- openjdk/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java
++++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -62,7 +62,7 @@
+ // legal use of '.' in a Java name.
+
+ public static final RepositoryIdCache_1_3 cache = new RepositoryIdCache_1_3();
+- public static final byte[] IDL_IDENTIFIER_CHARS = {
++ private static final byte[] IDL_IDENTIFIER_CHARS = {
+
+ // 0 1 2 3 4 5 6 7 8 9 a b c d e f
+ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 00-0f
+@@ -180,7 +180,7 @@
+ public static final String kRemoteTypeStr = "";
+ public static final String kRemoteValueRepID = "";
+
+- public static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
++ private static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
+
+ static {
+ kSpecialArrayTypeStrings.put("CORBA.WStringValue", new StringBuffer(java.lang.String.class.getName()));
+@@ -189,7 +189,7 @@
+
+ }
+
+- public static final Hashtable kSpecialCasesRepIDs = new Hashtable();
++ private static final Hashtable kSpecialCasesRepIDs = new Hashtable();
+
+ static {
+ kSpecialCasesRepIDs.put(java.lang.String.class, kWStringValueRepID);
+@@ -197,7 +197,7 @@
+ kSpecialCasesRepIDs.put(java.rmi.Remote.class, kRemoteValueRepID);
+ }
+
+- public static final Hashtable kSpecialCasesStubValues = new Hashtable();
++ private static final Hashtable kSpecialCasesStubValues = new Hashtable();
+
+ static {
+ kSpecialCasesStubValues.put(java.lang.String.class, kWStringStubValue);
+@@ -209,7 +209,7 @@
+ }
+
+
+- public static final Hashtable kSpecialCasesVersions = new Hashtable();
++ private static final Hashtable kSpecialCasesVersions = new Hashtable();
+
+ static {
+ kSpecialCasesVersions.put(java.lang.String.class, kWStringValueHash);
+@@ -220,7 +220,7 @@
+ kSpecialCasesVersions.put(java.rmi.Remote.class, kRemoteValueHash);
+ }
+
+- public static final Hashtable kSpecialCasesClasses = new Hashtable();
++ private static final Hashtable kSpecialCasesClasses = new Hashtable();
+
+ static {
+ kSpecialCasesClasses.put(kWStringTypeStr, java.lang.String.class);
+@@ -232,7 +232,7 @@
+ //kSpecialCasesClasses.put(kRemoteTypeStr, java.rmi.Remote.class);
+ }
+
+- public static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
++ private static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
+
+ static {
+ kSpecialCasesArrayPrefix.put(java.lang.String.class, kValuePrefix + kSequencePrefix + kCORBAPrefix);
+@@ -243,7 +243,7 @@
+ kSpecialCasesArrayPrefix.put(java.rmi.Remote.class, kValuePrefix + kSequencePrefix + kCORBAPrefix);
+ }
+
+- public static final Hashtable kSpecialPrimitives = new Hashtable();
++ private static final Hashtable kSpecialPrimitives = new Hashtable();
+
+ static {
+ kSpecialPrimitives.put("int","long");
+diff --git a/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java b/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java
+--- openjdk/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java
++++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -63,7 +63,7 @@
+ // uniformly, and is safe because that is the only
+ // legal use of '.' in a Java name.
+
+- public static final byte[] IDL_IDENTIFIER_CHARS = {
++ private static final byte[] IDL_IDENTIFIER_CHARS = {
+
+ // 0 1 2 3 4 5 6 7 8 9 a b c d e f
+ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 00-0f
+@@ -198,7 +198,7 @@
+ public static final String kRemoteTypeStr = "";
+ public static final String kRemoteValueRepID = "";
+
+- public static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
++ private static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
+
+ static {
+ kSpecialArrayTypeStrings.put("CORBA.WStringValue", new StringBuffer(java.lang.String.class.getName()));
+@@ -207,7 +207,7 @@
+
+ }
+
+- public static final Hashtable kSpecialCasesRepIDs = new Hashtable();
++ private static final Hashtable kSpecialCasesRepIDs = new Hashtable();
+
+ static {
+ kSpecialCasesRepIDs.put(java.lang.String.class, kWStringValueRepID);
+@@ -215,7 +215,7 @@
+ kSpecialCasesRepIDs.put(java.rmi.Remote.class, kRemoteValueRepID);
+ }
+
+- public static final Hashtable kSpecialCasesStubValues = new Hashtable();
++ private static final Hashtable kSpecialCasesStubValues = new Hashtable();
+
+ static {
+ kSpecialCasesStubValues.put(java.lang.String.class, kWStringStubValue);
+@@ -227,7 +227,7 @@
+ }
+
+
+- public static final Hashtable kSpecialCasesVersions = new Hashtable();
++ private static final Hashtable kSpecialCasesVersions = new Hashtable();
+
+ static {
+ kSpecialCasesVersions.put(java.lang.String.class, kWStringValueHash);
+@@ -238,7 +238,7 @@
+ kSpecialCasesVersions.put(java.rmi.Remote.class, kRemoteValueHash);
+ }
+
+- public static final Hashtable kSpecialCasesClasses = new Hashtable();
++ private static final Hashtable kSpecialCasesClasses = new Hashtable();
+
+ static {
+ kSpecialCasesClasses.put(kWStringTypeStr, java.lang.String.class);
+@@ -250,7 +250,7 @@
+ //kSpecialCasesClasses.put(kRemoteTypeStr, java.rmi.Remote.class);
+ }
+
+- public static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
++ private static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
+
+ static {
+ kSpecialCasesArrayPrefix.put(java.lang.String.class, kValuePrefix + kSequencePrefix + kCORBAPrefix);
+@@ -261,7 +261,7 @@
+ kSpecialCasesArrayPrefix.put(java.rmi.Remote.class, kValuePrefix + kSequencePrefix + kCORBAPrefix);
+ }
+
+- public static final Hashtable kSpecialPrimitives = new Hashtable();
++ private static final Hashtable kSpecialPrimitives = new Hashtable();
+
+ static {
+ kSpecialPrimitives.put("int","long");
+diff --git a/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java b/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java
+--- openjdk/corba/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java
++++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -52,7 +52,7 @@
+
+ // If isNextIsLocalValid.get() == Boolean.TRUE,
+ // the next call to isLocal should be valid
+- protected static ThreadLocal isNextCallValid = new ThreadLocal() {
++ private static final ThreadLocal isNextCallValid = new ThreadLocal() {
+ protected synchronized Object initialValue() {
+ return Boolean.TRUE;
+ }
+diff --git a/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java b/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java
+--- openjdk/corba/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java
++++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -57,7 +57,7 @@
+ // uniformly, and is safe because that is the only
+ // legal use of '.' in a Java name.
+
+- public static final byte[] IDL_IDENTIFIER_CHARS = {
++ private static final byte[] IDL_IDENTIFIER_CHARS = {
+
+ // 0 1 2 3 4 5 6 7 8 9 a b c d e f
+ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 00-0f
+@@ -95,7 +95,7 @@
+ private static IdentityHashtable classIDLToRepStr = new IdentityHashtable();
+ private static IdentityHashtable classSeqToRepStr = new IdentityHashtable();
+
+- private static IdentityHashtable repStrToByteArray = new IdentityHashtable();
++ private static final IdentityHashtable repStrToByteArray = new IdentityHashtable();
+ private static Hashtable repStrToClass = new Hashtable();
+
More information about the distro-pkg-dev
mailing list