/hg/release/icedtea7-forest-2.1/corba: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 12 15:48:42 PDT 2012
changeset c4a7d2b9664d in /hg/release/icedtea7-forest-2.1/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba?cmd=changeset;node=c4a7d2b9664d
author: mbankal
date: Tue Feb 28 17:00:14 2012 +0000
7079902: Refine CORBA data models
Reviewed-by: asaha, coffeys
changeset 338c21646c76 in /hg/release/icedtea7-forest-2.1/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba?cmd=changeset;node=338c21646c76
author: coffeys
date: Wed Feb 29 16:41:49 2012 +0000
7143851: Improve IIOP stub and tie generation in RMIC
7149048: Changes to corba rmic stubGenerator class are not used during jdk build process
Reviewed-by: mschoene, dholmes
changeset 8c5573b22489 in /hg/release/icedtea7-forest-2.1/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba?cmd=changeset;node=8c5573b22489
author: andrew
date: Thu Jun 07 15:21:36 2012 +0100
Added tag icedtea-2.1.1 for changeset 338c21646c76
diffstat:
.hgtags | 1 +
src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java | 4 +-
src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java | 4 +-
src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java | 19 ++++-
src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java | 6 +-
src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java | 6 +-
src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java | 6 +-
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java | 18 ++--
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java | 18 ++--
src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java | 4 +-
src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java | 20 ++--
src/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java | 4 +-
src/share/classes/sun/rmi/rmic/iiop/IDLNames.java | 34 +++++++++-
src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java | 8 +-
14 files changed, 98 insertions(+), 54 deletions(-)
diffs (truncated from 541 to 500 lines):
diff -r 5617f6c5cc94 -r 8c5573b22489 .hgtags
--- a/.hgtags Wed Feb 15 08:26:34 2012 +0000
+++ b/.hgtags Thu Jun 07 15:21:36 2012 +0100
@@ -147,3 +147,4 @@
62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21
ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint
a4c1348efa0807023deb0235c477b7ef0de093fa icedtea-2.1
+338c21646c7616e63483a9e8fa7c517931706b95 icedtea-2.1.1
diff -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java Thu Jun 07 15:21:36 2012 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, 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
@@ -217,7 +217,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 -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java
--- a/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java Thu Jun 07 15:21:36 2012 +0100
@@ -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 -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
--- a/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Thu Jun 07 15:21:36 2012 +0100
@@ -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 -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java
--- a/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java Thu Jun 07 15:21:36 2012 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, 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);
@@ -129,7 +129,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 -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java
--- a/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java Thu Jun 07 15:21:36 2012 +0100
@@ -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 -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java
--- a/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java Thu Jun 07 15:21:36 2012 +0100
@@ -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 -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java Thu Jun 07 15:21:36 2012 +0100
@@ -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 -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java Thu Jun 07 15:21:36 2012 +0100
@@ -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 -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java
--- a/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java Thu Jun 07 15:21:36 2012 +0100
@@ -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 -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java
--- a/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java Thu Jun 07 15:21:36 2012 +0100
@@ -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();
private String repId = null;
@@ -192,7 +192,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()));
@@ -201,7 +201,7 @@
}
- public static final Hashtable kSpecialCasesRepIDs = new Hashtable();
+ private static final Hashtable kSpecialCasesRepIDs = new Hashtable();
static {
kSpecialCasesRepIDs.put(java.lang.String.class, kWStringValueRepID);
@@ -209,7 +209,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);
@@ -221,7 +221,7 @@
}
- public static final Hashtable kSpecialCasesVersions = new Hashtable();
+ private static final Hashtable kSpecialCasesVersions = new Hashtable();
static {
kSpecialCasesVersions.put(java.lang.String.class, kWStringValueHash);
@@ -232,7 +232,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);
@@ -244,7 +244,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);
@@ -255,7 +255,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 -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java
--- a/src/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java Thu Jun 07 15:21:36 2012 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -58,7 +58,7 @@
private CORBALogDomains() {}
// Top level log domain for CORBA
- public static String TOP_LEVEL_DOMAIN = "javax.enterprise.resource.corba";
+ public static final String TOP_LEVEL_DOMAIN = "javax.enterprise.resource.corba";
public static final String RPC = "rpc" ;
diff -r 5617f6c5cc94 -r 8c5573b22489 src/share/classes/sun/rmi/rmic/iiop/IDLNames.java
--- a/src/share/classes/sun/rmi/rmic/iiop/IDLNames.java Wed Feb 15 08:26:34 2012 +0000
+++ b/src/share/classes/sun/rmi/rmic/iiop/IDLNames.java Thu Jun 07 15:21:36 2012 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2007, 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
@@ -71,6 +71,34 @@
(byte)'F',
};
+ // Legal IDL Identifier characters (1 = legal). Note
+ // that '.' (2E) is marked as legal even though it is
+ // not legal in IDL. This allows us to treat a fully
+ // qualified Java name with '.' package separators
+ // uniformly, and is safe because that is the only
+ // legal use of '.' in a Java name.
+
+ 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
+ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 10-1f
+ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,1,0, // 20-2f
+ 1,1,1,1, 1,1,1,1, 1,1,0,0, 0,0,0,0, // 30-3f
+ 0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // 40-4f
+ 1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,1, // 50-5f
+ 0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // 60-6f
+ 1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,0, // 70-7f
+ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 80-8f
+ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 90-9f
+ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // a0-af
+ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // b0-bf
+ 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // c0-cf
+ 0,1,1,1, 1,1,1,0, 1,1,1,1, 1,0,0,1, // d0-df
+ 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // e0-ef
+ 0,1,1,1, 1,1,1,0, 1,1,1,1, 1,0,0,1, // f0-ff
+ };
+
//_____________________________________________________________________
// Public Interfaces
//_____________________________________________________________________
@@ -139,7 +167,7 @@
result = replace(result,"x\\U","U");
// Now see if we have any remaining illegal characters (see
- // RepositoryId.IDL_IDENTIFIER_CHARS array)...
+ // IDL_IDENTIFIER_CHARS array)...
int length = result.length();
StringBuffer buffer = null;
@@ -148,7 +176,7 @@
More information about the distro-pkg-dev
mailing list