svn commit: r351655 - in head/java/openjdk7: . files
Greg Lewis
glewis at FreeBSD.org
Sun Apr 20 22:56:19 UTC 2014
Author: glewis
Date: Sun Apr 20 22:56:18 2014
New Revision: 351655
URL: http://svnweb.freebsd.org/changeset/ports/351655
QAT: https://qat.redports.org/buildarchive/r351655/
Log:
. Update to 7u55.
. Use version 1.9.3 of ant [1]
. Don't insist on GCC since compilation with clang now works [2].
Obtained from: jkim@'s openjdk7 redport repo ([1], [2])
Deleted:
head/java/openjdk7/files/patch-src-solaris-classes-sun-net-PortConfig.java
Modified:
head/java/openjdk7/Makefile
head/java/openjdk7/distinfo
head/java/openjdk7/files/patch-set
Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile Sun Apr 20 22:45:36 2014 (r351654)
+++ head/java/openjdk7/Makefile Sun Apr 20 22:56:18 2014 (r351655)
@@ -30,7 +30,6 @@ USES= dos2unix iconv gmake zip
USE_XORG+= x11 xext xi xrender xt xtst
MAKE_ARGS= CC=${CC} CXX=${CXX} HOST_CC=${CC}
MAKE_JOBS_UNSAFE= yes
-USE_GCC= any
OPTIONS_DEFINE= DEBUG POLICY TZUPDATE
OPTIONS_DEFAULT= POLICY TZUPDATE
@@ -38,7 +37,7 @@ DEBUG_DESC= Enable extra debugging info
POLICY_DESC= Install the Unlimited Strength Policy Files
TZUPDATE_DESC= Update the time zone data
-PORT_MINOR_VERSION= 51
+PORT_MINOR_VERSION= 55
PORT_BUILD_NUMBER= 13
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 40
@@ -47,7 +46,7 @@ JDK_BUILD_DATE= 26_aug_2013
JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
# Use our own version of ant to avoid circular dependencies
-ANT_VERSION= 1.8.4
+ANT_VERSION= 1.9.3
ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin
LATEST_LINK= openjdk7
@@ -86,6 +85,7 @@ MAKE_ENV+= LANG="C" \
JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \
X11DIR="${LOCALBASE}" \
LOCALDIR="${LOCALBASE}" \
+ COMPILER_WARNINGS_FATAL="false" \
NO_DOCS="true" \
SKIP_COMPARE_IMAGES="true" \
SKIP_FASTDEBUG_BUILD="true" \
Modified: head/java/openjdk7/distinfo
==============================================================================
--- head/java/openjdk7/distinfo Sun Apr 20 22:45:36 2014 (r351654)
+++ head/java/openjdk7/distinfo Sun Apr 20 22:56:18 2014 (r351655)
@@ -1,4 +1,4 @@
SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596
SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
-SHA256 (apache-ant-1.8.4-bin.zip) = d49d60bc0468279125e4a0db4d9b6637cab342a4bd736c90c0b71865b26c1479
-SIZE (apache-ant-1.8.4-bin.zip) = 8043520
+SHA256 (apache-ant-1.9.3-bin.zip) = 32caa50e473a81c3f6a0f68eb6a103b2eeb95bff09e62f78e93571b20f8237e1
+SIZE (apache-ant-1.9.3-bin.zip) = 8264969
Modified: head/java/openjdk7/files/patch-set
==============================================================================
--- head/java/openjdk7/files/patch-set Sun Apr 20 22:45:36 2014 (r351654)
+++ head/java/openjdk7/files/patch-set Sun Apr 20 22:56:18 2014 (r351655)
@@ -1,5 +1,5 @@
--- .hgtags 2013-09-06 11:20:33.000000000 -0700
-+++ .hgtags 2014-01-18 12:16:04.000000000 -0800
++++ .hgtags 2014-04-20 12:39:52.000000000 -0700
@@ -123,6 +123,7 @@
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
@@ -40,7 +40,7 @@
da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
-@@ -341,3 +358,37 @@
+@@ -341,3 +358,59 @@
3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
@@ -65,6 +65,9 @@
+f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18
+82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30
+f4373de4b75ba8d7f7a5d9c1f77e7884d9064b7e jdk7u45-b31
++b73c006b5d81528dfb4104a79b994b56675bf75d jdk7u45-b33
++05742477836cb30235328181c8e6cae5d4bb06fd jdk7u45-b34
++d0d5badd77abce0469830466ff7b910d3621d847 jdk7u45-b35
+f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u51-b00
+c5822e1d1baa9625ee4e54b8e83a9bf529c883fc jdk7u51-b01
+f750621fb31b8f6462b803b47bbf84f05cd5174a jdk7u51-b02
@@ -78,8 +81,27 @@
+9868efbea4290f4359a6a54d722f2cb79ef634a9 jdk7u51-b10
+573c4cfca7dda548463bb84330bddfd07fe1183f jdk7u51-b11
+df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u51-b12
++6c778574d87336a2e55156544af92ce2de799696 jdk7u51-b13
++d2eeac0235eda77d0a6c72c7235a6e96bc9ad4fb jdk7u51-b30
++626e76f127a44ba0118a545d37410f80000db8fb jdk7u51-b31
++df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u55-b00
++15bc13cd7f5d0bb06ab59935e25944fa7cb15bc8 jdk7u55-b01
++b829c5947c6cd473f42cadfe2c61399fb67c2da6 jdk7u55-b02
++a72b902cdd39d9f2f2d353d5ad629e543cbc01ae jdk7u55-b03
++6a8ee38075621564dd276e8ed7be576d637acf79 jdk7u55-b04
++92ac508efb9e00d88b04a2bd79ab8a55f450a048 jdk7u55-b05
++6c7cd2146f69cf0823765b3cf84c338c1dc7157c jdk7u55-b06
++5cad0f56c685a0673944dbc5632ea9ae7b9340c7 jdk7u55-b07
++f617c33f98e1941875457c5c227198c52917942e jdk7u55-b08
++1f02b1889f7098c1e6fdd271ef74c62a2e346b28 jdk7u55-b09
++736c951b19b9562830f61d5ebbad78775f200e94 jdk7u55-b09
++2a55bbab15f6c866281003dcf48708a9d8c145e9 jdk7u55-b10
++f4ace62029de00d2497058c3c0e1d26e019cde30 jdk7u55-b11
++de268da51b54a4f36bcc1a9af60faea285e94330 jdk7u55-b12
++d972a2d9e4f3f864d26c33ccfdacd8269e0f29a8 jdk7u55-b13
++0820b4707cfa75f8211b88b0daa67bba8475f498 jdk7u55-b30
--- Makefile 2013-09-06 11:20:33.000000000 -0700
-+++ Makefile 2013-12-01 11:13:37.000000000 -0800
++++ Makefile 2014-04-20 12:39:52.000000000 -0700
@@ -264,7 +264,7 @@
DEBUG_NAME=$(DEBUG_NAME) \
GENERATE_DOCS=false \
@@ -90,7 +112,7 @@
generic_build_repo_series
--- corba/.hgtags 2013-09-06 11:20:46.000000000 -0700
-+++ corba/.hgtags 2014-01-18 12:16:06.000000000 -0800
++++ corba/.hgtags 2014-04-20 12:39:46.000000000 -0700
@@ -123,6 +123,7 @@
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
@@ -122,7 +144,7 @@
ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12
eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13
577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14
-@@ -343,3 +360,38 @@
+@@ -343,3 +360,60 @@
b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
@@ -148,6 +170,9 @@
+80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
+a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30
+b7fb35bbe70d88eced3725b6e9070ad0b5b621ad jdk7u45-b31
++d641ac83157ec86219519c0cbaf3122bdc997136 jdk7u45-b33
++aa24e046a2da95637257c9effeaabe254db0aa0b jdk7u45-b34
++fab1423e6ab8ecf36da8b6bf2e454156ec701e8a jdk7u45-b35
+b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u51-b00
+8d884cf2e8cce92d532950de2c7283d9804f9e58 jdk7u51-b01
+327035fbb0433927c1b1af2bc0bcb84e7827f1b9 jdk7u51-b02
@@ -161,8 +186,27 @@
+eecfc296009b81934a329e7ce42a53484093f611 jdk7u51-b10
+a26d0e8ab1027e70ae1ded8ede0086a0a4a10256 jdk7u51-b11
+55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u51-b12
++e2f0036f712aa636cfd55334ac21ea7ca2587a7b jdk7u51-b13
++6563d12c48c92af39a27ca46b4515fad8e994667 jdk7u51-b30
++0ad990211737fe1b1e2737a3498ab266146d2c53 jdk7u51-b31
++55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u55-b00
++aabfdc799c0799837dcbbf9ea8d6df1511978b1f jdk7u55-b01
++db2e6d87bade9d2061646ff9a6b39b5159fba0ec jdk7u55-b02
++02ff18f156bd3382fe22e4758b138370f5238e97 jdk7u55-b03
++6a88a170331fb38af5046e54bf75f38176af5c41 jdk7u55-b04
++a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u55-b05
++af7f1808106bf4e9b4680d943677299829245d08 jdk7u55-b06
++44801796d42bebc90e8c4c7fb5bd79db04b10b75 jdk7u55-b07
++aa98fb8dc3608a30ac593635b21aca2105aaab20 jdk7u55-b08
++2a4842e7ca0b2228017542cea0fed3b8d4f4491a jdk7u55-b09
++5805c3291eb3a82cd75e95ac06eb13daa7f92866 jdk7u55-b09
++b9dae31c56a2bf69fc5932cc490cd80fccc1e0fd jdk7u55-b10
++cbd5b4b07e0c8a5f61eff396b7622e7b04d2a164 jdk7u55-b11
++3cce2a49d18d93dfca2634db32368486ebbb1590 jdk7u55-b12
++8efa6e66c13a5329c312d1a521ffab75d9a330e3 jdk7u55-b13
++e041c52fe69128ec3439d26afef9b0fcba00684c jdk7u55-b30
--- corba/make/Makefile 2013-09-06 11:20:46.000000000 -0700
-+++ corba/make/Makefile 2014-01-18 12:16:05.000000000 -0800
++++ corba/make/Makefile 2014-04-20 12:39:43.000000000 -0700
@@ -160,7 +160,7 @@
#
# CORBA
@@ -173,7 +217,7 @@
build:
$(SUBDIRS-loop)
--- corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-09-06 11:20:47.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -82,11 +82,18 @@
super((ORB)orb);
}
@@ -199,7 +243,7 @@
}
--- corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
@@ -230,7 +274,7 @@
protected CodeSetConversion.BTCConverter createCharBTCConverter() {
--- corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
@@ -265,7 +309,7 @@
protected CodeSetConversion.CTBConverter createCharCTBConverter() {
--- corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
@@ -301,7 +345,7 @@
encap.setEnclosingInputStream(is);
encap.makeEncapsulation();
--- corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2014-04-20 12:39:43.000000000 -0700
@@ -61,6 +61,8 @@
import java.math.BigInteger;
import java.nio.ByteBuffer;
@@ -325,7 +369,7 @@
//System.out.println("Created TypeCodeInputStream " + tcis + " with no parent");
//tcis.printBuffer();
--- corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2014-04-20 12:39:43.000000000 -0700
@@ -33,6 +33,8 @@
import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
import com.sun.corba.se.spi.logging.CORBALogDomains;
@@ -348,7 +392,7 @@
cdrIn.consumeEndian();
--- corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -411,7 +455,7 @@
com.sun.org.omg.SendingContext.CodeBase sender,
int offset)
--- corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2014-04-20 12:39:43.000000000 -0700
@@ -201,7 +201,7 @@
readObjectState.endDefaultReadObject(this);
}
@@ -421,8 +465,396 @@
abstract void readFields(java.util.Map fieldToValueMap)
throws java.io.InvalidClassException, java.io.StreamCorruptedException,
+--- corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2014-04-20 12:39:43.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1998, 2014, 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,6 +52,7 @@
+ import java.io.DataOutputStream;
+ import java.io.ByteArrayOutputStream;
+ import java.io.InvalidClassException;
++import java.io.Externalizable;
+ import java.io.Serializable;
+
+ import java.util.Arrays;
+@@ -82,15 +83,15 @@
+ public static final long kDefaultUID = -1;
+
+ private static Object noArgsList[] = {};
+- private static Class noTypesList[] = {};
++ private static Class<?> noTypesList[] = {};
+
+ /** true if represents enum type */
+ private boolean isEnum;
+
+ private static final Bridge bridge =
+- (Bridge)AccessController.doPrivileged(
+- new PrivilegedAction() {
+- public Object run() {
++ AccessController.doPrivileged(
++ new PrivilegedAction<Bridge>() {
++ public Bridge run() {
+ return Bridge.get() ;
+ }
+ }
+@@ -100,7 +101,7 @@
+ * is returned if the specified class does not implement
+ * java.io.Serializable or java.io.Externalizable.
+ */
+- static final ObjectStreamClass lookup(Class cl)
++ static final ObjectStreamClass lookup(Class<?> cl)
+ {
+ ObjectStreamClass desc = lookupInternal(cl);
+ if (desc.isSerializable() || desc.isExternalizable())
+@@ -112,7 +113,7 @@
+ * Find the class descriptor for the specified class.
+ * Package access only so it can be called from ObjectIn/OutStream.
+ */
+- static ObjectStreamClass lookupInternal(Class cl)
++ static ObjectStreamClass lookupInternal(Class<?> cl)
+ {
+ /* Synchronize on the hashtable so no two threads will do
+ * this at the same time.
+@@ -123,14 +124,14 @@
+ desc = findDescriptorFor(cl);
+ if (desc == null) {
+ /* Check if it's serializable */
+- boolean serializable = classSerializable.isAssignableFrom(cl);
++ boolean serializable = Serializable.class.isAssignableFrom(cl);
+
+ /* If the class is only Serializable,
+ * lookup the descriptor for the superclass.
+ */
+ ObjectStreamClass superdesc = null;
+ if (serializable) {
+- Class superclass = cl.getSuperclass();
++ Class<?> superclass = cl.getSuperclass();
+ if (superclass != null)
+ superdesc = lookup(superclass);
+ }
+@@ -143,7 +144,7 @@
+ if (serializable) {
+ externalizable =
+ ((superdesc != null) && superdesc.isExternalizable()) ||
+- classExternalizable.isAssignableFrom(cl);
++ Externalizable.class.isAssignableFrom(cl);
+ if (externalizable) {
+ serializable = false;
+ }
+@@ -187,7 +188,7 @@
+ * that have evolved from a common root class and agree to be serialized
+ * and deserialized using a common format.
+ */
+- public static final long getSerialVersionUID( java.lang.Class clazz) {
++ public static final long getSerialVersionUID( java.lang.Class<?> clazz) {
+ ObjectStreamClass theosc = ObjectStreamClass.lookup( clazz );
+ if( theosc != null )
+ {
+@@ -221,7 +222,7 @@
+ /**
+ * Return the actual (computed) serialVersionUID for this class.
+ */
+- public static final long getActualSerialVersionUID( java.lang.Class clazz )
++ public static final long getActualSerialVersionUID( java.lang.Class<?> clazz )
+ {
+ ObjectStreamClass theosc = ObjectStreamClass.lookup( clazz );
+ if( theosc != null )
+@@ -251,7 +252,7 @@
+ * Return the class in the local VM that this version is mapped to.
+ * Null is returned if there is no corresponding local class.
+ */
+- public final Class forClass() {
++ public final Class<?> forClass() {
+ return ofClass;
+ }
+
+@@ -351,7 +352,7 @@
+ * Create a new ObjectStreamClass from a loaded class.
+ * Don't call this directly, call lookup instead.
+ */
+- private ObjectStreamClass(java.lang.Class cl, ObjectStreamClass superdesc,
++ private ObjectStreamClass(java.lang.Class<?> cl, ObjectStreamClass superdesc,
+ boolean serial, boolean extern)
+ {
+ ofClass = cl; /* created from this class */
+@@ -390,7 +391,7 @@
+
+ PersistentFieldsValue() { }
+
+- ObjectStreamField[] get(Class type) {
++ ObjectStreamField[] get(Class<?> type) {
+ Object value = map.get(type);
+ if (value == null) {
+ value = computeValue(type);
+@@ -448,7 +449,7 @@
+ if (initialized)
+ return;
+
+- final Class cl = ofClass;
++ final Class<?> cl = ofClass;
+
+ if (!serializable ||
+ externalizable ||
+@@ -576,9 +577,9 @@
+ * will call it as necessary.
+ */
+ writeObjectMethod = getPrivateMethod( cl, "writeObject",
+- new Class[] { java.io.ObjectOutputStream.class }, Void.TYPE ) ;
++ new Class<?>[] { java.io.ObjectOutputStream.class }, Void.TYPE ) ;
+ readObjectMethod = getPrivateMethod( cl, "readObject",
+- new Class[] { java.io.ObjectInputStream.class }, Void.TYPE ) ;
++ new Class<?>[] { java.io.ObjectInputStream.class }, Void.TYPE ) ;
+ }
+ return null;
+ }
+@@ -604,9 +605,9 @@
+ * class, or null if none found. Access checks are disabled on the
+ * returned method (if any).
+ */
+- private static Method getPrivateMethod(Class cl, String name,
+- Class[] argTypes,
+- Class returnType)
++ private static Method getPrivateMethod(Class<?> cl, String name,
++ Class<?>[] argTypes,
++ Class<?> returnType)
+ {
+ try {
+ Method meth = cl.getDeclaredMethod(name, argTypes);
+@@ -667,7 +668,7 @@
+ * Fill in the reflected Fields that will be used
+ * for reading.
+ */
+- final void setClass(Class cl) throws InvalidClassException {
++ final void setClass(Class<?> cl) throws InvalidClassException {
+
+ if (cl == null) {
+ localClassDesc = null;
+@@ -934,9 +935,9 @@
+ * Access checks are disabled on the returned constructor (if any), since
+ * the defining class may still be non-public.
+ */
+- private static Constructor getExternalizableConstructor(Class cl) {
++ private static Constructor getExternalizableConstructor(Class<?> cl) {
+ try {
+- Constructor cons = cl.getDeclaredConstructor(new Class[0]);
++ Constructor cons = cl.getDeclaredConstructor(new Class<?>[0]);
+ cons.setAccessible(true);
+ return ((cons.getModifiers() & Modifier.PUBLIC) != 0) ?
+ cons : null;
+@@ -950,15 +951,15 @@
+ * superclass, or null if none found. Access checks are disabled on the
+ * returned constructor (if any).
+ */
+- private static Constructor getSerializableConstructor(Class cl) {
+- Class initCl = cl;
++ private static Constructor getSerializableConstructor(Class<?> cl) {
++ Class<?> initCl = cl;
+ while (Serializable.class.isAssignableFrom(initCl)) {
+ if ((initCl = initCl.getSuperclass()) == null) {
+ return null;
+ }
+ }
+ try {
+- Constructor cons = initCl.getDeclaredConstructor(new Class[0]);
++ Constructor cons = initCl.getDeclaredConstructor(new Class<?>[0]);
+ int mods = cons.getModifiers();
+ if ((mods & Modifier.PRIVATE) != 0 ||
+ ((mods & (Modifier.PUBLIC | Modifier.PROTECTED)) == 0 &&
+@@ -1063,7 +1064,7 @@
+ * items to the hash accumulating in the digest stream.
+ * Fold the hash into a long. Use the SHA secure hash function.
+ */
+- private static long _computeSerialVersionUID(Class cl) {
++ private static long _computeSerialVersionUID(Class<?> cl) {
+ if (DEBUG_SVUID)
+ msg( "Computing SerialVersionUID for " + cl ) ;
+ ByteArrayOutputStream devnull = new ByteArrayOutputStream(512);
+@@ -1117,7 +1118,7 @@
+ * them from its computation.
+ */
+
+- Class interfaces[] = cl.getInterfaces();
++ Class<?> interfaces[] = cl.getInterfaces();
+ Arrays.sort(interfaces, compareClassByName);
+
+ for (int i = 0; i < interfaces.length; i++) {
+@@ -1247,7 +1248,7 @@
+ return h;
+ }
+
+- private static long computeStructuralUID(com.sun.corba.se.impl.io.ObjectStreamClass osc, Class cl) {
++ private static long computeStructuralUID(com.sun.corba.se.impl.io.ObjectStreamClass osc, Class<?> cl) {
+ ByteArrayOutputStream devnull = new ByteArrayOutputStream(512);
+
+ long h = 0;
+@@ -1267,7 +1268,7 @@
+ DataOutputStream data = new DataOutputStream(mdo);
+
+ // Get SUID of parent
+- Class parent = cl.getSuperclass();
++ Class<?> parent = cl.getSuperclass();
+ if ((parent != null))
+ // SerialBug 1; acc. to spec the one for
+ // java.lang.object
+@@ -1323,10 +1324,10 @@
+ /**
+ * Compute the JVM signature for the class.
+ */
+- static String getSignature(Class clazz) {
++ static String getSignature(Class<?> clazz) {
+ String type = null;
+ if (clazz.isArray()) {
+- Class cl = clazz;
++ Class<?> cl = clazz;
+ int dimensions = 0;
+ while (cl.isArray()) {
+ dimensions++;
+@@ -1372,7 +1373,7 @@
+
+ sb.append("(");
+
+- Class[] params = meth.getParameterTypes(); // avoid clone
++ Class<?>[] params = meth.getParameterTypes(); // avoid clone
+ for (int j = 0; j < params.length; j++) {
+ sb.append(getSignature(params[j]));
+ }
+@@ -1389,7 +1390,7 @@
+
+ sb.append("(");
+
+- Class[] params = cons.getParameterTypes(); // avoid clone
++ Class<?>[] params = cons.getParameterTypes(); // avoid clone
+ for (int j = 0; j < params.length; j++) {
+ sb.append(getSignature(params[j]));
+ }
+@@ -1409,7 +1410,7 @@
+ * The entries are extended from java.lang.ref.SoftReference so the
+ * gc will be able to free them if needed.
+ */
+- private static ObjectStreamClass findDescriptorFor(Class cl) {
++ private static ObjectStreamClass findDescriptorFor(Class<?> cl) {
+
+ int hash = cl.hashCode();
+ int index = (hash & 0x7FFFFFFF) % descriptorFor.length;
+@@ -1456,7 +1457,7 @@
+ descriptorFor[index] = e;
+ }
+
+- private static Field[] getDeclaredFields(final Class clz) {
++ private static Field[] getDeclaredFields(final Class<?> clz) {
+ return (Field[]) AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return clz.getDeclaredFields();
+@@ -1490,7 +1491,7 @@
+ /*
+ * Class that is a descriptor for in this virtual machine.
+ */
+- private Class ofClass;
++ private Class<?> ofClass;
+
+ /*
+ * True if descriptor for a proxy class.
+@@ -1562,30 +1563,17 @@
+ * Returns true if the given class defines a static initializer method,
+ * false otherwise.
+ */
+- private static boolean hasStaticInitializer(Class cl) {
++ private static boolean hasStaticInitializer(Class<?> cl) {
+ if (hasStaticInitializerMethod == null) {
+- Class classWithThisMethod = null;
++ Class<?> classWithThisMethod = null;
+
+ try {
+- try {
+- // When using rip-int with Merlin or when this is a Merlin
+- // workspace, the method we want is in sun.misc.ClassReflector
+- // and absent from java.io.ObjectStreamClass.
+- //
+- // When compiling rip-int with JDK 1.3.x, we have to get it
+- // from java.io.ObjectStreamClass.
+- classWithThisMethod = Class.forName("sun.misc.ClassReflector");
+- } catch (ClassNotFoundException cnfe) {
+- // Do nothing. This is either not a Merlin workspace,
+- // or rip-int is being compiled with something other than
+- // Merlin, probably JDK 1.3. Fall back on java.io.ObjectStreaClass.
+- }
+ if (classWithThisMethod == null)
+ classWithThisMethod = java.io.ObjectStreamClass.class;
+
+ hasStaticInitializerMethod =
+ classWithThisMethod.getDeclaredMethod("hasStaticInitializer",
+- new Class[] { Class.class });
++ new Class<?>[] { Class.class });
+ } catch (NoSuchMethodException ex) {
+ }
+
+@@ -1610,22 +1598,6 @@
+ }
+
+
+- /* The Class Object for java.io.Serializable */
+- private static Class classSerializable = null;
+- private static Class classExternalizable = null;
+-
+- /*
+- * Resolve java.io.Serializable at load time.
+- */
+- static {
+- try {
+- classSerializable = Class.forName("java.io.Serializable");
+- classExternalizable = Class.forName("java.io.Externalizable");
+- } catch (Throwable e) {
+- System.err.println("Could not load java.io.Serializable or java.io.Externalizable.");
+- }
+- }
+-
+ /** use serialVersionUID from JDK 1.1. for interoperability */
+ private static final long serialVersionUID = -6120832682080437368L;
+
+@@ -1663,8 +1635,8 @@
+
+ private static class CompareClassByName implements Comparator {
+ public int compare(Object o1, Object o2) {
+- Class c1 = (Class)o1;
+- Class c2 = (Class)o2;
++ Class<?> c1 = (Class)o1;
++ Class<?> c2 = (Class)o2;
+ return (c1.getName()).compareTo(c2.getName());
+ }
+ }
+@@ -1778,12 +1750,12 @@
+ *
+ * Copied from the Merlin java.io.ObjectStreamClass.
+ */
+- private static Method getInheritableMethod(Class cl, String name,
+- Class[] argTypes,
+- Class returnType)
++ private static Method getInheritableMethod(Class<?> cl, String name,
++ Class<?>[] argTypes,
++ Class<?> returnType)
+ {
+ Method meth = null;
+- Class defCl = cl;
++ Class<?> defCl = cl;
+ while (defCl != null) {
+ try {
+ meth = defCl.getDeclaredMethod(name, argTypes);
+@@ -1815,7 +1787,7 @@
+ *
+ * Copied from the Merlin java.io.ObjectStreamClass.
+ */
+- private static boolean packageEquals(Class cl1, Class cl2) {
++ private static boolean packageEquals(Class<?> cl1, Class<?> cl2) {
+ Package pkg1 = cl1.getPackage(), pkg2 = cl2.getPackage();
+ return ((pkg1 == pkg2) || ((pkg1 != null) && (pkg1.equals(pkg2))));
+ }
--- corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
@@ -451,7 +883,7 @@
return result ;
}
--- corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2014-04-20 12:39:44.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
@@ -478,7 +910,7 @@
ObjectKeyTemplate oktemp = create( is, fullKey, osh ) ;
if (oktemp == null)
--- corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2013-09-06 11:20:48.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -70,6 +70,8 @@
import com.sun.corba.se.impl.encoding.EncapsInputStream ;
import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
@@ -499,8 +931,302 @@
istr.consumeEndian();
init( istr ) ;
}
+--- corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java 2013-09-06 11:20:49.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java 2014-04-20 12:39:43.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2014, 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
+@@ -94,7 +94,7 @@
+ });
+ }
+
+- public static long computeStructuralUID(boolean hasWriteObject, Class cl) {
++ public static long computeStructuralUID(boolean hasWriteObject, Class<?> cl) {
+ ByteArrayOutputStream devnull = new ByteArrayOutputStream(512);
+
+ long h = 0;
+@@ -119,7 +119,7 @@
+ // Object method in there
+
+ // Get SUID of parent
+- Class parent = cl.getSuperclass();
++ Class<?> parent = cl.getSuperclass();
+ if ((parent != null) && (parent != java.lang.Object.class)) {
+ boolean hasWriteObjectFlag = false;
+ Class [] args = {java.io.ObjectOutputStream.class};
+@@ -503,19 +503,6 @@
+ Class classWithThisMethod = null;
+
+ try {
+- try {
+- // When using rip-int with Merlin or when this is a Merlin
+- // workspace, the method we want is in sun.misc.ClassReflector
+- // and absent from java.io.ObjectStreamClass.
+- //
+- // When compiling rip-int with JDK 1.3.x, we have to get it
+- // from java.io.ObjectStreamClass.
+- classWithThisMethod = Class.forName("sun.misc.ClassReflector");
+- } catch (ClassNotFoundException cnfe) {
+- // Do nothing. This is either not a Merlin workspace,
+- // or rip-int is being compiled with something other than
+- // Merlin, probably JDK 1.3. Fall back on java.io.ObjectStreaClass.
+- }
+ if (classWithThisMethod == null)
+ classWithThisMethod = java.io.ObjectStreamClass.class;
+
+--- corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2013-09-06 11:20:49.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2014-04-20 12:39:43.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 2014, 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
+@@ -53,6 +53,7 @@
+ import java.io.ByteArrayOutputStream;
+ import java.io.InvalidClassException;
+ import java.io.Serializable;
++import java.io.Externalizable;
+
+ import java.util.Arrays;
+ import java.util.Comparator;
+@@ -88,7 +89,7 @@
+ public static final long kDefaultUID = -1;
+
+ private static Object noArgsList[] = {};
+- private static Class noTypesList[] = {};
++ private static Class<?> noTypesList[] = {};
+
+ private static Hashtable translatedFields;
+
+@@ -96,7 +97,7 @@
+ * is returned if the specified class does not implement
+ * java.io.Serializable or java.io.Externalizable.
+ */
+- static final ObjectStreamClass_1_3_1 lookup(Class cl)
++ static final ObjectStreamClass_1_3_1 lookup(Class<?> cl)
+ {
+ ObjectStreamClass_1_3_1 desc = lookupInternal(cl);
+ if (desc.isSerializable() || desc.isExternalizable())
+@@ -108,7 +109,7 @@
+ * Find the class descriptor for the specified class.
+ * Package access only so it can be called from ObjectIn/OutStream.
+ */
+- static ObjectStreamClass_1_3_1 lookupInternal(Class cl)
++ static ObjectStreamClass_1_3_1 lookupInternal(Class<?> cl)
+ {
+ /* Synchronize on the hashtable so no two threads will do
+ * this at the same time.
+@@ -122,13 +123,13 @@
+ }
+
+ /* Check if it's serializable */
+- boolean serializable = classSerializable.isAssignableFrom(cl);
++ boolean serializable = Serializable.class.isAssignableFrom(cl);
+ /* If the class is only Serializable,
+ * lookup the descriptor for the superclass.
+ */
+ ObjectStreamClass_1_3_1 superdesc = null;
+ if (serializable) {
+- Class superclass = cl.getSuperclass();
++ Class<?> superclass = cl.getSuperclass();
+ if (superclass != null)
+ superdesc = lookup(superclass);
+ }
+@@ -141,7 +142,7 @@
+ if (serializable) {
+ externalizable =
+ ((superdesc != null) && superdesc.isExternalizable()) ||
+- classExternalizable.isAssignableFrom(cl);
++ Externalizable.class.isAssignableFrom(cl);
+ if (externalizable) {
+ serializable = false;
+ }
+@@ -170,7 +171,7 @@
+ * that have evolved from a common root class and agree to be serialized
+ * and deserialized using a common format.
+ */
+- public static final long getSerialVersionUID( java.lang.Class clazz) {
++ public static final long getSerialVersionUID( java.lang.Class<?> clazz) {
+ ObjectStreamClass_1_3_1 theosc = ObjectStreamClass_1_3_1.lookup( clazz );
+ if( theosc != null )
+ {
+@@ -204,7 +205,7 @@
+ /**
+ * Return the actual (computed) serialVersionUID for this class.
+ */
+- public static final long getActualSerialVersionUID( java.lang.Class clazz )
++ public static final long getActualSerialVersionUID( java.lang.Class<?> clazz )
+ {
+ ObjectStreamClass_1_3_1 theosc = ObjectStreamClass_1_3_1.lookup( clazz );
+ if( theosc != null )
+@@ -234,7 +235,7 @@
+ * Return the class in the local VM that this version is mapped to.
+ * Null is returned if there is no corresponding local class.
+ */
+- public final Class forClass() {
++ public final Class<?> forClass() {
+ return ofClass;
+ }
+
+@@ -333,7 +334,7 @@
+ * Create a new ObjectStreamClass_1_3_1 from a loaded class.
+ * Don't call this directly, call lookup instead.
+ */
+- private ObjectStreamClass_1_3_1(java.lang.Class cl, ObjectStreamClass_1_3_1 superdesc,
++ private ObjectStreamClass_1_3_1(java.lang.Class<?> cl, ObjectStreamClass_1_3_1 superdesc,
+ boolean serial, boolean extern)
+ {
+ ofClass = cl; /* created from this class */
+@@ -376,7 +377,7 @@
+ private void init() {
+ synchronized (lock) {
+
+- final Class cl = ofClass;
++ final Class<?> cl = ofClass;
+
+ if (fields != null) // already initialized
+ return;
+@@ -558,7 +559,7 @@
+ * will call it as necessary.
+ */
+ try {
+- Class[] args = {java.io.ObjectOutputStream.class};
++ Class<?>[] args = {java.io.ObjectOutputStream.class};
+ writeObjectMethod = cl.getDeclaredMethod("writeObject", args);
+ hasWriteObjectMethod = true;
+ int mods = writeObjectMethod.getModifiers();
+@@ -578,7 +579,7 @@
+ * ObjectInputStream so it can all the method directly.
+ */
+ try {
+- Class[] args = {java.io.ObjectInputStream.class};
++ Class<?>[] args = {java.io.ObjectInputStream.class};
+ readObjectMethod = cl.getDeclaredMethod("readObject", args);
+ int mods = readObjectMethod.getModifiers();
+
+@@ -629,11 +630,11 @@
+ if (translation != null)
+ return translation;
+ else {
+- Class osfClass = com.sun.corba.se.impl.orbutil.ObjectStreamField.class;
++ Class<?> osfClass = com.sun.corba.se.impl.orbutil.ObjectStreamField.class;
+
+ translation = (Object[])java.lang.reflect.Array.newInstance(osfClass, objs.length);
+ Object arg[] = new Object[2];
+- Class types[] = {String.class, Class.class};
++ Class<?> types[] = {String.class, Class.class};
+ Constructor constructor = osfClass.getDeclaredConstructor(types);
+ for (int i = fields.length -1; i >= 0; i--){
+ arg[0] = fields[i].getName();
+@@ -804,7 +805,7 @@
+ }
+ }
+
+- private static long computeStructuralUID(ObjectStreamClass_1_3_1 osc, Class cl) {
++ private static long computeStructuralUID(ObjectStreamClass_1_3_1 osc, Class<?> cl) {
+ ByteArrayOutputStream devnull = new ByteArrayOutputStream(512);
+
+ long h = 0;
+@@ -824,7 +825,7 @@
+ DataOutputStream data = new DataOutputStream(mdo);
+
+ // Get SUID of parent
+- Class parent = cl.getSuperclass();
++ Class<?> parent = cl.getSuperclass();
+ if ((parent != null))
+ // SerialBug 1; acc. to spec the one for
+ // java.lang.object
+@@ -910,10 +911,10 @@
+ /**
+ * Compute the JVM signature for the class.
+ */
+- static String getSignature(Class clazz) {
++ static String getSignature(Class<?> clazz) {
+ String type = null;
+ if (clazz.isArray()) {
+- Class cl = clazz;
++ Class<?> cl = clazz;
+ int dimensions = 0;
+ while (cl.isArray()) {
+ dimensions++;
+@@ -959,7 +960,7 @@
+
+ sb.append("(");
+
+- Class[] params = meth.getParameterTypes(); // avoid clone
++ Class<?>[] params = meth.getParameterTypes(); // avoid clone
+ for (int j = 0; j < params.length; j++) {
+ sb.append(getSignature(params[j]));
+ }
+@@ -976,7 +977,7 @@
+
+ sb.append("(");
+
+- Class[] params = cons.getParameterTypes(); // avoid clone
++ Class<?>[] params = cons.getParameterTypes(); // avoid clone
+ for (int j = 0; j < params.length; j++) {
+ sb.append(getSignature(params[j]));
+ }
+@@ -996,7 +997,7 @@
+ * The entries are extended from java.lang.ref.SoftReference so the
+ * gc will be able to free them if needed.
+ */
+- private static ObjectStreamClass_1_3_1 findDescriptorFor(Class cl) {
++ private static ObjectStreamClass_1_3_1 findDescriptorFor(Class<?> cl) {
+
+ int hash = cl.hashCode();
+ int index = (hash & 0x7FFFFFFF) % descriptorFor.length;
+@@ -1077,7 +1078,7 @@
+ /*
+ * Class that is a descriptor for in this virtual machine.
+ */
+- private Class ofClass;
++ private Class<?> ofClass;
+
+ /*
+ * True if descriptor for a proxy class.
+@@ -1130,22 +1131,6 @@
+ /* Get the private static final field for serial version UID */
+ // private static native long getSerialVersionUIDField(Class cl);
+
+- /* The Class Object for java.io.Serializable */
+- private static Class classSerializable = null;
+- private static Class classExternalizable = null;
+-
+- /*
+- * Resolve java.io.Serializable at load time.
+- */
+- static {
+- try {
+- classSerializable = Class.forName("java.io.Serializable");
+- classExternalizable = Class.forName("java.io.Externalizable");
+- } catch (Throwable e) {
+- System.err.println("Could not load java.io.Serializable or java.io.Externalizable.");
+- }
+- }
+-
+ /** use serialVersionUID from JDK 1.1. for interoperability */
+ private static final long serialVersionUID = -6120832682080437368L;
+
+@@ -1183,8 +1168,8 @@
+
+ private static class CompareClassByName implements Comparator {
+ public int compare(Object o1, Object o2) {
+- Class c1 = (Class)o1;
+- Class c2 = (Class)o2;
++ Class<?> c1 = (Class)o1;
++ Class<?> c2 = (Class)o2;
+ return (c1.getName()).compareTo(c2.getName());
+ }
+ }
--- corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-09-06 11:20:49.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-12-01 11:13:38.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -905,28 +905,4 @@
return contents.toString();
@@ -531,7 +1257,7 @@
- }
}
--- corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2013-12-01 11:13:38.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -43,6 +43,8 @@
import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ;
import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ;
@@ -577,7 +1303,7 @@
// If the method passed to invoke is not from DynamicStub or its superclasses,
// it must be from an implemented interface, so we just handle
--- corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
@@ -629,7 +1355,7 @@
public abstract org.omg.CORBA.Object makeStub() ;
}
--- corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
@@ -665,7 +1391,7 @@
}
}
--- corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -693,7 +1419,7 @@
String msg =
--- corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2014-01-18 12:16:06.000000000 -0800
++++ corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2014-04-20 12:39:43.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
@@ -763,7 +1489,7 @@
cdrInputObject.setMessageMediator(messageMediator);
--- corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java 2013-09-06 11:20:50.000000000 -0700
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list