Merge jdk7u6-b19 into jdk7u6-b20
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index dc7fb53..07d8e71 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -192,3 +192,4 @@
7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16
b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17
9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18
+56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19
diff --git a/corba/.hgtags b/corba/.hgtags
index 7846b56..7fe34a5 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -192,3 +192,4 @@
7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16
e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17
b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18
+5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index e76588d..962804b 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -312,3 +312,5 @@
270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08
7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17
df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18
+1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19
+a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java
index edd8a80..a42d8be 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -141,18 +141,19 @@
public static String stringOopToString(Oop stringOop) {
if (offsetField == null) {
InstanceKlass k = (InstanceKlass) stringOop.getKlass();
- offsetField = (IntField) k.findField("offset", "I");
- countField = (IntField) k.findField("count", "I");
+ offsetField = (IntField) k.findField("offset", "I"); // optional
+ countField = (IntField) k.findField("count", "I"); // optional
valueField = (OopField) k.findField("value", "[C");
if (Assert.ASSERTS_ENABLED) {
- Assert.that(offsetField != null &&
- countField != null &&
- valueField != null, "must find all java.lang.String fields");
+ Assert.that(valueField != null, "Field \'value\' of java.lang.String not found");
}
}
- return charArrayToString((TypeArray) valueField.getValue(stringOop),
- offsetField.getValue(stringOop),
- countField.getValue(stringOop));
+ if (offsetField != null && countField != null) {
+ return charArrayToString((TypeArray) valueField.getValue(stringOop),
+ offsetField.getValue(stringOop),
+ countField.getValue(stringOop));
+ }
+ return charArrayToString((TypeArray) valueField.getValue(stringOop));
}
public static String stringOopToEscapedString(Oop stringOop) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ObjectReader.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ObjectReader.java
index 55cb299..1f17a7f 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ObjectReader.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ObjectReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -85,6 +85,21 @@
this(new ProcImageClassLoader());
}
+ static void debugPrintln(String msg) {
+ if (DEBUG) {
+ System.err.println("DEBUG>" + msg);
+ }
+ }
+
+ static void debugPrintStackTrace(Exception exp) {
+ if (DEBUG) {
+ StackTraceElement[] els = exp.getStackTrace();
+ for (int i = 0; i < els.length; i++) {
+ System.err.println("DEBUG>" + els[i].toString());
+ }
+ }
+ }
+
public Object readObject(Oop oop) throws ClassNotFoundException {
if (oop instanceof Instance) {
return readInstance((Instance) oop);
@@ -120,13 +135,96 @@
}
protected Symbol javaLangString;
+ protected Symbol javaUtilHashtableEntry;
+ protected Symbol javaUtilHashtable;
+ protected Symbol javaUtilProperties;
+
+ protected Symbol getVMSymbol(String name) {
+ return VM.getVM().getSymbolTable().probe(name);
+ }
+
protected Symbol javaLangString() {
if (javaLangString == null) {
- javaLangString = VM.getVM().getSymbolTable().probe("java/lang/String");
+ javaLangString = getVMSymbol("java/lang/String");
}
return javaLangString;
}
+ protected Symbol javaUtilHashtableEntry() {
+ if (javaUtilHashtableEntry == null) {
+ javaUtilHashtableEntry = getVMSymbol("java/util/Hashtable$Entry");
+ }
+ return javaUtilHashtableEntry;
+ }
+
+ protected Symbol javaUtilHashtable() {
+ if (javaUtilHashtable == null) {
+ javaUtilHashtable = getVMSymbol("java/util/Hashtable");
+ }
+ return javaUtilHashtable;
+ }
+
+ protected Symbol javaUtilProperties() {
+ if (javaUtilProperties == null) {
+ javaUtilProperties = getVMSymbol("java/util/Properties");
+ }
+ return javaUtilProperties;
+ }
+
+ private void setHashtableEntry(java.util.Hashtable p, Oop oop) {
+ InstanceKlass ik = (InstanceKlass)oop.getKlass();
+ OopField keyField = (OopField)ik.findField("key", "Ljava/lang/Object;");
+ OopField valueField = (OopField)ik.findField("value", "Ljava/lang/Object;");
+ OopField nextField = (OopField)ik.findField("next", "Ljava/util/Hashtable$Entry;");
+ if (DEBUG) {
+ if (Assert.ASSERTS_ENABLED) {
+ Assert.that(ik.getName().equals(javaUtilHashtableEntry()), "Not a Hashtable$Entry?");
+ Assert.that(keyField != null && valueField != null && nextField != null, "Invalid fields!");
+ }
+ }
+
+ Object key = null;
+ Object value = null;
+ Oop next = null;
+ try {
+ key = readObject(keyField.getValue(oop));
+ value = readObject(valueField.getValue(oop));
+ next = (Oop)nextField.getValue(oop);
+ // For Properties, should use setProperty(k, v). Since it only runs in SA
+ // using put(k, v) should be OK.
+ p.put(key, value);
+ if (next != null) {
+ setHashtableEntry(p, next);
+ }
+ } catch (ClassNotFoundException ce) {
+ if( DEBUG) {
+ debugPrintln("Class not found " + ce);
+ debugPrintStackTrace(ce);
+ }
+ }
+ }
+
+ protected Object getHashtable(Instance oop, boolean isProperties) {
+ InstanceKlass k = (InstanceKlass)oop.getKlass();
+ OopField tableField = (OopField)k.findField("table", "[Ljava/util/Hashtable$Entry;");
+ if (tableField == null) {
+ debugPrintln("Could not find field of [Ljava/util/Hashtable$Entry;");
+ return null;
+ }
+ java.util.Hashtable table = (isProperties) ? new java.util.Properties()
+ : new java.util.Hashtable();
+ ObjArray kvs = (ObjArray)tableField.getValue(oop);
+ long size = kvs.getLength();
+ debugPrintln("Hashtable$Entry Size = " + size);
+ for (long i=0; i<size; i++) {
+ Oop entry = kvs.getObjAt(i);
+ if (entry != null && entry.isInstance()) {
+ setHashtableEntry(table, entry);
+ }
+ }
+ return table;
+ }
+
public Object readInstance(Instance oop) throws ClassNotFoundException {
Object result = getFromObjTable(oop);
if (result == null) {
@@ -134,11 +232,21 @@
// Handle java.lang.String instances differently. As part of JSR-133, fields of immutable
// classes have been made final. The algorithm below will not be able to read Strings from
// debuggee (can't use reflection to set final fields). But, need to read Strings is very
- // important. FIXME: need a framework to handle many other special cases.
+ // important.
+ // Same for Hashtable, key and hash are final, could not be set in the algorithm too.
+ // FIXME: need a framework to handle many other special cases.
if (kls.getName().equals(javaLangString())) {
return OopUtilities.stringOopToString(oop);
}
+ if (kls.getName().equals(javaUtilHashtable())) {
+ return getHashtable(oop, false);
+ }
+
+ if (kls.getName().equals(javaUtilProperties())) {
+ return getHashtable(oop, true);
+ }
+
Class clz = readClass(kls);
try {
result = clz.newInstance();
@@ -164,8 +272,8 @@
break;
} catch (Exception exp) {
if (DEBUG) {
- System.err.println("Can't create object using " + c);
- exp.printStackTrace();
+ debugPrintln("Can't create object using " + c);
+ debugPrintStackTrace(exp);
}
}
}
@@ -329,8 +437,8 @@
arrayObj[ifd.getIndex()] = readObject(field.getValue(getObj()));
} catch (Exception e) {
if (DEBUG) {
- System.err.println("Array element set failed for " + ifd);
- e.printStackTrace();
+ debugPrintln("Array element set failed for " + ifd);
+ debugPrintStackTrace(e);
}
}
}
@@ -348,8 +456,8 @@
private void printFieldSetError(java.lang.reflect.Field f, Exception ex) {
if (DEBUG) {
- if (f != null) System.err.println("Field set failed for " + f);
- ex.printStackTrace();
+ if (f != null) debugPrintln("Field set failed for " + f);
+ debugPrintStackTrace(ex);
}
}
@@ -601,7 +709,7 @@
return Class.forName(className, true, cl);
} catch (Exception e) {
if (DEBUG) {
- System.err.println("Can't load class " + className);
+ debugPrintln("Can't load class " + className);
}
throw new RuntimeException(e);
}
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index a2785c2..bd1459a 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -35,7 +35,7 @@
HS_MAJOR_VER=23
HS_MINOR_VER=2
-HS_BUILD_NUMBER=08
+HS_BUILD_NUMBER=09
JDK_MAJOR_VER=1
JDK_MINOR_VER=7
diff --git a/hotspot/make/pic.make b/hotspot/make/pic.make
index 4c1e6b1..79b2ea2 100644
--- a/hotspot/make/pic.make
+++ b/hotspot/make/pic.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,13 @@
ifneq ($(OSNAME), windows)
ifndef LP64
+ PARTIAL_NONPIC=1
+ endif
+ PIC_ARCH = ppc
+ ifneq ("$(filter $(PIC_ARCH),$(BUILDARCH))","")
+ PARTIAL_NONPIC=0
+ endif
+ ifeq ($(PARTIAL_NONPIC),1)
NONPIC_DIRS = memory oops gc_implementation gc_interface
NONPIC_DIRS := $(foreach dir,$(NONPIC_DIRS), $(GAMMADIR)/src/share/vm/$(dir))
# Look for source files under NONPIC_DIRS
diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp
index 65de23e..7452108 100644
--- a/hotspot/src/share/vm/classfile/symbolTable.cpp
+++ b/hotspot/src/share/vm/classfile/symbolTable.cpp
@@ -40,7 +40,6 @@
SymbolTable* SymbolTable::_the_table = NULL;
bool SymbolTable::_needs_rehashing = false;
-jint SymbolTable::_seed = 0;
Symbol* SymbolTable::allocate_symbol(const u1* name, int len, TRAPS) {
assert (len <= Symbol::max_length(), "should be checked by caller");
@@ -112,12 +111,6 @@
}
}
-unsigned int SymbolTable::new_hash(Symbol* sym) {
- ResourceMark rm;
- // Use alternate hashing algorithm on this symbol.
- return AltHashing::murmur3_32(seed(), (const jbyte*)sym->as_C_string(), sym->utf8_length());
-}
-
// Create a new table and using alternate hash code, populate the new table
// with the existing strings. Set flag to use the alternate hash code afterwards.
void SymbolTable::rehash_table() {
@@ -127,10 +120,6 @@
// Create a new symbol table
SymbolTable* new_table = new SymbolTable();
- // Initialize the global seed for hashing.
- _seed = AltHashing::compute_seed();
- assert(seed() != 0, "shouldn't be zero");
-
the_table()->move_to(new_table);
// Delete the table and buckets (entries are reused in new table).
@@ -582,7 +571,6 @@
StringTable* StringTable::_the_table = NULL;
bool StringTable::_needs_rehashing = false;
-jint StringTable::_seed = 0;
// Pick hashing algorithm
unsigned int StringTable::hash_string(const jchar* s, int len) {
@@ -799,14 +787,6 @@
}
-unsigned int StringTable::new_hash(oop string) {
- ResourceMark rm;
- int length;
- jchar* chars = java_lang_String::as_unicode_string(string, length);
- // Use alternate hashing algorithm on the string
- return AltHashing::murmur3_32(seed(), chars, length);
-}
-
// Create a new table and using alternate hash code, populate the new table
// with the existing strings. Set flag to use the alternate hash code afterwards.
void StringTable::rehash_table() {
@@ -815,10 +795,6 @@
if (DumpSharedSpaces) return;
StringTable* new_table = new StringTable();
- // Initialize new global seed for hashing.
- _seed = AltHashing::compute_seed();
- assert(seed() != 0, "shouldn't be zero");
-
// Rehash the table
the_table()->move_to(new_table);
diff --git a/hotspot/src/share/vm/classfile/symbolTable.hpp b/hotspot/src/share/vm/classfile/symbolTable.hpp
index 47a37dc..636f2bc 100644
--- a/hotspot/src/share/vm/classfile/symbolTable.hpp
+++ b/hotspot/src/share/vm/classfile/symbolTable.hpp
@@ -81,7 +81,6 @@
// Set if one bucket is out of balance due to hash algorithm deficiency
static bool _needs_rehashing;
- static jint _seed;
// For statistics
static int symbols_removed;
@@ -118,10 +117,6 @@
: Hashtable<Symbol*>(symbol_table_size, sizeof (HashtableEntry<Symbol*>), t,
number_of_entries) {}
- static bool use_alternate_hashcode() { return _seed != 0; }
- static jint seed() { return _seed; }
-
- unsigned int new_hash(Symbol* sym);
public:
enum {
symbol_alloc_batch_size = 8
@@ -232,7 +227,6 @@
// Set if one bucket is out of balance due to hash algorithm deficiency
static bool _needs_rehashing;
- static jint _seed;
static oop intern(Handle string_or_null, jchar* chars, int length, TRAPS);
oop basic_add(int index, Handle string_or_null, jchar* name, int len,
@@ -246,11 +240,6 @@
StringTable(HashtableBucket* t, int number_of_entries)
: Hashtable<oop>((int)StringTableSize, sizeof (HashtableEntry<oop>), t,
number_of_entries) {}
-
- static bool use_alternate_hashcode() { return _seed != 0; }
- static jint seed() { return _seed; }
-
- unsigned int new_hash(oop s);
public:
// The string table
static StringTable* the_table() { return _the_table; }
diff --git a/hotspot/src/share/vm/compiler/compilerOracle.cpp b/hotspot/src/share/vm/compiler/compilerOracle.cpp
index 408dcc3..7869342 100644
--- a/hotspot/src/share/vm/compiler/compilerOracle.cpp
+++ b/hotspot/src/share/vm/compiler/compilerOracle.cpp
@@ -550,10 +550,12 @@
}
}
+static const char* default_cc_file = ".hotspot_compiler";
+
static const char* cc_file() {
#ifdef ASSERT
if (CompileCommandFile == NULL) {
- return ".hotspot_compiler";
+ return default_cc_file;
}
#endif
return CompileCommandFile;
@@ -637,10 +639,17 @@
CompilerOracle::parse_from_string(CompileOnly, CompilerOracle::parse_compile_only);
if (CompilerOracle::has_command_file()) {
CompilerOracle::parse_from_file();
+ } else {
+ struct stat buf;
+ if (os::stat(default_cc_file, &buf) == 0) {
+ warning("%s file is present but has been ignored. "
+ "Run with -XX:CompileCommandFile=%s to load the file.",
+ default_cc_file, default_cc_file);
+ }
}
if (lists[PrintCommand] != NULL) {
if (PrintAssembly) {
- warning("CompileCommand and/or .hotspot_compiler file contains 'print' commands, but PrintAssembly is also enabled");
+ warning("CompileCommand and/or %s file contains 'print' commands, but PrintAssembly is also enabled", default_cc_file);
} else if (FLAG_IS_DEFAULT(DebugNonSafepoints)) {
warning("printing of assembly code is enabled; turning on DebugNonSafepoints to gain additional output");
DebugNonSafepoints = true;
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index a4cebb0..b1eb51c 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -2955,7 +2955,10 @@
const char* tail;
// If flag "-XX:Flags=flags-file" is used it will be the first option to be processed.
+ const char* hotspotrc = ".hotspotrc";
bool settings_file_specified = false;
+ bool needs_hotspotrc_warning = false;
+
const char* flags_file;
int index;
for (index = 0; index < args->nOptions; index++) {
@@ -2999,16 +3002,19 @@
if (!process_settings_file(flags_file, true, args->ignoreUnrecognized)) {
return JNI_EINVAL;
}
- }
-
+ } else {
#ifdef ASSERT
- // Parse default .hotspotrc settings file
- if (!settings_file_specified) {
+ // Parse default .hotspotrc settings file
if (!process_settings_file(".hotspotrc", false, args->ignoreUnrecognized)) {
return JNI_EINVAL;
}
- }
+#else
+ struct stat buf;
+ if (os::stat(hotspotrc, &buf) == 0) {
+ needs_hotspotrc_warning = true;
+ }
#endif
+ }
if (PrintVMOptions) {
for (index = 0; index < args->nOptions; index++) {
@@ -3025,6 +3031,14 @@
return result;
}
+ // Delay warning until here so that we've had a chance to process
+ // the -XX:-PrintWarnings flag
+ if (needs_hotspotrc_warning) {
+ warning("%s file is present but has been ignored. "
+ "Run with -XX:Flags=%s to load the file.",
+ hotspotrc, hotspotrc);
+ }
+
#if (defined JAVASE_EMBEDDED || defined ARM)
UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
#endif
diff --git a/hotspot/src/share/vm/utilities/hashtable.cpp b/hotspot/src/share/vm/utilities/hashtable.cpp
index 877e895..d62b1d3 100644
--- a/hotspot/src/share/vm/utilities/hashtable.cpp
+++ b/hotspot/src/share/vm/utilities/hashtable.cpp
@@ -23,6 +23,8 @@
*/
#include "precompiled.hpp"
+#include "classfile/altHashing.hpp"
+#include "classfile/javaClasses.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/filemap.hpp"
#include "memory/resourceArea.hpp"
@@ -103,12 +105,33 @@
return false;
}
+template <class T> jint Hashtable<T>::_seed = 0;
+
+template <class T> unsigned int Hashtable<T>::new_hash(Symbol* sym) {
+ ResourceMark rm;
+ // Use alternate hashing algorithm on this symbol.
+ return AltHashing::murmur3_32(seed(), (const jbyte*)sym->as_C_string(), sym->utf8_length());
+}
+
+template <class T> unsigned int Hashtable<T>::new_hash(oop string) {
+ ResourceMark rm;
+ int length;
+ jchar* chars = java_lang_String::as_unicode_string(string, length);
+ // Use alternate hashing algorithm on the string
+ return AltHashing::murmur3_32(seed(), chars, length);
+}
+
// Create a new table and using alternate hash code, populate the new table
// with the existing elements. This can be used to change the hash code
// and could in the future change the size of the table.
template <class T> void Hashtable<T>::move_to(Hashtable<T>* new_table) {
- int saved_entry_count = number_of_entries();
+
+ // Initialize the global seed for hashing.
+ _seed = AltHashing::compute_seed();
+ assert(seed() != 0, "shouldn't be zero");
+
+ int saved_entry_count = this->number_of_entries();
// Iterate through the table and create a new entry for the new table
for (int i = 0; i < new_table->table_size(); ++i) {
diff --git a/hotspot/src/share/vm/utilities/hashtable.hpp b/hotspot/src/share/vm/utilities/hashtable.hpp
index d31c0ff..2926f54 100644
--- a/hotspot/src/share/vm/utilities/hashtable.hpp
+++ b/hotspot/src/share/vm/utilities/hashtable.hpp
@@ -278,7 +278,14 @@
// Function to move these elements into the new table.
void move_to(Hashtable<T>* new_table);
- virtual unsigned int new_hash(T) { ShouldNotReachHere(); return 0; } // should be overridden
+ static bool use_alternate_hashcode() { return _seed != 0; }
+ static jint seed() { return _seed; }
+
+ private:
+ static jint _seed;
+
+ unsigned int new_hash(Symbol* s);
+ unsigned int new_hash(oop string);
};
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index b8e2f7ce..31ed008 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -192,3 +192,4 @@
0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16
5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17
1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18
+3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 9e05412..b3fefb3 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -192,3 +192,4 @@
e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16
401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17
a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18
+58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 3f728a6..609fccf 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -192,3 +192,4 @@
966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16
aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17
4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18
+a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19
diff --git a/jdk/src/linux/doc/man/jcmd.1 b/jdk/src/linux/doc/man/jcmd.1
index 913d6ea..4014b8b 100644
--- a/jdk/src/linux/doc/man/jcmd.1
+++ b/jdk/src/linux/doc/man/jcmd.1
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jcmd 1 "16 Mar 2012"
+.TH jcmd 1 "10 Jul 2012"
.LP
.SH "Name"
@@ -56,7 +56,7 @@
When a process id is specified on the command line, jcmd sends the diagnostic command request to the process with this id.
.LP
.LP
-When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes with this main class.
+When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes for which the command line argument is a substring of the Java process' main class.
.LP
.LP
With the PerfCounter.print argument, jcmd prints the performance counters available on the targeted Java process(es).
@@ -73,11 +73,9 @@
.TP 3
\-l
Prints the list of running Java processes with their process id, their main class and their command line arguments.
-.br
.TP 3
\-h
Prints a help message.
-.br
.TP 3
\-help
Prints a help message.
@@ -90,19 +88,15 @@
.TP 3
pid
Identifies the process that receives the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, use jps(1) or jcmd(1).
-.br
.TP 3
main class
-Main class of the process that receives the diagnostic command requests. If several running Java processes share this main class, the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1).
-.br
+Main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring will be matched. If several running Java processes share this main class, the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1).
.TP 3
command [arguments]
-Invoke the diagnostic command called \f2command\fP on the targeted Java process(es). The list of available diagnostic commands for a given process can be obtained by invoking the \f3help\fP command on this process. Each diagnostic command has its own set of \f2arguments\fP, which can be obtained by invoking the \f3help\fP command followed by the command name.
-.br
+Invoke the diagnostic command called \f2command\fP on the targeted Java process(es). The list of available diagnostic commands for a given process can be obtained by invoking the \f3help\fP command on this process. Each diagnostic command has its own set of \f2arguments\fP, which can be obtained by invoking the the command name followed by \f3help\fP.
.TP 3
-Counter.print
+PerfCounter.print
Print the performance counters available on the targeted Java process(es). The list of performance counters may vary with the Java process.
-.br
.TP 3
\-f file
Read commands from \f2file\fP and invoke them on the targeted Java process(es). In \f2file\fP, each command must be written on a single line. Lines starting with # are ignored. Processing of \f2file\fP ends when all lines have been invoked or when a line containing the \f3stop\fP keyword is read.
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
index 181d084..0f32d31 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
@@ -128,6 +128,15 @@
}
}
+ @Override
+ protected int postDropTargetEvent(Component component, int x, int y, int dropAction,
+ int actions, long[] formats, long nativeCtxt, int eventID,
+ boolean dispatchType) {
+ // On MacOS X all the DnD events should be synchronous
+ return super.postDropTargetEvent(component, x, y, dropAction, actions, formats, nativeCtxt,
+ eventID, SunDropTargetContextPeer.DISPATCH_SYNC);
+ }
+
// Signal drop complete:
protected void doDropDone(boolean success, int dropAction, boolean isLocal) {
long nativeDropTarget = this.getNativeDragContext();
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
index 9a0d9dc..0eba781 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
@@ -209,6 +209,7 @@
private boolean undecorated; // initialized in getInitialStyleBits()
private Rectangle normalBounds = null; // not-null only for undecorated maximized windows
private CPlatformResponder responder;
+ private volatile boolean zoomed = false; // from native perspective
public CPlatformWindow(final PeerType peerType) {
super(0, true);
@@ -471,26 +472,42 @@
return this.visible;
}
- private void zoom() {
+ private boolean isMaximized() {
+ return undecorated ? this.normalBounds != null : zoomed;
+ }
+
+ private void maximize() {
+ if (isMaximized()) {
+ return;
+ }
if (!undecorated) {
+ zoomed = true;
CWrapper.NSWindow.zoom(getNSWindowPtr());
} else {
- // OS X handles -zoom incorrectly for undecorated windows
- final boolean isZoomed = this.normalBounds == null;
- deliverZoom(isZoomed);
+ deliverZoom(true);
- Rectangle toBounds;
- if (isZoomed) {
- this.normalBounds = peer.getBounds();
- long screen = CWrapper.NSWindow.screen(getNSWindowPtr());
- toBounds = CWrapper.NSScreen.visibleFrame(screen).getBounds();
- // Flip the y coordinate
- Rectangle frame = CWrapper.NSScreen.frame(screen).getBounds();
- toBounds.y = frame.height - toBounds.y - toBounds.height;
- } else {
- toBounds = normalBounds;
- this.normalBounds = null;
- }
+ this.normalBounds = peer.getBounds();
+ long screen = CWrapper.NSWindow.screen(getNSWindowPtr());
+ Rectangle toBounds = CWrapper.NSScreen.visibleFrame(screen).getBounds();
+ // Flip the y coordinate
+ Rectangle frame = CWrapper.NSScreen.frame(screen).getBounds();
+ toBounds.y = frame.height - toBounds.y - toBounds.height;
+ setBounds(toBounds.x, toBounds.y, toBounds.width, toBounds.height);
+ }
+ }
+
+ private void unmaximize() {
+ if (!isMaximized()) {
+ return;
+ }
+ if (!undecorated) {
+ zoomed = false;
+ CWrapper.NSWindow.zoom(getNSWindowPtr());
+ } else {
+ deliverZoom(false);
+
+ Rectangle toBounds = this.normalBounds;
+ this.normalBounds = null;
setBounds(toBounds.x, toBounds.y, toBounds.width, toBounds.height);
}
}
@@ -499,9 +516,9 @@
public void setVisible(boolean visible) {
final long nsWindowPtr = getNSWindowPtr();
- // 1. Process parent-child relationship when hiding
+ // Process parent-child relationship when hiding
if (!visible) {
- // 1a. Unparent my children
+ // Unparent my children
for (Window w : target.getOwnedWindows()) {
WindowPeer p = (WindowPeer)w.getPeer();
if (p instanceof LWWindowPeer) {
@@ -512,30 +529,17 @@
}
}
- // 1b. Unparent myself
+ // Unparent myself
if (owner != null && owner.isVisible()) {
CWrapper.NSWindow.removeChildWindow(owner.getNSWindowPtr(), nsWindowPtr);
}
}
- // 2. Configure stuff
+ // Configure stuff
updateIconImages();
updateFocusabilityForAutoRequestFocus(false);
- // 3. Manage the extended state when hiding
- if (!visible) {
- // Cancel out the current native state of the window
- switch (peer.getState()) {
- case Frame.ICONIFIED:
- CWrapper.NSWindow.deminiaturize(nsWindowPtr);
- break;
- case Frame.MAXIMIZED_BOTH:
- zoom();
- break;
- }
- }
-
- // 4. Actually show or hide the window
+ // Actually show or hide the window
LWWindowPeer blocker = peer.getBlocker();
if (blocker == null || !visible) {
// If it ain't blocked, or is being hidden, go regular way
@@ -564,16 +568,19 @@
}
this.visible = visible;
- // 5. Manage the extended state when showing
+ // Manage the extended state when showing
if (visible) {
- // Re-apply the extended state as expected in shared code
+ // Apply the extended state as expected in shared code
if (target instanceof Frame) {
switch (((Frame)target).getExtendedState()) {
case Frame.ICONIFIED:
CWrapper.NSWindow.miniaturize(nsWindowPtr);
break;
case Frame.MAXIMIZED_BOTH:
- zoom();
+ maximize();
+ break;
+ default: // NORMAL
+ unmaximize(); // in case it was maximized, otherwise this is a no-op
break;
}
}
@@ -581,12 +588,12 @@
nativeSynthesizeMouseEnteredExitedEvents(nsWindowPtr);
- // 6. Configure stuff #2
+ // Configure stuff #2
updateFocusabilityForAutoRequestFocus(true);
- // 7. Manage parent-child relationship when showing
+ // Manage parent-child relationship when showing
if (visible) {
- // 7a. Add myself as a child
+ // Add myself as a child
if (owner != null && owner.isVisible()) {
CWrapper.NSWindow.addChildWindow(owner.getNSWindowPtr(), nsWindowPtr, CWrapper.NSWindow.NSWindowAbove);
if (target.isAlwaysOnTop()) {
@@ -594,7 +601,7 @@
}
}
- // 7b. Add my own children to myself
+ // Add my own children to myself
for (Window w : target.getOwnedWindows()) {
WindowPeer p = (WindowPeer)w.getPeer();
if (p instanceof LWWindowPeer) {
@@ -609,7 +616,7 @@
}
}
- // 8. Deal with the blocker of the window being shown
+ // Deal with the blocker of the window being shown
if (blocker != null && visible) {
// Make sure the blocker is above its siblings
((CPlatformWindow)blocker.getPlatformWindow()).orderAboveSiblings();
@@ -767,7 +774,7 @@
if (prevWindowState == Frame.MAXIMIZED_BOTH) {
// let's return into the normal states first
// the zoom call toggles between the normal and the max states
- zoom();
+ unmaximize();
}
CWrapper.NSWindow.miniaturize(nsWindowPtr);
break;
@@ -776,14 +783,14 @@
// let's return into the normal states first
CWrapper.NSWindow.deminiaturize(nsWindowPtr);
}
- zoom();
+ maximize();
break;
case Frame.NORMAL:
if (prevWindowState == Frame.ICONIFIED) {
CWrapper.NSWindow.deminiaturize(nsWindowPtr);
} else if (prevWindowState == Frame.MAXIMIZED_BOTH) {
// the zoom call toggles between the normal and the max states
- zoom();
+ unmaximize();
}
break;
default:
diff --git a/jdk/src/share/classes/java/io/FileInputStream.java b/jdk/src/share/classes/java/io/FileInputStream.java
index f3d9339..36a0278 100644
--- a/jdk/src/share/classes/java/io/FileInputStream.java
+++ b/jdk/src/share/classes/java/io/FileInputStream.java
@@ -56,6 +56,16 @@
private final Object closeLock = new Object();
private volatile boolean closed = false;
+ private static final ThreadLocal<Boolean> runningFinalize =
+ new ThreadLocal<>();
+
+ private static boolean isRunningFinalize() {
+ Boolean val;
+ if ((val = runningFinalize.get()) != null)
+ return val.booleanValue();
+ return false;
+ }
+
/**
* Creates a <code>FileInputStream</code> by
* opening a connection to an actual file,
@@ -124,7 +134,7 @@
throw new NullPointerException();
}
fd = new FileDescriptor();
- fd.attach(this);
+ fd.incrementAndGetUseCount();
open(name);
}
@@ -164,9 +174,10 @@
/*
* FileDescriptor is being shared by streams.
- * Register this stream with FileDescriptor tracker.
+ * Ensure that it's GC'ed only when all the streams/channels are done
+ * using it.
*/
- fd.attach(this);
+ fd.incrementAndGetUseCount();
}
/**
@@ -293,13 +304,27 @@
closed = true;
}
if (channel != null) {
+ /*
+ * Decrement the FD use count associated with the channel
+ * The use count is incremented whenever a new channel
+ * is obtained from this stream.
+ */
+ fd.decrementAndGetUseCount();
channel.close();
}
- fd.closeAll(new Closeable() {
- public void close() throws IOException {
- close0();
- }
- });
+
+ /*
+ * Decrement the FD use count associated with this stream
+ */
+ int useCount = fd.decrementAndGetUseCount();
+
+ /*
+ * If FileDescriptor is still in use by another stream, the finalizer
+ * will not close it.
+ */
+ if ((useCount <= 0) || !isRunningFinalize()) {
+ close0();
+ }
}
/**
@@ -313,9 +338,7 @@
* @see java.io.FileDescriptor
*/
public final FileDescriptor getFD() throws IOException {
- if (fd != null) {
- return fd;
- }
+ if (fd != null) return fd;
throw new IOException();
}
@@ -339,6 +362,13 @@
synchronized (this) {
if (channel == null) {
channel = FileChannelImpl.open(fd, true, false, this);
+
+ /*
+ * Increment fd's use count. Invoking the channel's close()
+ * method will result in decrementing the use count set for
+ * the channel.
+ */
+ fd.incrementAndGetUseCount();
}
return channel;
}
@@ -361,12 +391,18 @@
*/
protected void finalize() throws IOException {
if ((fd != null) && (fd != FileDescriptor.in)) {
- /* if fd is shared, the references in FileDescriptor
- * will ensure that finalizer is only called when
- * safe to do so. All references using the fd have
- * become unreachable. We can call close()
+
+ /*
+ * Finalizer should not release the FileDescriptor if another
+ * stream is still using it. If the user directly invokes
+ * close() then the FileDescriptor is also released.
*/
- close();
+ runningFinalize.set(Boolean.TRUE);
+ try {
+ close();
+ } finally {
+ runningFinalize.set(Boolean.FALSE);
+ }
}
}
}
diff --git a/jdk/src/share/classes/java/io/FileOutputStream.java b/jdk/src/share/classes/java/io/FileOutputStream.java
index b0c5c06..afe9367 100644
--- a/jdk/src/share/classes/java/io/FileOutputStream.java
+++ b/jdk/src/share/classes/java/io/FileOutputStream.java
@@ -69,6 +69,15 @@
private final Object closeLock = new Object();
private volatile boolean closed = false;
+ private static final ThreadLocal<Boolean> runningFinalize =
+ new ThreadLocal<>();
+
+ private static boolean isRunningFinalize() {
+ Boolean val;
+ if ((val = runningFinalize.get()) != null)
+ return val.booleanValue();
+ return false;
+ }
/**
* Creates a file output stream to write to the file with the
@@ -199,7 +208,7 @@
this.fd = new FileDescriptor();
this.append = append;
- fd.attach(this);
+ fd.incrementAndGetUseCount();
open(name, append);
}
@@ -236,7 +245,13 @@
}
this.fd = fdObj;
this.append = false;
- fd.attach(this);
+
+ /*
+ * FileDescriptor is being shared by streams.
+ * Ensure that it's GC'ed only when all the streams/channels are done
+ * using it.
+ */
+ fd.incrementAndGetUseCount();
}
/**
@@ -325,13 +340,27 @@
}
if (channel != null) {
+ /*
+ * Decrement FD use count associated with the channel
+ * The use count is incremented whenever a new channel
+ * is obtained from this stream.
+ */
+ fd.decrementAndGetUseCount();
channel.close();
}
- fd.closeAll(new Closeable() {
- public void close() throws IOException {
- close0();
- }
- });
+
+ /*
+ * Decrement FD use count associated with this stream
+ */
+ int useCount = fd.decrementAndGetUseCount();
+
+ /*
+ * If FileDescriptor is still in use by another stream, the finalizer
+ * will not close it.
+ */
+ if ((useCount <= 0) || !isRunningFinalize()) {
+ close0();
+ }
}
/**
@@ -345,9 +374,7 @@
* @see java.io.FileDescriptor
*/
public final FileDescriptor getFD() throws IOException {
- if (fd != null) {
- return fd;
- }
+ if (fd != null) return fd;
throw new IOException();
}
@@ -372,6 +399,13 @@
synchronized (this) {
if (channel == null) {
channel = FileChannelImpl.open(fd, false, true, append, this);
+
+ /*
+ * Increment fd's use count. Invoking the channel's close()
+ * method will result in decrementing the use count set for
+ * the channel.
+ */
+ fd.incrementAndGetUseCount();
}
return channel;
}
@@ -390,12 +424,18 @@
if (fd == FileDescriptor.out || fd == FileDescriptor.err) {
flush();
} else {
- /* if fd is shared, the references in FileDescriptor
- * will ensure that finalizer is only called when
- * safe to do so. All references using the fd have
- * become unreachable. We can call close()
+
+ /*
+ * Finalizer should not release the FileDescriptor if another
+ * stream is still using it. If the user directly invokes
+ * close() then the FileDescriptor is also released.
*/
- close();
+ runningFinalize.set(Boolean.TRUE);
+ try {
+ close();
+ } finally {
+ runningFinalize.set(Boolean.FALSE);
+ }
}
}
}
diff --git a/jdk/src/share/classes/java/io/RandomAccessFile.java b/jdk/src/share/classes/java/io/RandomAccessFile.java
index 199771a..9ef3788 100644
--- a/jdk/src/share/classes/java/io/RandomAccessFile.java
+++ b/jdk/src/share/classes/java/io/RandomAccessFile.java
@@ -229,7 +229,7 @@
throw new NullPointerException();
}
fd = new FileDescriptor();
- fd.attach(this);
+ fd.incrementAndGetUseCount();
open(name, imode);
}
@@ -242,9 +242,7 @@
* @see java.io.FileDescriptor
*/
public final FileDescriptor getFD() throws IOException {
- if (fd != null) {
- return fd;
- }
+ if (fd != null) return fd;
throw new IOException();
}
@@ -270,6 +268,17 @@
synchronized (this) {
if (channel == null) {
channel = FileChannelImpl.open(fd, true, rw, this);
+
+ /*
+ * FileDescriptor could be shared by FileInputStream or
+ * FileOutputStream.
+ * Ensure that FD is GC'ed only when all the streams/channels
+ * are done using it.
+ * Increment fd's use count. Invoking the channel's close()
+ * method will result in decrementing the use count set for
+ * the channel.
+ */
+ fd.incrementAndGetUseCount();
}
return channel;
}
@@ -568,13 +577,21 @@
closed = true;
}
if (channel != null) {
+ /*
+ * Decrement FD use count associated with the channel. The FD use
+ * count is incremented whenever a new channel is obtained from
+ * this stream.
+ */
+ fd.decrementAndGetUseCount();
channel.close();
}
- fd.closeAll(new Closeable() {
- public void close() throws IOException {
- close0();
- }
- });
+
+ /*
+ * Decrement FD use count associated with this stream.
+ * The count got incremented by FileDescriptor during its construction.
+ */
+ fd.decrementAndGetUseCount();
+ close0();
}
//
diff --git a/jdk/src/share/classes/java/util/Hashtable.java b/jdk/src/share/classes/java/util/Hashtable.java
index a5aea93..3858601 100644
--- a/jdk/src/share/classes/java/util/Hashtable.java
+++ b/jdk/src/share/classes/java/util/Hashtable.java
@@ -167,13 +167,13 @@
* The default threshold of map capacity above which alternative hashing is
* used for String keys. Alternative hashing reduces the incidence of
* collisions due to weak hash code calculation for String keys.
- * <p/>
+ * <p>
* This value may be overridden by defining the system property
* {@code jdk.map.althashing.threshold}. A property value of {@code 1}
* forces alternative hashing to be used at all times whereas
* {@code -1} value ensures that alternative hashing is never used.
*/
- static final int ALTERNATIVE_HASHING_THRESHOLD_DEFAULT = 512;
+ static final int ALTERNATIVE_HASHING_THRESHOLD_DEFAULT = Integer.MAX_VALUE;
/**
* holds values which can't be initialized until after VM is booted.
diff --git a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java b/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
index 302a6db..360bb9a 100644
--- a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
+++ b/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
@@ -498,7 +498,7 @@
postDropTargetEvent(component, x, y, dropAction, actions,
formats, nativeCtxt,
SunDropTargetEvent.MOUSE_DROPPED,
- SunDropTargetContextPeer.DISPATCH_SYNC);
+ !SunDropTargetContextPeer.DISPATCH_SYNC);
}
/**
diff --git a/jdk/src/solaris/classes/java/io/FileDescriptor.java b/jdk/src/solaris/classes/java/io/FileDescriptor.java
index 1082d97..8a16c62 100644
--- a/jdk/src/solaris/classes/java/io/FileDescriptor.java
+++ b/jdk/src/solaris/classes/java/io/FileDescriptor.java
@@ -24,8 +24,8 @@
*/
package java.io;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.concurrent.atomic.AtomicInteger;
/**
* Instances of the file descriptor class serve as an opaque handle
@@ -45,9 +45,13 @@
public final class FileDescriptor {
private int fd;
- private Closeable parent;
- private List<Closeable> otherParents;
- private boolean closed;
+
+ /**
+ * A counter for tracking the FIS/FOS/RAF instances that
+ * use this FileDescriptor. The FIS/FOS.finalize() will not release
+ * the FileDescriptor if it is still under user by a stream.
+ */
+ private AtomicInteger useCount;
/**
* Constructs an (invalid) FileDescriptor
@@ -55,10 +59,12 @@
*/
public /**/ FileDescriptor() {
fd = -1;
+ useCount = new AtomicInteger();
}
private /* */ FileDescriptor(int fd) {
this.fd = fd;
+ useCount = new AtomicInteger();
}
/**
@@ -158,67 +164,13 @@
);
}
- /*
- * Package private methods to track referents.
- * If multiple streams point to the same FileDescriptor, we cycle
- * through the list of all referents and call close()
- */
+ // package private methods used by FIS, FOS and RAF
- /**
- * Attach a Closeable to this FD for tracking.
- * parent reference is added to otherParents when
- * needed to make closeAll simpler.
- */
- synchronized void attach(Closeable c) {
- if (parent == null) {
- // first caller gets to do this
- parent = c;
- } else if (otherParents == null) {
- otherParents = new ArrayList<>();
- otherParents.add(parent);
- otherParents.add(c);
- } else {
- otherParents.add(c);
- }
+ int incrementAndGetUseCount() {
+ return useCount.incrementAndGet();
}
- /**
- * Cycle through all Closeables sharing this FD and call
- * close() on each one.
- *
- * The caller closeable gets to call close0().
- */
- @SuppressWarnings("try")
- synchronized void closeAll(Closeable releaser) throws IOException {
- if (!closed) {
- closed = true;
- IOException ioe = null;
- try (Closeable c = releaser) {
- if (otherParents != null) {
- for (Closeable referent : otherParents) {
- try {
- referent.close();
- } catch(IOException x) {
- if (ioe == null) {
- ioe = x;
- } else {
- ioe.addSuppressed(x);
- }
- }
- }
- }
- } catch(IOException ex) {
- /*
- * If releaser close() throws IOException
- * add other exceptions as suppressed.
- */
- if (ioe != null)
- ex.addSuppressed(ioe);
- ioe = ex;
- } finally {
- if (ioe != null)
- throw ioe;
- }
- }
+ int decrementAndGetUseCount() {
+ return useCount.decrementAndGet();
}
}
diff --git a/jdk/src/solaris/doc/sun/man/man1/jcmd.1 b/jdk/src/solaris/doc/sun/man/man1/jcmd.1
index 913d6ea..4014b8b 100644
--- a/jdk/src/solaris/doc/sun/man/man1/jcmd.1
+++ b/jdk/src/solaris/doc/sun/man/man1/jcmd.1
@@ -19,7 +19,7 @@
." or visit www.oracle.com if you need additional information or have any
." questions.
."
-.TH jcmd 1 "16 Mar 2012"
+.TH jcmd 1 "10 Jul 2012"
.LP
.SH "Name"
@@ -56,7 +56,7 @@
When a process id is specified on the command line, jcmd sends the diagnostic command request to the process with this id.
.LP
.LP
-When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes with this main class.
+When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes for which the command line argument is a substring of the Java process' main class.
.LP
.LP
With the PerfCounter.print argument, jcmd prints the performance counters available on the targeted Java process(es).
@@ -73,11 +73,9 @@
.TP 3
\-l
Prints the list of running Java processes with their process id, their main class and their command line arguments.
-.br
.TP 3
\-h
Prints a help message.
-.br
.TP 3
\-help
Prints a help message.
@@ -90,19 +88,15 @@
.TP 3
pid
Identifies the process that receives the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, use jps(1) or jcmd(1).
-.br
.TP 3
main class
-Main class of the process that receives the diagnostic command requests. If several running Java processes share this main class, the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1).
-.br
+Main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring will be matched. If several running Java processes share this main class, the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1).
.TP 3
command [arguments]
-Invoke the diagnostic command called \f2command\fP on the targeted Java process(es). The list of available diagnostic commands for a given process can be obtained by invoking the \f3help\fP command on this process. Each diagnostic command has its own set of \f2arguments\fP, which can be obtained by invoking the \f3help\fP command followed by the command name.
-.br
+Invoke the diagnostic command called \f2command\fP on the targeted Java process(es). The list of available diagnostic commands for a given process can be obtained by invoking the \f3help\fP command on this process. Each diagnostic command has its own set of \f2arguments\fP, which can be obtained by invoking the the command name followed by \f3help\fP.
.TP 3
-Counter.print
+PerfCounter.print
Print the performance counters available on the targeted Java process(es). The list of performance counters may vary with the Java process.
-.br
.TP 3
\-f file
Read commands from \f2file\fP and invoke them on the targeted Java process(es). In \f2file\fP, each command must be written on a single line. Lines starting with # are ignored. Processing of \f2file\fP ends when all lines have been invoked or when a line containing the \f3stop\fP keyword is read.
diff --git a/jdk/src/windows/classes/java/io/FileDescriptor.java b/jdk/src/windows/classes/java/io/FileDescriptor.java
index 69ed09a..405832d 100644
--- a/jdk/src/windows/classes/java/io/FileDescriptor.java
+++ b/jdk/src/windows/classes/java/io/FileDescriptor.java
@@ -24,8 +24,8 @@
*/
package java.io;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.concurrent.atomic.AtomicInteger;
/**
* Instances of the file descriptor class serve as an opaque handle
@@ -42,10 +42,16 @@
public final class FileDescriptor {
private int fd;
+
private long handle;
- private Closeable parent;
- private List<Closeable> otherParents;
- private boolean closed;
+
+ /**
+ * A use counter for tracking the FIS/FOS/RAF instances that
+ * use this FileDescriptor. The FIS/FOS.finalize() will not release
+ * the FileDescriptor if it is still under use by any stream.
+ */
+ private AtomicInteger useCount;
+
/**
* Constructs an (invalid) FileDescriptor
@@ -54,6 +60,7 @@
public /**/ FileDescriptor() {
fd = -1;
handle = -1;
+ useCount = new AtomicInteger();
}
static {
@@ -161,67 +168,13 @@
return desc;
}
- /*
- * Package private methods to track referents.
- * If multiple streams point to the same FileDescriptor, we cycle
- * through the list of all referents and call close()
- */
+ // package private methods used by FIS, FOS and RAF.
- /**
- * Attach a Closeable to this FD for tracking.
- * parent reference is added to otherParents when
- * needed to make closeAll simpler.
- */
- synchronized void attach(Closeable c) {
- if (parent == null) {
- // first caller gets to do this
- parent = c;
- } else if (otherParents == null) {
- otherParents = new ArrayList<>();
- otherParents.add(parent);
- otherParents.add(c);
- } else {
- otherParents.add(c);
- }
+ int incrementAndGetUseCount() {
+ return useCount.incrementAndGet();
}
- /**
- * Cycle through all Closeables sharing this FD and call
- * close() on each one.
- *
- * The caller closeable gets to call close0().
- */
- @SuppressWarnings("try")
- synchronized void closeAll(Closeable releaser) throws IOException {
- if (!closed) {
- closed = true;
- IOException ioe = null;
- try (Closeable c = releaser) {
- if (otherParents != null) {
- for (Closeable referent : otherParents) {
- try {
- referent.close();
- } catch(IOException x) {
- if (ioe == null) {
- ioe = x;
- } else {
- ioe.addSuppressed(x);
- }
- }
- }
- }
- } catch(IOException ex) {
- /*
- * If releaser close() throws IOException
- * add other exceptions as suppressed.
- */
- if (ioe != null)
- ex.addSuppressed(ioe);
- ioe = ex;
- } finally {
- if (ioe != null)
- throw ioe;
- }
- }
+ int decrementAndGetUseCount() {
+ return useCount.decrementAndGet();
}
}
diff --git a/jdk/test/java/awt/Frame/HideMaximized/HideMaximized.java b/jdk/test/java/awt/Frame/HideMaximized/HideMaximized.java
new file mode 100644
index 0000000..9e64b2d
--- /dev/null
+++ b/jdk/test/java/awt/Frame/HideMaximized/HideMaximized.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ @test
+ @bug 7177173
+ @summary The maximized state shouldn't be reset upon hiding a frame
+ @author anthony.petrov@oracle.com: area=awt.toplevel
+ @run main HideMaximized
+*/
+
+import java.awt.*;
+
+public class HideMaximized {
+ public static void main(String[] args) {
+ if (!Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_BOTH)) {
+ // Nothing to test
+ return;
+ }
+
+ // First test a decorated frame
+ Frame frame = new Frame("test");
+ test(frame);
+
+ // Now test an undecorated frames
+ frame = new Frame("undecorated test");
+ frame.setUndecorated(true);
+ test(frame);
+ }
+
+ private static void test(Frame frame) {
+ frame.setExtendedState(Frame.MAXIMIZED_BOTH);
+ frame.setVisible(true);
+
+ try { Thread.sleep(1000); } catch (Exception ex) {}
+
+ if (frame.getExtendedState() != Frame.MAXIMIZED_BOTH) {
+ throw new RuntimeException("The maximized state has not been applied");
+ }
+
+ // This will hide the frame, and also clean things up for safe exiting
+ frame.dispose();
+
+ try { Thread.sleep(1000); } catch (Exception ex) {}
+
+ if (frame.getExtendedState() != Frame.MAXIMIZED_BOTH) {
+ throw new RuntimeException("The maximized state has been reset");
+ }
+ }
+}
diff --git a/jdk/test/java/io/FileDescriptor/FileChannelFDTest.java b/jdk/test/java/io/FileDescriptor/FileChannelFDTest.java
new file mode 100644
index 0000000..8a44859
--- /dev/null
+++ b/jdk/test/java/io/FileDescriptor/FileChannelFDTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ *
+ * @test
+ * @bug 6322678
+ * @summary Test for making sure that fd is closed during
+ * finalization of a stream, when an associated
+ * file channel is not available
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+
+public class FileChannelFDTest {
+
+ static byte data[] = new byte[] {48, 49, 50, 51, 52, 53, 54, 55, 56, 57,};
+ static String inFileName = "fd-in-test.txt";
+ static String outFileName = "fd-out-test.txt";
+ static File inFile;
+ static File outFile;
+
+ private static void writeToInFile() throws IOException {
+ FileOutputStream out = new FileOutputStream(inFile);
+ out.write(data);
+ out.close();
+ }
+
+ public static void main(String[] args)
+ throws Exception {
+
+ inFile= new File(System.getProperty("test.dir", "."),
+ inFileName);
+ inFile.createNewFile();
+ inFile.deleteOnExit();
+ writeToInFile();
+
+ outFile = new File(System.getProperty("test.dir", "."),
+ outFileName);
+ outFile.createNewFile();
+ outFile.deleteOnExit();
+
+ doFileChannel();
+ }
+
+ private static void doFileChannel() throws Exception {
+
+ FileInputStream fis = new FileInputStream(inFile);
+ FileDescriptor fd = fis.getFD();
+ FileChannel fc = fis.getChannel();
+ System.out.println("Created fis:" + fis);
+
+ /**
+ * Encourage the GC
+ */
+ fis = null;
+ fc = null;
+ System.gc();
+ Thread.sleep(500);
+
+ if (fd.valid()) {
+ throw new Exception("Finalizer either didn't run --" +
+ "try increasing the Thread's sleep time after System.gc();" +
+ "or the finalizer didn't close the file");
+ }
+
+ System.out.println("File Closed successfully");
+ System.out.println();
+ }
+}
diff --git a/jdk/test/java/io/FileDescriptor/Sharing.java b/jdk/test/java/io/FileDescriptor/Sharing.java
deleted file mode 100644
index da194d1..0000000
--- a/jdk/test/java/io/FileDescriptor/Sharing.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 7105952 6322678 7082769
- * @summary Improve finalisation for FileInputStream/FileOutputStream/RandomAccessFile
- * @run main/othervm Sharing
- */
-
-import java.io.*;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.util.concurrent.CountDownLatch;
-
-public class Sharing {
-
- final static int numFiles = 10;
- volatile static boolean fail;
-
- public static void main(String[] args) throws Exception {
- TestFinalizer();
- TestMultipleFD();
- TestIsValid();
- MultiThreadedFD();
- TestCloseAll();
- }
-
- /**
- * Finalizer shouldn't discard a file descriptor until all streams have
- * finished with it.
- */
- private static void TestFinalizer() throws Exception {
- FileDescriptor fd = null;
- File tempFile = new File("TestFinalizer1.txt");
- tempFile.deleteOnExit();
- try (Writer writer = new FileWriter(tempFile)) {
- for (int i=0; i<5; i++) {
- writer.write("test file content test file content");
- }
- }
-
- FileInputStream fis1 = new FileInputStream(tempFile);
- fd = fis1.getFD();
- // Create a new FIS based on the existing FD (so the two FIS's share the same native fd)
- try (FileInputStream fis2 = new FileInputStream(fd)) {
- // allow fis1 to be gc'ed
- fis1 = null;
- int ret = 0;
- while(ret >= 0) {
- // encourage gc
- System.gc();
- // read from fis2 - when fis1 is gc'ed and finalizer is run, read will fail
- System.out.print(".");
- ret = fis2.read();
- }
- }
-
- // variation of above. Use RandomAccessFile to obtain a filedescriptor
- File testFinalizerFile = new File("TestFinalizer");
- RandomAccessFile raf = new RandomAccessFile(testFinalizerFile, "rw");
- raf.writeBytes("test file content test file content");
- raf.seek(0L);
- fd = raf.getFD();
- try (FileInputStream fis3 = new FileInputStream(fd)) {
- // allow raf to be gc'ed
- raf = null;
- int ret = 0;
- while (ret >= 0) {
- // encourage gc
- System.gc();
- /*
- * read from fis3 - when raf is gc'ed and finalizer is run,
- * fd should still be valid.
- */
- System.out.print(".");
- ret = fis3.read();
- }
- } finally {
- testFinalizerFile.delete();
- }
- }
-
- /**
- * Exercise FileDispatcher close()/preClose()
- */
- private static void TestMultipleFD() throws Exception {
- RandomAccessFile raf = null;
- FileOutputStream fos = null;
- FileInputStream fis = null;
- FileChannel fc = null;
- FileLock fileLock = null;
-
- File test1 = new File("test1");
- try {
- raf = new RandomAccessFile(test1, "rw");
- fos = new FileOutputStream(raf.getFD());
- fis = new FileInputStream(raf.getFD());
- fc = raf.getChannel();
- fileLock = fc.lock();
- raf.setLength(0L);
- fos.flush();
- fos.write("TEST".getBytes());
- } finally {
- if (fileLock != null) fileLock.release();
- if (fis != null) fis.close();
- if (fos != null) fos.close();
- if (raf != null) raf.close();
- test1.delete();
- }
-
- /*
- * Close out in different order to ensure FD is not
- * closed out too early
- */
- File test2 = new File("test2");
- try {
- raf = new RandomAccessFile(test2, "rw");
- fos = new FileOutputStream(raf.getFD());
- fis = new FileInputStream(raf.getFD());
- fc = raf.getChannel();
- fileLock = fc.lock();
- raf.setLength(0L);
- fos.flush();
- fos.write("TEST".getBytes());
- } finally {
- if (fileLock != null) fileLock.release();
- if (raf != null) raf.close();
- if (fos != null) fos.close();
- if (fis != null) fis.close();
- test2.delete();
- }
-
- // one more time, fos first this time
- File test3 = new File("test3");
- try {
- raf = new RandomAccessFile(test3, "rw");
- fos = new FileOutputStream(raf.getFD());
- fis = new FileInputStream(raf.getFD());
- fc = raf.getChannel();
- fileLock = fc.lock();
- raf.setLength(0L);
- fos.flush();
- fos.write("TEST".getBytes());
- } finally {
- if (fileLock != null) fileLock.release();
- if (fos != null) fos.close();
- if (raf != null) raf.close();
- if (fis != null) fis.close();
- test3.delete();
- }
- }
-
- /**
- * Similar to TestMultipleFD() but this time we
- * just get and use FileDescriptor.valid() for testing.
- */
- private static void TestIsValid() throws Exception {
- FileDescriptor fd = null;
- RandomAccessFile raf = null;
- FileOutputStream fos = null;
- FileInputStream fis = null;
- FileChannel fc = null;
-
- File test1 = new File("test1");
- try {
- raf = new RandomAccessFile(test1, "rw");
- fd = raf.getFD();
- fos = new FileOutputStream(fd);
- fis = new FileInputStream(fd);
- } finally {
- try {
- if (fis != null) fis.close();
- if (fd.valid()) {
- throw new RuntimeException("[FIS close()] FileDescriptor shouldn't be valid");
- }
- if (fos != null) fos.close();
- if (raf != null) raf.close();
- } finally {
- test1.delete();
- }
- }
-
- /*
- * Close out in different order to ensure FD is
- * closed correctly.
- */
- File test2 = new File("test2");
- try {
- raf = new RandomAccessFile(test2, "rw");
- fd = raf.getFD();
- fos = new FileOutputStream(fd);
- fis = new FileInputStream(fd);
- } finally {
- try {
- if (raf != null) raf.close();
- if (fd.valid()) {
- throw new RuntimeException("[RAF close()] FileDescriptor shouldn't be valid");
- }
- if (fos != null) fos.close();
- if (fis != null) fis.close();
- } finally {
- test2.delete();
- }
- }
-
- // one more time, fos first this time
- File test3 = new File("test3");
- try {
- raf = new RandomAccessFile(test3, "rw");
- fd = raf.getFD();
- fos = new FileOutputStream(fd);
- fis = new FileInputStream(fd);
- } finally {
- try {
- if (fos != null) fos.close();
- if (fd.valid()) {
- throw new RuntimeException("[FOS close()] FileDescriptor shouldn't be valid");
- }
- if (raf != null) raf.close();
- if (fis != null) fis.close();
- } finally {
- test3.delete();
- }
- }
- }
-
- /**
- * Test concurrent access to the same FileDescriptor
- */
- private static void MultiThreadedFD() throws Exception {
- RandomAccessFile raf = null;
- FileDescriptor fd = null;
- int numThreads = 2;
- CountDownLatch done = new CountDownLatch(numThreads);
- OpenClose[] fileOpenClose = new OpenClose[numThreads];
- File MultipleThreadedFD = new File("MultipleThreadedFD");
- try {
- raf = new RandomAccessFile(MultipleThreadedFD, "rw");
- fd = raf.getFD();
- for(int count=0;count<numThreads;count++) {
- fileOpenClose[count] = new OpenClose(fd, done);
- fileOpenClose[count].start();
- }
- done.await();
- } finally {
- try {
- if(raf != null) raf.close();
- // fd should now no longer be valid
- if(fd.valid()) {
- throw new RuntimeException("FileDescriptor should not be valid");
- }
- // OpenClose thread tests failed
- if(fail) {
- throw new RuntimeException("OpenClose thread tests failed.");
- }
- } finally {
- MultipleThreadedFD.delete();
- }
- }
- }
-
- /**
- * Test closeAll handling in FileDescriptor
- */
- private static void TestCloseAll() throws Exception {
- File testFile = new File("test");
- testFile.deleteOnExit();
- RandomAccessFile raf = new RandomAccessFile(testFile, "rw");
- FileInputStream fis = new FileInputStream(raf.getFD());
- fis.close();
- if (raf.getFD().valid()) {
- throw new RuntimeException("FD should not be valid.");
- }
-
- // Test the suppressed exception handling - FileInputStream
-
- raf = new RandomAccessFile(testFile, "rw");
- fis = new FileInputStream(raf.getFD());
- BadFileInputStream bfis1 = new BadFileInputStream(raf.getFD());
- BadFileInputStream bfis2 = new BadFileInputStream(raf.getFD());
- BadFileInputStream bfis3 = new BadFileInputStream(raf.getFD());
- // extra test - set bfis3 to null
- bfis3 = null;
- try {
- fis.close();
- } catch (IOException ioe) {
- ioe.printStackTrace();
- if (ioe.getSuppressed().length != 2) {
- throw new RuntimeException("[FIS]Incorrect number of suppressed " +
- "exceptions received : " + ioe.getSuppressed().length);
- }
- }
- if (raf.getFD().valid()) {
- // we should still have closed the FD
- // even with the exception.
- throw new RuntimeException("[FIS]TestCloseAll : FD still valid.");
- }
-
- // Now test with FileOutputStream
-
- raf = new RandomAccessFile(testFile, "rw");
- FileOutputStream fos = new FileOutputStream(raf.getFD());
- BadFileOutputStream bfos1 = new BadFileOutputStream(raf.getFD());
- BadFileOutputStream bfos2 = new BadFileOutputStream(raf.getFD());
- BadFileOutputStream bfos3 = new BadFileOutputStream(raf.getFD());
- // extra test - set bfos3 to null
- bfos3 = null;
- try {
- fos.close();
- } catch (IOException ioe) {
- ioe.printStackTrace();
- if (ioe.getSuppressed().length != 2) {
- throw new RuntimeException("[FOS]Incorrect number of suppressed " +
- "exceptions received : " + ioe.getSuppressed().length);
- }
- }
- if (raf.getFD().valid()) {
- // we should still have closed the FD
- // even with the exception.
- throw new RuntimeException("[FOS]TestCloseAll : FD still valid.");
- }
- }
-
- /**
- * A thread which will open and close a number of FileInputStreams and
- * FileOutputStreams referencing the same native file descriptor.
- */
- private static class OpenClose extends Thread {
- private FileDescriptor fd = null;
- private CountDownLatch done;
- FileInputStream[] fisArray = new FileInputStream[numFiles];
- FileOutputStream[] fosArray = new FileOutputStream[numFiles];
-
- OpenClose(FileDescriptor filedescriptor, CountDownLatch done) {
- this.fd = filedescriptor;
- this.done = done;
- }
-
- public void run() {
- try {
- for(int i=0;i<numFiles;i++) {
- fisArray[i] = new FileInputStream(fd);
- fosArray[i] = new FileOutputStream(fd);
- }
-
- // Now close out
- for(int i=0;i<numFiles;i++) {
- if(fisArray[i] != null) fisArray[i].close();
- if(fosArray[i] != null) fosArray[i].close();
- }
-
- } catch(IOException ioe) {
- System.out.println("OpenClose encountered IO issue :" + ioe);
- fail = true;
- } finally {
- if (fd.valid()) { // fd should not be valid after first close() call
- System.out.println("OpenClose: FileDescriptor shouldn't be valid");
- fail = true;
- }
- done.countDown();
- }
- }
- }
-
- private static class BadFileInputStream extends FileInputStream {
-
- BadFileInputStream(FileDescriptor fd) {
- super(fd);
- }
-
- public void close() throws IOException {
- throw new IOException("Bad close operation");
- }
- }
-
- private static class BadFileOutputStream extends FileOutputStream {
-
- BadFileOutputStream(FileDescriptor fd) {
- super(fd);
- }
-
- public void close() throws IOException {
- throw new IOException("Bad close operation");
- }
- }
-
-}
diff --git a/langtools/.hgtags b/langtools/.hgtags
index c965d45..75856d3 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -192,3 +192,4 @@
5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
+474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
