changeset 6617:bd50944b07fa

Merge
author mduigou
date Tue, 20 Nov 2012 12:21:51 -0800
parents 17888810ebe5 c87df8b1f55e
children 9a1c54defd94
files .hgtags make/Makefile make/common/Release.gmk make/common/shared/Defs-control.gmk make/common/shared/Defs-java.gmk make/common/shared/Sanity-Settings.gmk make/common/shared/Sanity.gmk make/docs/CORE_PKGS.gmk make/java/invoke/Makefile make/java/java/FILES_java.gmk make/java/java/Makefile make/java/nio/FILES_java.gmk make/java/nio/Makefile make/java/sun_nio/FILES_java.gmk make/netbeans/common/architectures/name-Macosx.properties make/sun/jdbc/Makefile make/sun/nio/cs/FILES_java.gmk make/sun/osxapp/Makefile make/sun/security/other/Makefile make/sun/util/Makefile make/tools/CharsetMapping/DoubleByte-X.java.template make/tools/src/build/tools/charsetmapping/DBCS.java make/tools/src/build/tools/charsetmapping/SBCS.java makefiles/docs/CORE_PKGS.gmk makefiles/docs/Makefile makefiles/docs/NON_CORE_PKGS.gmk makefiles/docs/Notes.html makefiles/mapfiles/launchers/mapfile-amd64 makefiles/mapfiles/launchers/mapfile-i586 makefiles/mapfiles/libawt_headless/reorder-i586 makefiles/mapfiles/libjava/reorder-i586 makefiles/mapfiles/libjpeg/reorder-i586 makefiles/mapfiles/libnio/mapfile-bsd makefiles/mapfiles/libnio/reorder-i586 makefiles/mapfiles/libverify/reorder-i586 makefiles/mapfiles/libzip/reorder-i586 makefiles/sun/xawt/ToBin.java src/macosx/native/sun/osxapp/NSApplicationAWT.m src/share/classes/com/sun/tools/jdi/EventSetImpl.java src/share/classes/java/io/Reader.java src/share/classes/java/lang/AbstractStringBuilder.java src/share/classes/java/lang/CharSequence.java src/share/classes/java/lang/StringBuffer.java src/share/classes/java/lang/StringBuilder.java src/share/classes/java/lang/ThreadLocal.java src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java src/share/classes/java/lang/invoke/LambdaConversionException.java src/share/classes/java/lang/invoke/LambdaMetafactory.java src/share/classes/java/lang/invoke/MethodHandleProxies.java src/share/classes/java/lang/invoke/MethodHandleProxyLambdaMetafactory.java src/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java src/share/classes/java/util/ArrayList.java src/share/classes/java/util/Collection.java src/share/classes/java/util/LinkedHashMap.java src/share/classes/java/util/List.java src/share/classes/java/util/Map.java src/share/classes/java/util/Set.java src/share/classes/java/util/SortedMap.java src/share/classes/java/util/concurrent/RecursiveAction.java src/share/classes/java/util/concurrent/atomic/AtomicInteger.java src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java src/share/classes/java/util/concurrent/atomic/AtomicLong.java src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java src/share/classes/java/util/concurrent/atomic/AtomicReference.java src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java src/share/classes/java/util/function/DoubleFunction.java src/share/classes/java/util/function/IntFunction.java src/share/classes/java/util/function/LongSupplier.java src/share/classes/java/util/function/UnaryOperator.java src/share/classes/java/util/logging/Logger.java src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java src/share/classes/sun/net/www/protocol/gopher/GopherClient.java src/share/classes/sun/net/www/protocol/gopher/Handler.java src/share/classes/sun/security/tools/CertAndKeyGen.java src/share/classes/sun/security/tools/JarSigner.java src/share/classes/sun/security/tools/JarSignerResources.java src/share/classes/sun/security/tools/JarSignerResources_ja.java src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java src/share/classes/sun/security/tools/KeyTool.java src/share/classes/sun/security/tools/TimestampedSigner.java src/share/classes/sun/tools/java/RuntimeConstants.java src/share/classes/sun/util/PreHashedMap.java src/share/javavm/export/classfile_constants.h src/share/javavm/export/jvm.h src/share/native/common/check_code.c src/solaris/native/java/io/FileSystem_md.c src/windows/classes/java/io/Win32FileSystem.java src/windows/native/java/io/FileSystem_md.c src/windows/native/java/io/Win32FileSystem_md.c test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java test/com/sun/jndi/ldap/ReadTimeoutTest.java
diffstat 3032 files changed, 91979 insertions(+), 30317 deletions(-) [+]