changeset 24769:de4dcfa9380f

Merge
author attila
date Wed, 28 May 2014 16:53:43 +0200
parents ae21f28f0ddc 601c81b4165d
children 17f8e3b82ad3
files corba/make/src/classes/build/tools/stripproperties/StripPropertiesCorba.java hotspot/make/hotspot_version hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.hpp hotspot/test/runtime/6925573/SortMethodsTest.java hotspot/test/runtime/InitialThreadOverflow/invoke.cxx jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/MS1252Encoder.java jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/SingleByteEncoder.java jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/Surrogate.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java jdk/make/src/classes/build/tools/stripproperties/StripProperties.java jdk/src/bsd/doc/man/ja/kinit.1 jdk/src/bsd/doc/man/ja/klist.1 jdk/src/bsd/doc/man/ja/ktab.1 jdk/src/macosx/classes/com/apple/laf/ImageCache.java jdk/src/macosx/classes/sun/lwawt/macosx/CThreading.java jdk/src/macosx/classes/sun/lwawt/macosx/event/NSEvent.java jdk/src/macosx/lib/content-types.properties jdk/src/macosx/native/sun/awt/CClipboard.h jdk/src/macosx/native/sun/awt/CWrapper.h jdk/src/share/classes/com/oracle/net/Sdp.java jdk/src/share/classes/java/net/SdpSocketImpl.java jdk/src/share/classes/javax/swing/text/html/ResourceLoader.java jdk/src/share/classes/javax/swing/text/html/parser/ResourceLoader.java jdk/src/share/classes/jdk/internal/util/xml/BasicXmlPropertiesProvider.java jdk/src/share/classes/sun/awt/EventListenerAggregate.java jdk/src/share/classes/sun/misc/REException.java jdk/src/share/classes/sun/misc/Regexp.java jdk/src/share/classes/sun/misc/RegexpPool.java jdk/src/share/classes/sun/misc/RegexpTarget.java jdk/src/share/classes/sun/swing/AbstractFilterComboBoxModel.java jdk/src/share/classes/sun/swing/SwingLazyValue.java jdk/src/share/classes/sun/tools/serialver/serialver.properties jdk/src/share/classes/sun/tools/serialver/serialver_ja.properties jdk/src/share/classes/sun/tools/serialver/serialver_zh_CN.properties jdk/src/share/classes/sun/util/spi/XmlPropertiesProvider.java jdk/src/share/classes/sun/util/xml/META-INF/services/sun.util.spi.XmlPropertiesProvider jdk/src/share/classes/sun/util/xml/PlatformXmlPropertiesProvider.java jdk/src/share/demo/nio/zipfs/Demo.java jdk/src/share/demo/nio/zipfs/README.txt jdk/src/share/demo/nio/zipfs/src/META-INF/services/java.nio.file.spi.FileSystemProvider jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/JarFileSystemProvider.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipDirectoryStream.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributes.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipPath.java jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipUtils.java jdk/src/solaris/classes/java/lang/UNIXProcess.java.aix jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris jdk/src/solaris/lib/content-types.properties jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h jdk/src/windows/lib/content-types.properties jdk/test/com/oracle/net/Sanity.java jdk/test/com/oracle/net/sanity.sh jdk/test/demo/zipfs/Basic.java jdk/test/demo/zipfs/PathOps.java jdk/test/demo/zipfs/ZFSTests.java jdk/test/demo/zipfs/ZipFSTester.java jdk/test/demo/zipfs/basic.sh jdk/test/java/lang/ClassLoader/Assert.sh jdk/test/java/util/Properties/CustomProvider.java jdk/test/java/util/Properties/MyXmlPropertiesProvider.java jdk/test/javax/swing/UIDefaults/6795356/SwingLazyValueTest.java jdk/test/javax/swing/text/AbstractDocument/7146146/bug7146146.java langtools/make/netbeans/langtools/nbproject/standard-context-menu-items.ent langtools/make/netbeans/langtools/nbproject/standard-ide-actions.ent langtools/test/tools/javac/6464451/BigFinally.java langtools/test/tools/javac/6464451/DeepNestedFinally.java langtools/test/tools/javac/6464451/ManyExitsInTry.java langtools/test/tools/javac/ArrayCloneCodeGen.java langtools/test/tools/javac/ConditionalClass.java langtools/test/tools/javac/NoNoClassDefFoundErrorError.java langtools/test/tools/javac/T6557865.java langtools/test/tools/javac/annotations/neg/MixedSource.java langtools/test/tools/javac/boxing/NoBoxingBool.java langtools/test/tools/javac/boxing/NoBoxingByte.java langtools/test/tools/javac/boxing/NoBoxingChar.java langtools/test/tools/javac/boxing/NoBoxingDouble.java langtools/test/tools/javac/boxing/NoBoxingFloat.java langtools/test/tools/javac/boxing/NoBoxingInt.java langtools/test/tools/javac/boxing/NoBoxingLong.java langtools/test/tools/javac/boxing/NoBoxingShort.java langtools/test/tools/javac/enum/6384542/T6384542.java langtools/test/tools/javac/enum/6384542/T6384542.out langtools/test/tools/javac/enum/6384542/T6384542a.java langtools/test/tools/javac/enum/6384542/T6384542a_1_4.out langtools/test/tools/javac/enum/6384542/T6384542a_5.out langtools/test/tools/javac/enum/EnumAsIdentifier4.out langtools/test/tools/javac/enum/EnumAsIdentifier5.out langtools/test/tools/javac/enum/FauxEnum2.java langtools/test/tools/javac/foreach/T6682380.java langtools/test/tools/javac/generics/BridgeRestype.java langtools/test/tools/javac/generics/compat/CovariantCompat1.java langtools/test/tools/javac/generics/compat/CovariantCompat2.java langtools/test/tools/javac/generics/compat/OverrideBridge1.java langtools/test/tools/javac/generics/compat/OverrideBridge2.java langtools/test/tools/javac/generics/compat/OverrideBridge3.java langtools/test/tools/javac/generics/compat/VisibleBridge.java langtools/test/tools/javac/lambda/ErroneousLambdaExpr.java langtools/test/tools/javac/lambda/ErroneousLambdaExpr.out langtools/test/tools/javac/lambda/TargetType16.out langtools/test/tools/javac/limits/FinallyNesting.java nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java nashorn/make/build.xml nashorn/make/project.properties nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java nashorn/src/jdk/nashorn/internal/codegen/Compiler.java nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java nashorn/src/jdk/nashorn/internal/codegen/FindScopeDepths.java nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java nashorn/src/jdk/nashorn/internal/lookup/Lookup.java nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java nashorn/src/jdk/nashorn/internal/objects/Global.java nashorn/src/jdk/nashorn/internal/objects/NativeArray.java nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java nashorn/src/jdk/nashorn/internal/objects/NativeDataView.java nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java nashorn/src/jdk/nashorn/internal/objects/NativeError.java nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java nashorn/src/jdk/nashorn/internal/objects/NativeObject.java nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java nashorn/src/jdk/nashorn/internal/objects/NativeString.java nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java nashorn/src/jdk/nashorn/internal/parser/Parser.java nashorn/src/jdk/nashorn/internal/parser/TokenType.java nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java nashorn/src/jdk/nashorn/internal/runtime/Context.java nashorn/src/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java nashorn/src/jdk/nashorn/internal/runtime/JSType.java nashorn/src/jdk/nashorn/internal/runtime/Property.java nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java nashorn/src/jdk/nashorn/internal/runtime/Source.java nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties nashorn/src/jdk/nashorn/tools/Shell.java nashorn/test/script/trusted/JDK-8006529.js nashorn/test/script/trusted/event_queue.js nashorn/test/script/trusted/optimistic_recompilation.js nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java nashorn/test/src/jdk/nashorn/internal/runtime/CodeStoreAndPathTest.java nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java
diffstat 3618 files changed, 196340 insertions(+), 112271 deletions(-) [+]