Changeset 406 for trunk/openjdk

Timestamp:

Dec 21, 2012, 10:37:13 AM (13 years ago)

Author:

dmik

Message:

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

Location:

trunk/openjdk

Files:

• . (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java (modified) (view diffs)
• corba/src/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java (modified) (view diffs)
• corba/src/share/classes/sun/rmi/rmic/iiop/IDLNames.java (modified) (view diffs)
• corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java (modified) (view diffs)
• hotspot/make/linux/Makefile (modified) (view diffs)
• hotspot/src/os_cpu/os2_x86/vm/os2_x86_32.s (modified) (view diffs)
• hotspot/src/share/vm/ci/ciField.cpp (modified) (view diffs)
• hotspot/src/share/vm/ci/ciField.hpp (modified) (view diffs)
• hotspot/src/share/vm/classfile/altHashing.cpp (copied) (copied from branches/vendor/oracle/openjdk6/b27/hotspot/src/share/vm/classfile/altHashing.cpp ) (view diffs)
• hotspot/src/share/vm/classfile/altHashing.hpp (copied) (copied from branches/vendor/oracle/openjdk6/b27/hotspot/src/share/vm/classfile/altHashing.hpp ) (view diffs)
• hotspot/src/share/vm/classfile/javaClasses.cpp (modified) (view diffs)
• hotspot/src/share/vm/classfile/javaClasses.hpp (modified) (view diffs)
• hotspot/src/share/vm/classfile/symbolTable.cpp (modified) (view diffs)
• hotspot/src/share/vm/classfile/symbolTable.hpp (modified) (view diffs)
• hotspot/src/share/vm/classfile/verifier.cpp (modified) (view diffs)
• hotspot/src/share/vm/compiler/compilerOracle.cpp (modified) (view diffs)
• hotspot/src/share/vm/compiler/compilerOracle.hpp (modified) (view diffs)
• hotspot/src/share/vm/memory/dump.cpp (modified) (view diffs)
• hotspot/src/share/vm/opto/addnode.cpp (modified) (view diffs)
• hotspot/src/share/vm/opto/loopTransform.cpp (modified) (view diffs)
• hotspot/src/share/vm/opto/loopnode.cpp (modified) (view diffs)
• hotspot/src/share/vm/opto/runtime.cpp (modified) (view diffs)
• hotspot/src/share/vm/prims/jniCheck.cpp (modified) (view diffs)
• hotspot/src/share/vm/prims/jvmtiEnter.xsl (modified) (view diffs)
• hotspot/src/share/vm/prims/jvmtiEnv.cpp (modified) (view diffs)
• hotspot/src/share/vm/prims/jvmtiExport.cpp (modified) (view diffs)
• hotspot/src/share/vm/runtime/arguments.cpp (modified) (view diffs)
• hotspot/src/share/vm/runtime/globals.hpp (modified) (view diffs)
• hotspot/src/share/vm/runtime/init.cpp (modified) (view diffs)
• hotspot/src/share/vm/runtime/interfaceSupport.hpp (modified) (view diffs)
• hotspot/src/share/vm/runtime/safepoint.cpp (modified) (view diffs)
• hotspot/src/share/vm/utilities/hashtable.cpp (modified) (view diffs)
• hotspot/src/share/vm/utilities/hashtable.hpp (modified) (view diffs)
• hotspot/src/share/vm/utilities/hashtable.inline.hpp (modified) (view diffs)
• hotspot/test/runtime/7110720 (copied) (copied from branches/vendor/oracle/openjdk6/b27/hotspot/test/runtime/7110720 ) (view diffs)
• hotspot/test/runtime/7110720/Test7110720.sh (copied) (copied from branches/vendor/oracle/openjdk6/b27/hotspot/test/runtime/7110720/Test7110720.sh ) (view diffs)
• hotspot/test/runtime/7160757 (copied) (copied from branches/vendor/oracle/openjdk6/b27/hotspot/test/runtime/7160757 ) (view diffs)
• hotspot/test/runtime/7160757/Test7160757.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/hotspot/test/runtime/7160757/Test7160757.java ) (view diffs)
• jaxp/jaxp.properties (modified) (view diffs)
• jdk/make/com/sun/jmx/Makefile (modified) (view diffs)
• jdk/make/common/shared/Compiler-gcc.gmk (modified) (view diffs)
• jdk/make/sun/Makefile (modified) (view diffs)
• jdk/make/sun/beans/Makefile (deleted)
• jdk/src/share/classes/com/sun/beans/editors (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/BooleanEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/BooleanEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/ByteEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/ByteEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/ColorEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/ColorEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/DoubleEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/DoubleEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/EnumEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/EnumEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/FloatEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/FloatEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/FontEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/FontEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/IntegerEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/IntegerEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/LongEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/LongEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/NumberEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/NumberEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/ShortEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/ShortEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/editors/StringEditor.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/editors/StringEditor.java ) (view diffs)
• jdk/src/share/classes/com/sun/beans/finder/ClassFinder.java (modified) (view diffs)
• jdk/src/share/classes/com/sun/beans/infos (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/infos ) (view diffs)
• jdk/src/share/classes/com/sun/beans/infos/ComponentBeanInfo.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/com/sun/beans/infos/ComponentBeanInfo.java ) (view diffs)
• jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java (modified) (view diffs)
• jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/AWTEvent.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/CheckboxMenuItem.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/Component.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/Cursor.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/EventQueue.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/Font.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/KeyboardFocusManager.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/Menu.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/MenuBar.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/MenuComponent.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/MenuItem.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/PopupMenu.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/ScrollPaneAdjustable.java (modified) (view diffs)
• jdk/src/share/classes/java/awt/Window.java (modified) (view diffs)
• jdk/src/share/classes/java/beans/Introspector.java (modified) (view diffs)
• jdk/src/share/classes/java/beans/PropertyEditorManager.java (modified) (view diffs)
• jdk/src/share/classes/java/beans/XMLDecoder.java (modified) (view diffs)
• jdk/src/share/classes/java/io/File.java (modified) (view diffs)
• jdk/src/share/classes/java/io/FilePermission.java (modified) (view diffs)
• jdk/src/share/classes/java/io/FileSystem.java (modified) (view diffs)
• jdk/src/share/classes/java/net/URL.java (modified) (view diffs)
• jdk/src/share/classes/java/security/AccessController.java (modified) (view diffs)
• jdk/src/share/classes/java/util/ServiceLoader.java (modified) (view diffs)
• jdk/src/share/classes/java/util/UUID.java (modified) (view diffs)
• jdk/src/share/classes/java/util/concurrent/Executors.java (modified) (view diffs)
• jdk/src/share/classes/java/util/logging/FileHandler.java (modified) (view diffs)
• jdk/src/share/classes/java/util/logging/Handler.java (modified) (view diffs)
• jdk/src/share/classes/java/util/logging/LogManager.java (modified) (view diffs)
• jdk/src/share/classes/java/util/logging/Logger.java (modified) (view diffs)
• jdk/src/share/classes/java/util/logging/MemoryHandler.java (modified) (view diffs)
• jdk/src/share/classes/java/util/logging/StreamHandler.java (modified) (view diffs)
• jdk/src/share/classes/javax/crypto/CipherSpi.java (modified) (view diffs)
• jdk/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java (modified) (view diffs)
• jdk/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java (modified) (view diffs)
• jdk/src/share/classes/javax/management/loading/MLet.java (modified) (view diffs)
• jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java (modified) (view diffs)
• jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java (modified) (view diffs)
• jdk/src/share/classes/javax/swing/ClientPropertyKey.java (modified) (view diffs)
• jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java (modified) (view diffs)
• jdk/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java (modified) (view diffs)
• jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java (modified) (view diffs)
• jdk/src/share/classes/javax/swing/text/DefaultFormatter.java (modified) (view diffs)
• jdk/src/share/classes/sun/awt/AWTAccessor.java (modified) (view diffs)
• jdk/src/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java (modified) (view diffs)
• jdk/src/share/classes/sun/awt/SunToolkit.java (modified) (view diffs)
• jdk/src/share/classes/sun/beans (deleted)
• jdk/src/share/classes/sun/misc/IOUtils.java (modified) (view diffs)
• jdk/src/share/classes/sun/misc/JavaIOFileAccess.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/sun/misc/JavaIOFileAccess.java ) (view diffs)
• jdk/src/share/classes/sun/misc/Service.java (modified) (view diffs)
• jdk/src/share/classes/sun/misc/SharedSecrets.java (modified) (view diffs)
• jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java (modified) (view diffs)
• jdk/src/share/classes/sun/print/PSPrinterJob.java (modified) (view diffs)
• jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java (modified) (view diffs)
• jdk/src/share/classes/sun/rmi/server/Activation.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/pkcs11/P11Key.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/pkcs11/P11Signature.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/provider/SecureRandom.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/ssl/AppOutputStream.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/ssl/Handshaker.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/ssl/OutputRecord.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/util/KeyLength.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/sun/security/util/KeyLength.java ) (view diffs)
• jdk/src/share/classes/sun/security/util/Length.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/src/share/classes/sun/security/util/Length.java ) (view diffs)
• jdk/src/share/classes/sun/security/x509/CRLExtensions.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/x509/CertificateExtensions.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/x509/X509CRLImpl.java (modified) (view diffs)
• jdk/src/share/classes/sun/security/x509/X509CertImpl.java (modified) (view diffs)
• jdk/src/share/classes/sun/tools/jar/Main.java (modified) (view diffs)
• jdk/src/share/classes/sun/tools/native2ascii/Main.java (modified) (view diffs)
• jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt (modified) (view diffs)
• jdk/src/share/demo/jvmti/gctest/sample.makefile.txt (modified) (view diffs)
• jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt (modified) (view diffs)
• jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt (modified) (view diffs)
• jdk/src/share/demo/jvmti/hprof/sample.makefile.txt (modified) (view diffs)
• jdk/src/share/demo/jvmti/index.html (modified) (view diffs)
• jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt (modified) (view diffs)
• jdk/src/share/demo/jvmti/minst/sample.makefile.txt (modified) (view diffs)
• jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt (modified) (view diffs)
• jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt (modified) (view diffs)
• jdk/src/share/lib/security/java.security (modified) (view diffs)
• jdk/src/share/lib/security/java.security-solaris (modified) (view diffs)
• jdk/src/share/lib/security/java.security-windows (modified) (view diffs)
• jdk/src/share/native/java/net/net_util.c (modified) (view diffs)
• jdk/src/share/native/java/net/net_util.h (modified) (view diffs)
• jdk/src/share/native/sun/font/layout/LookupProcessor.cpp (modified) (view diffs)
• jdk/src/share/native/sun/font/layout/LookupProcessor.h (modified) (view diffs)
• jdk/src/solaris/classes/java/io/UnixFileSystem.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XGlobalCursorManager.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XMenuPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XScrollPanePeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XTextTransferHelper.java (deleted)
• jdk/src/solaris/classes/sun/awt/X11/XToolkit.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XWindow.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/X11/XlibWrapper.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/print/UnixPrintJob.java (modified) (view diffs)
• jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java (modified) (view diffs)
• jdk/src/solaris/native/java/io/UnixFileSystem_md.c (modified) (view diffs)
• jdk/src/solaris/native/java/net/net_util_md.c (modified) (view diffs)
• jdk/src/windows/classes/java/io/Win32FileSystem.java (modified) (view diffs)
• jdk/src/windows/classes/java/io/WinNTFileSystem.java (modified) (view diffs)
• jdk/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java (modified) (view diffs)
• jdk/src/windows/native/java/io/Win32FileSystem_md.c (modified) (view diffs)
• jdk/src/windows/native/java/io/WinNTFileSystem_md.c (modified) (view diffs)
• jdk/src/windows/native/java/net/net_util_md.c (modified) (view diffs)
• jdk/src/windows/native/sun/windows/awt_Dialog.cpp (modified) (view diffs)
• jdk/src/windows/native/sun/windows/awt_Window.cpp (modified) (view diffs)
• jdk/src/windows/native/sun/windows/awt_Window.h (modified) (view diffs)
• jdk/test/java/awt/Dialog/CrashXCheckJni (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/java/awt/Dialog/CrashXCheckJni ) (view diffs)
• jdk/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java ) (view diffs)
• jdk/test/java/net/Socket/setReuseAddress/Basic.java (modified) (view diffs)
• jdk/test/java/net/Socket/setReuseAddress/Restart.java (modified) (view diffs)
• jdk/test/java/util/UUID/UUIDTest.java (modified) (view diffs)
• jdk/test/javax/crypto/CipherSpi (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/javax/crypto/CipherSpi ) (view diffs)
• jdk/test/javax/crypto/CipherSpi/DirectBBRemaining.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/javax/crypto/CipherSpi/DirectBBRemaining.java ) (view diffs)
• jdk/test/javax/swing/plaf/synth/7143614 (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/javax/swing/plaf/synth/7143614 ) (view diffs)
• jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java ) (view diffs)
• jdk/test/sun/security/x509/X509CRLImpl/OrderAndDup.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/sun/security/x509/X509CRLImpl/OrderAndDup.java ) (view diffs)
• jdk/test/sun/tools/native2ascii/Permission.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/sun/tools/native2ascii/Permission.java ) (view diffs)
• jdk/test/tools/jar/UpdateJar.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/tools/jar/UpdateJar.java ) (view diffs)