changeset 9304:e40ac3dcb075

Merge
author kvn
date Wed, 22 Jan 2014 17:40:55 -0800
parents c44d84c6774d b1663fd9ded9
children 9bb65e1ac82a
files make/CompileJavaClasses.gmk make/CompileLaunchers.gmk make/gendata/GendataFontConfig.gmk make/gensrc/GensrcX11Wrappers.gmk make/mapfiles/libnio/mapfile-linux make/mapfiles/libnio/mapfile-macosx make/mapfiles/libnio/mapfile-solaris src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java src/share/classes/sun/nio/ch/Net.java src/share/classes/sun/nio/ch/ServerSocketAdaptor.java src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java src/share/classes/sun/nio/ch/SocketAdaptor.java src/share/classes/sun/nio/ch/SocketChannelImpl.java src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java src/share/classes/sun/util/resources/pt/LocaleNames_pt_BR.properties src/share/native/java/net/net_util.c src/share/native/java/net/net_util.h src/share/native/java/util/zip/zip_util.c src/share/native/sun/awt/medialib/mlib_sys.c src/share/native/sun/awt/medialib/mlib_types.h src/share/transport/socket/socketTransport.c src/solaris/classes/sun/nio/ch/EPollPort.java src/solaris/classes/sun/nio/ch/KQueuePort.java src/solaris/classes/sun/nio/ch/PollArrayWrapper.java src/solaris/classes/sun/nio/ch/SinkChannelImpl.java src/solaris/classes/sun/nio/ch/SourceChannelImpl.java src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java src/solaris/classes/sun/print/UnixPrintServiceLookup.java src/solaris/demo/jvmti/hprof/hprof_md.c src/solaris/native/java/lang/UNIXProcess_md.c src/solaris/native/java/net/NetworkInterface.c src/solaris/native/java/net/net_util_md.c src/solaris/native/sun/awt/awt_LoadLibrary.c src/solaris/native/sun/awt/fontpath.c src/solaris/native/sun/java2d/x11/XRBackendNative.c src/solaris/native/sun/management/OperatingSystemImpl.c src/solaris/native/sun/nio/ch/Net.c src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c src/windows/classes/sun/nio/ch/PollArrayWrapper.java src/windows/native/java/net/net_util_md.c src/windows/native/sun/nio/ch/Net.c test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh test/java/io/Serializable/evolution/RenamePackage/run.sh test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh test/java/net/Authenticator/B4933582.sh test/java/nio/file/Files/walkFileTree/find.sh test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh test/java/rmi/registry/readTest/readTest.sh test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh test/java/security/Security/signedfirst/Dyn.sh test/java/security/Security/signedfirst/Static.sh test/java/util/ResourceBundle/Bug6299235Test.sh test/java/util/ServiceLoader/basic.sh test/javax/crypto/SecretKeyFactory/FailOverTest.sh test/javax/swing/text/AbstractDocument/7146146/bug7146146.java test/lib/security/java.policy/Ext_AllPolicy.sh test/sun/net/ftp/MarkResetTest.sh test/sun/net/www/http/HttpClient/RetryPost.sh test/sun/security/krb5/runNameEquals.sh test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh test/sun/security/ssl/javax/net/ssl/SSLContextVersion.java test/sun/security/tools/keytool/AltProviderPath.sh test/sun/security/tools/keytool/printssl.sh test/sun/security/tools/keytool/standard.sh test/sun/security/tools/policytool/Alias.sh test/sun/security/tools/policytool/ChangeUI.sh test/sun/security/tools/policytool/OpenPolicy.sh test/sun/security/tools/policytool/SaveAs.sh test/sun/security/tools/policytool/UpdatePermissions.sh test/sun/security/tools/policytool/UsePolicy.sh test/sun/security/tools/policytool/i18n.sh
diffstat 4285 files changed, 9035 insertions(+), 5682 deletions(-) [+]