Changeset 390

Timestamp:

Jul 2, 2012, 3:05:26 PM (13 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b25 from branches/vendor/oracle.

This accompanies an incomplete r389.

Location:

trunk/openjdk

Files:

• corba/make/common/Rules.gmk (modified) (view diffs)
• corba/make/common/shared/Platform.gmk (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java (modified) (view diffs)
• corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java (modified) (view diffs)
• hotspot/make/jprt.properties (modified) (view diffs)
• hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp (modified) (view diffs)
• hotspot/src/cpu/x86/vm/globals_x86.hpp (modified) (view diffs)
• hotspot/src/cpu/x86/vm/vm_version_x86.cpp (modified) (view diffs)
• hotspot/src/cpu/x86/vm/vm_version_x86.hpp (modified) (view diffs)
• hotspot/src/cpu/x86/vm/x86_32.ad (modified) (view diffs)
• hotspot/src/cpu/x86/vm/x86_64.ad (modified) (view diffs)
• hotspot/src/os/linux/vm/os_linux.cpp (modified) (view diffs)
• hotspot/src/os_cpu/os2_x86/vm/os2_x86_32.s (modified) (view diffs)
• hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp (modified) (view diffs)
• hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp (modified) (view diffs)
• hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp (modified) (view diffs)
• hotspot/src/share/vm/adlc/output_c.cpp (modified) (view diffs)
• hotspot/src/share/vm/c1/c1_Compilation.cpp (modified) (view diffs)
• hotspot/src/share/vm/c1/c1_Compilation.hpp (modified) (view diffs)
• hotspot/src/share/vm/c1/c1_LIRGenerator.cpp (modified) (view diffs)
• hotspot/src/share/vm/ci/ciEnv.cpp (modified) (view diffs)
• hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp (modified) (view diffs)
• hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp (modified) (view diffs)
• hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp (modified) (view diffs)
• hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp (modified) (view diffs)
• hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp (modified) (view diffs)
• hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp (modified) (view diffs)
• hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp (modified) (view diffs)
• hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp (modified) (view diffs)
• hotspot/src/share/vm/memory/allocation.cpp (modified) (view diffs)
• hotspot/src/share/vm/memory/allocation.hpp (modified) (view diffs)
• hotspot/src/share/vm/memory/genMarkSweep.cpp (modified) (view diffs)
• hotspot/src/share/vm/opto/ifnode.cpp (modified) (view diffs)
• hotspot/src/share/vm/opto/loopTransform.cpp (modified) (view diffs)
• hotspot/src/share/vm/opto/loopnode.hpp (modified) (view diffs)
• hotspot/src/share/vm/opto/loopopts.cpp (modified) (view diffs)
• hotspot/src/share/vm/opto/node.cpp (modified) (view diffs)
• hotspot/src/share/vm/prims/jvmtiEventController.cpp (modified) (view diffs)
• hotspot/src/share/vm/prims/jvmtiExport.cpp (modified) (view diffs)
• hotspot/src/share/vm/prims/jvmtiExport.hpp (modified) (view diffs)
• hotspot/src/share/vm/prims/jvmtiImpl.cpp (modified) (view diffs)
• hotspot/src/share/vm/prims/jvmtiImpl.hpp (modified) (view diffs)
• hotspot/src/share/vm/prims/jvmtiTagMap.cpp (modified) (view diffs)
• hotspot/src/share/vm/prims/jvmtiTagMap.hpp (modified) (view diffs)
• hotspot/src/share/vm/runtime/arguments.hpp (modified) (view diffs)
• hotspot/src/share/vm/runtime/globals.hpp (modified) (view diffs)
• hotspot/src/share/vm/runtime/jniHandles.cpp (modified) (view diffs)
• hotspot/src/share/vm/services/heapDumper.cpp (modified) (view diffs)
• hotspot/src/share/vm/utilities/debug.cpp (modified) (view diffs)
• hotspot/src/share/vm/utilities/debug.hpp (modified) (view diffs)
• hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp (modified) (view diffs)
• hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp (modified) (view diffs)
• hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp (modified) (view diffs)
• hotspot/src/share/vm/utilities/vmError.cpp (modified) (view diffs)
• hotspot/src/share/vm/utilities/vmError.hpp (modified) (view diffs)
• jdk/make/common/shared/Platform.gmk (modified) (view diffs)
• jdk/make/common/shared/Sanity-Settings.gmk (modified) (view diffs)
• jdk/make/common/shared/Sanity.gmk (modified) (view diffs)
• jdk/make/java/java/FILES_java.gmk (modified) (view diffs)
• jdk/make/sun/security/mscapi/Makefile (modified) (view diffs)
• jdk/make/sun/security/pkcs11/Makefile (modified) (view diffs)
• jdk/src/share/bin/java.c (modified) (view diffs)
• jdk/src/share/bin/java.h (modified) (view diffs)
• jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java (modified) (view diffs)
• jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java (modified) (view diffs)
• jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java (modified) (view diffs)
• jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java (modified) (view diffs)
• jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java (modified) (view diffs)
• jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java (modified) (view diffs)
• jdk/src/share/classes/com/sun/security/sasl/ExternalClient.java (modified) (view diffs)
• jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java (modified) (view diffs)
• jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/AWTKeyStroke.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/KeyboardFocusManager.java (modified) (view diffs)
• jdk/src/share/classes/java/io/ObjectStreamClass.java (modified) (view diffs)
• jdk/src/share/classes/java/net/NetworkInterface.java (modified) (view diffs)
• jdk/src/share/classes/java/net/URI.java (modified) (view diffs)
• jdk/src/share/classes/java/nio/charset/package.html (modified) (view diffs)
• jdk/src/share/classes/java/sql/Timestamp.java (modified) (view diffs)
• jdk/src/share/classes/java/util/TimeZone.java (modified) (view diffs)
• jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java (modified) (view diffs)
• jdk/src/share/classes/javax/management/remote/JMXServiceURL.java (modified) (view diffs)
• jdk/src/share/classes/javax/naming/ldap/LdapName.java (modified) (view diffs)
• jdk/src/share/classes/javax/naming/ldap/Rdn.java (modified) (view diffs)
• jdk/src/share/classes/javax/net/ssl/SSLContext.java (modified) (view diffs)
• jdk/src/share/classes/javax/print/DocFlavor.java (modified) (view diffs)
• jdk/src/share/classes/javax/swing/ImageIcon.java (modified) (view diffs)
• jdk/src/share/classes/sun/awt/AppContext.java (modified) (view diffs)
• jdk/src/share/classes/sun/awt/SunToolkit.java (modified) (view diffs)
• jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java (modified) (view diffs)
• jdk/src/share/classes/sun/font/FileFontStrike.java (modified) (view diffs)
• jdk/src/share/classes/sun/java2d/pipe/DrawImage.java (modified) (view diffs)
• jdk/src/share/classes/sun/misc/JavaAWTAccess.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/src/share/classes/sun/misc/JavaAWTAccess.java ) (view diffs)
• jdk/src/share/classes/sun/misc/SharedSecrets.java (modified) (view diffs)
• jdk/src/share/classes/sun/net/httpserver/Request.java (modified) (view diffs)
• jdk/src/share/classes/sun/net/httpserver/ServerConfig.java (modified) (view diffs)
• jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java (modified) (view diffs)
• jdk/src/share/classes/sun/rmi/server/LoaderHandler.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/provider/certpath/UntrustedChecker.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/src/share/classes/sun/security/provider/certpath/UntrustedChecker.java ) (view diffs)
• jdk/src/share/classes/sun/security/ssl/AppOutputStream.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/ssl/EngineArgs.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/util/UntrustedCertificates.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java ) (view diffs)
• jdk/src/share/classes/sun/security/validator/SimpleValidator.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/validator/ValidatorException.java (modified) (view diffs)
• jdk/src/share/native/java/util/zip/zip_util.c (modified) (view diffs)
• jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c (modified) (view diffs)
• jdk/src/solaris/bin/java_md.c (modified) (view diffs)
• jdk/src/windows/bin/java_md.c (modified) (view diffs)
• jdk/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java (modified) (view diffs)
• jdk/src/windows/native/sun/windows/awt_FileDialog.cpp (modified) (view diffs)
• jdk/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java (modified) (view diffs)
• jdk/test/java/rmi/registry/readTest (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/java/rmi/registry/readTest ) (view diffs)
• jdk/test/java/rmi/registry/readTest/readTest.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/java/rmi/registry/readTest/readTest.java ) (view diffs)
• jdk/test/java/rmi/registry/readTest/readTest.sh (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/java/rmi/registry/readTest/readTest.sh ) (view diffs)
• jdk/test/java/rmi/registry/readTest/testPkg (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/java/rmi/registry/readTest/testPkg ) (view diffs)
• jdk/test/java/rmi/registry/readTest/testPkg/Client.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/java/rmi/registry/readTest/testPkg/Client.java ) (view diffs)
• jdk/test/java/rmi/registry/readTest/testPkg/Hello.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/java/rmi/registry/readTest/testPkg/Hello.java ) (view diffs)
• jdk/test/java/rmi/registry/readTest/testPkg/Server.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/java/rmi/registry/readTest/testPkg/Server.java ) (view diffs)
• jdk/test/javax/sound/sampled (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/javax/sound/sampled ) (view diffs)
• jdk/test/javax/sound/sampled/DataLine (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/javax/sound/sampled/DataLine ) (view diffs)
• jdk/test/javax/sound/sampled/DataLine/DataLine_ArrayIndexOutOfBounds.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/javax/sound/sampled/DataLine/DataLine_ArrayIndexOutOfBounds.java ) (view diffs)
• jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs ) (view diffs)
• jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.java ) (view diffs)
• jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh ) (view diffs)
• jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh (modified) (view diffs)
• langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java (modified) (view diffs)
• langtools/test/tools/javadoc/parser (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser ) (view diffs)
• langtools/test/tools/javadoc/parser/7091528 (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528 ) (view diffs)
• langtools/test/tools/javadoc/parser/7091528/T7091528.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528/T7091528.java ) (view diffs)
• langtools/test/tools/javadoc/parser/7091528/p (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528/p ) (view diffs)
• langtools/test/tools/javadoc/parser/7091528/p/C1.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528/p/C1.java ) (view diffs)
• langtools/test/tools/javadoc/parser/7091528/p/q (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528/p/q ) (view diffs)
• langtools/test/tools/javadoc/parser/7091528/p/q/C2.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528/p/q/C2.java ) (view diffs)
• make/scripts/jdkreport.pl (modified) (view diffs)