[SCM] jigsaw packaging branch, master, updated. 9525b9189759e98277a77d1e140a167bc8029409
Guillaume Mazoyer
respawneral at gmail.com
Fri Dec 2 22:24:44 UTC 2011
The following commit has been merged in the master branch:
commit 4850a5baa1e636e1d89becf1ce166abc0a376b9b
Author: Mandy Chung <mandy.chung at oracle.com>
Date: Thu Dec 1 10:56:06 2011 +0100
Sync with the latest upstream source.
diff --git a/.hg/cache/branchheads b/.hg/cache/branchheads
index bd1daf9..99fd1a6 100644
--- a/.hg/cache/branchheads
+++ b/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-3ca12a409ec831a17d5e2d3331686b001d71f780 399
-3ca12a409ec831a17d5e2d3331686b001d71f780 default
+960b2e6851862c515f414834239360268925ca66 411
+960b2e6851862c515f414834239360268925ca66 default
diff --git a/.hg/dirstate b/.hg/dirstate
index 49a90e2..9d63be2 100644
Binary files a/.hg/dirstate and b/.hg/dirstate differ
diff --git a/.hg/store/00changelog.i b/.hg/store/00changelog.i
index b339ffa..3b235c6 100644
Binary files a/.hg/store/00changelog.i and b/.hg/store/00changelog.i differ
diff --git a/.hg/store/00manifest.i b/.hg/store/00manifest.i
index 9edbbc0..f706436 100644
Binary files a/.hg/store/00manifest.i and b/.hg/store/00manifest.i differ
diff --git a/.hg/store/data/~2ehgtags.i b/.hg/store/data/~2ehgtags.i
index 2e75a97..fcb3be2 100644
Binary files a/.hg/store/data/~2ehgtags.i and b/.hg/store/data/~2ehgtags.i differ
diff --git a/.hg/store/undo b/.hg/store/undo
index f12f787..28fb988 100644
Binary files a/.hg/store/undo and b/.hg/store/undo differ
diff --git a/.hg/undo.desc b/.hg/undo.desc
index 61b9310..d0f6fe2 100644
--- a/.hg/undo.desc
+++ b/.hg/undo.desc
@@ -1,3 +1,3 @@
-383
+400
pull
http://hg.openjdk.java.net/jigsaw/jigsaw
diff --git a/.hg/undo.dirstate b/.hg/undo.dirstate
index 209e2be..49a90e2 100644
Binary files a/.hg/undo.dirstate and b/.hg/undo.dirstate differ
diff --git a/.hgtags b/.hgtags
index c6d0af4..bcf2cf5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -136,3 +136,9 @@ b910aac18c772b823b1f7da03e2c6528725cc6de jdk8-b05
28cf2aec4dd7c3c75efc1c15078522467c781a6d jdk8-b06
0db7ae9f2b1017124c779bccd016c976928859a0 jdk8-b07
fb1bc13260d76447e269e843859eb593fe2a8ab2 jdk8-b08
+8adb70647b5af5273dfe6a540f07be667cd50216 jdk8-b09
+a6c4c248e8fa350c35014fa94bab5ac1a1ac3299 jdk8-b10
+1defbc57940a56f0aa41e9dee87b71e8c8b71103 jdk8-b11
+8e2104d565baee473895d5eba20e39f85ab4bf9f jdk8-b12
+26fb81a1e9ceb9baffba216acd9ded62e9e9d5ab jdk8-b13
+23aa7f2c80a2fa354c80decf03e7c2018177ef4e jdk8-b14
diff --git a/corba/.hg/cache/branchheads b/corba/.hg/cache/branchheads
index 8535165..91c9402 100644
--- a/corba/.hg/cache/branchheads
+++ b/corba/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-ea83b73f6983a3081875f3ccf57df394c5b7c344 326
-ea83b73f6983a3081875f3ccf57df394c5b7c344 default
+15cf53f9eb35d0db7b33062ebf04dc36ae9cf5fd 339
+15cf53f9eb35d0db7b33062ebf04dc36ae9cf5fd default
diff --git a/corba/.hg/dirstate b/corba/.hg/dirstate
index 0f48489..faea2b4 100644
Binary files a/corba/.hg/dirstate and b/corba/.hg/dirstate differ
diff --git a/corba/.hg/store/00changelog.i b/corba/.hg/store/00changelog.i
index 739d61a..2c8b9e5 100644
Binary files a/corba/.hg/store/00changelog.i and b/corba/.hg/store/00changelog.i differ
diff --git a/corba/.hg/store/00manifest.d b/corba/.hg/store/00manifest.d
index f659c89..ddb6c04 100644
Binary files a/corba/.hg/store/00manifest.d and b/corba/.hg/store/00manifest.d differ
diff --git a/corba/.hg/store/00manifest.i b/corba/.hg/store/00manifest.i
index a27fd2f..8786b84 100644
Binary files a/corba/.hg/store/00manifest.i and b/corba/.hg/store/00manifest.i differ
diff --git a/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/io/_i_i_o_p_input_stream.java.i b/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/io/_i_i_o_p_input_stream.java.i
index 7b9cb82..dcd3c10 100644
Binary files a/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/io/_i_i_o_p_input_stream.java.i and b/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/io/_i_i_o_p_input_stream.java.i differ
diff --git a/corba/.hg/store/data/~2ehgtags.i b/corba/.hg/store/data/~2ehgtags.i
index 4817a05..c6baf48 100644
Binary files a/corba/.hg/store/data/~2ehgtags.i and b/corba/.hg/store/data/~2ehgtags.i differ
diff --git a/corba/.hg/store/undo b/corba/.hg/store/undo
index be685b4..01ca6da 100644
Binary files a/corba/.hg/store/undo and b/corba/.hg/store/undo differ
diff --git a/corba/.hg/undo.desc b/corba/.hg/undo.desc
index 1a0c757..d80e677 100644
--- a/corba/.hg/undo.desc
+++ b/corba/.hg/undo.desc
@@ -1,3 +1,3 @@
-318
+327
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/corba
diff --git a/corba/.hg/undo.dirstate b/corba/.hg/undo.dirstate
index 3f88c70..0f48489 100644
Binary files a/corba/.hg/undo.dirstate and b/corba/.hg/undo.dirstate differ
diff --git a/corba/.hgtags b/corba/.hgtags
index 89819b5..16c006d 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -136,3 +136,9 @@ cc1b599b986a37cb57de4584c5e58169766ca535 jdk8-b05
45c43dde7ba7f176333a51a98f086275478836fa jdk8-b06
3d61f0856f349e2163bf98146465dab3b7437f63 jdk8-b07
0d52b1c87aa8fdea7fdc9c4126ea58f95ca6b351 jdk8-b08
+a891732c1a83082177ff7a4cf1506068d9cc0a47 jdk8-b09
+cda87f7fefcee3b89742a57ce5ad9b03a54c210d jdk8-b10
+0199e4fef5cc2bd234c65b93220459ef7a3bb3b1 jdk8-b11
+31d70911b712c6b4e580a3110363d5f044cfed7a jdk8-b12
+5b9d9b839d3d7fe02347827221c97c6d242a6f96 jdk8-b13
+e59c47de1ad8982ff3b0e843773a6902b36c2337 jdk8-b14
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java b/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
index 1992c25..9f7008a 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, 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
@@ -2243,6 +2243,10 @@ public class IIOPInputStream
}
try {
+ Class fieldCl = fields[i].getClazz();
+ if (objectValue != null && !fieldCl.isInstance(objectValue)) {
+ throw new IllegalArgumentException();
+ }
bridge.putObject( o, fields[i].getFieldID(), objectValue ) ;
// reflective code: fields[i].getField().set( o, objectValue ) ;
} catch (IllegalArgumentException e) {
@@ -2553,6 +2557,10 @@ public class IIOPInputStream
{
try {
Field fld = c.getDeclaredField( fieldName ) ;
+ Class fieldCl = fld.getType();
+ if(v != null && !fieldCl.isInstance(v)) {
+ throw new Exception();
+ }
long key = bridge.objectFieldOffset( fld ) ;
bridge.putObject( o, key, v ) ;
} catch (Exception e) {
diff --git a/hotspot/.hg/cache/branchheads b/hotspot/.hg/cache/branchheads
index 40dee89..5c5284c 100644
--- a/hotspot/.hg/cache/branchheads
+++ b/hotspot/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-19c31a07e45edf76746d09a1100fcb20194054b2 2778
-19c31a07e45edf76746d09a1100fcb20194054b2 default
+fdd4ba16fb4bd20e2b5c7e1f6079b844c2bf8347 2889
+fdd4ba16fb4bd20e2b5c7e1f6079b844c2bf8347 default
diff --git a/hotspot/.hg/dirstate b/hotspot/.hg/dirstate
index 77c959c..dc315b7 100644
Binary files a/hotspot/.hg/dirstate and b/hotspot/.hg/dirstate differ
diff --git a/hotspot/.hg/store/00changelog.d b/hotspot/.hg/store/00changelog.d
index 384747e..7fd8b4e 100644
Binary files a/hotspot/.hg/store/00changelog.d and b/hotspot/.hg/store/00changelog.d differ
diff --git a/hotspot/.hg/store/00changelog.i b/hotspot/.hg/store/00changelog.i
index a12e99c..3e486d7 100644
Binary files a/hotspot/.hg/store/00changelog.i and b/hotspot/.hg/store/00changelog.i differ
diff --git a/hotspot/.hg/store/00manifest.d b/hotspot/.hg/store/00manifest.d
index 8955f95..6bc3e7d 100644
Binary files a/hotspot/.hg/store/00manifest.d and b/hotspot/.hg/store/00manifest.d differ
diff --git a/hotspot/.hg/store/00manifest.i b/hotspot/.hg/store/00manifest.i
index 8810b00..415944c 100644
Binary files a/hotspot/.hg/store/00manifest.i and b/hotspot/.hg/store/00manifest.i differ
diff --git a/hotspot/.hg/store/data/agent/make/_makefile.i b/hotspot/.hg/store/data/agent/make/_makefile.i
index 66bd094..fd8d781 100644
Binary files a/hotspot/.hg/store/data/agent/make/_makefile.i and b/hotspot/.hg/store/data/agent/make/_makefile.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/_macosx_debugger_local.m.i b/hotspot/.hg/store/data/agent/src/os/bsd/_macosx_debugger_local.m.i
new file mode 100644
index 0000000..ae3e594
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/_macosx_debugger_local.m.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/_makefile.i b/hotspot/.hg/store/data/agent/src/os/bsd/_makefile.i
index 88e5eae..e5f917b 100644
Binary files a/hotspot/.hg/store/data/agent/src/os/bsd/_makefile.i and b/hotspot/.hg/store/data/agent/src/os/bsd/_makefile.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/symtab.c.i b/hotspot/.hg/store/data/agent/src/os/bsd/symtab.c.i
index f6fb988..603b864 100644
Binary files a/hotspot/.hg/store/data/agent/src/os/bsd/symtab.c.i and b/hotspot/.hg/store/data/agent/src/os/bsd/symtab.c.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_debugger_local.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_debugger_local.java.i
index 7a315de..af25c11 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_debugger_local.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_debugger_local.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_collected_heap.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_collected_heap.java.i
new file mode 100644
index 0000000..33e43eb
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_collected_heap.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_monitoring_support.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_monitoring_support.java.i
new file mode 100644
index 0000000..5e58910
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_monitoring_support.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_heap_region.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_heap_region.java.i
new file mode 100644
index 0000000..b12acd0
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_heap_region.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_heap_region_seq.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_heap_region_seq.java.i
new file mode 100644
index 0000000..5de38a8
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_heap_region_seq.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__interface/_collected_heap_name.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__interface/_collected_heap_name.java.i
index 4e40ead..65898c8 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__interface/_collected_heap_name.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__interface/_collected_heap_name.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_universe.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_universe.java.i
index 9577d5a..eb14e41 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_universe.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_universe.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_object_heap.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_object_heap.java.i
index 38ba588..ff63e0d 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_object_heap.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_object_heap.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_frame.java.i
index 89aea69..9d8b755 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_frame.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_heap_summary.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_heap_summary.java.i
index e1437fc..b58ab0a 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_heap_summary.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_heap_summary.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_perm_stat.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_perm_stat.java.i
index 7e44ec9..f813e39 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_perm_stat.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_perm_stat.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i
index f384847..bf4ad19 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i differ
diff --git a/hotspot/.hg/store/data/make/_makefile.i b/hotspot/.hg/store/data/make/_makefile.i
index 3cfe310..0c5df30 100644
Binary files a/hotspot/.hg/store/data/make/_makefile.i and b/hotspot/.hg/store/data/make/_makefile.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i
index cd97807..b3add28 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i
index 51e88c2..1fbb514 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i
index 3595e0d..22dd11c 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i
index 84e0140..3048fa1 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i
index 97ff349..7b5fc66 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i
index c4146d0..53dd236 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/saproc.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/saproc.make.i
index 0787b14..268470d 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/saproc.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/saproc.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i
index c646ca6..9446e3f 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i
index eb92e32..4dc7cdb 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i differ
diff --git a/hotspot/.hg/store/data/make/defs.make.i b/hotspot/.hg/store/data/make/defs.make.i
index dd8a94b..19a90a4 100644
Binary files a/hotspot/.hg/store/data/make/defs.make.i and b/hotspot/.hg/store/data/make/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/hotspot__version.i b/hotspot/.hg/store/data/make/hotspot__version.i
index bcee8a9..2a890b7 100644
Binary files a/hotspot/.hg/store/data/make/hotspot__version.i and b/hotspot/.hg/store/data/make/hotspot__version.i differ
diff --git a/hotspot/.hg/store/data/make/jprt.properties.i b/hotspot/.hg/store/data/make/jprt.properties.i
index 4d64413..efc3faa 100644
Binary files a/hotspot/.hg/store/data/make/jprt.properties.i and b/hotspot/.hg/store/data/make/jprt.properties.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i b/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i
index 2e4f537..8fc68d4 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i b/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i
index de44581..d2a53dc 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i differ
diff --git a/hotspot/.hg/store/data/make/sa.files.i b/hotspot/.hg/store/data/make/sa.files.i
index dacc7b0..053c380 100644
Binary files a/hotspot/.hg/store/data/make/sa.files.i and b/hotspot/.hg/store/data/make/sa.files.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i
index 5d4ac84..66745b2 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/gcc.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/gcc.make.i
index ebad029..d4753f2 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/gcc.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/gcc.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/vm.make.i b/hotspot/.hg/store/data/make/windows/makefiles/vm.make.i
index ce05a2b..cd5ed56 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/vm.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/vm.make.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i
index 40775e6..8787c06 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i
index 17a14e6..550ed35 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i
index 8185e6b..17dc85c 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___runtime1__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___runtime1__sparc.cpp.i
index 699908b..308ef64 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___runtime1__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___runtime1__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/copy__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/copy__sparc.hpp.i
index 5d3cabd..1e3dc51 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/copy__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/copy__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i
index 7f7cab4..ee376d6 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.hpp.i
index 70fe7ea..af15aa1 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i
index b89c3fb..ccc760e 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.cpp.i
index 00ae964..85ab0ba 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___code_stubs__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___code_stubs__x86.cpp.i
index bea9cdb..8887196 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___code_stubs__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___code_stubs__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i
index 0c44cb7..71f511b 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i
index c51c9f9..7bb1544 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/jni__x86.h.i b/hotspot/.hg/store/data/src/cpu/x86/vm/jni__x86.h.i
index d611c5e..2b03d5a 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/jni__x86.h.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/jni__x86.h.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i
index 06dd762..6e7e101 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i
index 411087b..4fd94bb 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i
index c8612b1..08fcd90 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/template_interpreter__x86__32.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/template_interpreter__x86__32.cpp.i
index da7cda7..4f351ce 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/template_interpreter__x86__32.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/template_interpreter__x86__32.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/template_interpreter__x86__64.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/template_interpreter__x86__64.cpp.i
index 3e76da3..b71872b 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/template_interpreter__x86__64.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/template_interpreter__x86__64.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i
index 4644869..2520bf3 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i
index 593026a..7017ef2 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/generate_jvm_offsets.cpp.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/generate_jvm_offsets.cpp.i
new file mode 100644
index 0000000..a2dd530
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/generate_jvm_offsets.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/generate_jvm_offsets.h.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/generate_jvm_offsets.h.i
new file mode 100644
index 0000000..f73ee8f
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/generate_jvm_offsets.h.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/generate_jvm_offsets_main.c.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/generate_jvm_offsets_main.c.i
new file mode 100644
index 0000000..ae98d68
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/generate_jvm_offsets_main.c.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/hotspot.d.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/hotspot.d.i
new file mode 100644
index 0000000..42656d0
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/hotspot.d.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/hotspot__jni.d.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/hotspot__jni.d.i
new file mode 100644
index 0000000..e502116
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/hotspot__jni.d.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/hs__private.d.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/hs__private.d.i
new file mode 100644
index 0000000..ac7bd44
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/hs__private.d.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/jhelper.d.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/jhelper.d.i
new file mode 100644
index 0000000..30ca433
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/jhelper.d.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/jvm__dtrace.c.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/jvm__dtrace.c.i
new file mode 100644
index 0000000..6cf9c69
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/jvm__dtrace.c.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/jvm__dtrace.h.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/jvm__dtrace.h.i
new file mode 100644
index 0000000..3b7f230
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/jvm__dtrace.h.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/libjvm__db.c.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/libjvm__db.c.i
new file mode 100644
index 0000000..320eeaa
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/libjvm__db.c.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/dtrace/libjvm__db.h.i b/hotspot/.hg/store/data/src/os/bsd/dtrace/libjvm__db.h.i
new file mode 100644
index 0000000..a708912
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/dtrace/libjvm__db.h.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/dtrace_j_s_d_t__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/dtrace_j_s_d_t__bsd.cpp.i
index b9e26c5..6fce904 100644
Binary files a/hotspot/.hg/store/data/src/os/bsd/vm/dtrace_j_s_d_t__bsd.cpp.i and b/hotspot/.hg/store/data/src/os/bsd/vm/dtrace_j_s_d_t__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/jvm__bsd.h.i b/hotspot/.hg/store/data/src/os/bsd/vm/jvm__bsd.h.i
index 9ab8e3e..eda9ba9 100644
Binary files a/hotspot/.hg/store/data/src/os/bsd/vm/jvm__bsd.h.i and b/hotspot/.hg/store/data/src/os/bsd/vm/jvm__bsd.h.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i
index df6cb86..9361134 100644
Binary files a/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i and b/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i b/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i
index cd66b95..c10245b 100644
Binary files a/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i and b/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/posix/launcher/launcher.script.i b/hotspot/.hg/store/data/src/os/posix/launcher/launcher.script.i
index 7901ec2..02a1b28 100644
Binary files a/hotspot/.hg/store/data/src/os/posix/launcher/launcher.script.i and b/hotspot/.hg/store/data/src/os/posix/launcher/launcher.script.i differ
diff --git a/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i b/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i
index a56a14a..95760a4 100644
Binary files a/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i and b/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i b/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i
index e33c09d..42eca5c 100644
Binary files a/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i and b/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.s.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.s.i
index 290cad8..146c769 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.s.i and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.s.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i
index 201db20..3e02498 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/bytes__bsd__zero.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/bytes__bsd__zero.inline.hpp.i
index b273eb0..bc3a1a5 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/bytes__bsd__zero.inline.hpp.i and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/bytes__bsd__zero.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i
index 4031942..c410c42 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/copy__windows__x86.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/copy__windows__x86.inline.hpp.i
index 33dc8eb..9ed11c3 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/copy__windows__x86.inline.hpp.i and b/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/copy__windows__x86.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/asm/code_buffer.cpp.i b/hotspot/.hg/store/data/src/share/vm/asm/code_buffer.cpp.i
index 0bf85fe..3fb60c9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/asm/code_buffer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/asm/code_buffer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/asm/code_buffer.hpp.i b/hotspot/.hg/store/data/src/share/vm/asm/code_buffer.hpp.i
index abbc183..5b3eaf1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/asm/code_buffer.hpp.i and b/hotspot/.hg/store/data/src/share/vm/asm/code_buffer.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.hpp.i
index 6a6edb6..67b8ac5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i
index 22ce91e..35e9dd3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i
index 95d8318..128d9c3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i
index 9d529b3..cd9b97e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i
index e97f716..9b08f56 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.hpp.i
index 522bed3..97a8895 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_env.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_env.cpp.i
index e0dda77..0e198f9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_env.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_env.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i
index 1486695..c435494 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_method.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_method.cpp.i
index fac630c..fbd3372 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_method.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_method.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_method.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_method.hpp.i
index bf85faa..84d3d5e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_method.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_method.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.cpp.i
index d501788..22d59a6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.hpp.i
index 54775a4..470a27f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.cpp.i
index baca787..8206398 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.hpp.i
index d6e8f5c..a54c3cc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_signature.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_signature.cpp.i
index f93e67f..07a49fa 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_signature.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_signature.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_signature.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_signature.hpp.i
index 2321b51..70315d8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_signature.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_signature.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i
index 516559a..91180a8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.hpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.hpp.i
index 9ad2433..f31bf5e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.hpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/dependencies.cpp.i b/hotspot/.hg/store/data/src/share/vm/code/dependencies.cpp.i
index bc096ec..f877c5b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/dependencies.cpp.i and b/hotspot/.hg/store/data/src/share/vm/code/dependencies.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i b/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i
index a9e3e07..1af7175 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i and b/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.cpp.i b/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.cpp.i
index f199659..0d0673c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.cpp.i and b/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/compactible_free_list_space.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/compactible_free_list_space.cpp.i
index 8809191..a784863 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/compactible_free_list_space.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/compactible_free_list_space.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/compactible_free_list_space.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/compactible_free_list_space.hpp.i
index 9e51223..2dc36c4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/compactible_free_list_space.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/compactible_free_list_space.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i
index a9d93f5..8f25915 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/vm_c_m_s_operations.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/vm_c_m_s_operations.cpp.i
index e3083cd..c3049a9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/vm_c_m_s_operations.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/vm_c_m_s_operations.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i
index 2648df5..6e8d8d8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.hpp.i
index 5428017..2a23b59 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i
index 116794a..d1a92c0 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i
index 40b79e9..96516b8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i
index a85b52f..0db32e9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i
index d2fce40..3e87efc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d
index 51ca870..bdbd8f1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i
index 2922ec9..dd9e8c6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i
index 6d4c061..401a652 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i
index 565a007..d436009 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i
index ed9b48f..86b17e2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_mark_sweep.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_mark_sweep.cpp.i
index 3044016..14db12b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_mark_sweep.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_mark_sweep.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.cpp.i
index 7802b5a..0fec6e9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.hpp.i
index 1aa2d19..decd485 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i
index 03a2e3a..49015bc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.cpp.i
index 558a568..7dccaac 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i
index fe27788..0262b8e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i
index 815b592..e6b49b5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.cpp.i
index 9079486..32cbae3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.hpp.i
index 2810c51..9f06610 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_seq.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_seq.hpp.i
index 2626dee..5c9c359 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_seq.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_seq.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.cpp.i
index 5a2ac14..94d3dc6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.hpp.i
index 96d7944..743db90 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_sets.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_sets.cpp.i
index a6adc04..7aa99c3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_sets.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_sets.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_sets.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_sets.hpp.i
index 4c5c4a1..43b4f30 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_sets.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_sets.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/satb_queue.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/satb_queue.cpp.i
index c4777c0..f5aeb49 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/satb_queue.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/satb_queue.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i
index 6a7b0a4..05a9bb5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.hpp.i
index 5c14ef8..33902d6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm_structs__g1.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm_structs__g1.hpp.i
new file mode 100644
index 0000000..81ce2b6
Binary files /dev/null and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm_structs__g1.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i
index 649117e..b173548 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.hpp.i
index 35d6b82..12623e2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i
index d2e2ee4..5f2df76 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i
index 1c502b1..380c5b6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_l_a_b.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_l_a_b.cpp.i
index e3dce77..4e99404 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_l_a_b.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_l_a_b.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_l_a_b.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_l_a_b.hpp.i
index bac6fa9..7b0673c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_l_a_b.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_l_a_b.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.cpp.i
index 488f754..715f9e9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.cpp.i
index a96ba22..155569c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/concurrent_g_c_thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/concurrent_g_c_thread.cpp.i
index 126bec9..3856803 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/concurrent_g_c_thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/concurrent_g_c_thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/generation_counters.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/generation_counters.cpp.i
index b502d56..9a79b0e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/generation_counters.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/generation_counters.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/generation_counters.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/generation_counters.hpp.i
index 802ed5b..5b5feef 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/generation_counters.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/generation_counters.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/vm_g_c_operations.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/vm_g_c_operations.cpp.i
index 64574e1..65f97f8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/vm_g_c_operations.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/vm_g_c_operations.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i
index b083aab..c9bead4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i
index 6d5d983..7d1b19e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.cpp.i
index 6676413..43a0cf6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode.hpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode.hpp.i
index 2946e99..cdd9f90 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_tracer.cpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_tracer.cpp.i
index e2e6b13..89d60a8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_tracer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_tracer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i
index 6c9a191..085a4f8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/libadt/vectset.cpp.i b/hotspot/.hg/store/data/src/share/vm/libadt/vectset.cpp.i
index 6e9d9d6..b4b320d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/libadt/vectset.cpp.i and b/hotspot/.hg/store/data/src/share/vm/libadt/vectset.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/libadt/vectset.hpp.i b/hotspot/.hg/store/data/src/share/vm/libadt/vectset.hpp.i
index 9552fbc..297871c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/libadt/vectset.hpp.i and b/hotspot/.hg/store/data/src/share/vm/libadt/vectset.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i
index 8cfc67b..1bb11e9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.hpp.i
index 14e4bf7..9a5d8ad 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/reference_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/reference_policy.cpp.i
index 4fb3ef4..bd1d02d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/reference_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/reference_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/reference_policy.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/reference_policy.hpp.i
index ec3cc0a..ef7f180 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/reference_policy.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/reference_policy.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.cpp.i
index 0a0ef2e..4264676 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.hpp.i
index 3d60518..2d2396f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i
index 4914188..0fc03df 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i
index 8d87347..0223aec 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/array_oop.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/array_oop.cpp.i
index 2c94777..e3ddeac 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/array_oop.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/array_oop.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/array_oop.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/array_oop.hpp.i
index 0ef87e4..682dc4e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/array_oop.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/array_oop.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_klass.cpp.i
index 3db8c6d..8b5702b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i
index 6b19659..9f90c94 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/instance_mirror_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/instance_mirror_klass.cpp.i
index 7ad53df..d518f29 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/instance_mirror_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/instance_mirror_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/addnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/addnode.cpp.i
index 2ead532..5224c73 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/addnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/addnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i
index ab9daa6..c327973 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/call_generator.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/call_generator.cpp.i
index dd72bc8..44af5ff 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/call_generator.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/call_generator.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i
index fb8566c..97f041f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/connode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/connode.cpp.i
index c666f7e..927689e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/connode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/connode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/escape.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/escape.cpp.i
index 8bfcb56..3834f5c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/escape.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/escape.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/escape.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/escape.hpp.i
index f32f32c..635856b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/escape.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/escape.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i
index 4508e35..0834299 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/loopnode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/loopnode.hpp.i
index 0c591eb..19be719 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/loopnode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/loopnode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/loopopts.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/loopopts.cpp.i
index dc7c1d4..f08428a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/loopopts.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/loopopts.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/machnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/machnode.cpp.i
index 885ead8..79e63cc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/machnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/machnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/matcher.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/matcher.cpp.i
index bd83980..9a2f05b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/matcher.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/matcher.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/matcher.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/matcher.hpp.i
index 43b66d9..2a41e9a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/matcher.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/matcher.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i
index 69f319f..10e3387 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/phase_x.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/phase_x.cpp.i
index 9086a31..c9e563c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/phase_x.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/phase_x.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/runtime.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/runtime.cpp.i
index 34708c2..6ccb557 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/runtime.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/runtime.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/runtime.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/runtime.hpp.i
index f0c1f9a..150ee4e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/runtime.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/runtime.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/precompiled/precompiled.hpp.i b/hotspot/.hg/store/data/src/share/vm/precompiled/precompiled.hpp.i
new file mode 100644
index 0000000..e04e0f3
Binary files /dev/null and b/hotspot/.hg/store/data/src/share/vm/precompiled/precompiled.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jni.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jni.cpp.i
index 5cb349b..29a3575 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jni.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jni.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jni_check.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jni_check.cpp.i
index 5a42342..788d846 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jni_check.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jni_check.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i
index 7e63d45..b0135b4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvm.h.i b/hotspot/.hg/store/data/src/share/vm/prims/jvm.h.i
index e12fdbf..da11621 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvm.h.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvm.h.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_enter.xsl.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_enter.xsl.i
index 177949f..85a1b02 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_enter.xsl.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_enter.xsl.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env.cpp.i
index 1316ee1..cc9623a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.cpp.i
index 99ad89d..e1df4dc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.cpp.i
index b3df830..928a3db 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/method_handles.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/method_handles.cpp.i
index bec94d4..af04469 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/method_handles.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/method_handles.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/unsafe.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/unsafe.cpp.i
index c187a12..9f811ad 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/unsafe.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/unsafe.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i
index 7c133f5..96a2799 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i
index a2dd735..f6f5b54 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/frame.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/frame.cpp.i
index 66895e9..4f154dd 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/frame.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/frame.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i
index 0844df7..9d48cd8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i
index a9e5cf8..8a97b3e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i
index 5d179db..0b8a85e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/java.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/java.cpp.i
index de7432f..d5ef94b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/java.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/java.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/object_monitor.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/object_monitor.cpp.i
index 6224eca..bb4187c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/object_monitor.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/object_monitor.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i
index 71b2a02..1e1c793 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i
index efc0a98..e7c0fc6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i
index d2ba85e..7654066 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/synchronizer.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/synchronizer.cpp.i
index fa396fc..8dc5ab5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/synchronizer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/synchronizer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i
index 3f7f03f..4a2faa2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i
index 5d0a55a..839e735 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i
index 8d78596..0503ed8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i
index bca0174..af3bdc6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.cpp.i
index f0f035d..3522ec5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/class_loading_service.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/class_loading_service.cpp.i
index c9f25a5..4e5cef2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/class_loading_service.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/class_loading_service.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.cpp.i
index cb5c660..b7b49f8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.hpp.i b/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.hpp.i
index 600c18c..c404443 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.hpp.i and b/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/heap_dumper.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/heap_dumper.cpp.i
index 0dcfb07..96ecbed 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/heap_dumper.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/heap_dumper.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/memory_manager.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/memory_manager.cpp.i
index f18a022..b954a29 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/memory_manager.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/memory_manager.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/runtime_service.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/runtime_service.cpp.i
index 48e3f97..6e1adf8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/runtime_service.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/runtime_service.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/thread_service.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/thread_service.cpp.i
index 8c11732..96043e6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/thread_service.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/thread_service.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i
index c5ea4e2..2f5f3b6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/dtrace.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/dtrace.hpp.i
index 2d7b258..8bb48a4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/dtrace.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/dtrace.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/dtrace__usdt2__disabled.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/dtrace__usdt2__disabled.hpp.i
new file mode 100644
index 0000000..4052af8
Binary files /dev/null and b/hotspot/.hg/store/data/src/share/vm/utilities/dtrace__usdt2__disabled.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions.hpp.i
index 9205924..cb5d8b9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/hashtable.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/hashtable.cpp.i
index 8738d95..871fd18 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/hashtable.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/hashtable.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/quick_sort.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/quick_sort.cpp.i
index 77f0b90..42c6cb0 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/quick_sort.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/quick_sort.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i
index 76b6270..3365591 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i differ
diff --git a/hotspot/.hg/store/data/test/_makefile.i b/hotspot/.hg/store/data/test/_makefile.i
index 281e144..85ca7ce 100644
Binary files a/hotspot/.hg/store/data/test/_makefile.i and b/hotspot/.hg/store/data/test/_makefile.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/6865265/_stack_overflow_bug.java.i b/hotspot/.hg/store/data/test/compiler/6865265/_stack_overflow_bug.java.i
new file mode 100644
index 0000000..47feeea
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/6865265/_stack_overflow_bug.java.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/7100757/_test7100757.java.i b/hotspot/.hg/store/data/test/compiler/7100757/_test7100757.java.i
new file mode 100644
index 0000000..6ce488d
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/7100757/_test7100757.java.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/7103261/_test7103261.java.i b/hotspot/.hg/store/data/test/compiler/7103261/_test7103261.java.i
new file mode 100644
index 0000000..4dd424c
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/7103261/_test7103261.java.i differ
diff --git a/hotspot/.hg/store/data/test/runtime/7100935/_test_conjoint_atomic_arraycopy.java.i b/hotspot/.hg/store/data/test/runtime/7100935/_test_conjoint_atomic_arraycopy.java.i
new file mode 100644
index 0000000..65c2a27
Binary files /dev/null and b/hotspot/.hg/store/data/test/runtime/7100935/_test_conjoint_atomic_arraycopy.java.i differ
diff --git a/hotspot/.hg/store/data/test/runtime/7100935/_test_short_arraycopy.java.i b/hotspot/.hg/store/data/test/runtime/7100935/_test_short_arraycopy.java.i
new file mode 100644
index 0000000..7944ac6
Binary files /dev/null and b/hotspot/.hg/store/data/test/runtime/7100935/_test_short_arraycopy.java.i differ
diff --git a/hotspot/.hg/store/data/~2ehgignore.i b/hotspot/.hg/store/data/~2ehgignore.i
index 1f0ae96..a28c1de 100644
Binary files a/hotspot/.hg/store/data/~2ehgignore.i and b/hotspot/.hg/store/data/~2ehgignore.i differ
diff --git a/hotspot/.hg/store/data/~2ehgtags.i b/hotspot/.hg/store/data/~2ehgtags.i
index a67c6bc..1b9b5f0 100644
Binary files a/hotspot/.hg/store/data/~2ehgtags.i and b/hotspot/.hg/store/data/~2ehgtags.i differ
diff --git a/hotspot/.hg/store/fncache b/hotspot/.hg/store/fncache
index 9fe4c07..e24c03f 100644
--- a/hotspot/.hg/store/fncache
+++ b/hotspot/.hg/store/fncache
@@ -1,27 +1,30 @@
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLoadInstruction.java.i
+data/src/share/vm/memory/universe.cpp.i
data/make/windows/projectfiles/compiler2/vm.def.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadContext.java.i
data/make/windows/platform_ia64.i
data/test/gc/6941923/test6941923.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9IntRegisterBranchDecoder.java.i
data/agent/src/scripts/README.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java.i
+data/test/compiler/6636138/Test1.java.i
data/src/cpu/zero/vm/nativeInst_zero.hpp.i
data/src/cpu/zero/vm/vmreg_zero.cpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/manifest.mf.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedByte.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FlushDecoder.java.i
+data/src/share/vm/code/vmreg.cpp.i
data/test/compiler/5091921/Test6897150.java.i
-data/src/share/vm/opto/regalloc.cpp.i
+data/src/share/vm/services/heapDumper.cpp.i
+data/src/share/vm/opto/subnode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberVisitor.java.i
+data/agent/src/os/win32/Buffer.cpp.i
data/src/share/vm/shark/sharkFunction.hpp.i
data/test/compiler/5091921/Test6186134.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java.i
data/test/compiler/5091921/Test6850611.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVrInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/InstructionVisitor.java.i
+data/src/share/vm/oops/typeArrayKlass.cpp.i
data/src/share/vm/utilities/quickSort.cpp.i
-data/test/Makefile.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java.i
+data/src/share/vm/prims/jni.h.i
data/src/cpu/x86/vm/vm_version_x86.hpp.i
data/src/os/windows/vm/attachListener_windows.cpp.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/build.xml.i
@@ -43,17 +46,16 @@ data/agent/src/os/linux/elfmacros.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FloatRegisters.java.i
data/src/os/windows/vm/osThread_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/NonConcreteMethodImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/ProcessListPanel.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java.i
+data/test/compiler/6716441/Tester.java.i
+data/test/compiler/6805724/Test6805724.java.i
data/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalPub.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CMoveDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/SAListener.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/Bundle.properties.i
data/build/linux/makefiles/adjust-mflags.sh.i
data/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/InstructionDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteOopHandle.java.i
+data/src/cpu/zero/vm/bytecodes_zero.hpp.i
data/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame.gif.i
data/src/os/windows/vm/os_windows.cpp.i
@@ -63,12 +65,11 @@ data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGener
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedShort.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/DoubleTreeNodeAdapter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32Debugger.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTracePanel.java.i
-data/build/windows/projectfiles/compiler1/vm.def.i
-data/agent/doc/ReadMe-JavaScript.text.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java.i
+data/make/linux/makefiles/sparc.make.i
data/make/solaris/makefiles/mapfile-vers.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32DebuggerLocal.java.i
-data/src/os/solaris/dtrace/libjvm_db.h.i
+data/src/share/tools/MakeDeps/WinGammaPlatformVC8.java.i
data/agent/make/heapdumpwindbg.bat.i
data/src/share/vm/runtime/hpi.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialRegisterInstruction.java.i
@@ -79,29 +80,26 @@ data/agent/src/os/solaris/dbx/proc_service_2.h.i
data/src/share/vm/services/gcNotifier.hpp.i
data/src/cpu/x86/vm/c1_FrameMap_x86.hpp.i
data/src/share/vm/shark/sharkStateScanner.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java.i
data/src/cpu/x86/vm/bytes_x86.hpp.i
data/src/share/vm/opto/adlcVMDeps.hpp.i
data/test/compiler/6663854/Test6663854.java.i
data/src/share/vm/runtime/perfData.cpp.i
data/src/share/vm/utilities/exceptions.cpp.i
-data/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java.i
data/make/jprt.config.i
-data/agent/test/jdi/runjdb.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/PackageNameFilter.java.i
data/src/share/vm/code/dependencies.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadFactory.java.i
data/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FloatRegister.java.i
+data/make/windows/makefiles/debug.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedChar.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java.i
data/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp.i
+data/src/share/vm/utilities/yieldingWorkgroup.cpp.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.xml.i
data/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DumpExports.java.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties.i
data/agent/make/jsdbwindbg64.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxWeakExternalRecord.java.i
data/src/share/vm/classfile/resolutionErrors.hpp.i
@@ -113,15 +111,17 @@ data/make/solaris/reorder.sh.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/DeadlockDetector.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Register.java.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java.i
data/src/share/vm/gc_implementation/shared/gcUtil.hpp.i
+data/src/share/vm/utilities/array.hpp.i
data/src/share/vm/c1/c1_Compiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties.i
data/src/share/vm/ci/ciMethodBlocks.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/WorkerThread.java.i
-data/make/windows/get_msc_ver.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SpecialRegisters.java.i
data/make/windows/projectfiles/kernel/vm.dsw.i
data/agent/src/share/classes/com/sun/java/swing/ui/OkCancelDialog.java.i
-data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/suite.properties.i
+data/src/share/vm/opto/memnode.cpp.i
data/src/share/vm/prims/jvmtiEnvFill.java.i
data/src/share/vm/memory/defNewGeneration.inline.hpp.i
data/src/share/vm/utilities/bitMap.cpp.i
@@ -130,14 +130,16 @@ data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/co
data/make/bsd/platform_i486.suncc.i
data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp.i
data/src/share/vm/runtime/threadLocalStorage.hpp.i
+data/src/share/vm/code/location.hpp.i
data/src/os/solaris/vm/os_solaris.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlassKlass.java.i
data/src/share/vm/adlc/dfa.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/NotInHeapException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CStringTreeNodeAdapter.java.i
-data/build/windows/makefiles/debug.make.i
+data/make/solaris/makefiles/reorder_CORE_i486.i
data/src/share/tools/IdealGraphVisualizer/Util/manifest.mf.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodKlass.java.i
+data/src/share/vm/memory/gcLocker.cpp.i
+data/src/share/vm/shark/sharkNativeWrapper.cpp.i
data/build/windows/projectfiles/compiler1/Makefile.i
data/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp.i
data/src/share/vm/runtime/perfMemory.hpp.i
@@ -146,14 +148,15 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcL
data/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayData.java.i
data/src/share/vm/memory/genOopClosures.hpp.i
data/make/solaris/makefiles/amd64.make.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java.i
data/src/share/vm/ci/ciNullObject.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java.i
+data/src/share/vm/runtime/globals.hpp.i
data/src/share/vm/runtime/init.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java.i
+data/agent/src/os/win32/SwDbgSrv.dsw.i
data/src/share/vm/code/scopeDesc.cpp.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties.i
+data/src/share/vm/runtime/fprofiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCMemoryInstruction.java.i
data/src/share/vm/oops/symbolOop.hpp.i
@@ -163,49 +166,46 @@ data/make/windows/build.make.i
data/src/share/vm/prims/jvmtiCodeBlobEvents.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java.i
-data/src/share/vm/oops/constantPoolOop.hpp.i
+data/build/solaris/makefiles/hp1.make.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Helper.java.i
data/agent/make/jhistoproc.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadFactory.java.i
data/src/share/vm/memory/genRemSet.cpp.i
data/src/share/vm/runtime/reflectionUtils.cpp.i
-data/agent/test/jdi/serialvm.java.i
-data/src/cpu/sparc/vm/vtableStubs_sparc.cpp.i
-data/src/cpu/x86/vm/c1_LinearScan_x86.cpp.i
data/src/share/vm/opto/memnode.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86XMMRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPArithmeticDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBaseClass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadFactory.java.i
data/src/share/vm/runtime/os.cpp.i
data/build/solaris/makefiles/buildtree.make.i
data/agent/make/index.html.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/Open16.gif.i
+data/make/bsd/makefiles/mapfile-vers-jsig.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/removeall.gif.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/SlotLayout.java.i
data/src/share/vm/opto/phaseX.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java.i
-data/src/os_cpu/linux_x86/vm/prefetch_linux_x86.inline.hpp.i
+data/src/os/bsd/dtrace/hs_private.d.i
+data/agent/make/pstackwindbg.bat.i
data/agent/test/libproc/Makefile.i
-data/make/solaris/makefiles/reorder_COMPILER2_sparc.i
-data/src/share/vm/gc_implementation/g1/survRateGroup.cpp.i
+data/agent/make/heapdumpproc64.sh.i
+data/src/cpu/sparc/vm/c2_globals_sparc.hpp.i
+data/src/share/vm/memory/filemap.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeMultiANewArray.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSaveInstruction.java.i
-data/src/share/vm/c1/c1_CodeStubs.hpp.i
-data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/LoopNode.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java.i
+data/src/share/tools/MakeDeps/DirectoryTree.java.i
+data/agent/src/os/linux/ps_core.c.i
+data/src/os/bsd/vm/decoder_bsd.cpp.i
data/agent/test/jdi/runsa.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/JmplDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/resources/triangle.png.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcModule.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java.i
data/src/share/vm/memory/barrierSet.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcThreadFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxOopHandle.java.i
+data/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DLLCharacteristics.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32CDebugger.java.i
-data/src/share/vm/shark/sharkIntrinsics.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java.i
data/src/share/vm/interpreter/bytecodeHistogram.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86XMMRegisters.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp.i
@@ -214,31 +214,27 @@ data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionFlags.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CompressedLineNumberReadStream.java.i
data/src/cpu/x86/vm/globals_x86.hpp.i
-data/src/share/vm/shark/sharkFunction.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif.i
+data/make/bsd/makefiles/ppc.make.i
+data/src/share/vm/utilities/array.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFlushInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/VoidValueImpl.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp.i
-data/agent/make/start-debug-server-windbg.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/DataSource.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheKlass.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86ShiftInstruction.java.i
-data/src/os/bsd/vm/os_share_bsd.hpp.i
data/src/share/vm/runtime/extendedPC.hpp.i
data/make/solaris/makefiles/build_vm_def.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java.i
-data/src/cpu/x86/vm/jniFastGetField_x86_32.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64Thread.java.i
-data/test/compiler/7046096/Test7046096.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicVoidType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/JVMDIClassStatus.java.i
data/test/compiler/5091921/Test7005594.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegister.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java.i
data/src/share/vm/adlc/arena.hpp.i
data/src/os/windows/vm/dtraceJSDT_windows.cpp.i
data/make/linux/platform_sparc.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindCrashesAction.java.i
-data/src/cpu/x86/vm/icache_x86.hpp.i
+data/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FlushwInstruction.java.i
data/agent/make/hsdb.sh.i
@@ -246,15 +242,15 @@ data/src/share/vm/opto/escape.cpp.i
data/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp.i
data/src/share/vm/ci/ciTypeArrayKlassKlass.cpp.i
data/test/compiler/6896727/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/JCharField.java.i
+data/src/cpu/x86/vm/dump_x86_64.cpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Property.java.i
data/agent/src/os/solaris/proc/salibproc.h.i
data/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerField.java.i
data/src/share/vm/runtime/park.cpp.i
data/src/share/vm/opto/c2_globals.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java.i
-data/src/share/tools/launcher/wildcard.h.i
+data/src/share/vm/runtime/relocator.cpp.i
data/make/solaris/platform_sparcv9.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickHandler.java.i
data/src/os_cpu/linux_x86/vm/os_linux_x86.cpp.i
@@ -264,31 +260,30 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerServer.java.i
data/test/compiler/6946040/TestCharShortByteSwap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/MonitorValue.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/UnimpDecoder.java.i
data/src/os/solaris/vm/decoder_solaris.cpp.i
data/src/share/vm/prims/jvmtiHpp.xsl.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/UnalignedAddressException.java.i
-data/src/share/vm/adlc/formsopt.hpp.i
+data/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/AddressTreeNodeAdapter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/manifest.mf.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegisters.java.i
data/agent/make/finalizerinfowindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegister.java.i
data/src/cpu/sparc/vm/frame_sparc.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlassKlass.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_ia64/Win32IA64JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/SimpleTreeTableModel.java.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java.i
data/build/linux/makefiles/mapfile-vers-debug.i
-data/src/cpu/zero/vm/interpreterFrame_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDescEnums.java.i
data/src/share/vm/classfile/classFileStream.cpp.i
data/build/solaris/makefiles/gcc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java.i
-data/test/compiler/6716441/Tester.java.i
-data/src/share/vm/classfile/classFileStream.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/ProcessListPanel.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp.i
data/src/share/vm/memory/gcLocker.inline.hpp.i
-data/test/compiler/6805724/Test6805724.java.i
data/build/linux/platform_sparc.i
data/agent/src/os/linux/salibelf.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEInstructionDecoder.java.i
@@ -297,11 +292,11 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SpecialRegisterIns
data/src/share/vm/asm/codeBuffer.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/ActionManager.java.i
data/make/linux/makefiles/mapfile-vers-jsig.i
-data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/genfiles.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlassKlass.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java.i
-data/agent/make/jcorewindbg64.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorDecoder.java.i
data/src/share/vm/runtime/java.cpp.i
-data/src/os/bsd/vm/osThread_bsd.hpp.i
+data/src/share/vm/opto/ifnode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java.i
data/src/share/vm/gc_implementation/shared/generationCounters.hpp.i
@@ -320,25 +315,26 @@ data/src/share/vm/memory/blockOffsetTable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9WriteDecoder.java.i
data/make/linux/makefiles/shark.make.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java.i
-data/src/share/vm/c1/c1_ValueMap.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CompiledICHolder.java.i
data/src/os_cpu/windows_x86/vm/assembler_windows_x86.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFProgramHeader.java.i
+data/src/share/vm/shark/sharkCacheDecache.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetPut.java.i
-data/src/os/windows/vm/interfaceSupport_windows.hpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties.i
+data/src/share/vm/opto/parse.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java.i
-data/src/os/linux/vm/mutex_linux.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceStoreDecoder.java.i
-data/src/share/vm/memory/resourceArea.hpp.i
+data/src/share/vm/oops/oop.psgc.inline.hpp.i
+data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.hpp.i
+data/src/cpu/x86/vm/vmStructs_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java.i
data/src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp.i
data/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java.i
data/src/share/vm/oops/cpCacheKlass.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SwapDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java.i
-data/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/manifest.mf.i
data/src/share/vm/runtime/stubRoutines.cpp.i
data/src/cpu/x86/vm/debug_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionType.java.i
@@ -349,9 +345,9 @@ data/src/os/bsd/vm/os_bsd.inline.hpp.i
data/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp.i
data/make/solaris/platform_sparc.i
data/src/cpu/sparc/vm/assembler_sparc.hpp.i
+data/src/share/vm/services/memoryService.hpp.i
data/src/cpu/sparc/vm/disassembler_sparc.cpp.i
data/src/share/vm/oops/constantPoolKlass.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicFieldWrapper.java.i
data/agent/src/os/win32/nt4internals.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeFastIAccess0.java.i
@@ -366,41 +362,40 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCUnimpInstruction.jav
data/test/compiler/6916644/Test6916644.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDesc.java.i
data/src/share/vm/runtime/synchronizer.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialRegisters.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java.i
+data/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp.i
data/agent/test/jdi/sagtarg.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LocalSym.java.i
data/agent/src/share/classes/com/sun/java/swing/action/DelegateAction.java.i
data/src/cpu/zero/vm/vm_version_zero.hpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/JavaSE6ScriptEngine.java.i
data/src/cpu/x86/vm/interp_masm_x86_64.hpp.i
-data/src/share/vm/shark/sharkIntrinsics.cpp.i
-data/src/os/windows/vm/mutex_windows.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java.i
+data/src/share/vm/memory/barrierSet.inline.hpp.i
+data/src/share/vm/ci/ciSignature.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBTree.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceSwapDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CompiledICHolderKlass.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/Bundle.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC32Bit.java.i
+data/build/windows/makefiles/shared.make.i
data/src/cpu/x86/vm/methodHandles_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java.i
-data/make/linux/makefiles/sparc.make.i
+data/build/windows/projectfiles/compiler1/vm.def.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/IntegerBranchDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlassKlass.java.i
data/src/share/vm/runtime/frame.cpp.i
data/src/share/vm/gc_implementation/g1/g1OopClosures.hpp.i
data/src/os/linux/vm/interfaceSupport_linux.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolEnums.java.i
data/build/solaris/makefiles/reorder_TIERED_amd64.i
data/agent/test/libproc/libproctest64.sh.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp.i
+data/src/share/vm/adlc/archDesc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/MemRegion.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Opcodes.java.i
data/src/share/vm/compiler/oopMap.cpp.i
data/agent/src/os/win32/toolHelp.hpp.i
-data/agent/make/dumpflagswindbg.bat.i
data/src/share/tools/IdealGraphVisualizer/View/nbproject/project.xml.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupOrganizer.i
data/src/share/vm/services/attachListener.hpp.i
@@ -408,41 +403,44 @@ data/src/share/vm/ci/ciCallProfile.hpp.i
data/src/share/vm/interpreter/oopMapCache.hpp.i
data/src/share/vm/code/exceptionHandlerTable.cpp.i
data/agent/src/share/native/jvmdi/sa.dsw.i
-data/agent/make/dumpflagswindbg64.bat.i
+data/src/share/tools/IdealGraphVisualizer/View/nbproject/genfiles.properties.i
+data/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicType.java.i
data/src/share/vm/oops/methodOop.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ValueContainer.java.i
+data/build/windows/makefiles/generated.make.i
+data/src/share/vm/memory/heapInspection.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFPMoveInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleSpace.java.i
data/src/share/vm/memory/genRemSet.hpp.i
data/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp.i
-data/src/share/vm/c1/c1_Runtime1.hpp.i
data/agent/src/os/linux/LinuxDebuggerLocal.c.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java.i
data/src/share/vm/ci/ciStreams.hpp.i
data/src/os/bsd/vm/vmError_bsd.cpp.i
-data/make/linux/makefiles/buildtree.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaMethod.java.i
data/src/share/vm/prims/jvmtiGen.java.i
+data/make/windows/makefiles/projectcreator.make.i
data/src/os/solaris/vm/objectMonitor_solaris.cpp.i
data/src/share/vm/oops/constantPoolOop.cpp.i
data/test/runtime/6929067/invoke.c.i
data/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicNarrowOopField.java.i
data/src/share/vm/memory/blockOffsetTable.hpp.i
-data/src/os/solaris/vm/thread_solaris.inline.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties.i
data/agent/src/os/bsd/libproc_impl.h.i
-data/test/compiler/6973329/Test.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadContext.java.i
data/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp.i
data/test/compiler/6860469/Test.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/platform.properties.i
data/src/cpu/sparc/vm/stubRoutines_sparc.cpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSets.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeFastAAccess0.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Delete24.gif.i
-data/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml.i
+data/src/share/vm/prims/jvmtiEventController.hpp.i
data/src/os/solaris/vm/dtraceJSDT_solaris.cpp.i
+data/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp.i
data/build/linux/makefiles/vm.make.i
+data/src/share/vm/opto/loopTransform.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/c1/Runtime1.java.i
data/agent/src/os/solaris/proc/Makefile.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java.i
@@ -450,9 +448,7 @@ data/src/share/vm/utilities/bitMap.hpp.i
data/src/share/vm/oops/symbol.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ScopeValue.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethodKlass.java.i
-data/agent/src/os/win32/ioUtils.hpp.i
-data/make/bsd/makefiles/zero.make.i
-data/test/compiler/7048332/Test7048332.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfMemory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/GlobalSym.java.i
data/src/share/vm/memory/allocation.inline.hpp.i
data/src/cpu/x86/vm/vm_version_x86_64.cpp.i
@@ -476,34 +472,35 @@ data/src/cpu/x86/vm/assembler_x86_64.inline.hpp.i
data/src/os/windows/vm/objectMonitor_windows.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/JInternalFrameWrapper.java.i
-data/agent/make/clhsdbwindbg64.bat.i
+data/src/share/vm/classfile/vmSymbols.hpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.properties.i
data/src/share/vm/asm/codeBuffer.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/CIntegerField.java.i
+data/src/cpu/x86/vm/stubRoutines_x86_64.hpp.i
data/src/share/vm/c1/c1_globals.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/SymbolKlass.java.i
data/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java.i
data/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp.i
data/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp.i
data/src/share/vm/shark/sharkValue.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegisters.java.i
data/build/windows/jvmexp.lcf.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/WindowsNTSubsystem.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp.i
data/agent/make/bugspot.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicNamedFieldIdentifier.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/Page.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/TypeImpl.java.i
data/src/share/vm/prims/methodHandles.hpp.i
+data/src/share/vm/runtime/deoptimization.cpp.i
data/src/share/vm/runtime/reflection.hpp.i
-data/src/cpu/sparc/vm/vmreg_sparc.hpp.i
+data/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp.i
data/src/cpu/x86/vm/vmreg_x86.hpp.i
data/agent/src/os/linux/libproc_impl.h.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFile.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/Win32VtblAccess.java.i
+data/src/os/bsd/vm/os_share_bsd.hpp.i
data/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPreComp.java.i
+data/make/linux/makefiles/debug.make.i
data/src/share/vm/c1/c1_Compiler.cpp.i
data/src/share/vm/memory/generationSpec.hpp.i
data/make/linux/makefiles/dtrace.make.i
@@ -511,12 +508,12 @@ data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeVisitor.java.i
data/make/cscope.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadContext.java.i
data/src/os/solaris/vm/attachListener_solaris.cpp.i
-data/make/bsd/makefiles/defs.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadFactory.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeRootInputs.filter.i
data/src/share/vm/utilities/elfStringTable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LineInfo.java.i
data/make/linux/makefiles/vm.make.i
+data/src/share/vm/gc_implementation/shared/coTracker.cpp.i
data/src/share/vm/oops/cpCacheKlass.cpp.i
data/src/share/vm/runtime/stackValueCollection.hpp.i
data/agent/src/os/solaris/dbx/svc_agent_dbx.cpp.i
@@ -529,15 +526,14 @@ data/src/share/vm/interpreter/invocationCounter.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/PageCache.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIllegalInstruction.java.i
data/src/share/vm/oops/methodKlass.hpp.i
-data/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPathElement.java.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ShortField.java.i
-data/build/sa.files.i
+data/src/share/vm/shark/sharkState.hpp.i
data/agent/src/os/bsd/Makefile.i
data/src/cpu/sparc/vm/disassembler_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java.i
data/build/solaris/makefiles/tiered.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactingPermGen.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java.i
data/src/os_cpu/windows_x86/vm/os_windows_x86.cpp.i
data/src/cpu/x86/vm/vtableStubs_x86_32.cpp.i
@@ -546,7 +542,7 @@ data/make/solaris/platform_i486.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SethiDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/HeapDumper.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86JmpInstruction.java.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java.i
data/src/share/vm/opto/domgraph.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/StringTransferable.java.i
data/build/windows/makefiles/fastdebug.make.i
@@ -554,7 +550,6 @@ data/agent/src/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java.i
data/agent/src/os/win32/nt4internals.hpp.i
data/src/share/vm/runtime/vframeArray.hpp.i
data/src/share/vm/runtime/stubRoutines.hpp.i
-data/agent/make/jsdbwindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java.i
data/src/share/vm/runtime/stackValueCollection.cpp.i
data/agent/make/start-debug-server.i
@@ -565,6 +560,7 @@ data/make/windows/create_obj_files.sh.i
data/src/cpu/x86/vm/dump_x86_32.cpp.i
data/src/share/vm/oops/objArrayKlass.hpp.i
data/src/share/vm/memory/oopFactory.cpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/build.xml.i
data/agent/src/share/classes/com/sun/java/swing/action/FileMenu.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86DirectAddress.java.i
@@ -572,7 +568,7 @@ data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMObjectFactory.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestDebugInfo.java.i
-data/make/bsd/platform_zero.in.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form.i
data/test/compiler/6724218/Test.java.i
data/build/windows/cross_build.bat.i
data/src/share/vm/oops/methodDataOop.hpp.i
@@ -586,18 +582,19 @@ data/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeLeafIndices.java.i
data/src/share/vm/memory/collectorPolicy.cpp.i
data/agent/src/os/solaris/dbx/shell_imp.h.i
+data/test/runtime/6626217/You_Have_Been_P0wned.java.i
data/build/windows/makefiles/top.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/DefaultScriptObject.java.i
data/build/solaris/makefiles/mapfile-vers-debug.i
-data/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep.i
-data/src/cpu/x86/vm/frame_x86.hpp.i
-data/src/share/vm/classfile/classFileError.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java.i
+data/test/compiler/5091921/Test6959129.java.i
+data/test/compiler/6910618/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEMoveDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLoadDecoder.java.i
data/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp.i
-data/src/cpu/x86/vm/c1_FpuStackSim_x86.hpp.i
-data/test/compiler/7068051/Test7068051.java.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java.i
+data/src/share/vm/runtime/globals.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/JavaLineNumberInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/LocalVariableTableElement.java.i
data/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp.i
@@ -611,11 +608,11 @@ data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeTableswitch.jav
data/src/share/vm/gc_implementation/shared/vmGCOperations.hpp.i
data/agent/src/os/win32/ports.h.i
data/src/share/vm/c1/c1_IR.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Registers.java.i
+data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp.i
data/make/bsd/build.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Register.java.i
data/src/share/vm/gc_implementation/shared/markSweep.inline.hpp.i
+data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/Dictionary.java.i
data/src/share/vm/runtime/memprofiler.hpp.i
@@ -625,18 +622,17 @@ data/agent/make/permstatproc.sh.i
data/test/compiler/6857159/Test6857159.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaVM.java.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/Immediate.java.i
+data/agent/src/os/bsd/elfmacros.h.i
data/src/share/vm/code/oopRecorder.cpp.i
-data/make/bsd/makefiles/adlc.make.i
data/agent/src/os/win32/Handler.hpp.i
data/build/solaris/makefiles/jvmg.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32CDebugInfoBuilder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties.i
data/make/windows/projectfiles/compiler1/Makefile.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSPermGen.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java.i
+data/src/share/vm/ci/ciSymbol.hpp.i
+data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisterInstruction.java.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties.i
data/src/share/tools/IdealGraphVisualizer/Data/manifest.mf.i
data/build/solaris/makefiles/mapfile-vers-jvm_db.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FlushwDecoder.java.i
@@ -647,46 +643,45 @@ data/agent/src/share/classes/sun/jvm/hotspot/oops/CheckedExceptionElement.java.i
data/src/share/vm/services/memoryUsage.hpp.i
data/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties.i
-data/test/compiler/6866651/Test.java.i
+data/make/bsd/adlc_updater.i
data/src/share/vm/ci/ciTypeArrayKlassKlass.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactingPermGenGen.java.i
data/src/share/vm/utilities/globalDefinitions_gcc.hpp.i
data/src/share/vm/c1/c1_Compilation.hpp.i
-data/src/share/vm/classfile/javaClasses.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ParNewGeneration.java.i
-data/build/solaris/makefiles/reorder_COMPILER2_i486.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantDoubleValue.java.i
+data/src/share/vm/code/scopeDesc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegisters.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantDoubleValue.java.i
data/src/share/vm/runtime/registerMap.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java.i
data/src/share/vm/utilities/decoder.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPMoveDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV8Disassembler.java.i
-data/src/share/vm/opto/phaseX.cpp.i
+data/test/compiler/6832293/Test.java.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java.i
data/src/share/vm/runtime/vmStructs.hpp.i
data/src/share/tools/IdealGraphVisualizer/nbproject/project.properties.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form.i
data/src/share/vm/services/threadService.hpp.i
data/src/cpu/zero/vm/registerMap_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedObject.java.i
+data/src/cpu/zero/vm/frame_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ImpdepInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java.i
data/agent/doc/transported_core.html.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/DirectAddress.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86Thread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/CharTypeImpl.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/remove.gif.i
data/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap32.java.i
data/make/solaris/makefiles/fastdebug.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/IntField.java.i
+data/agent/test/jdi/multivm.java.i
data/src/share/vm/gc_implementation/shared/generationCounters.cpp.i
data/src/share/vm/interpreter/interpreterGenerator.hpp.i
data/make/windows/build.bat.i
data/make/solaris/makefiles/product.make.i
data/agent/make/jstackproc64.sh.i
data/build/windows/makefiles/compile.make.i
-data/build/solaris/platform_sparcv9.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionHeader.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/DeadlockDetectionPanel.java.i
@@ -694,36 +689,38 @@ data/src/os/linux/vm/os_share_linux.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPathList.java.i
data/src/cpu/zero/vm/interpreterGenerator_zero.hpp.i
data/build/solaris/reorder.sh.i
-data/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp.i
data/make/windows/projectfiles/compiler1/vm.def.i
data/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCFrame.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLdstubInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/resources/breakpoint.png.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArrayKlass.java.i
+data/src/cpu/x86/vm/copy_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGoto.java.i
data/src/os/solaris/dtrace/generateJvmOffsets.cpp.i
data/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPStoreInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMReg.java.i
+data/src/os/linux/vm/c1_globals_linux.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java.i
data/src/cpu/sparc/vm/interpreterRT_sparc.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java.i
-data/src/share/vm/interpreter/bytecodes.hpp.i
+data/src/share/vm/gc_implementation/g1/heapRegion.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgThreadFactory.java.i
+data/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad.i
data/make/openjdk_distro.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThread.java.i
+data/src/share/vm/runtime/relocator.hpp.i
+data/src/share/tools/hsdis/README.i
data/src/cpu/sparc/vm/jniTypes_sparc.hpp.i
data/src/cpu/sparc/vm/sparc.ad.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form.i
-data/src/cpu/x86/vm/vmreg_x86.cpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java.i
data/src/share/vm/opto/parse1.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/RootTreeNodeAdapter.java.i
data/src/share/vm/services/memoryPool.cpp.i
data/src/share/vm/runtime/simpleThresholdPolicy.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/NamedFieldIdentifier.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxThreadFactory.java.i
+data/test/runtime/7100935/TestShortArraycopy.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp.i
data/src/share/tools/ProjectCreator/WinGammaPlatform.java.i
+data/src/cpu/sparc/vm/interpreter_sparc.hpp.i
data/test/compiler/6700047/Test6700047.java.i
data/agent/src/share/classes/META-INF/services/com.sun.jdi.connect.Connector.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredSpace.java.i
@@ -731,65 +728,58 @@ data/build/solaris/makefiles/adlc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbol.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/ObjectListPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/MethodCallable.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBColor.java.i
-data/src/os/windows/vm/c2_globals_windows.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallNode.java.i
+data/make/defs.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ContigPermSpace.java.i
data/src/share/vm/classfile/loaderConstraints.hpp.i
data/src/cpu/x86/vm/globalDefinitions_x86.hpp.i
data/src/share/vm/memory/space.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java.i
-data/test/compiler/7042153/Test7042153.java.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java.i
+data/test/compiler/7068051/Test7068051.java.i
+data/src/share/vm/shark/sharkIntrinsics.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPArithmeticDecoder.java.i
data/build/solaris/makefiles/cscope.make.i
data/src/share/vm/utilities/errorReporter.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java.i
data/src/cpu/x86/vm/c2_init_x86.cpp.i
-data/src/share/vm/opto/output.cpp.i
+data/test/compiler/6987555/Test6987555.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/JavaStackTraceAction.java.i
+data/agent/test/jdi/jstack64.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/MirrorImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC64Bit.java.i
data/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp.i
data/src/cpu/zero/vm/interpreterRT_zero.hpp.i
data/build/linux/makefiles/debug.make.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/resources/arrow.png.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArrayKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/DebugServer.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIHandles.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugger.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugTypes.java.i
data/src/share/tools/ProjectCreator/Macro.java.i
data/src/share/vm/gc_implementation/shared/spaceDecorator.cpp.i
data/src/share/vm/code/compiledIC.hpp.i
-data/src/share/vm/ci/ciKlassKlass.cpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java.i
+data/src/os_cpu/linux_x86/vm/bytes_linux_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/CPPExpressions.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObjectComparator.java.i
data/test/compiler/5091921/Test6985295.java.i
data/src/share/vm/code/pcDesc.cpp.i
data/src/share/vm/gc_implementation/g1/g1RemSet.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicMemberFunctionType.java.i
-data/src/share/vm/runtime/basicLock.cpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Timing.java.i
-data/src/share/vm/code/compressedStream.cpp.i
-data/make/solaris/makefiles/saproc.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/Symbol.java.i
+data/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/HeapParametersPanel.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hide.gif.i
-data/src/cpu/zero/vm/frame_zero.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/action/MemoryAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalSym.java.i
+data/src/share/vm/services/lowMemoryDetector.hpp.i
+data/src/share/vm/gc_implementation/g1/g1_globals.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/SymbolLookup.java.i
data/build/solaris/makefiles/kernel.make.i
data/src/share/vm/adlc/main.cpp.i
-data/src/cpu/zero/vm/stack_zero.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties.i
+data/src/os/bsd/dtrace/libjvm_db.c.i
+data/test/runtime/6626217/Test6626217.sh.i
data/agent/src/os/win32/Dispatcher.cpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml.i
-data/build/linux/makefiles/i486.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/GrowableArray.java.i
data/src/share/tools/ProjectCreator/Util.java.i
data/src/cpu/sparc/vm/templateTable_sparc.cpp.i
@@ -797,17 +787,17 @@ data/src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp.i
data/agent/make/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/FlagDumper.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/FieldTreeNodeAdapter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java.i
-data/src/share/vm/c1/c1_InstructionPrinter.hpp.i
+data/src/share/vm/classfile/loaderConstraints.cpp.i
+data/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp.i
data/agent/test/libproc/README.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FloatBranchDecoder.java.i
data/agent/src/os/bsd/ps_proc.c.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/LongTreeNodeAdapter.java.i
data/src/share/vm/opto/stringopts.hpp.i
data/test/compiler/6849574/Test.java.i
data/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp.i
+data/src/share/vm/includeDB_gc_parallel.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java.i
-data/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp.i
+data/test/compiler/6880034/Test6880034.java.i
data/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp.i
data/src/share/vm/runtime/hpi.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/down.gif.i
@@ -821,23 +811,26 @@ data/src/share/vm/runtime/sweeper.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/DoubleField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpacePrefetchDecoder.java.i
-data/make/windows/README.i
+data/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp.i
data/src/os/linux/launcher/java_md.h.i
data/make/bsd/makefiles/debug.make.i
data/make/bsd/makefiles/sparc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassLoaderReferenceImpl.java.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionSym.java.i
data/make/linux/platform_ppc.i
+data/src/share/vm/services/memoryService.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9DoneRetryDecoder.java.i
-data/src/share/vm/runtime/dtraceJSDT.cpp.i
+data/make/bsd/makefiles/mapfile-vers-debug.i
data/make/linux/platform_i486.i
data/src/share/vm/runtime/stackValue.cpp.i
data/src/share/vm/prims/jvmtiRedefineClasses.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Settings/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBNode.java.i
data/src/share/vm/memory/universe.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BaseClass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SAPIDAttachingConnector.java.i
-data/src/os_cpu/linux_x86/vm/bytes_linux_x86.inline.hpp.i
+data/src/share/vm/ci/ciKlassKlass.cpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Find16.gif.i
data/src/share/vm/memory/generation.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/StoreDecoder.java.i
@@ -849,41 +842,38 @@ data/agent/src/share/classes/images/toolbarButtonGraphics/general/New24.gif.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.properties.i
data/src/share/vm/gc_interface/gcCause.cpp.i
data/src/os_cpu/solaris_x86/vm/vm_version_solaris_x86.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/suite.properties.i
+data/test/compiler/6837011/Test6837011.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortTypeImpl.java.i
-data/src/share/vm/gc_implementation/shared/liveRange.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java.i
+data/src/share/vm/oops/typeArrayKlass.hpp.i
data/src/share/vm/oops/objArrayOop.hpp.i
-data/make/linux/Queens.class.i
data/src/cpu/sparc/vm/stubRoutines_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/nbproject/project.xml.i
-data/src/share/vm/c1/c1_Optimizer.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterIndirectAddress.java.i
+data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/Inspector.java.i
-data/src/share/vm/compiler/disassembler.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java.i
+data/src/cpu/zero/vm/stubRoutines_zero.hpp.i
data/src/os/linux/vm/os_linux.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIntType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredGeneration.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/manifest.mf.i
data/src/cpu/zero/vm/frame_zero.hpp.i
data/test/compiler/5091921/Test6931567.java.i
data/build/linux/Makefile.i
data/src/share/vm/ci/ciObjectFactory.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryIndirectAddress.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java.i
data/src/cpu/sparc/vm/registerMap_sparc.hpp.i
-data/make/bsd/makefiles/arm.make.i
data/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties.i
data/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCBranchInstruction.java.i
data/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSectionDefinitionsRecord.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/platform.properties.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ScriptEngineAbstraction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortHeaderMouseAdapter.java.i
data/build/linux/makefiles/defs.make.i
data/src/share/vm/utilities/dtrace.hpp.i
data/src/share/vm/oops/oop.inline2.hpp.i
@@ -891,44 +881,43 @@ data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackFrameStream.java.i
data/src/share/vm/c1/c1_FrameMap.cpp.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/platform.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/RegisterDecoder.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SaveDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/Format3ADecoder.java.i
+data/src/share/vm/gc_implementation/g1/heapRegionSet.cpp.i
+data/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9MOVrDecoder.java.i
data/build/solaris/makefiles/reorder_COMPILER1_sparcv9.i
-data/src/cpu/zero/vm/stubGenerator_zero.cpp.i
data/src/share/vm/runtime/simpleThresholdPolicy.hpp.i
data/test/compiler/6865031/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/CIntegerAccessor.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/NamedFieldIdentifier.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJCharField.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java.i
+data/src/share/vm/compiler/abstractCompiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/project.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/RetData.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java.i
+data/src/os/bsd/dtrace/generateJvmOffsetsMain.c.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/SignatureInfo.java.i
-data/src/cpu/zero/vm/depChecker_zero.cpp.i
+data/src/cpu/x86/vm/codeBuffer_x86.hpp.i
data/src/share/vm/oops/typeArrayOop.cpp.i
data/src/share/vm/runtime/globals_extension.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadGroupReferenceImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveInstruction.java.i
data/agent/src/share/native/jvmdi/sa.dsp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/TestDebugger.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JShortField.java.i
data/src/share/vm/services/attachListener.cpp.i
-data/src/share/vm/opto/locknode.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/PermStat.java.i
+data/src/cpu/sparc/vm/cppInterpreterGenerator_sparc.hpp.i
+data/agent/src/os/solaris/dbx/README.i
data/src/os/windows/vm/globals_windows.hpp.i
data/make/jdk6_hotspot_distro.i
-data/src/cpu/sparc/vm/methodHandles_sparc.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/Array.java.i
-data/src/share/vm/libadt/vectset.cpp.i
+data/build/solaris/makefiles/adjust-mflags.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java.i
+data/src/share/tools/LogCompilation/README.i
+data/make/solaris/makefiles/mapfile-vers-TIERED.i
data/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp.i
data/src/share/vm/ci/ciObjArrayKlassKlass.hpp.i
data/src/cpu/sparc/vm/nativeInst_sparc.cpp.i
-data/make/solaris/makefiles/sparc.make.i
+data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/suite.properties.i
data/src/cpu/x86/vm/assembler_x86_32.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstance.java.i
+data/src/share/vm/code/icBuffer.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.form.i
data/src/cpu/zero/vm/vmreg_zero.hpp.i
@@ -936,12 +925,11 @@ data/src/share/vm/services/dtraceAttacher.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeNewArray.java.i
data/agent/make/heapdumpwindbg64.bat.i
data/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp.i
-data/src/cpu/x86/vm/sharedRuntime_x86_64.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml.i
data/src/share/vm/interpreter/interpreterRuntime.hpp.i
data/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp.i
data/agent/src/os/win32/windbg/sawindbg.cpp.i
-data/src/os/bsd/vm/attachListener_bsd.cpp.i
+data/src/share/vm/memory/generation.hpp.i
data/make/windows/makefiles/makedeps.make.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java.i
data/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp.i
@@ -952,46 +940,44 @@ data/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JBooleanField.java.i
data/build/solaris/makefiles/reorder_CORE_i486.i
data/test/compiler/6792161/Test6792161.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapSet.java.i
data/src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp.i
-data/test/compiler/7070134/words.i
data/src/share/vm/opto/addnode.hpp.i
data/src/share/vm/utilities/accessFlags.cpp.i
data/test/compiler/7041100/Test7041100.java.i
-data/src/cpu/zero/vm/methodHandles_zero.hpp.i
-data/src/share/tools/launcher/wildcard.c.i
data/make/windows/projectfiles/compiler1/vm.dsw.i
data/agent/make/dumpsyspropsproc64.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArray.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java.i
data/src/os/solaris/vm/perfMemory_solaris.cpp.i
data/test/compiler/6795362/Test6795362.java.i
data/src/share/vm/runtime/sharedRuntime.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBitType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java.i
-data/src/share/tools/ProjectCreator/FileFormatException.java.i
+data/src/share/vm/runtime/stackValue.hpp.i
+data/src/share/vm/code/vtableStubs.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSLibraries.java.i
data/agent/src/os/linux/proc_service.h.i
data/src/share/vm/gc_implementation/shared/ageTable.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ObjectReferenceImpl.java.i
-data/make/bsd/makefiles/ia64.make.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/ZoomIn16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVrInstruction.java.i
data/src/os/linux/vm/os_linux.hpp.i
data/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadFactory.java.i
-data/make/templates/gpl-header.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallNode.java.i
data/agent/make/pstackwindbg64.bat.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryIndirectAddress.java.i
data/src/share/vm/runtime/serviceThread.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FieldIdentifier.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DebugEvent.java.i
+data/test/compiler/6756768/Test6756768.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java.i
data/src/os_cpu/linux_sparc/vm/prefetch_linux_sparc.inline.hpp.i
data/make/linux/makefiles/jsig.make.i
+data/src/os/bsd/dtrace/jvm_dtrace.c.i
+data/src/share/vm/shark/sharkType.hpp.i
data/src/os/linux/vm/threadCritical_linux.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/OopVisitor.java.i
data/agent/make/ClosureFinder.java.i
data/src/share/vm/code/debugInfoRec.hpp.i
data/src/cpu/x86/vm/c1_FrameMap_x86.cpp.i
@@ -1007,11 +993,10 @@ data/make/linux/makefiles/mapfile-vers-product.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/FloatTreeNodeAdapter.java.i
data/agent/make/jstackproc.sh.i
data/src/share/vm/adlc/formssel.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaString.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64Thread.java.i
data/build/linux/adlc_updater.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxBfEfRecord.java.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PrivilegedReadWriteDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/graph.gif.i
data/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp.i
@@ -1019,7 +1004,6 @@ data/agent/src/share/classes/com/sun/java/swing/action/AlignLeftAction.java.i
data/src/share/tools/launcher/java.h.i
data/src/os/linux/vm/thread_linux.inline.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java.i
data/test/compiler/7044738/Test7044738.java.i
data/src/cpu/zero/vm/disassembler_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedLong.java.i
@@ -1028,8 +1012,8 @@ data/agent/make/permstatwindbg.bat.i
data/src/share/vm/gc_implementation/shared/ageTable.hpp.i
data/test/compiler/7070134/Test7070134.sh.i
data/src/share/tools/IdealGraphVisualizer/README.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/DLL.java.i
-data/make/windows/projectfiles/tiered/vm.dsw.i
+data/build/windows/makefiles/jvmti.make.i
+data/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp.i
data/src/share/vm/runtime/dtraceJSDT.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolKlass.java.i
data/src/share/vm/runtime/sharedRuntime.cpp.i
@@ -1037,23 +1021,21 @@ data/src/share/vm/prims/jvmtiLib.xsl.i
data/src/share/vm/oops/objArrayKlass.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciField.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFPArithmeticInstruction.java.i
data/src/cpu/x86/vm/registerMap_x86.hpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/manifest.mf.i
data/agent/make/saenv64.sh.i
data/src/share/vm/oops/compiledICHolderKlass.cpp.i
-data/make/bsd/makefiles/mapfile-vers-jsig.i
data/src/share/vm/classfile/placeholders.hpp.i
data/src/share/vm/classfile/classFileParser.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FindByQueryPanel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java.i
-data/src/os/bsd/vm/mutex_bsd.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMap.java.i
+data/src/share/vm/opto/node.hpp.i
+data/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/EditorFactory.java.i
-data/src/cpu/sparc/vm/globalDefinitions_sparc.hpp.i
data/make/linux/makefiles/fastdebug.make.i
-data/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java.i
data/src/share/vm/c1/c1_Compilation.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionTypes.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java.i
@@ -1062,35 +1044,31 @@ data/agent/src/share/classes/images/toolbarButtonGraphics/general/History24.gif.
data/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp.i
data/agent/test/jdi/sagclient.java.i
data/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp.i
-data/agent/src/os/bsd/elfmacros.h.i
data/src/share/vm/adlc/Test/i486.ad.i
+data/agent/make/dumpflagsproc64.sh.i
data/src/share/vm/oops/oop.cpp.i
data/src/cpu/sparc/vm/cppInterpreter_sparc.hpp.i
data/make/bsd/makefiles/sa.make.i
-data/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.gif.i
data/src/share/vm/ci/ciType.hpp.i
data/build/solaris/makefiles/dtrace.make.i
data/agent/src/scripts/start-rmiregistry.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadContext.java.i
-data/src/cpu/zero/vm/icBuffer_zero.cpp.i
+data/src/os/solaris/vm/thread_solaris.inline.hpp.i
data/src/share/vm/memory/compactingPermGenGen.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/VoidType.java.i
-data/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.i
data/agent/src/os/solaris/Makefile.i
data/make/bsd/makefiles/dtrace.make.i
data/make/solaris/makefiles/vm.make.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ConcurrentMarkSweepGeneration.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java.i
-data/src/os/solaris/vm/os_solaris.hpp.i
+data/src/os_cpu/windows_x86/vm/assembler_windows_x86_32.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java.i
-data/agent/make/pstackwindbg.bat.i
+data/src/os_cpu/linux_x86/vm/prefetch_linux_x86.inline.hpp.i
data/test/compiler/7088020/Test7088020.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RotateInstruction.java.i
data/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/HSDBActionManager.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java.i
-data/src/share/vm/gc_interface/collectedHeap.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaHeap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/JInfo.java.i
data/agent/make/soqlproc64.sh.i
@@ -1099,10 +1077,14 @@ data/agent/src/share/classes/sun/jvm/hotspot/ui/action/ShowAction.java.i
data/src/share/tools/MakeDeps/MetroWerksMacPlatform.java.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.properties.i
data/make/linux/platform_arm.i
-data/agent/make/heapdumpproc64.sh.i
+data/make/solaris/makefiles/reorder_COMPILER2_sparc.i
+data/src/share/vm/utilities/stack.inline.hpp.i
+data/src/share/vm/c1/c1_Canonicalizer.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.InputGraphProvider.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Block.java.i
data/make/windows/jvmexp_g.lcf.i
+data/agent/make/start-debug-server-proc64.sh.i
data/make/Makefile.i
data/src/cpu/zero/vm/interpreter_zero.cpp.i
data/build/solaris/Makefile.i
@@ -1110,26 +1092,28 @@ data/agent/doc/jsdb.html.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantOopReadValue.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/History16.gif.i
data/src/share/vm/runtime/frame.hpp.i
-data/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/Format3ADecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/SpaceClosure.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86LogicInstruction.java.i
data/build/solaris/makefiles/makedeps.make.i
data/src/share/vm/prims/jni.cpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/layer.xml.i
data/src/share/vm/memory/specialized_oop_closures.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java.i
+data/src/share/vm/c1/c1_CodeStubs.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSFileIndex.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Register.java.i
data/build/solaris/build.sh.i
data/src/share/vm/interpreter/bytecodes.cpp.i
data/.hgtags.i
data/build/windows/projectfiles/core/Makefile.i
+data/src/share/vm/adlc/filebuff.hpp.i
data/src/cpu/sparc/vm/c1_Defs_sparc.hpp.i
+data/src/share/vm/gc_implementation/g1/sparsePRT.cpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/extendedColor.filter.i
-data/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp.i
-data/agent/src/os/linux/ps_core.c.i
+data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp.i
data/src/share/vm/services/classLoadingService.cpp.i
data/src/share/vm/interpreter/cppInterpreterGenerator.hpp.i
-data/src/os/bsd/vm/decoder_bsd.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Instruction.java.i
data/src/share/vm/oops/klass.inline.hpp.i
data/src/share/vm/interpreter/interpreterRuntime.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java.i
@@ -1138,38 +1122,39 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/PermGen.java.i
data/src/share/vm/opto/library_call.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/NoSuchSymbolException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/cInterpreter.java.i
+data/src/os/bsd/dtrace/generateJvmOffsets.h.i
data/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.i
data/src/share/vm/oops/markOop.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ObjectVisitor.java.i
+data/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.d
data/src/share/vm/oops/typeArrayKlassKlass.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp.i
-data/make/bsd/makefiles/sparcv9.make.i
-data/src/cpu/sparc/vm/vm_version_sparc.cpp.i
+data/src/share/vm/runtime/vm_version.cpp.i
+data/src/share/vm/memory/specialized_oop_closures.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/split.filter.i
data/agent/src/os/win32/Message.hpp.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java.i
+data/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp.i
data/build/solaris/makefiles/hp.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadFactory.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegister.java.i
data/src/share/vm/interpreter/templateInterpreter.hpp.i
data/agent/src/share/classes/com/sun/java/swing/ui/TabsDlg.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ArrayTypeImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/LookupswitchPair.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ArithmeticDecoder.java.i
data/src/os_cpu/linux_x86/vm/vm_version_linux_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/CellTypeStateList.java.i
+data/test/runtime/7051189/Xchecksig.sh.i
data/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp.i
data/.jcheck/conf.i
data/test/compiler/6879902/Test6879902.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodDataKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublic.java.i
data/src/cpu/sparc/vm/cppInterpreter_sparc.cpp.i
-data/src/share/vm/ci/ciArrayKlassKlass.hpp.i
+data/test/compiler/6823354/Test6823354.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPInstructionDecoder.java.i
data/src/share/vm/runtime/signature.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/Address.java.i
-data/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp.i
-data/src/share/vm/ci/ciField.hpp.i
+data/make/linux/makefiles/sparcv9.make.i
+data/src/share/vm/classfile/symbolTable.cpp.i
+data/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ObjectHistogram.java.i
data/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/PrimitiveValueImpl.java.i
@@ -1178,13 +1163,12 @@ data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Expo
data/make/bsd/platform_sparc.i
data/src/cpu/zero/vm/sharkFrame_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ShiftDecoder.java.i
-data/agent/make/finalizerinfowindbg64.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/AbstractInstruction.java.i
+data/src/share/vm/prims/jvm.cpp.i
+data/src/share/vm/utilities/histogram.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/TemplateType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ContiguousSpace.java.i
data/src/share/vm/shark/sharkRuntime.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInstanceOf.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NodeFindAction.java.i
data/build/windows/makefiles/sa.make.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/build.xml.i
@@ -1195,37 +1179,36 @@ data/src/cpu/x86/vm/interpreter_x86_64.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMap.java.i
data/make/hotspot_version.i
data/src/share/vm/utilities/constantTag.cpp.i
-data/src/share/vm/gc_implementation/g1/survRateGroup.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java.i
data/src/share/vm/opto/postaloc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFileRecord.java.i
-data/src/cpu/x86/vm/register_x86.hpp.i
+data/test/compiler/6689060/Test.java.i
data/src/share/vm/prims/jvmtiUtil.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ProgressiveHeapVisitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64Frame.java.i
data/src/share/vm/c1/c1_ValueSet.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescription.java.i
data/src/cpu/x86/vm/sharedRuntime_x86_32.cpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp.i
data/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp.i
data/src/share/vm/shark/sharkBlock.hpp.i
data/src/share/vm/runtime/statSampler.cpp.i
-data/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.gif.i
data/src/cpu/zero/vm/entryFrame_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/RMIHelper.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ObjectVisitor.java.i
data/src/share/vm/runtime/icache.cpp.i
-data/src/cpu/x86/vm/codeBuffer_x86.hpp.i
+data/src/cpu/zero/vm/depChecker_zero.cpp.i
data/src/share/vm/c1/c1_ValueType.cpp.i
data/src/share/vm/compiler/abstractCompiler.cpp.i
data/src/share/vm/interpreter/bytecodeStream.cpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml.i
data/src/os_cpu/windows_x86/vm/prefetch_windows_x86.inline.hpp.i
-data/src/cpu/sparc/vm/depChecker_sparc.hpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp.i
data/agent/src/share/lib/maf-1_0.jar.i
data/src/share/vm/oops/instanceOop.hpp.i
data/src/share/vm/utilities/growableArray.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodKlass.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32Address.java.i
+data/agent/src/share/classes/com/sun/java/swing/ui/SplashScreen.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WriteInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/EnumTreeNodeAdapter.java.i
data/agent/src/os/win32/windbg/Makefile.i
@@ -1233,37 +1216,38 @@ data/agent/src/os/bsd/BsdDebuggerLocal.c.i
data/src/share/vm/prims/nativeLookup.cpp.i
data/src/share/vm/runtime/safepoint.hpp.i
data/src/share/vm/runtime/timer.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java.i
+data/build/linux/makefiles/jsig.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RdprDecoder.java.i
data/src/cpu/x86/vm/bytecodes_x86.cpp.i
data/src/share/vm/memory/compactPermGen.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsr.java.i
+data/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp.i
data/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp.i
+data/src/cpu/x86/vm/jni_x86.h.i
data/src/share/vm/memory/iterator.cpp.i
data/src/os_cpu/linux_x86/vm/copy_linux_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGotoW.java.i
data/agent/src/share/classes/com/sun/java/swing/action/ViewMenu.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ConcreteMethodImpl.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp.i
+data/src/share/vm/adlc/filebuff.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java.i
+data/src/share/vm/opto/chaitin.hpp.i
data/src/share/vm/memory/allocation.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/platform.properties.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/build-impl.xml.i
data/agent/test/jdi/jstack.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDebugEvent.java.i
-data/src/share/vm/runtime/fieldDescriptor.cpp.i
+data/src/share/vm/gc_implementation/g1/concurrentMark.hpp.i
data/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ScriptObject.java.i
+data/agent/src/share/classes/com/sun/java/swing/ui/ToggleActionPropertyChangeListener.java.i
data/src/os/linux/vm/jvm_linux.h.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ExternalVFrame.java.i
data/src/cpu/x86/vm/relocInfo_x86.cpp.i
data/src/os/linux/vm/globals_linux.hpp.i
-data/make/linux/makefiles/ppc.make.i
+data/src/share/vm/oops/symbol.cpp.i
data/src/cpu/sparc/vm/vmreg_sparc.cpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignRight24.gif.i
data/src/share/vm/oops/oop.hpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif.i
+data/src/share/vm/shark/sharkFunction.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ConnectionAnchor.java.i
data/src/share/vm/shark/sharkState.cpp.i
data/src/cpu/zero/vm/disassembler_zero.cpp.i
@@ -1271,15 +1255,16 @@ data/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java.i
data/src/share/vm/oops/symbolKlass.cpp.i
data/src/share/vm/prims/forte.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFileParser.java.i
+data/src/share/vm/opto/superword.cpp.i
+data/src/share/vm/prims/jniFastGetField.hpp.i
+data/src/os/windows/launcher/java_md.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ArithmeticInstruction.java.i
-data/src/share/vm/prims/jvm.cpp.i
-data/test/runtime/7051189/Xchecksig.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/PointerType.java.i
data/src/share/vm/prims/jni_md.h.i
data/src/share/vm/oops/methodKlass.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/SafePointNode.java.i
data/agent/src/os/win32/Reaper.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/AddressVisitor.java.i
-data/src/cpu/sparc/vm/cppInterpreterGenerator_sparc.hpp.i
+data/src/share/vm/opto/locknode.cpp.i
data/test/compiler/6857159/Test6857159.sh.i
data/src/share/vm/runtime/fieldType.hpp.i
data/src/os/solaris/launcher/java_md.c.i
@@ -1288,16 +1273,16 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/RestoreDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicArrayType.java.i
data/src/share/vm/opto/graphKit.hpp.i
data/src/os/posix/launcher/java_md.c.i
-data/agent/src/os/solaris/dbx/README.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/PermStat.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIndexableFieldIdentifier.java.i
-data/agent/make/jhistoproc64.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java.i
+data/src/cpu/zero/vm/templateInterpreter_zero.cpp.i
+data/src/share/vm/ci/ciArrayKlass.cpp.i
data/src/share/vm/services/serviceUtil.hpp.i
data/src/os_cpu/linux_x86/vm/linux_x86_32.s.i
data/agent/src/os/win32/LockableList.hpp.i
data/make/bsd/platform_amd64.suncc.i
data/src/share/vm/shark/sharkInvariants.cpp.i
-data/agent/make/clhsdbproc64.sh.i
+data/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp.i
data/agent/make/start-rmiregistry.bat.i
data/agent/make/clhsdbproc.sh.i
data/src/share/vm/utilities/sizes.hpp.i
@@ -1306,36 +1291,34 @@ data/agent/make/heapsumwindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java.i
data/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp.i
data/src/os/solaris/vm/hpi_solaris.cpp.i
-data/src/share/vm/memory/genRemSet.inline.hpp.i
+data/agent/src/os/bsd/salibelf.h.i
data/make/solaris/makefiles/reorder_CORE_sparcv9.i
data/src/share/vm/memory/heap.cpp.i
-data/make/solaris/makefiles/mapfile-vers-TIERED.i
+data/src/share/vm/libadt/vectset.cpp.i
data/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp.i
-data/src/cpu/zero/vm/templateInterpreter_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/Callable.java.i
data/build/solaris/makefiles/reorder_COMPILER1_i486.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java.i
data/src/share/vm/runtime/objectMonitor.cpp.i
+data/src/share/vm/prims/jvmtiTrace.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java.i
data/make/templates/gpl-cp-header.i
data/src/share/vm/opto/machnode.hpp.i
data/make/solaris/makefiles/reorder_TIERED_amd64.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java.i
data/build/windows/projectfiles/compiler2/ADLCompiler.dsw.i
-data/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp.i
+data/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJmp.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCReturnInstruction.java.i
-data/src/share/vm/runtime/globals.cpp.i
+data/make/solaris/makefiles/reorder_COMPILER2_amd64.i
data/src/share/vm/prims/jvmtiTrace.hpp.i
-data/src/cpu/zero/vm/copy_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java.i
+data/src/share/vm/shark/sharkContext.hpp.i
+data/make/linux/makefiles/amd64.make.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.properties.i
-data/build/windows/makefiles/jvmti.make.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSPermGenGen.java.i
data/build/solaris/makefiles/core.make.i
-data/make/linux/makefiles/product.make.i
+data/src/share/vm/classfile/verifier.cpp.i
data/src/share/vm/oops/methodOop.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLogicInstruction.java.i
+data/src/share/vm/memory/genRemSet.inline.hpp.i
data/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/Debugger.java.i
data/src/share/vm/runtime/advancedThresholdPolicy.hpp.i
@@ -1347,22 +1330,24 @@ data/agent/src/os/bsd/libproc.h.i
data/src/share/vm/gc_implementation/shared/gcStats.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/SymbolFinder.java.i
data/src/os/solaris/vm/interfaceSupport_solaris.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCNoopInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java.i
data/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java.i
data/src/share/vm/runtime/atomic.cpp.i
-data/agent/src/os/bsd/libproc_impl.c.i
-data/test/compiler/6775880/Test.java.i
+data/src/share/vm/c1/c1_ValueMap.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9WrprDecoder.java.i
data/src/cpu/x86/vm/vm_version_x86_64.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java.i
+data/build/solaris/makefiles/reorder_CORE_sparcv9.i
data/agent/src/os/win32/IOBuf.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap16.java.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/Bundle.properties.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java.i
+data/src/share/vm/code/exceptionHandlerTable.hpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSet.hpp.i
data/make/linux/makefiles/launcher.make.i
data/agent/make/dumpsyspropswindbg.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/VoidTypeImpl.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStore.java.i
+data/build/solaris/makefiles/compiler2.make.i
+data/src/share/vm/gc_implementation/shared/spaceDecorator.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java.i
data/build/windows/README.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java.i
@@ -1373,7 +1358,6 @@ data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Inpu
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Open24.gif.i
data/src/share/vm/shark/sharkMemoryManager.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Instruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPopDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublicSym.java.i
data/agent/make/saenv.sh.i
data/src/os_cpu/linux_x86/vm/linux_x86_64.s.i
@@ -1385,27 +1369,28 @@ data/agent/make/permstatproc64.sh.i
data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp.i
data/src/os/solaris/vm/c2_globals_solaris.hpp.i
+data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp.i
data/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp.i
data/src/share/vm/utilities/top.hpp.i
data/src/share/vm/classfile/classLoader.cpp.i
-data/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeEnums.java.i
+data/make/solaris/makefiles/reorder_COMPILER1_amd64.i
data/src/share/vm/opto/locknode.hpp.i
+data/agent/make/soqlwindbg.bat.i
data/src/share/vm/interpreter/templateInterpreterGenerator.hpp.i
data/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp.i
data/agent/src/share/classes/com/sun/java/swing/action/NewAction.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java.i
+data/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/Stub.java.i
data/src/share/vm/gc_implementation/g1/ptrQueue.cpp.i
data/build/linux/makefiles/mapfile-vers-jsig.i
-data/src/share/vm/prims/privilegedStack.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegName.java.i
+data/src/share/tools/MakeDeps/DirectoryTreeNode.java.i
+data/test/compiler/5091921/Test6753639.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp.i
-data/make/templates/bsd-header.i
+data/src/os/linux/vm/objectMonitor_linux.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBitType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/CIntegerType.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/JNITypeParser.java.i
data/src/share/vm/memory/referenceProcessor.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSELogicalDecoder.java.i
@@ -1414,7 +1399,6 @@ data/make/bsd/makefiles/optimized.make.i
data/test/compiler/6795465/Test6795465.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/TrapDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java.i
-data/test/runtime/6819213/TestBootNativeLibraryPath.java.i
data/src/share/vm/gc_implementation/shared/markSweep.hpp.i
data/src/share/vm/classfile/dictionary.hpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java.i
@@ -1423,63 +1407,62 @@ data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/EditorCommands.java.i
data/src/share/vm/utilities/intHisto.cpp.i
data/src/share/tools/LogCompilation/Makefile.i
-data/agent/src/os/win32/SwDbgSrv.dsw.i
-data/agent/src/os/linux/libproc.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64FloatRegisters.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/WrongTypeException.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java.i
-data/src/cpu/zero/vm/shark_globals_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9ReadDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java.i
+data/src/share/vm/runtime/sharedRuntimeTrig.cpp.i
data/src/cpu/x86/vm/x86_64.ad.i
+data/src/share/vm/prims/unsafe.cpp.i
+data/test/compiler/7103261/Test7103261.java.i
data/src/os/linux/vm/os_linux.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/blocks.gif.i
data/src/share/vm/classfile/placeholders.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/JVMDIClassStatus.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/Characteristics.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicVoidType.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Bundle.properties.i
-data/test/compiler/6909839/Test6909839.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java.i
-data/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegisters.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_ia64/Win32IA64JavaThreadPDAccess.java.i
+data/src/share/vm/oops/constMethodOop.hpp.i
+data/src/share/vm/adlc/formsopt.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlassKlass.java.i
+data/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ClosestSymbol.java.i
data/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9WrprDecoder.java.i
-data/src/share/vm/opto/ifnode.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/Type.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RicochetFrame.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FloatBranchDecoder.java.i
+data/src/os/bsd/vm/osThread_bsd.hpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/remove.filter.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java.i
data/src/share/vm/utilities/globalDefinitions.hpp.i
-data/src/share/vm/shark/sharkCacheDecache.hpp.i
-data/src/share/vm/opto/parse.hpp.i
-data/src/cpu/x86/vm/vmStructs_x86.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFProgramHeader.java.i
+data/src/os/windows/vm/interfaceSupport_windows.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceStoreDecoder.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Information16.gif.i
-data/src/os_cpu/windows_x86/vm/os_windows_x86.hpp.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties.i
-data/make/solaris/makefiles/mapfile-vers-jvm_dtrace.i
+data/build/solaris/platform_sparcv9.i
data/src/share/vm/runtime/icache.hpp.i
data/make/solaris/makefiles/launcher.make.i
-data/build/windows/makefiles/shared.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC32Bit.java.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Bytes.java.i
data/make/bsd/makefiles/hp.make.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModLineNumberMap.java.i
-data/build/windows/makefiles/generated.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ValueContainer.java.i
data/agent/test/jdi/SASanityChecker.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicObjectLock.java.i
-data/src/share/vm/opto/matcher.cpp.i
data/src/cpu/x86/vm/assembler_x86.hpp.i
+data/test/compiler/7009231/Test7009231.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/suite.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfMemory.java.i
+data/agent/src/os/win32/ioUtils.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FPop2Decoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCCallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRicochetFrame.java.i
-data/src/share/vm/classfile/vmSymbols.hpp.i
+data/build/linux/makefiles/hp.make.i
+data/agent/make/clhsdbwindbg64.bat.i
data/src/share/vm/utilities/preserveException.hpp.i
data/agent/src/os/bsd/mapfile.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciVirtualCallData.java.i
@@ -1488,19 +1471,22 @@ data/make/solaris/makefiles/jvmti.make.i
data/src/share/vm/oops/klassKlass.hpp.i
data/src/os/solaris/launcher/java.c.i
data/test/compiler/6769124/TestArrayCopy6769124.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java.i
-data/agent/src/share/classes/com/sun/java/swing/action/SaveAsAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java.i
+data/src/share/vm/gc_implementation/shared/collectorCounters.cpp.i
data/src/share/vm/opto/phase.cpp.i
data/src/share/vm/runtime/objectMonitor.hpp.i
-data/src/os/linux/vm/dtraceJSDT_linux.cpp.i
data/src/share/vm/c1/c1_Runtime1.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form.i
-data/src/share/vm/services/heapDumper.hpp.i
+data/make/bsd/platform_zero.in.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml.i
+data/agent/src/share/classes/com/sun/java/swing/action/BackAction.java.i
data/build/linux/makefiles/sparcWorks.make.i
data/src/cpu/zero/vm/bytes_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Operand.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86IllegalInstruction.java.i
+data/src/share/vm/gc_implementation/g1/ptrQueue.inline.hpp.i
data/src/share/vm/opto/buildOopMap.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.gif.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java.i
data/src/share/vm/opto/rootnode.cpp.i
data/src/share/vm/opto/cfgnode.hpp.i
@@ -1512,104 +1498,104 @@ data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/co
data/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp.i
data/make/linux/makefiles/compiler1.make.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_64.il.i
-data/agent/test/jdi/multivm.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCDebugInfoDataBase.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/IntField.java.i
data/test/runtime/6626217/bug_21227.java.i
data/src/share/vm/ci/ciInstanceKlassKlass.cpp.i
-data/src/os/linux/vm/c1_globals_linux.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMReg.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/DLL.java.i
-data/src/share/vm/runtime/relocator.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThread.java.i
data/src/share/vm/memory/cardTableModRefBS.cpp.i
data/src/share/vm/services/management.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CallDecoder.java.i
+data/test/runtime/6878713/Test6878713.sh.i
data/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp.i
data/src/os_cpu/linux_sparc/vm/thread_linux_sparc.hpp.i
data/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java.i
-data/src/share/vm/runtime/relocator.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/VMModifiers.java.i
+data/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp.i
+data/src/share/vm/code/compressedStream.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/build.xml.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderTable.java.i
data/src/cpu/zero/vm/templateTable_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolIterator.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java.i
+data/src/share/vm/prims/jvmtiRedefineClasses.cpp.i
data/src/share/vm/utilities/elfFile.hpp.i
data/src/share/vm/oops/klassKlass.cpp.i
data/src/os/solaris/dtrace/hs_private.d.i
data/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/manifest.mf.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java.i
+data/build/linux/makefiles/profiled.make.i
data/make/jprt.properties.i
data/src/share/vm/gc_implementation/shared/vmGCOperations.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVccInstruction.java.i
-data/src/share/vm/prims/forte.cpp.i
+data/make/windows/projectfiles/tiered/vm.def.i
+data/src/share/vm/oops/klass.hpp.i
data/src/cpu/x86/vm/templateInterpreter_x86_64.cpp.i
-data/src/share/vm/gc_implementation/includeDB_gc_parNew.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SaveDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/NamedFieldIdentifier.java.i
data/agent/make/README.txt.i
-data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java.i
data/make/bsd/makefiles/jvmti.make.i
data/test/runtime/6626217/Loader2.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/suite.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/Array.java.i
+data/make/solaris/makefiles/sparc.make.i
data/src/share/vm/opto/output.hpp.i
data/src/share/vm/c1/c1_IR.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciType.java.i
-data/src/share/vm/opto/stringopts.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegName.java.i
data/build/solaris/makefiles/mapfile-vers-jvm_dtrace.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SpecialStoreDecoder.java.i
+data/build/windows/projectfiles/kernel/vm.def.i
data/src/cpu/x86/vm/nativeInst_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegisterAddress.java.i
data/src/share/vm/ci/ciObject.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/plus.gif.i
-data/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp.i
-data/test/compiler/6756768/Test6756768.java.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java.i
data/build/windows/projectfiles/core/vm.def.i
data/src/share/vm/ci/ciInstanceKlass.cpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java.i
data/src/cpu/zero/vm/assembler_zero.cpp.i
data/test/compiler/6837094/Test.java.i
-data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.inline.hpp.i
-data/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp.i
-data/make/bsd/makefiles/vm.make.i
+data/src/share/vm/memory/heapInspection.hpp.i
+data/make/windows/projectfiles/tiered/vm.dsw.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceLdstubDecoder.java.i
-data/src/share/vm/opto/node.hpp.i
+data/src/os/bsd/vm/mutex_bsd.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/ThreadInfoPanel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java.i
+data/src/share/vm/ci/ciFlags.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RegisterIndirectAddress.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.gif.i
+data/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.i
data/src/share/vm/runtime/mutexLocker.hpp.i
-data/agent/src/share/classes/com/sun/java/swing/action/SaveAction.java.i
+data/build/solaris/makefiles/fastdebug.make.i
data/agent/make/jhistowindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedWriteStream.java.i
data/agent/src/share/classes/com/sun/java/swing/action/AlignRightAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassTypeImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java.i
+data/src/share/vm/memory/dump.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/IndexableFieldIdentifier.java.i
data/src/share/vm/memory/defNewGeneration.cpp.i
data/src/share/vm/classfile/systemDictionary.cpp.i
data/src/share/vm/gc_interface/collectedHeap.hpp.i
data/src/share/vm/runtime/orderAccess.hpp.i
data/agent/src/os/win32/Monitor.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/Sym.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegister.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ArithmeticDecoder.java.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignCenter16.gif.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicOopField.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadFactory.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/LookupswitchPair.java.i
+data/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Node_List.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/Field.java.i
-data/src/share/vm/utilities/histogram.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/AbstractInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/EdenSpace.java.i
data/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/BadOopTreeNodeAdapter.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/settings.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/BooleanField.java.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.gif.i
+data/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp.i
data/build/solaris/makefiles/debug.make.i
-data/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp.i
+data/src/cpu/sparc/vm/depChecker_sparc.hpp.i
data/src/share/vm/opto/bytecodeInfo.cpp.i
data/src/share/vm/runtime/rframe.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/AssertionFailure.java.i
@@ -1620,33 +1606,33 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCAtomicLoadStoreInstr
data/make/solaris/makefiles/rules.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/OopMapForCacheEntry.java.i
-data/src/share/vm/oops/symbol.cpp.i
+data/make/linux/makefiles/ppc.make.i
data/make/linux/platform_sparcv9.i
data/src/share/vm/gc_implementation/shared/immutableSpace.hpp.i
data/src/share/vm/compiler/compileLog.cpp.i
data/src/share/vm/opto/graphKit.cpp.i
-data/src/share/vm/ci/ciArrayKlass.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java.i
-data/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.i
-data/make/solaris/makefiles/reorder_COMPILER2_amd64.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/action/InspectAction.java.i
+data/build/linux/README.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCReturnInstruction.java.i
+data/src/cpu/sparc/vm/interpreter_sparc.cpp.i
+data/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java.i
-data/agent/src/os/win32/README-commands.txt.i
data/src/cpu/zero/vm/cppInterpreter_zero.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap16.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/META-INF/services/com.sun.hotspot.igv.filter.ScriptEngineAbstraction.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadContext.java.i
-data/make/windows/projectfiles/core/vm.def.i
+data/src/share/vm/oops/klassVtable.cpp.i
data/test/compiler/6895383/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/CallNode.java.i
-data/make/solaris/makefiles/reorder_TIERED_i486.i
+data/build/solaris/makefiles/reorder_COMPILER2_sparc.i
+data/agent/src/share/classes/com/sun/java/swing/ui/CommonToolBar.java.i
data/test/compiler/7068051/Test7068051.sh.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/manifest.mf.i
-data/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java.i
+data/src/share/vm/opto/escape.hpp.i
data/make/solaris/makefiles/reorder_COMPILER2_sparcv9.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFormat3AInstruction.java.i
+data/src/share/vm/c1/c1_Canonicalizer.hpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/genfiles.properties.i
data/src/share/vm/ci/ciUtilities.hpp.i
data/src/share/vm/utilities/workgroup.hpp.i
@@ -1656,6 +1642,7 @@ data/src/share/vm/runtime/mutex.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/StratumLineInfo.java.i
data/make/solaris/makefiles/mapfile-vers-CORE.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/StringReferenceImpl.java.i
+data/src/share/vm/adlc/dict2.cpp.i
data/src/share/vm/ci/ciSignature.cpp.i
data/src/share/vm/memory/referenceProcessor.cpp.i
data/src/cpu/x86/vm/interp_masm_x86_64.cpp.i
@@ -1670,33 +1657,32 @@ data/src/share/vm/utilities/copy.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentGCThread.cpp.i
data/agent/src/os/solaris/proc/saproc_audit.cpp.i
data/src/share/vm/opto/loopopts.cpp.i
-data/build/linux/makefiles/profiled.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java.i
data/src/share/tools/IdealGraphVisualizer/Util/build.xml.i
-data/build/windows/projectfiles/kernel/vm.def.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CompoundType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SpecialStoreDecoder.java.i
+data/src/share/vm/runtime/advancedThresholdPolicy.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/JSnap.java.i
-data/src/share/vm/ci/ciObjectFactory.hpp.i
+data/src/share/vm/classfile/classFileParser.cpp.i
data/test/compiler/6826736/Test.java.i
data/make/bsd/makefiles/build_vm_def.sh.i
data/agent/src/os/win32/Monitor.cpp.i
-data/src/cpu/x86/vm/vm_version_x86_32.hpp.i
+data/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp.i
data/src/share/vm/includeDB_compiler1.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties.i
+data/make/solaris/makefiles/hp1.make.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArithmeticInstruction.java.i
-data/src/share/vm/opto/escape.hpp.i
+data/src/os/bsd/dtrace/generateJvmOffsets.cpp.i
+data/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObject.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChainProvider.java.i
-data/build/solaris/makefiles/reorder_TIERED_sparc.i
+data/src/share/vm/gc_implementation/includeDB_gc_parNew.i
data/src/share/vm/opto/regmask.hpp.i
-data/src/os/bsd/vm/osThread_bsd.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupOrganizer.i
data/make/linux/makefiles/tiered.make.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRettInstruction.java.i
+data/src/share/tools/MakeDeps/WinGammaPlatformVC6.java.i
data/src/share/vm/opto/mulnode.hpp.i
data/make/linux/makefiles/zeroshark.make.i
-data/make/solaris/makefiles/dtrace.make.i
data/src/cpu/x86/vm/assembler_x86_32.hpp.i
data/src/share/vm/utilities/macros.hpp.i
data/agent/src/os/win32/Dispatcher.hpp.i
@@ -1707,6 +1693,7 @@ data/src/share/vm/runtime/thread.hpp.i
data/build/solaris/makefiles/launcher.make.i
data/src/share/vm/ci/ciInstance.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9ShiftDecoder.java.i
+data/src/share/tools/MakeDeps/WinGammaPlatformVC9.java.i
data/src/share/vm/gc_implementation/g1/satbQueue.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/MultiConnectionWidget.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/OldHierarchicalLayoutManager.java.i
@@ -1715,29 +1702,29 @@ data/src/share/vm/utilities/workgroup.cpp.i
data/build/solaris/makefiles/sparcv9.make.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickAction.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Save24.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FloatType.java.i
+data/make/solaris/makefiles/cscope.make.i
data/make/solaris/makefiles/reorder_TIERED_sparc.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/genfiles.properties.i
data/make/closed.make.i
data/agent/src/scripts/start-debug-server64.sh.i
data/make/solaris/platform_sparcv9.gcc.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortHeaderMouseAdapter.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteTypeImpl.java.i
data/src/share/vm/utilities/hashtable.inline.hpp.i
data/build/linux/makefiles/tiered.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java.i
data/make/windows/makefiles/vm.make.i
data/src/cpu/x86/vm/c2_globals_x86.hpp.i
-data/src/os/solaris/dtrace/jvm_dtrace.h.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyType.java.i
data/agent/src/os/linux/symtab.c.i
data/make/solaris/makefiles/makedeps.make.i
-data/test/compiler/7024475/Test7024475.java.i
+data/test/compiler/7046096/Test7046096.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/TestHelloWorld.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java.i
data/src/share/vm/code/icBuffer.cpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTraceEntry.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedFloat.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/CPUHelper.java.i
-data/make/solaris/makefiles/debug.make.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/platform.properties.i
data/make/windows/makefiles/jvmti.make.i
data/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp.i
@@ -1745,7 +1732,7 @@ data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/
data/build/solaris/makefiles/vm.make.i
data/src/share/vm/shark/sharkBlock.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeDisassembler.java.i
-data/src/share/vm/shark/sharkBuilder.hpp.i
+data/src/share/vm/runtime/dtraceJSDT.cpp.i
data/src/share/vm/runtime/monitorChunk.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java.i
data/src/cpu/x86/vm/assembler_x86.cpp.i
@@ -1757,36 +1744,34 @@ data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/
data/build/linux/makefiles/cscope.make.i
data/src/share/vm/runtime/handles.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/build-impl.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassFilter.java.i
-data/agent/src/os/bsd/salibelf.c.i
+data/src/share/vm/prims/methodHandles.cpp.i
+data/make/solaris/adlc_updater.i
data/make/solaris/makefiles/reorder_COMPILER2_i486.i
data/build/linux/makefiles/makedeps.make.i
data/src/share/vm/services/classLoadingService.hpp.i
-data/build/windows/makefiles/defs.make.i
+data/make/solaris/makefiles/tiered.make.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJFloatField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86ThreadFactory.java.i
data/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp.i
-data/agent/make/jdbcore64.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/LogicInstruction.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignLeft24.gif.i
data/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp.i
data/src/share/vm/prims/jvmtiGetLoadedClasses.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFloatType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PrefetchDecoder.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp.i
data/src/share/tools/IdealGraphVisualizer/build.xml.i
data/test/compiler/6431242/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/DebuggerConsolePanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeIf.java.i
data/src/share/vm/utilities/sizes.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/import.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlassKlass.java.i
data/src/share/vm/prims/perf.cpp.i
data/make/windows/makefiles/fastdebug.make.i
data/src/cpu/zero/vm/sharedRuntime_zero.cpp.i
data/src/share/vm/runtime/arguments.cpp.i
data/src/cpu/x86/vm/vm_version_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java.i
-data/agent/make/pstackproc.sh.i
-data/agent/src/os/bsd/StubDebuggerLocal.c.i
+data/build/solaris/platform_i486.gcc.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatTypeImpl.java.i
data/src/share/vm/libadt/vectset.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxDebugger.java.i
@@ -1810,7 +1795,9 @@ data/build/solaris/makefiles/sa.make.i
data/agent/src/os/win32/procList.hpp.i
data/src/share/vm/ci/ciStreams.cpp.i
data/test/runtime/6929067/T.java.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckListView.java.i
+data/test/compiler/6661247/Test.java.i
data/src/share/vm/oops/markOop.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJIntField.java.i
@@ -1818,28 +1805,28 @@ data/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp.i
data/src/cpu/x86/vm/stubRoutines_x86_32.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java.i
data/test/compiler/6603011/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSectionHeader.java.i
data/src/cpu/x86/vm/icache_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/build.xml.i
data/test/compiler/6799693/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/RuntimeStub.java.i
+data/src/cpu/x86/vm/c1_LinearScan_x86.cpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/development/Server24.gif.i
-data/test/compiler/6912517/Test.java.i
+data/src/share/vm/memory/collectorPolicy.hpp.i
data/src/os/windows/vm/decoder_windows.cpp.i
-data/src/share/vm/memory/cardTableRS.cpp.i
data/agent/src/share/classes/com/sun/java/swing/ui/OkCancelButtonPanel.java.i
data/src/cpu/sparc/vm/interp_masm_sparc.hpp.i
+data/src/share/vm/ci/ciTypeArray.hpp.i
data/src/share/vm/gc_implementation/shared/markSweep.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9BranchInstruction.java.i
+data/src/share/vm/utilities/hashtable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SavedInstruction.java.i
data/make/linux/makefiles/cscope.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/UnsupportedPlatformException.java.i
data/build/windows/projectfiles/compiler2/ADLCompiler.dsp.i
+data/agent/make/jdbproc64.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/AccessFlags.java.i
data/src/share/vm/opto/c2compiler.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/Generation.java.i
+data/src/share/vm/gc_implementation/shared/liveRange.hpp.i
data/agent/src/os/win32/SwDbgSrv.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodePutField.java.i
+data/make/bsd/makefiles/adlc.make.i
data/src/cpu/x86/vm/c1_Defs_x86.hpp.i
data/src/share/vm/c1/c1_LinearScan.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java.i
@@ -1847,9 +1834,11 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegM
data/agent/src/share/classes/sun/jvm/hotspot/jdi/BooleanValueImpl.java.i
data/test/compiler/6958485/Test.java.i
data/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/splash.gif.i
+data/src/share/vm/runtime/fprofiler.cpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp.i
data/src/os/windows/vm/thread_windows.inline.hpp.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC7.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcCFrame.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/build.xml.i
data/src/share/vm/utilities/constantTag.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/CancelAction.java.i
@@ -1857,14 +1846,14 @@ data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/manifest.mf.i
data/make/bsd/makefiles/sparcWorks.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveStoreInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicTypeSize.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RicochetFrame.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/ConditionalJmpDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/Block_Array.java.i
+data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.xml.i
data/test/compiler/6741738/Tester.java.i
data/src/share/vm/ci/ciMethod.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64RegisterMap.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java.i
-data/make/windows/platform_i486.i
data/agent/src/share/classes/images/toolbarButtonGraphics/navigation/Up16.gif.i
data/make/solaris/Makefile.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/RhinoScriptEngine.java.i
@@ -1872,7 +1861,7 @@ data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapValue.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/GRPDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/JTreeTable.java.i
data/agent/src/share/classes/com/sun/java/swing/ui/WizardDlg.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java.i
+data/src/cpu/zero/vm/vtableStubs_zero.cpp.i
data/src/os/linux/vm/perfMemory_linux.cpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/build-impl.xml.i
data/test/TEST.ROOT.i
@@ -1880,11 +1869,9 @@ data/src/share/vm/gc_implementation/g1/heapRegionSets.hpp.i
data/src/share/vm/opto/reg_split.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxDebuggerLocal.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/BranchDecoder.java.i
-data/src/share/vm/memory/generation.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/DLL.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/export.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ImmediateOrRegister.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFile.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyOopHandle.java.i
data/src/share/vm/c1/c1_MacroAssembler.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java.i
data/src/cpu/zero/vm/vm_version_zero.cpp.i
@@ -1904,9 +1891,8 @@ data/src/cpu/sparc/vm/depChecker_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/CallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIid.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialStoreDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeModel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java.i
+data/make/linux/Queens.class.i
+data/src/share/vm/ci/ciTypeFlow.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java.i
data/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp.i
@@ -1926,23 +1912,23 @@ data/src/os_cpu/windows_x86/vm/assembler_windows_x86_64.cpp.i
data/src/share/vm/opto/coalesce.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64Thread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationIsInClosure.java.i
-data/make/windows/makefiles/shared.make.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Source.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties.i
+data/test/runtime/6888954/vmerrors.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/BadAddressTreeNodeAdapter.java.i
data/src/share/vm/prims/jniFastGetField.cpp.i
-data/src/share/vm/oops/oop.pcgc.inline.hpp.i
+data/src/share/vm/ci/ciUtilities.cpp.i
data/agent/make/build-filelist.i
data/src/cpu/sparc/vm/bytecodes_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderStandardFields.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadFactory.java.i
+data/test/compiler/7070134/Stemmer.java.i
data/src/share/vm/code/compiledIC.cpp.i
data/make/solaris/makefiles/optimized.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/MemoryInstruction.java.i
data/src/share/vm/prims/jvmtiExport.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/Scheduler.java.i
+data/agent/src/os/bsd/libproc_impl.c.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbolConstants.java.i
data/test/compiler/6956668/Test6956668.java.i
data/src/cpu/x86/vm/templateTable_x86_32.hpp.i
@@ -1955,20 +1941,18 @@ data/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp.i
data/make/bsd/makefiles/compiler2.make.i
data/agent/make/start-rmiregistry.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThread.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/livejvm/Event.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp.i
data/make/windows/projectfiles/common/Makefile.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaCallWrapper.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java.i
data/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RegisterBranchDecoder.java.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Instruction.java.i
+data/src/share/tools/IdealGraphVisualizer/View/nbproject/project.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ObjectVisitor.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Bundle.properties.i
-data/make/solaris/makefiles/sparcWorks.make.i
+data/test/compiler/6973329/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/table/TableModelComparator.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/MonitorInfoImpl.java.i
data/src/share/vm/opto/split_if.cpp.i
data/src/os/solaris/vm/hpi_solaris.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp.i
@@ -1977,48 +1961,46 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC9.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialLoadDecoder.java.i
data/test/compiler/5091921/Test6905845.java.i
-data/src/share/vm/oops/klassOop.hpp.i
data/src/cpu/zero/vm/interp_masm_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Arithmetic.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler.i
+data/src/share/vm/oops/methodDataKlass.cpp.i
data/build/solaris/makefiles/mapfile-vers-CORE.i
data/src/share/vm/gc_implementation/g1/ptrQueue.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/TypeVisitor.java.i
-data/make/windows/projectfiles/tiered/Makefile.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java.i
+data/agent/src/os/win32/README-commands.txt.i
+data/src/share/vm/services/dtraceAttacher.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassTypeImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolTypes.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp.i
+data/src/share/vm/shark/sharkBuilder.hpp.i
data/src/share/vm/c1/c1_CFGPrinter.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadContext.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMapClosure.java.i
+data/agent/make/pmapwindbg64.bat.i
data/src/os_cpu/linux_x86/vm/linux_x86_32.ad.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/JFrameWrapper.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/StubQueue.java.i
+data/make/bsd/makefiles/tiered.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleTypeImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java.i
data/src/cpu/x86/vm/javaFrameAnchor_x86.hpp.i
data/build/windows/makefiles/rules.make.i
data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86_64.cpp.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java.i
data/agent/src/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java.i
data/make/linux/makefiles/optimized.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlass.java.i
+data/src/share/vm/ci/ciInstance.cpp.i
data/src/share/vm/gc_implementation/g1/g1_globals.cpp.i
data/make/bsd/makefiles/buildtree.make.i
data/make/linux/README.i
-data/src/cpu/x86/vm/depChecker_x86.hpp.i
data/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp.i
data/agent/src/scripts/start-rmiregistry64.sh.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java.i
data/agent/src/share/classes/com/sun/java/swing/action/OpenAction.java.i
data/src/cpu/sparc/vm/codeBuffer_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/BooleanTreeNodeAdapter.java.i
data/src/share/vm/oops/instanceKlassKlass.hpp.i
data/src/share/vm/code/codeCache.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.i
data/agent/test/jdi/multivm.sh.i
-data/agent/test/jdi/jstack64.sh.i
-data/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPathElement.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JDoubleField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/DefaultHeapVisitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialStoreInstruction.java.i
@@ -2029,46 +2011,48 @@ data/src/share/vm/libadt/dict.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadContext.java.i
data/agent/make/clhsdbwindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java.i
+data/src/share/vm/runtime/unhandledOops.hpp.i
data/src/share/vm/runtime/task.hpp.i
data/agent/make/jdbproc.sh.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java.i
-data/src/os/solaris/vm/os_share_solaris.hpp.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/suite.properties.i
-data/src/share/tools/ProjectCreator/DirectoryTree.java.i
+data/src/share/vm/classfile/javaAssertions.cpp.i
data/src/share/vm/oops/objArrayOop.cpp.i
data/make/linux/build.sh.i
data/src/share/vm/runtime/vm_operations.hpp.i
data/agent/doc/clhsdb.html.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/BaseIndexScaleDispAddress.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ReadDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SpecialRegisters.java.i
+data/test/compiler/6865265/StackOverflowBug.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHistogram.java.i
+data/src/share/tools/launcher/wildcard.c.i
data/agent/make/hsdbwindbg.bat.i
data/src/os_cpu/solaris_sparc/vm/solaris_sparc.s.i
data/src/share/vm/prims/jvmtiEnvThreadState.hpp.i
data/build/solaris/makefiles/reorder_COMPILER2_amd64.i
data/src/share/vm/oops/instanceRefKlass.hpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIndirectCallInstruction.java.i
+data/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/VariablePanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegisters.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/minus.gif.i
-data/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java.i
data/make/windows/makefiles/sa.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/manifest.mf.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java.i
data/src/share/vm/prims/jvmtiClassFileReconstituter.hpp.i
data/src/cpu/x86/vm/templateTable_x86_64.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/META-INF/services/com.sun.hotspot.igv.filter.ScriptEngineAbstraction.i
data/agent/src/os/win32/Buffer.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml.i
data/make/solaris/makefiles/hp.make.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp.i
data/test/compiler/6711100/Test.java.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadProxy.java.i
data/src/share/vm/opto/callGenerator.cpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Settings.java.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java.i
data/agent/src/os/win32/SwDbgSub.dsp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java.i
data/src/share/vm/code/pcDesc.hpp.i
@@ -2078,141 +2062,142 @@ data/make/bsd/makefiles/amd64.make.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Information24.gif.i
data/src/cpu/zero/vm/icache_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java.i
-data/make/solaris/makefiles/reorder_COMPILER1_sparcv9.i
+data/src/share/vm/asm/assembler.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java.i
data/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CodeCacheVisitor.java.i
data/src/share/vm/ci/ciCallSite.hpp.i
data/src/share/vm/runtime/virtualspace.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectory.java.i
-data/src/cpu/x86/vm/assembler_x86_64.cpp.i
+data/agent/src/os/bsd/StubDebuggerLocal.c.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValue.java.i
data/src/os/windows/vm/hpi_windows.cpp.i
data/src/cpu/x86/vm/interpreterGenerator_x86.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/HeapBlock.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9CasInstruction.java.i
data/agent/make/jsdbproc.sh.i
data/src/os_cpu/windows_x86/vm/windows_x86_32.ad.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/BreakpointInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TypeIndicators.java.i
data/test/compiler/5091921/Test6992759.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java.i
+data/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp.i
+data/src/share/vm/gc_implementation/parNew/parOopClosures.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJDoubleField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9InstructionFactory.java.i
-data/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapPrinter.java.i
+data/src/cpu/zero/vm/register_definitions_zero.cpp.i
data/src/share/vm/runtime/vframe_hp.hpp.i
data/test/compiler/6892265/Test.java.i
-data/src/cpu/zero/vm/globals_zero.hpp.i
+data/test/compiler/6663621/IVTest.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java.i
data/src/share/vm/runtime/reflectionCompat.hpp.i
data/src/cpu/x86/vm/stubRoutines_x86_32.hpp.i
data/src/share/vm/interpreter/bytecodeInterpreter.cpp.i
-data/src/share/vm/ci/ciCallSite.cpp.i
+data/src/share/vm/ci/ciObjArray.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp.i
data/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp.i
data/src/os/linux/vm/osThread_linux.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml.i
-data/src/cpu/sparc/vm/register_definitions_sparc.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java.i
+data/src/share/vm/prims/hpi_imported.h.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GraphViewer.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Opcodes.java.i
-data/src/cpu/x86/vm/assembler_x86_32.inline.hpp.i
+data/test/compiler/6757316/Test6757316.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/AdapterBlob.java.i
data/src/cpu/zero/vm/nativeInst_zero.cpp.i
data/src/share/vm/utilities/taskqueue.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/FieldIdentifier.java.i
+data/src/share/vm/gc_interface/collectedHeap.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlassKlass.java.i
data/src/share/vm/code/debugInfo.cpp.i
data/src/share/vm/memory/defNewGeneration.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/ExportDirectoryTable.java.i
+data/test/compiler/6910484/Test.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java.i
data/src/share/vm/memory/sharedHeap.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/AddressOps.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/Generation.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfDataPrologue.java.i
data/src/share/vm/runtime/jfieldIDWorkaround.hpp.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgOopHandle.java.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp.i
-data/src/share/vm/memory/universe.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLoadInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java.i
data/src/share/vm/c1/c1_Instruction.cpp.i
-data/src/share/vm/prims/jni.h.i
+data/test/Makefile.i
data/src/share/vm/memory/genMarkSweep.cpp.i
data/src/share/vm/runtime/javaCalls.hpp.i
data/src/share/vm/memory/referencePolicy.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTracePanel.java.i
data/src/share/vm/oops/constMethodOop.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java.i
-data/make/solaris/makefiles/mapfile-vers-nonproduct.i
+data/src/share/vm/shark/sharkCodeBuffer.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java.i
data/src/cpu/zero/vm/entry_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/Bits.java.i
+data/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp.i
data/src/share/vm/ci/ciKlassKlass.hpp.i
-data/src/share/vm/utilities/yieldingWorkgroup.cpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties.i
-data/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DumpExports.java.i
+data/make/windows/makefiles/rules.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlassKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadContext.java.i
-data/src/share/vm/opto/memnode.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/suite.properties.i
data/src/os/solaris/vm/globals_solaris.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegInfo.java.i
-data/src/share/vm/memory/gcLocker.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodKlass.java.i
data/src/share/vm/includeDB_shark.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties.i
-data/src/share/vm/runtime/fprofiler.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties.i
data/agent/src/share/classes/com/sun/java/swing/action/ExitAction.java.i
+data/src/cpu/x86/vm/disassembler_x86.cpp.i
data/src/share/vm/gc_interface/gcCause.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/AddressDataSource.java.i
data/src/share/vm/c1/c1_LIRGenerator.hpp.i
-data/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxOopHandle.java.i
data/src/cpu/zero/vm/stubRoutines_zero.cpp.i
data/make/windows/projectfiles/compiler2/vm.dsw.i
-data/src/share/vm/adlc/filebuff.cpp.i
-data/test/compiler/7047069/Test7047069.java.i
data/make/bsd/makefiles/saproc.make.i
data/src/share/vm/oops/generateOopMap.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/OopField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/RotateDecoder.java.i
-data/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp.i
+data/src/cpu/x86/vm/icache_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/Editor.java.i
-data/src/cpu/x86/vm/dump_x86_64.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java.i
data/src/share/vm/runtime/serviceThread.cpp.i
data/make/linux/adlc_updater.i
data/build/windows/build.make.i
-data/src/os/windows/vm/hpi_windows.hpp.i
+data/src/os/windows/vm/vtune_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortHeaderCellRenderer.java.i
+data/src/share/vm/services/psMemoryPool.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/Type.java.i
-data/src/share/vm/runtime/safepoint.cpp.i
+data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/genfiles.properties.i
data/make/solaris/makefiles/mapfile-vers-debug.i
data/make/solaris/makefiles/reorder_CORE_amd64.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantLongValue.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedInt.java.i
-data/src/share/vm/code/exceptionHandlerTable.hpp.i
+data/src/share/vm/runtime/signature.cpp.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_64.s.i
data/src/share/vm/interpreter/rewriter.cpp.i
data/src/share/vm/opto/loopnode.cpp.i
-data/src/share/vm/oops/fieldInfo.hpp.i
data/agent/make/pstackproc64.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RetryInstruction.java.i
-data/src/share/tools/ProjectCreator/ProjectCreator.java.i
+data/src/share/vm/prims/jniCheck.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ProcImageClassLoader.java.i
-data/make/solaris/makefiles/reorder_COMPILER1_sparc.i
+data/test/compiler/6778657/Test.java.i
data/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/OffsetClosure.java.i
-data/agent/make/jcoreproc64.sh.i
-data/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp.i
-data/src/share/vm/ci/ciSignature.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java.i
+data/src/share/vm/runtime/frame.inline.hpp.i
data/src/share/vm/ci/ciTypeArray.cpp.i
data/src/share/vm/includeDB_compiler2.i
data/src/share/vm/oops/symbolKlass.hpp.i
data/src/cpu/zero/vm/register_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSethiInstruction.java.i
-data/src/share/tools/IdealGraphVisualizer/View/nbproject/genfiles.properties.i
-data/make/windows/create.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java.i
+data/agent/make/dumpflagswindbg64.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/InterpreterCodelet.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/project.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicField.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/Bundle.properties.i
data/src/share/vm/memory/space.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties.i
@@ -2223,58 +2208,57 @@ data/agent/test/jdi/TargetAdapter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodePutStatic.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86BranchInstruction.java.i
data/src/share/vm/interpreter/bytecodeStream.hpp.i
-data/src/cpu/x86/vm/stubRoutines_x86_64.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/CIntegerField.java.i
data/src/share/tools/ProjectCreator/BuildConfig.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java.i
-data/src/share/vm/compiler/compilerOracle.cpp.i
-data/test/compiler/6758234/Test6758234.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/WindowsNTSubsystem.java.i
+data/src/share/vm/gc_implementation/shared/gcStats.hpp.i
+data/src/share/vm/oops/constantPoolOop.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJBooleanField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVrDecoder.java.i
-data/src/share/vm/shark/sharkState.hpp.i
+data/build/sa.files.i
data/src/os/windows/vm/mutex_windows.cpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/manifest.mf.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/suite.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFRelocation.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LoadDecoder.java.i
+data/src/share/vm/memory/cardTableRS.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Thread.java.i
+data/src/share/vm/utilities/preserveException.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/TwoOopHashtable.java.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java.i
-data/test/compiler/6910618/Test.java.i
-data/test/compiler/5091921/Test6959129.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterIndirectAddress.java.i
+data/src/cpu/x86/vm/frame_x86.hpp.i
+data/src/share/vm/classfile/classFileError.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPMoveDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CounterData.java.i
data/agent/make/finalizerinfoproc.sh.i
data/src/share/tools/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties.i
-data/src/share/vm/ci/ciSymbol.hpp.i
-data/make/linux/makefiles/compiler2.make.i
-data/src/os/linux/vm/objectMonitor_linux.cpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java.i
+data/agent/test/jdi/runjdb.sh.i
data/src/share/vm/opto/parse2.cpp.i
data/src/share/vm/code/debugInfo.hpp.i
data/agent/test/jdi/README.jjh.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMVersionMismatchException.java.i
-data/test/compiler/6832293/Test.java.i
+data/src/share/vm/opto/phaseX.cpp.i
data/src/share/vm/memory/heap.hpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/SignatureIterator.java.i
data/src/cpu/sparc/vm/register_sparc.hpp.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java.i
-data/src/share/vm/c1/c1_CFGPrinter.cpp.i
+data/src/cpu/x86/vm/vmreg_x86.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSethiInstruction.java.i
data/src/cpu/zero/vm/dump_zero.cpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/build-impl.xml.i
-data/make/defs.make.i
-data/make/linux/makefiles/defs.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBColor.java.i
+data/make/solaris/makefiles/kernel.make.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/genfiles.properties.i
-data/build/solaris/platform_i486.gcc.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_32.s.i
data/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputMethod.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/HeapParametersPanel.java.i
-data/test/runtime/6626217/Test6626217.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/Symbol.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties.i
data/agent/src/os/win32/initWinsock.hpp.i
data/src/share/vm/runtime/vmThread.cpp.i
+data/make/solaris/makefiles/mapfile-vers-jvm_db.i
data/src/share/vm/runtime/biasedLocking.hpp.i
data/src/share/vm/prims/jvmtiH.xsl.i
data/src/cpu/sparc/vm/c1_LIRAssembler_sparc.hpp.i
@@ -2282,9 +2266,9 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialLoadStoreDecoder.j
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/amd64/AMD64CFrame.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java.i
data/src/share/vm/code/location.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/WriteDecoder.java.i
+data/test/compiler/7042153/Test7042153.java.i
data/src/share/vm/shark/sharkMemoryManager.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIntType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegister.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp.i
data/src/share/vm/services/runtimeService.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualSpace.java.i
@@ -2296,65 +2280,68 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCMoveInstruction.java
data/src/share/vm/gc_implementation/g1/concurrentMark.cpp.i
data/src/share/vm/prims/jvm.h.i
data/agent/src/share/classes/sun/jvm/hotspot/types/TypeDataBase.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVccInstruction.java.i
-data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeCheckCast.java.i
+data/src/cpu/x86/vm/assembler_x86_32.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_sparc/LinuxSPARCJavaThreadPDAccess.java.i
-data/src/share/tools/MakeDeps/MakeDeps.java.i
-data/src/share/vm/code/icBuffer.hpp.i
-data/src/cpu/sparc/vm/c2_init_sparc.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstance.java.i
data/agent/src/share/classes/com/sun/java/swing/ui/StatusBar.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCompoundType.java.i
data/src/os/windows/vm/threadCritical_windows.cpp.i
data/build/solaris/makefiles/mapfile-vers.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/LowMemoryDetectorThread.java.i
-data/src/share/vm/runtime/stackValue.hpp.i
+data/src/share/tools/ProjectCreator/FileFormatException.java.i
data/agent/make/dumpsyspropswindbg64.bat.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadFactory.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp.i
-data/make/solaris/makefiles/mapfile-vers-COMPILER1.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/MonitorInfoImpl.java.i
+data/agent/make/pstackproc.sh.i
data/src/share/vm/prims/jniCheck.hpp.i
data/src/share/vm/ci/ciObjArrayKlass.cpp.i
data/src/share/vm/runtime/vframe.hpp.i
data/test/compiler/6726999/Test.java.i
data/src/os/linux/vm/objectMonitor_linux.inline.hpp.i
-data/agent/src/share/classes/com/sun/java/swing/ui/ToggleActionPropertyChangeListener.java.i
+data/src/share/vm/opto/stringopts.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml.i
data/src/os_cpu/linux_sparc/vm/thread_linux_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/HaltNode.java.i
data/src/share/vm/c1/c1_ValueMap.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SavedRestoredDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RestoredInstruction.java.i
+data/src/share/vm/memory/blockOffsetTable.inline.hpp.i
data/test/compiler/5091921/Test5091921.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/VtblAccess.java.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.gif.i
-data/src/share/vm/oops/instanceKlass.cpp.i
+data/src/share/vm/libadt/set.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntegerEnum.java.i
+data/test/compiler/6795161/Test.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.properties.i
+data/test/compiler/7047069/Test7047069.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciReceiverTypeData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedDouble.java.i
data/build/windows/projectfiles/compiler1/vm.dsw.i
-data/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java.i
+data/src/share/vm/opto/loopUnswitch.cpp.i
+data/src/share/vm/runtime/fieldDescriptor.cpp.i
data/src/cpu/zero/vm/stack_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualBaseConstructor.java.i
-data/test/compiler/6823354/Test6823354.java.i
-data/make/linux/makefiles/sparcv9.make.i
+data/src/share/vm/ci/ciArrayKlassKlass.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/Address.java.i
data/src/share/vm/prims/jvmtiRawMonitor.hpp.i
data/build/windows/projectfiles/tiered/Makefile.i
data/src/share/vm/ci/ciMethodKlass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderDataDirectories.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactoryImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DataDirectory.java.i
+data/make/templates/bsd-header.i
data/src/cpu/zero/vm/templateTable_zero.cpp.i
-data/test/compiler/6837011/Test6837011.java.i
-data/agent/src/share/classes/com/sun/java/swing/ui/SplashScreen.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSaveInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32Address.java.i
data/src/os/solaris/dtrace/libjvm_db.c.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCShiftInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGraphWriter.java.i
data/src/share/vm/memory/gcLocker.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp.i
-data/src/os/solaris/vm/osThread_solaris.hpp.i
data/src/cpu/zero/vm/jniTypes_zero.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp.i
data/build/linux/platform_i486.suncc.i
@@ -2369,78 +2356,83 @@ data/src/share/vm/ci/ciInstanceKlass.hpp.i
data/agent/make/permstatwindbg64.bat.i
data/src/share/vm/runtime/osThread.cpp.i
data/src/share/vm/utilities/errorReporter.hpp.i
-data/build/solaris/makefiles/reorder_CORE_sparcv9.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java.i
data/src/share/vm/ci/ciObjArrayKlass.hpp.i
data/src/share/vm/includeDB_zero.i
-data/src/share/vm/memory/threadLocalAllocBuffer.cpp.i
-data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.cpp.i
+data/src/share/vm/compiler/compileLog.hpp.i
data/src/share/vm/classfile/verifier.hpp.i
-data/test/compiler/5091921/Test6753639.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50Subsection.java.i
+data/src/share/vm/prims/privilegedStack.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegister.java.i
data/src/share/vm/prims/jvmtiEnv.xsl.i
-data/make/bsd/makefiles/hp1.make.i
+data/build/linux/Queens.class.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThreadState.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp.i
-data/src/share/vm/runtime/sharedRuntimeTrig.cpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/remove.filter.i
+data/agent/src/os/linux/libproc.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9ReadDecoder.java.i
+data/src/cpu/sparc/vm/jni_sparc.h.i
+data/src/os/bsd/dtrace/jvm_dtrace.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/Type.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCDisassembler.java.i
+data/src/share/vm/opto/lcm.cpp.i
data/src/cpu/sparc/vm/register_sparc.cpp.i
data/src/cpu/zero/vm/cppInterpreter_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaScriptEngine.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/AddressDataSource.java.i
data/build/solaris/makefiles/compiler1.make.i
data/make/solaris/makefiles/reorder_COMPILER1_i486.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9MOVccDecoder.java.i
data/src/os/solaris/vm/mutex_solaris.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerTypeImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BitType.java.i
+data/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties.i
+data/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ArrayReferenceImpl.java.i
-data/agent/src/share/classes/com/sun/java/swing/action/HelpMenu.java.i
data/agent/test/jdi/TargetListener.java.i
data/build/windows/platform_amd64.i
-data/src/share/vm/ci/ciFlags.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java.i
data/src/share/vm/ci/ciEnv.cpp.i
data/src/share/vm/opto/doCall.cpp.i
-data/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp.i
+data/test/compiler/6930043/Test6930043.java.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignCenter16.gif.i
data/build/linux/makefiles/saproc.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Register.java.i
data/src/share/vm/opto/macro.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindClassesAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java.i
+data/src/share/vm/ci/ciMethod.cpp.i
data/src/share/tools/MakeDeps/Platform.java.i
-data/make/bsd/makefiles/mapfile-vers-debug.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java.i
data/test/compiler/6894807/Test6894807.sh.i
data/src/os/linux/vm/vmError_linux.cpp.i
data/src/share/vm/classfile/javaClasses.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java.i
-data/make/bsd/makefiles/ppc.make.i
+data/test/runtime/6929067/Test6929067.sh.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties.i
data/src/share/tools/ProjectCreator/ArgsParser.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/FloatTreeNodeAdapter.java.i
-data/make/windows/projectfiles/compiler2/Makefile.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/ExportDirectoryTable.java.i
data/src/share/tools/MakeDeps/Macro.java.i
data/src/share/vm/compiler/methodLiveness.cpp.i
+data/test/compiler/6935535/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactory.java.i
-data/src/share/vm/code/codeBlob.hpp.i
data/agent/test/jdi/TEST.ROOT.i
data/src/share/vm/includeDB_features.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9IlltrapInstruction.java.i
data/src/share/vm/interpreter/cppInterpreter.hpp.i
data/src/os_cpu/windows_x86/vm/windows_x86_64.ad.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32ThreadContext.java.i
+data/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java.i
-data/make/solaris/makefiles/tiered.make.i
+data/build/windows/makefiles/defs.make.i
data/src/share/vm/utilities/events.cpp.i
data/make/solaris/makefiles/i486.make.i
data/make/windows/projectfiles/compiler2/ADLCompiler.dsw.i
-data/src/share/vm/prims/jvmtiEventController.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java.i
-data/src/cpu/zero/vm/jni_zero.h.i
+data/src/share/vm/runtime/jniHandles.hpp.i
data/src/share/tools/IdealGraphVisualizer/Data/build.xml.i
data/agent/make/jdbcore.sh.i
data/build/windows/projectfiles/core/vm.dsw.i
@@ -2458,134 +2450,132 @@ data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntervalTree.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorBranchDecoder.java.i
data/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterPart.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86ThreadContext.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/JavaStackTracePanel.java.i
data/make/windows/makefiles/top.make.i
-data/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/livejvm/Event.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/StaticBaseConstructor.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java.i
-data/src/share/vm/oops/methodDataKlass.cpp.i
-data/src/share/vm/opto/superword.cpp.i
-data/agent/make/pmapwindbg64.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleTypeImpl.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMapClosure.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/StubQueue.java.i
+data/src/os/bsd/dtrace/hotspot_jni.d.i
data/src/share/vm/services/jmm.h.i
data/make/linux/makefiles/sa.make.i
data/make/linux/makefiles/arm.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/RuntimeStub.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfDataEntry.java.i
-data/src/share/vm/classfile/javaAssertions.cpp.i
+data/src/share/tools/ProjectCreator/DirectoryTree.java.i
data/src/share/vm/runtime/reflectionUtils.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugInfoDataBase.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/build-impl.xml.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java.i
+data/src/cpu/sparc/vm/c2_init_sparc.cpp.i
data/src/share/vm/memory/allocationStats.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceMirrorKlass.java.i
data/agent/make/dumpsyspropsproc.sh.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberMapping.java.i
data/src/share/vm/services/runtimeService.cpp.i
-data/test/compiler/6663621/IVTest.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapVisitor.java.i
+data/src/cpu/zero/vm/globals_zero.hpp.i
+data/src/share/vm/oops/cpCacheOop.hpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/FieldTreeNodeAdapter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntryConstants.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/LongField.java.i
-data/make/windows/makefiles/rules.make.i
+data/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp.i
data/src/share/vm/utilities/elfStringTable.hpp.i
data/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp.i
data/build/solaris/makefiles/reorder_COMPILER1_sparc.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java.i
-data/src/os/windows/vm/vtune_windows.cpp.i
+data/src/os/windows/vm/hpi_windows.hpp.i
data/test/compiler/6990212/Test6990212.java.i
data/src/share/vm/memory/serialize.cpp.i
-data/src/share/vm/prims/jniCheck.cpp.i
+data/src/share/tools/ProjectCreator/ProjectCreator.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterDirectAddress.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java.i
data/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java.i
-data/src/share/vm/memory/cardTableRS.hpp.i
+data/agent/doc/ReadMe-JavaScript.text.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LoadDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/search.gif.i
data/src/os/linux/vm/osThread_linux.cpp.i
data/src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java.i
data/src/share/vm/ci/ciField.cpp.i
data/test/compiler/7002666/Test7002666.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/CompoundTypeKind.java.i
+data/src/share/vm/shark/sharkContext.cpp.i
data/test/compiler/5091921/Test6890943.java.i
data/src/os/windows/vm/os_windows.inline.hpp.i
data/src/share/vm/precompiled.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/PhiNode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RestoredInstruction.java.i
+data/src/share/vm/c1/c1_LIR.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SavedRestoredDecoder.java.i
data/build/solaris/makefiles/mapfile-vers-COMPILER2.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64FloatRegister.java.i
-data/src/share/vm/oops/instanceOop.cpp.i
data/src/share/vm/opto/callnode.cpp.i
-data/src/share/vm/runtime/prefetch.hpp.i
+data/test/compiler/6863155/Test6863155.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java.i
data/src/share/vm/runtime/mutexLocker.cpp.i
-data/src/share/vm/gc_implementation/g1/ptrQueue.inline.hpp.i
+data/src/share/vm/memory/threadLocalAllocBuffer.cpp.i
data/src/share/vm/runtime/jniHandles.cpp.i
data/make/bsd/makefiles/rules.make.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/ZoomIn24.gif.i
+data/agent/make/dumpflagswindbg.bat.i
data/src/cpu/sparc/vm/javaFrameAnchor_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/build-impl.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxAddress.java.i
+data/src/share/vm/gc_implementation/shared/coTracker.hpp.i
data/src/share/vm/runtime/timer.hpp.i
data/src/share/vm/opto/callGenerator.hpp.i
-data/src/share/vm/interpreter/bytecode.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeFastAAccess0.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/TypeComponentImpl.java.i
-data/agent/src/os/win32/Buffer.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DataDirectory.java.i
+data/src/cpu/x86/vm/vm_version_x86_32.hpp.i
data/agent/make/soqlproc.sh.i
data/src/cpu/zero/vm/stack_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachNode.java.i
data/src/os/bsd/vm/threadCritical_bsd.cpp.i
data/src/share/vm/shark/sharkStack.hpp.i
-data/src/share/vm/oops/cpCacheOop.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapVisitor.java.i
data/src/share/vm/adlc/adlparse.cpp.i
-data/make/windows/projectfiles/tiered/ADLCompiler.dsw.i
+data/agent/test/jdi/serialvm.java.i
data/src/share/vm/adlc/adlc.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/extract.gif.i
-data/test/compiler/6863155/Test6863155.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/ResolveListener.java.i
-data/src/share/vm/runtime/osThread.hpp.i
+data/src/share/vm/runtime/prefetch.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicField.java.i
data/src/share/vm/runtime/perfMemory.cpp.i
data/src/share/vm/ci/ciFlags.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/InputLexer.java.i
-data/build/windows/projectfiles/tiered/ADLCompiler.dsp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ProcessControl.java.i
-data/agent/src/os/linux/Makefile.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaClass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicField.java.i
-data/src/cpu/sparc/vm/vm_version_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeRet.java.i
data/test/compiler/5091921/input6890943.txt.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SirInstruction.java.i
+data/agent/src/os/linux/Makefile.i
data/src/share/tools/MakeDeps/FileName.java.i
data/src/cpu/zero/vm/interpreter_zero.hpp.i
data/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJShortField.java.i
data/make/windows/makefiles/sanity.make.i
+data/build/solaris/makefiles/mapfile-vers-COMPILER1.i
data/src/share/vm/shark/sharkCompiler.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/bugspot/RegisterPanel.java.i
-data/build/solaris/platform_i486.i
+data/src/share/tools/IdealGraphVisualizer/View/nbproject/build-impl.xml.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlockEdge.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoomin.gif.i
data/make/solaris/makefiles/compiler2.make.i
data/test/compiler/6646020/Tester.java.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupReceiver.java.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/SAPanel.java.i
+data/agent/doc/hsdb.html.i
data/build/windows/platform_i486.i
+data/src/share/vm/opto/callnode.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CodeHeap.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/platform.properties.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardGroupOrganizer.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodePutField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java.i
data/src/share/vm/utilities/copy.hpp.i
data/src/share/vm/runtime/interfaceSupport.hpp.i
@@ -2594,16 +2584,15 @@ data/src/cpu/zero/vm/bytecodes_zero.cpp.i
data/src/cpu/x86/vm/c1_Runtime1_x86.cpp.i
data/agent/src/os/win32/isNT4.hpp.i
data/src/share/vm/ci/ciObjArrayKlassKlass.cpp.i
-data/src/cpu/zero/vm/relocInfo_zero.hpp.i
+data/src/share/tools/MakeDeps/UnixPlatform.java.i
data/src/os/bsd/vm/chaitin_bsd.cpp.i
data/src/cpu/zero/vm/fakeStubFrame_zero.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/JavaGroupOrganizer.java.i
data/make/windows/makefiles/defs.make.i
data/src/share/tools/launcher/java.c.i
-data/src/os/solaris/launcher/java_md.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/RetData.java.i
data/src/share/vm/shark/sharkInvariants.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationSpec.java.i
-data/src/os/linux/vm/chaitin_linux.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/method.gif.i
data/src/share/vm/gc_implementation/shared/mutableSpace.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Arguments.java.i
@@ -2614,8 +2603,8 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FP2RegisterDecoder.java.i
data/make/solaris/makefiles/core.make.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/SaveAs24.gif.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties.i
-data/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.d
+data/src/share/vm/ci/ciTypeArrayKlass.cpp.i
+data/src/share/vm/shark/sharkInliner.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/JMap.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Bundle.properties.i
@@ -2624,52 +2613,49 @@ data/agent/src/share/classes/sun/jvm/hotspot/types/JLongField.java.i
data/src/share/vm/runtime/threadLocalStorage.cpp.i
data/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp.i
data/src/share/vm/runtime/vtune.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVccDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/SafePointNode.java.i
data/agent/src/os/solaris/dbx/Makefile.i
data/agent/src/share/classes/com/sun/java/swing/action/NextAction.java.i
data/src/share/vm/interpreter/bytecodeHistogram.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Disassembler.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FloatBranchDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/PackageScanner.java.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/META-INF/services/com.sun.hotspot.igv.filter.ScriptEngineAbstraction.i
+data/src/share/vm/services/g1MemoryPool.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupReceiver.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadStore.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/OopHandle.java.i
data/src/share/vm/shark/sharkTopLevelBlock.hpp.i
data/src/os_cpu/windows_x86/vm/threadLS_windows_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLookupswitch.java.i
data/src/share/vm/gc_implementation/shared/spaceCounters.hpp.i
-data/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.i
+data/src/os/windows/vm/c2_globals_windows.hpp.i
data/src/share/vm/opto/live.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/SafepointBlob.java.i
data/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactoryImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/JmpDecoder.java.i
+data/make/linux/platform_zero.in.i
+data/make/windows/projectfiles/core/vm.dsw.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Zoom16.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObject.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/BufferBlob.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/InvocableCallable.java.i
data/test/compiler/6636138/Test2.java.i
data/build/solaris/makefiles/reorder_CORE_amd64.i
-data/src/os/windows/vm/jvm_windows.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V8FPop2Decoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/UnknownOopException.java.i
-data/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp.i
+data/src/share/vm/oops/fieldInfo.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/MemberFunctionType.java.i
data/src/share/vm/runtime/deoptimization.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceStoreDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java.i
+data/src/os/windows/vm/objectMonitor_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9InstructionFactoryImpl.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/project.properties.i
data/src/share/vm/memory/genMarkSweep.hpp.i
-data/src/os/windows/vm/perfMemory_windows.cpp.i
data/build/linux/build.sh.i
data/src/share/vm/oops/instanceRefKlass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JByteField.java.i
-data/src/share/vm/code/nmethod.hpp.i
data/src/share/vm/adlc/archDesc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/PCFinder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/development/Server16.gif.i
data/src/share/vm/utilities/utf8.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LdstubDecoder.java.i
@@ -2677,8 +2663,7 @@ data/test/compiler/6823453/Test.java.i
data/agent/src/os/linux/salibelf.c.i
data/src/share/vm/oops/instanceMirrorKlass.cpp.i
data/test/compiler/6579789/Test6579789.java.i
-data/agent/make/Makefile.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.gif.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java.i
data/make/windows/makefiles/product.make.i
data/make/bsd/makefiles/zeroshark.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java.i
@@ -2686,18 +2671,20 @@ data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp.i
data/src/os/windows/vm/version.rc.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/BlockWidget.java.i
data/build/windows/build.bat.i
-data/src/os_cpu/linux_x86/vm/assembler_linux_x86_32.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveStoreInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/TypeNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSList.java.i
-data/src/share/vm/adlc/formsopt.cpp.i
+data/src/share/vm/runtime/handles.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/StackTrace.java.i
data/test/runtime/6626217/IFace.java.i
data/test/compiler/6875866/Test.java.i
data/src/share/vm/runtime/vm_version.hpp.i
data/src/cpu/zero/vm/assembler_zero.inline.hpp.i
-data/test/compiler/6880034/Test6880034.java.i
+data/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp.i
data/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp.i
data/make/linux/makefiles/mapfile-vers-debug.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/build.xml.i
data/build/linux/makefiles/hp1.make.i
data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapVisitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java.i
@@ -2705,22 +2692,22 @@ data/src/os/solaris/vm/chaitin_solaris.cpp.i
data/agent/make/saenv.bat.i
data/build/windows/projectfiles/tiered/ADLCompiler.dsw.i
data/make/bsd/makefiles/launcher.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/RTLOperations.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/SysPropsPanel.java.i
+data/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp.i
data/agent/make/finalizerinfoproc64.sh.i
data/test/compiler/5091921/Test7005594.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCJmplInstruction.java.i
data/src/os/bsd/vm/mutex_bsd.cpp.i
-data/agent/test/jdi/serialvm.sh.i
+data/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp.i
data/agent/test/libproc/LibprocClient.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/OopPrinter.java.i
data/test/compiler/6378821/Test6378821.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DoubleType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignRight16.gif.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsrW.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java.i
-data/test/compiler/6932496/Test6932496.java.i
-data/build/linux/makefiles/hp.make.i
+data/src/cpu/sparc/vm/methodHandles_sparc.hpp.i
+data/make/solaris/makefiles/reorder_TIERED_i486.i
+data/agent/src/os/solaris/proc/saproc.cpp.i
data/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp.i
data/src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp.i
data/test/compiler/6910605/Test.java.i
@@ -2733,16 +2720,16 @@ data/agent/src/share/classes/sun/jvm/hotspot/jdi/BaseLineInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciSymbol.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThread.java.i
data/src/share/vm/opto/block.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/IndirectAddress.java.i
+data/src/share/vm/opto/connode.hpp.i
data/make/bsd/makefiles/cscope.make.i
-data/src/cpu/sparc/vm/frame_sparc.cpp.i
data/src/share/vm/runtime/orderAccess.cpp.i
+data/test/compiler/6589834/Test_ia32.java.i
data/build/windows/build_vm_def.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/SOQLEngine.java.i
-data/make/bsd/makefiles/gcc.make.i
+data/src/share/vm/utilities/elfFile.cpp.i
data/build/solaris/makefiles/profiled.make.i
data/test/compiler/6843752/Test.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml.i
+data/src/share/vm/opto/matcher.cpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Help16.gif.i
data/src/share/vm/gc_implementation/g1/heapRegion.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortableTableModel.java.i
@@ -2753,32 +2740,34 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86CallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CharField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlassKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java.i
-data/src/share/vm/services/threadService.cpp.i
+data/src/share/vm/prims/jvmtiExtensions.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSModule.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/Field.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FrameWrapper.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicOopField.java.i
-data/make/solaris/Queens.class.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallNode.java.i
+data/src/share/vm/oops/instanceOop.cpp.i
data/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/DefaultOopVisitor.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/PreferenceConstants.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java.i
data/src/share/vm/oops/compiledICHolderOop.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantIntValue.java.i
+data/build/windows/makefiles/adlc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java.i
data/src/cpu/sparc/vm/bytes_sparc.hpp.i
-data/src/share/tools/MakeDeps/MacroDefinitions.java.i
+data/src/share/vm/compiler/compileBroker.hpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp.i
data/build/solaris/platform_amd64.i
+data/src/share/vm/precompiled/precompiled.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DefaultObjectVisitor.java.i
data/build/solaris/makefiles/reorder_COMPILER2_sparcv9.i
data/src/share/vm/runtime/atomic.hpp.i
data/test/compiler/6769124/TestDeoptInt6769124.java.i
data/src/share/vm/runtime/vframeArray.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFRelocation.java.i
data/build/windows/projectfiles/compiler2/Makefile.i
data/src/share/tools/MakeDeps/Database.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/ProgressBarPanel.java.i
@@ -2786,9 +2775,9 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/ProtectionDomainEntry.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FPop1Decoder.java.i
data/src/share/vm/memory/genOopClosures.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/LongTreeNodeAdapter.java.i
-data/src/os_cpu/windows_x86/vm/bytes_windows_x86.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicType.java.i
-data/src/share/tools/IdealGraphVisualizer/Settings/build.xml.i
+data/src/share/vm/adlc/formsopt.cpp.i
+data/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp.i
+data/src/cpu/zero/vm/jni_zero.h.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerException.java.i
data/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp.i
data/build/linux/platform_amd64.i
@@ -2800,7 +2789,8 @@ data/src/share/vm/ci/ciMethodKlass.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/DiagramConnectionWidget.java.i
data/make/solaris/makefiles/reorder_CORE_sparc.i
data/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ByteField.java.i
+data/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp.i
+data/src/share/vm/c1/c1_FpuStackSim.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaThread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CasDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEArithmeticDecoder.java.i
@@ -2808,6 +2798,7 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.jav
data/src/share/vm/opto/divnode.cpp.i
data/src/share/vm/interpreter/linkResolver.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSMap.java.i
+data/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoad.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeGroupNode.java.i
@@ -2815,98 +2806,99 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.jav
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJByteField.java.i
data/agent/src/share/classes/com/sun/java/swing/action/ApplyAction.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterIndirectAddress.java.i
+data/src/os_cpu/windows_x86/vm/bytes_windows_x86.inline.hpp.i
data/test/runtime/6626217/many_loader1.java.foo.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/build.xml.i
data/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp.i
data/src/share/vm/prims/jvm_misc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyBlockSym.java.i
data/src/share/vm/opto/addnode.cpp.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObject.java.i
data/src/share/vm/opto/loopnode.hpp.i
data/make/linux/makefiles/sparcWorks.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86Thread.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/SAEditorPane.java.i
data/agent/src/os/solaris/dbx/helloWorld.cpp.i
data/src/share/vm/memory/permGen.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java.i
data/src/os/solaris/dtrace/hotspot.d.i
data/build/linux/makefiles/jvmti.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50ReservedTypes.java.i
-data/agent/make/pmapproc.sh.i
+data/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java.i
-data/src/cpu/x86/vm/nativeInst_x86.hpp.i
+data/src/share/vm/classfile/symbolTable.hpp.i
data/src/share/vm/memory/oopFactory.hpp.i
data/src/share/vm/interpreter/oopMapCache.cpp.i
data/.hgignore.i
-data/src/share/vm/gc_implementation/g1/satbQueue.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/LineNumberTableElement.java.i
+data/src/os_cpu/solaris_x86/vm/os_solaris_x86.hpp.i
data/build/solaris/makefiles/amd64.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/ReturnInstruction.java.i
-data/src/share/vm/code/vmreg.cpp.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/JFrameWrapper.java.i
+data/agent/make/finalizerinfowindbg64.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCOpcodes.java.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC8.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/project.xml.i
data/agent/src/share/classes/com/sun/java/swing/action/AlignCenterAction.java.i
-data/src/share/tools/MakeDeps/WinGammaPlatformVC8.java.i
+data/src/os/solaris/dtrace/libjvm_db.h.i
data/src/share/vm/prims/jvmtiImpl.hpp.i
-data/src/cpu/zero/vm/bytecodes_zero.hpp.i
-data/make/solaris/platform_amd64.i
-data/src/share/vm/gc_implementation/g1/sparsePRT.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteOopHandle.java.i
+data/test/compiler/5091921/Test6890943.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcThreadFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/SourceCodePanel.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignLeft16.gif.i
data/src/share/vm/interpreter/bytecodeInterpreter.hpp.i
data/src/share/vm/opto/divnode.hpp.i
data/src/share/vm/runtime/javaCalls.cpp.i
-data/make/solaris/makefiles/buildtree.make.i
data/src/cpu/zero/vm/register_zero.cpp.i
data/src/share/vm/opto/ifg.cpp.i
data/src/share/vm/runtime/aprofiler.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstance.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java.i
+data/src/share/vm/c1/c1_CFGPrinter.cpp.i
data/src/os/windows/vm/jvm_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeANewArray.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPArithmeticDecoder.java.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java.i
-data/src/cpu/sparc/vm/debug_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86XMMRegister.java.i
+data/make/bsd/makefiles/defs.make.i
+data/test/compiler/6932496/Test6932496.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp.i
-data/src/share/vm/memory/filemap.cpp.i
-data/src/share/vm/oops/oop.psgc.inline.hpp.i
+data/src/share/vm/gc_implementation/g1/survRateGroup.cpp.i
+data/src/share/vm/gc_implementation/g1/satbQueue.hpp.i
data/src/share/vm/utilities/ostream.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java.i
data/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/manifest.mf.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.i
data/test/compiler/7017746/Test.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/JCharField.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Save16.gif.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/layer.xml.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/CellTypeStateList.java.i
data/agent/src/os/linux/test.c.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/SaveAs16.gif.i
data/src/share/vm/utilities/taskqueue.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/BoundedZoomAction.java.i
+data/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp.i
data/build/solaris/adlc_updater.i
data/src/share/vm/utilities/events.hpp.i
data/src/cpu/sparc/vm/methodHandles_sparc.cpp.i
-data/build/windows/makefiles/adlc.make.i
+data/agent/make/jcorewindbg64.bat.i
data/LICENSE.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.xml.i
-data/src/share/vm/ci/ciTypeArrayKlass.cpp.i
-data/test/compiler/6757316/Test6757316.java.i
-data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java.i
+data/src/share/vm/memory/resourceArea.hpp.i
+data/src/cpu/zero/vm/copy_zero.hpp.i
data/src/share/vm/ci/bcEscapeAnalyzer.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestParser.java.i
data/src/os_cpu/linux_zero/vm/os_linux_zero.hpp.i
data/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp.i
data/src/os/bsd/vm/globals_bsd.hpp.i
+data/src/share/vm/services/management.hpp.i
data/src/share/vm/classfile/verificationType.cpp.i
-data/src/share/vm/memory/barrierSet.inline.hpp.i
+data/src/os/windows/vm/mutex_windows.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/StoreInstruction.java.i
data/make/solaris/makefiles/sparcv9.make.i
data/src/share/vm/compiler/compileBroker.cpp.i
-data/agent/src/os/solaris/proc/saproc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPopDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicRefType.java.i
data/src/share/vm/runtime/compilationPolicy.hpp.i
@@ -2914,42 +2906,44 @@ data/src/os/solaris/vm/stubRoutines_solaris.cpp.i
data/src/share/vm/opto/coalesce.hpp.i
data/src/share/vm/shark/shark_globals.hpp.i
data/src/share/tools/launcher/jli_util.h.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86ArithmeticInstruction.java.i
data/src/share/vm/opto/cfgnode.cpp.i
data/src/cpu/x86/vm/register_x86.cpp.i
data/test/compiler/6894807/IsInstanceTest.java.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBlockSym.java.i
data/test/compiler/6539464/Test.java.i
-data/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp.i
+data/make/solaris/makefiles/mapfile-vers-COMPILER1.i
+data/src/cpu/sparc/vm/vmreg_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/EditableAtEndDocument.java.i
+data/test/compiler/6885584/Test6885584.java.i
data/build/windows/projectfiles/compiler2/vm.dsw.i
-data/src/share/vm/opto/block.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicPointerType.java.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java.i
+data/agent/make/Makefile.i
data/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java.i
-data/src/share/vm/prims/jvmtiTrace.cpp.i
+data/src/cpu/x86/vm/interpreterRT_x86.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeModel.java.i
data/src/os/solaris/vm/objectMonitor_solaris.hpp.i
+data/src/share/vm/Xusage.txt.i
data/src/share/vm/prims/jvmtiTagMap.cpp.i
data/src/share/vm/code/compressedStream.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/build-impl.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisterInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIHandleBlock.java.i
-data/make/solaris/platform_sparc.gcc.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderTable.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegisters.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86ShiftInstruction.java.i
+data/src/share/vm/classfile/javaClasses.cpp.i
+data/build/solaris/makefiles/reorder_COMPILER2_i486.i
+data/src/share/vm/ci/ciType.cpp.i
data/src/share/vm/prims/jvmtiEnv.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFException.java.i
data/src/share/vm/oops/compiledICHolderOop.cpp.i
-data/src/share/vm/prims/methodHandles.cpp.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/ZoomIn24.gif.i
data/src/share/vm/memory/tenuredGeneration.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/MessageQueueBackend.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/manifest.mf.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SAJDIClassLoader.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/DummySymbolFinder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java.i
data/src/share/vm/classfile/stackMapTable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Disassembler.java.i
data/build/test/Queens.java.i
@@ -2958,88 +2952,87 @@ data/src/cpu/x86/vm/assembler_x86.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Graph.java.i
data/make/sa.files.i
data/src/os/bsd/vm/jvm_bsd.h.i
-data/src/share/vm/shark/sharkCodeBuffer.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/LogicalDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java.i
data/src/share/vm/gc_implementation/g1/g1RemSet.cpp.i
data/src/share/vm/runtime/javaFrameAnchor.hpp.i
data/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp.i
data/agent/src/os/win32/SwDbgSrv.dsp.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModelAdapter.java.i
-data/src/share/vm/gc_implementation/g1/g1_globals.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/genfiles.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/action/MemoryAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalSym.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEventProvider.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Node_Array.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/manifest.mf.i
-data/src/share/vm/classfile/loaderConstraints.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java.i
data/src/share/vm/c1/c1_Instruction.hpp.i
data/src/cpu/x86/vm/templateInterpreter_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/Interpreter.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/NativeSignatureIterator.java.i
data/src/share/vm/prims/jvmtiCodeBlobEvents.hpp.i
-data/src/cpu/sparc/vm/nativeInst_sparc.hpp.i
-data/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp.i
+data/make/windows/README.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FloatGRPDecoder.java.i
-data/src/cpu/zero/vm/interp_masm_zero.cpp.i
data/src/cpu/x86/vm/runtime_x86_64.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectoryEntry.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArray.java.i
-data/src/share/vm/oops/typeArrayKlass.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/ExceptionEvent.java.i
-data/src/share/vm/ci/ciExceptionHandler.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java.i
+data/src/share/vm/c1/c1_Optimizer.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java.i
data/src/cpu/x86/vm/c1_MacroAssembler_x86.hpp.i
data/build/windows/jvmexp_g.lcf.i
-data/agent/src/share/classes/sun/jvm/hotspot/livejvm/BreakpointEvent.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/VoidTypeImpl.java.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/Win32VtblAccess.java.i
+data/src/cpu/zero/vm/icache_zero.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ScriptEngineAbstraction.java.i
data/test/runtime/6925573/SortMethodsTest.java.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/manifest.mf.i
-data/src/share/vm/compiler/abstractCompiler.hpp.i
+data/src/cpu/zero/vm/stubGenerator_zero.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJCharField.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java.i
data/agent/make/hsdb.bat.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java.i
data/ASSEMBLY_EXCEPTION.i
data/src/share/vm/prims/jvmtiRawMonitor.cpp.i
data/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp.i
-data/src/share/vm/gc_implementation/g1/heapRegionSet.cpp.i
+data/src/os/solaris/launcher/java_md.h.i
data/src/share/vm/opto/regmask.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/CStringUtilities.java.i
-data/src/os/solaris/vm/threadCritical_solaris.cpp.i
+data/src/os/bsd/vm/attachListener_bsd.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JIntField.java.i
data/src/cpu/x86/vm/stubGenerator_x86_64.cpp.i
data/src/share/vm/c1/c1_Defs.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64JavaCallWrapper.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp.i
-data/src/share/vm/c1/c1_FpuStackSim.hpp.i
-data/src/share/vm/shark/sharkType.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/OopVisitor.java.i
+data/src/share/vm/interpreter/templateTable.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java.i
+data/src/share/vm/compiler/disassembler.cpp.i
+data/make/bsd/makefiles/zero.make.i
data/src/share/vm/shark/sharkValue.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/MaskFillerForNative.java.i
data/src/os/solaris/vm/objectMonitor_solaris.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java.i
-data/src/os_cpu/solaris_sparc/vm/prefetch_solaris_sparc.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/LongHashMap.java.i
data/test/compiler/6663848/Tester.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50Subsection.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java.i
data/src/share/vm/code/relocInfo.cpp.i
data/src/share/vm/shark/sharkTopLevelBlock.cpp.i
data/src/share/vm/oops/constMethodKlass.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java.i
data/src/share/vm/runtime/arguments.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardGroupOrganizer.java.i
data/src/share/vm/memory/allocationStats.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThread.java.i
-data/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java.i
data/src/share/vm/runtime/init.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp.i
data/src/cpu/sparc/vm/relocInfo_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ArrayType.java.i
-data/src/os_cpu/windows_x86/vm/assembler_windows_x86_32.cpp.i
+data/src/os/solaris/vm/os_solaris.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialLoadInstruction.java.i
data/test/compiler/6659207/Test.java.i
data/build/windows/projectfiles/compiler2/vm.def.i
-data/src/share/vm/c1/c1_Canonicalizer.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/RMIHelper.java.i
data/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/Assert.java.i
data/src/cpu/x86/vm/bytecodeInterpreter_x86.hpp.i
@@ -3050,30 +3043,30 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CVAttributes.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSMPC.java.i
data/src/cpu/sparc/vm/jniFastGetField_sparc.cpp.i
data/make/linux/makefiles/jvmg.make.i
-data/src/share/vm/runtime/vm_version.cpp.i
+data/make/bsd/makefiles/sparcv9.make.i
data/agent/src/share/native/jvmdi/sa.cpp.i
data/src/share/vm/adlc/arena.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java.i
-data/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp.i
-data/test/compiler/6930043/Test6930043.java.i
+data/src/share/vm/ci/ciField.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MembarInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindAction.java.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_32.il.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModFileDesc.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/DataSource.java.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java.i
+data/build/linux/makefiles/i486.make.i
data/src/share/vm/runtime/aprofiler.cpp.i
data/src/share/vm/gc_implementation/shared/spaceCounters.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicEnumType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstruction.java.i
-data/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp.i
-data/src/share/vm/ci/ciUtilities.cpp.i
-data/src/share/vm/shark/sharkContext.cpp.i
-data/src/share/vm/services/psMemoryPool.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/ArithmeticDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsr.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIHandles.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObject.java.i
data/src/share/vm/oops/arrayOop.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java.i
data/src/share/tools/hsdis/hsdis.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationFactory.java.i
data/src/share/tools/LogCompilation/manifest.mf.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSymbol.java.i
data/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp.i
@@ -3086,95 +3079,97 @@ data/make/bsd/platform_sparcv9.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHashTable.java.i
data/make/bsd/makefiles/core.make.i
data/build/linux/makefiles/jvmg.make.i
-data/src/share/vm/opto/chaitin.hpp.i
-data/build/solaris/makefiles/compiler2.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/Interval.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/Bundle.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStore.java.i
+data/src/share/vm/utilities/accessFlags.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java.i
data/src/share/vm/adlc/dict2.hpp.i
-data/src/cpu/x86/vm/disassembler_x86.cpp.i
-data/make/solaris/makefiles/reorder_COMPILER1_amd64.i
+data/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeEnums.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/layer.xml.i
data/agent/src/os/win32/toolHelp.cpp.i
data/make/pic.make.i
data/src/share/vm/oops/instanceKlass.hpp.i
data/src/share/vm/ci/ciMethodHandle.cpp.i
data/agent/src/share/lib/jlfgr-1_0.jar.i
-data/test/compiler/6478991/NullCheckTest.java.i
-data/make/linux/makefiles/hp.make.i
+data/src/share/vm/gc_implementation/shared/allocationStats.cpp.i
data/build/solaris/makefiles/i486.make.i
-data/src/share/vm/oops/constMethodOop.hpp.i
-data/src/os/windows/vm/objectMonitor_windows.cpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java.i
+data/src/cpu/zero/vm/stack_zero.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/next_diagram.png.i
-data/src/share/vm/oops/arrayKlass.hpp.i
+data/src/share/vm/utilities/hashtable.hpp.i
data/src/cpu/sparc/vm/templateInterpreter_sparc.cpp.i
data/src/share/vm/ci/ciMethodData.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/AddressField.java.i
+data/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp.i
data/agent/doc/index.html.i
data/src/share/vm/c1/c1_LIRAssembler.hpp.i
data/build/solaris/Queens.class.i
data/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp.i
data/test/compiler/6756768/Test6756768_2.java.i
-data/agent/src/os/solaris/proc/libproc.h.i
-data/src/share/vm/oops/klass.hpp.i
+data/src/os/posix/vm/os_posix.cpp.i
+data/src/share/vm/prims/forte.cpp.i
+data/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java.i
data/test/compiler/6855215/Test6855215.java.i
data/src/cpu/sparc/vm/c1_FrameMap_sparc.hpp.i
-data/src/share/vm/memory/dump.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java.i
data/make/windows/jvmexp.lcf.i
data/src/share/vm/opto/compile.cpp.i
-data/src/share/vm/ci/ciTypeFlow.hpp.i
+data/src/os/linux/vm/mutex_linux.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/HighPrecisionJScrollBar.java.i
data/src/share/vm/utilities/utf8.cpp.i
-data/src/share/vm/c1/c1_LIR.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceStoreDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86PCRelativeAddress.java.i
-data/make/bsd/makefiles/fastdebug.make.i
-data/src/cpu/sparc/vm/interpreter_sparc.cpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/RootNode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/action/InspectAction.java.i
+data/test/compiler/6714694/Tester.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFormat3AInstruction.java.i
+data/src/share/tools/MakeDeps/MakeDeps.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/Address.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java.i
data/src/share/vm/interpreter/templateInterpreter.cpp.i
data/src/share/tools/IdealGraphVisualizer/Difference/build.xml.i
-data/src/share/vm/runtime/advancedThresholdPolicy.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CompoundType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/FloatField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberInfo.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/About16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LongTypeImpl.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupOrganizer.i
-data/src/share/tools/MakeDeps/WinGammaPlatformVC6.java.i
+data/src/os/bsd/vm/osThread_bsd.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRettInstruction.java.i
data/src/os/solaris/vm/vtune_solaris.cpp.i
data/src/os/linux/vm/jsig.c.i
data/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp.i
data/src/share/vm/oops/methodDataKlass.hpp.i
-data/make/solaris/makefiles/cscope.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FloatType.java.i
+data/src/share/tools/launcher/jli_util.c.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPArithmeticInstruction.java.i
data/src/cpu/x86/vm/stubRoutines_x86_64.cpp.i
data/agent/src/os/win32/serverLists.cpp.i
data/src/share/vm/adlc/forms.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/LogicInstruction.java.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties.i
+data/agent/make/jdbcore64.sh.i
+data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp.i
data/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp.i
data/src/share/tools/MakeDeps/WinGammaPlatformVC7.java.i
data/build/windows/projectfiles/kernel/Makefile.i
data/src/cpu/x86/vm/stubGenerator_x86_32.cpp.i
data/src/share/vm/adlc/output_h.cpp.i
data/agent/src/os/bsd/test.c.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/PrimitiveTypeImpl.java.i
-data/agent/src/share/classes/com/sun/java/swing/ui/CommonToolBar.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSectionHeader.java.i
+data/src/os/bsd/dtrace/hotspot.d.i
data/agent/src/share/classes/com/sun/java/swing/action/FinishAction.java.i
data/test/compiler/6921969/TestMultiplyLongHiZero.java.i
-data/src/cpu/x86/vm/runtime_x86_32.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/UnsupportedPlatformException.java.i
data/test/compiler/6800154/Test6800154.java.i
data/make/bsd/platform_i486.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.properties.i
-data/build/linux/makefiles/jsig.make.i
+data/src/share/vm/gc_implementation/shared/mutableSpace.cpp.i
data/src/share/vm/utilities/defaultStream.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MultiNode.java.i
data/test/compiler/6852078/Test6852078.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86GeneralInstruction.java.i
data/make/windows/projectfiles/tiered/ADLCompiler.dsp.i
-data/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyOopHandle.java.i
data/src/share/vm/ci/ciArrayKlass.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/AddressDataSource.java.i
data/agent/src/share/classes/com/sun/java/swing/ui/CommonUI.java.i
@@ -3183,72 +3178,70 @@ data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/platform.properties.i
data/agent/make/jcoreproc.sh.i
data/src/share/vm/oops/fieldStreams.hpp.i
data/build/solaris/makefiles/reorder_TIERED_i486.i
-data/src/share/vm/utilities/array.cpp.i
+data/src/share/vm/oops/oop.pcgc.inline.hpp.i
data/src/share/vm/classfile/classLoader.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java.i
+data/make/solaris/makefiles/compiler1.make.i
data/test/compiler/7009359/Test7009359.java.i
-data/src/share/tools/IdealGraphVisualizer/View/nbproject/project.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RegisterBranchDecoder.java.i
data/src/share/vm/gc_interface/collectedHeap.inline.hpp.i
data/src/share/vm/memory/memRegion.cpp.i
data/src/share/tools/hsdis/hsdis-demo.c.i
-data/src/share/vm/interpreter/bytecodeTracer.cpp.i
-data/test/compiler/6885584/Test6885584.java.i
+data/src/share/vm/oops/klassVtable.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/Characteristics.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Registers.java.i
-data/test/compiler/7070134/Stemmer.java.i
data/src/cpu/zero/vm/assembler_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java.i
data/src/os/solaris/launcher/java.h.i
data/agent/src/os/linux/symtab.h.i
data/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp.i
data/src/cpu/sparc/vm/icache_sparc.hpp.i
+data/src/share/vm/opto/classes.cpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java.i
data/src/share/vm/ci/ciArray.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciConstant.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java.i
-data/src/share/vm/includeDB_gc_parallel.i
+data/make/windows/platform_i486.i
data/src/share/vm/runtime/basicLock.hpp.i
data/src/share/vm/runtime/virtualspace.hpp.i
-data/src/share/vm/asm/assembler.cpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentGCThread.hpp.i
+data/make/solaris/makefiles/reorder_COMPILER1_sparcv9.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/CallDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java.i
-data/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java.i
data/src/share/vm/runtime/vmThread.hpp.i
-data/make/linux/makefiles/amd64.make.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/Scheduler.java.i
+data/src/share/vm/prims/jvmtiEventController.inline.hpp.i
data/src/share/vm/gc_implementation/includeDB_gc_g1.i
-data/build/windows/projectfiles/kernel/vm.dsw.i
data/src/share/vm/ci/ciClassList.hpp.i
data/src/share/tools/ProjectCreator/DirectoryTreeNode.java.i
-data/src/share/vm/ci/ciType.cpp.i
-data/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp.i
-data/src/share/tools/hsdis/README.i
+data/src/share/vm/c1/c1_Runtime1.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Opcodes.java.i
+data/make/solaris/makefiles/mapfile-vers-nonproduct.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Node.java.i
data/src/share/vm/utilities/growableArray.cpp.i
data/src/os_cpu/windows_x86/vm/thread_windows_x86.hpp.i
data/src/share/vm/code/codeBlob.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java.i
data/src/cpu/x86/vm/templateInterpreterGenerator_x86.hpp.i
-data/src/share/vm/runtime/signature.cpp.i
-data/src/share/vm/utilities/decoder.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedInt.java.i
data/src/share/vm/memory/genCollectedHeap.hpp.i
-data/make/windows/cross_build.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/WatcherThread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadFactory.java.i
-data/src/share/vm/gc_implementation/shared/gcStats.hpp.i
+data/src/share/vm/compiler/compilerOracle.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintEntry.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEShiftDecoder.java.i
data/make/scm.make.i
data/src/share/vm/oops/constantPoolKlass.hpp.i
-data/test/compiler/7082949/Test7082949.java.i
data/src/share/vm/services/memoryManager.cpp.i
data/src/share/vm/classfile/stackMapTableFormat.hpp.i
-data/make/solaris/makefiles/kernel.make.i
+data/make/linux/makefiles/defs.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDoubleType.java.i
data/src/share/vm/memory/memRegion.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/IndexableFieldIdentifier.java.i
+data/build/solaris/makefiles/reorder_TIERED_sparc.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/suite.properties.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeCheckCast.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/ProjNode.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVccInstruction.java.i
+data/src/share/vm/ci/ciMethodHandle.hpp.i
+data/src/cpu/zero/vm/shark_globals_zero.hpp.i
data/src/os_cpu/solaris_sparc/vm/solaris_sparc.ad.i
data/src/cpu/zero/vm/javaFrameAnchor_zero.hpp.i
data/make/bsd/makefiles/jvmg.make.i
@@ -3258,64 +3251,66 @@ data/src/cpu/zero/vm/vmreg_zero.inline.hpp.i
data/make/bsd/makefiles/jsig.make.i
data/src/share/tools/hsdis/Makefile.i
data/test/gc/7072527/TestFullGCCount.java.i
+data/src/share/vm/prims/jvmtiEventController.cpp.i
data/src/cpu/x86/vm/methodHandles_x86.hpp.i
data/src/cpu/x86/vm/register_definitions_x86.cpp.i
data/make/bsd/platform_ia64.i
data/src/share/vm/memory/genCollectedHeap.cpp.i
data/make/linux/makefiles/jvmti.make.i
-data/src/share/vm/compiler/compileLog.hpp.i
+data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.cpp.i
data/src/os/linux/vm/decoder_linux.cpp.i
data/src/cpu/sparc/vm/sharedRuntime_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/FieldType.java.i
-data/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerTypeImpl.java.i
data/src/share/vm/prims/jvmtiThreadState.inline.hpp.i
data/src/share/vm/interpreter/interpreter.hpp.i
-data/src/cpu/sparc/vm/interpreter_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcModule.java.i
data/agent/src/os/linux/libproc_impl.c.i
data/src/os/windows/vm/stubRoutines_windows.cpp.i
data/build/solaris/makefiles/sparcWorks.make.i
data/src/cpu/sparc/vm/c1_FpuStackSim_sparc.hpp.i
data/agent/src/os/win32/ioUtils.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/KlassKlass.java.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/build.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterPart.java.i
data/src/share/vm/shark/llvmHeaders.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ReadWriteDecoder.java.i
data/build/solaris/makefiles/optimized.make.i
data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86_32.cpp.i
data/agent/make/hsdbwindbg64.bat.i
-data/agent/src/os/win32/libInfo.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPath.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/BranchDecoder.java.i
-data/src/os/windows/vm/osThread_windows.hpp.i
+data/src/share/vm/libadt/port.cpp.i
data/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp.i
-data/test/compiler/6935535/Test.java.i
+data/src/cpu/x86/vm/depChecker_x86.hpp.i
data/agent/make/jcorewindbg.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstIterator.java.i
+data/make/windows/projectfiles/core/Makefile.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFP2RegisterInstruction.java.i
+data/src/share/vm/ci/ciCPCache.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionSym.java.i
-data/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArithmeticInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactory.java.i
data/build/solaris/makefiles/saproc.make.i
data/make/solaris/makefiles/gcc.make.i
data/src/share/vm/runtime/os.hpp.i
-data/make/windows/makefiles/projectcreator.make.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java.i
-data/src/cpu/x86/vm/jni_x86.h.i
-data/src/share/vm/ci/ciInstanceKlassKlass.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcCFrame.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMap.java.i
+data/src/cpu/x86/vm/sharedRuntime_x86_64.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFile.java.i
+data/test/compiler/6478991/NullCheckTest.java.i
+data/src/share/vm/runtime/basicLock.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MappedByteBufferDataSource.java.i
-data/src/share/vm/shark/sharkNativeWrapper.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyType.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeSafepointInputs.filter.i
data/agent/make/start-debug-server-windbg64.bat.i
data/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp.i
data/test/compiler/6712835/Test6712835.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVccDecoder.java.i
data/src/share/vm/oops/arrayKlassKlass.hpp.i
data/agent/src/os/win32/isNT4.cpp.i
-data/make/linux/platform_zero.in.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactoryImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcOopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/MapScriptObject.java.i
-data/src/share/tools/IdealGraphVisualizer/Difference/manifest.mf.i
+data/src/os/solaris/vm/osThread_solaris.hpp.i
data/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/ObjectTreeNodeAdapter.java.i
data/src/share/vm/opto/parse3.cpp.i
@@ -3324,7 +3319,8 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RegisterBranchInst
data/src/cpu/x86/vm/c1_LinearScan_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/IndexableFieldIdentifier.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicSym.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsrW.java.i
+data/src/share/vm/ci/ciCPCache.hpp.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignRight16.gif.i
data/src/share/vm/services/lowMemoryDetector.cpp.i
data/build/linux/makefiles/compiler1.make.i
data/src/share/vm/runtime/reflection.cpp.i
@@ -3332,40 +3328,43 @@ data/make/bsd/makefiles/shark.make.i
data/src/os/windows/vm/vmError_windows.cpp.i
data/src/cpu/sparc/vm/assembler_sparc.cpp.i
data/src/share/vm/shark/sharkCacheDecache.cpp.i
-data/src/share/vm/c1/c1_Canonicalizer.hpp.i
-data/src/share/vm/compiler/compileBroker.hpp.i
-data/src/share/vm/opto/subnode.cpp.i
-data/build/windows/makefiles/vm.make.i
-data/src/share/vm/ci/ciCPCache.cpp.i
-data/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.i
+data/agent/make/jsdbwindbg.bat.i
+data/src/share/tools/MakeDeps/MacroDefinitions.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/Bits.java.i
+data/make/bsd/makefiles/vm.make.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapPrinter.java.i
data/src/share/vm/c1/c1_LIRAssembler.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLocalSym.java.i
-data/make/altsrc.make.i
+data/make/solaris/makefiles/sparcWorks.make.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/StringTable.java.i
data/src/share/vm/ci/ciEnv.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/SAEditorPane.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86Thread.java.i
data/src/share/vm/prims/jvmtiEnter.hpp.i
data/build/windows/projectfiles/tiered/vm.dsw.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml.i
+data/make/solaris/platform_amd64.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodData.java.i
-data/src/cpu/x86/vm/interpreterRT_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/NarrowOopField.java.i
-data/src/share/vm/utilities/elfFile.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFunctionDefinitionRecord.java.i
+data/make/solaris/makefiles/dtrace.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/livejvm/BreakpointEvent.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/BoundedZoomAction.java.i
data/src/share/vm/classfile/verificationType.hpp.i
+data/src/os/windows/vm/c1_globals_windows.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js.i
data/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/manifest.mf.i
-data/src/share/vm/memory/blockOffsetTable.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ObjectReferenceImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/BranchInstruction.java.i
data/build/linux/makefiles/fastdebug.make.i
data/src/share/vm/opto/macro.cpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java.i
-data/build/solaris/makefiles/hp1.make.i
+data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp.i
data/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp.i
data/src/os/solaris/dtrace/generateJvmOffsetsMain.c.i
-data/src/cpu/sparc/vm/c2_globals_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialRegisters.java.i
data/src/share/vm/runtime/vm_operations.cpp.i
data/agent/make/pmapwindbg.bat.i
data/agent/src/share/classes/com/sun/java/swing/action/AboutAction.java.i
@@ -3374,106 +3373,108 @@ data/src/share/vm/shark/sharkRuntime.cpp.i
data/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.i
data/src/share/vm/prims/jvmtiEnvBase.cpp.i
data/src/share/vm/adlc/forms.hpp.i
-data/agent/src/os/bsd/ps_core.c.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties.i
+data/src/share/vm/ci/ciArray.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java.i
data/build/linux/makefiles/rules.make.i
data/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp.i
data/src/share/vm/memory/allocation.hpp.i
-data/agent/src/os/win32/procList.cpp.i
+data/src/cpu/sparc/vm/icBuffer_sparc.cpp.i
data/src/share/vm/oops/methodDataOop.cpp.i
-data/src/share/vm/prims/nativeLookup.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java.i
data/src/share/vm/opto/parseHelper.cpp.i
-data/src/share/vm/prims/jvmtiEventController.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/UnimpDecoder.java.i
data/test/compiler/6796786/Test6796786.java.i
data/src/share/vm/utilities/debug.cpp.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/LoadInstruction.java.i
-data/test/compiler/6795161/Test.java.i
-data/src/share/vm/gc_implementation/shared/allocationStats.cpp.i
-data/src/share/vm/utilities/hashtable.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java.i
+data/make/linux/makefiles/hp.make.i
+data/src/share/vm/oops/arrayKlass.hpp.i
data/test/compiler/6863420/Test.java.i
data/src/cpu/sparc/vm/c1_MacroAssembler_sparc.hpp.i
data/src/cpu/x86/vm/vmreg_x86.inline.hpp.i
-data/src/share/vm/utilities/array.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java.i
+data/make/solaris/makefiles/debug.make.i
+data/src/os/windows/vm/perfMemory_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPLoadInstruction.java.i
-data/test/compiler/6589834/Test_ia32.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java.i
+data/src/cpu/sparc/vm/globalDefinitions_sparc.hpp.i
+data/src/share/vm/services/psMemoryPool.cpp.i
data/src/share/vm/ci/ciMethodData.hpp.i
-data/src/share/vm/opto/lcm.cpp.i
+data/test/compiler/7082949/Test7082949.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BlockSym.java.i
-data/src/share/vm/utilities/stack.inline.hpp.i
+data/src/share/vm/runtime/osThread.hpp.i
+data/src/share/vm/runtime/vframe.cpp.i
data/src/share/vm/opto/multnode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java.i
data/src/share/vm/gc_implementation/g1/g1HRPrinter.hpp.i
+data/agent/src/os/linux/ps_proc.c.i
+data/src/os/solaris/vm/threadCritical_solaris.cpp.i
data/build/linux/makefiles/gcc.make.i
data/src/os/windows/vm/objectMonitor_windows.hpp.i
data/make/solaris/makefiles/jvmg.make.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/InputGraphProvider.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/Location.java.i
+data/src/share/vm/memory/watermark.hpp.i
data/src/share/vm/memory/permGen.cpp.i
-data/src/share/vm/runtime/deoptimization.cpp.i
+data/src/os/linux/vm/chaitin_linux.cpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java.i
-data/src/share/vm/classfile/symbolTable.cpp.i
+data/make/windows/cross_build.bat.i
data/agent/make/jhistowindbg64.bat.i
data/build/windows/makefiles/sanity.make.i
data/agent/src/os/win32/SwDbgSub.cpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/Annotation.java.i
-data/src/share/vm/libadt/port.cpp.i
-data/make/windows/projectfiles/core/Makefile.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactory.java.i
+data/src/os/windows/vm/osThread_windows.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstIterator.java.i
+data/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp.i
data/build/windows/create.bat.i
data/test/compiler/6991596/Test6991596.java.i
data/src/share/vm/code/nmethod.cpp.i
data/src/share/vm/includeDB_gc.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java.i
+data/build/windows/makefiles/vm.make.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/JStack.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WrprInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java.i
-data/src/share/tools/launcher/jli_util.c.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadFactory.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java.i
data/build/solaris/platform_amd64.gcc.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/ServiceabilityAgentJVMDIModule.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/RevPtrsTreeNodeAdapter.java.i
-data/src/cpu/sparc/vm/icBuffer_sparc.cpp.i
-data/agent/test/libproc/libproctest.sh.i
+data/agent/src/os/win32/procList.cpp.i
+data/make/linux/makefiles/top.make.i
data/src/os/linux/launcher/java_md.c.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java.i
-data/src/share/vm/memory/watermark.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/Location.java.i
data/src/share/vm/memory/restore.cpp.i
-data/src/share/vm/services/management.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntegerEnum.java.i
-data/src/share/vm/prims/jvmtiEnter.xsl.i
+data/src/share/vm/code/codeBlob.hpp.i
+data/make/windows/projectfiles/tiered/Makefile.i
data/build/solaris/makefiles/rules.make.i
+data/src/share/vm/prims/jvmtiEnter.xsl.i
+data/src/share/tools/IdealGraphVisualizer/Difference/manifest.mf.i
data/src/share/vm/oops/compiledICHolderKlass.hpp.i
data/src/os/solaris/vm/jvm_solaris.h.i
-data/src/share/vm/code/scopeDesc.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java.i
+data/src/cpu/zero/vm/interpreterFrame_zero.hpp.i
+data/test/compiler/7024475/Test7024475.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/RegionNode.java.i
data/agent/src/scripts/start-rmiregistry.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java.i
-data/src/cpu/zero/vm/frame_zero.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeIterator.java.i
+data/test/compiler/6758234/Test6758234.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/AddressField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSwapInstruction.java.i
data/src/share/tools/ProjectCreator/MacroDefinitions.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/AbstractTreeTableModel.java.i
data/build/linux/platform_amd64.suncc.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedStream.java.i
data/src/os/bsd/vm/c1_globals_bsd.hpp.i
data/src/os/solaris/vm/jvm_solaris.cpp.i
data/src/share/vm/opto/multnode.hpp.i
data/src/share/vm/opto/superword.hpp.i
-data/test/runtime/6626217/You_Have_Been_P0wned.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java.i
data/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/manifest.mf.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrs.java.i
-data/src/share/vm/ci/ciConstantPoolCache.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/SysPropsPanel.java.i
data/test/compiler/6877254/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CellTypeState.java.i
data/src/share/vm/ci/ciMethodBlocks.hpp.i
@@ -3487,26 +3488,25 @@ data/make/linux/makefiles/ia64.make.i
data/src/share/vm/memory/iterator.hpp.i
data/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9DoneInstruction.java.i
-data/make/bsd/makefiles/i486.make.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java.i
data/src/cpu/x86/vm/depChecker_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassObjectReferenceImpl.java.i
data/src/share/vm/code/codeCache.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/SOQLException.java.i
-data/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad.i
+data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9InstructionDecoder.java.i
data/src/share/vm/gc_implementation/includeDB_gc_shared.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThread.java.i
data/src/share/vm/interpreter/bytecode.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/ArithmeticDecoder.java.i
+data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/genfiles.properties.i
data/src/os_cpu/solaris_x86/vm/bytes_solaris_x86.inline.hpp.i
data/src/cpu/x86/vm/assembler_x86_64.hpp.i
data/src/share/vm/classfile/resolutionErrors.cpp.i
data/test/compiler/5091921/Test6935022.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/LocationValue.java.i
-data/src/share/vm/shark/sharkConstant.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java.i
+data/src/cpu/sparc/vm/vtableStubs_sparc.cpp.i
data/src/cpu/sparc/vm/icache_sparc.cpp.i
data/src/share/vm/shark/sharkStack.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/StackFrameImpl.java.i
@@ -3516,7 +3516,6 @@ data/test/compiler/5091921/output6890943.txt.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedReadStream.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structure.gif.i
data/src/cpu/sparc/vm/stubGenerator_sparc.cpp.i
-data/make/jprt.gmk.i
data/src/share/vm/libadt/set.cpp.i
data/make/windows/makefiles/adlc.make.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/New16.gif.i
@@ -3524,33 +3523,36 @@ data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64CurrentFrameGuess.
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedPanAction.java.i
data/src/share/vm/prims/evmCompat.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/OopField.java.i
+data/src/cpu/sparc/vm/templateTable_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java.i
data/src/share/vm/runtime/memprofiler.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeSipush.java.i
data/src/cpu/x86/vm/bytecodes_x86.hpp.i
-data/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp.i
data/make/linux/makefiles/makedeps.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_ia64/LinuxIA64JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThread.java.i
-data/build/solaris/platform_sparcv9.gcc.i
-data/build/solaris/makefiles/reorder_COMPILER2_sparc.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_sparc/SolarisSPARCJavaThreadPDAccess.java.i
+data/src/share/vm/opto/c2_globals.hpp.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java.i
+data/src/cpu/x86/vm/jniFastGetField_x86_32.cpp.i
data/make/linux/platform_ia64.i
data/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.xml.i
+data/src/os/bsd/dtrace/libjvm_db.h.i
data/make/linux/makefiles/i486.make.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/save.gif.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java.i
+data/src/cpu/zero/vm/methodHandles_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerUtilities.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/RefType.java.i
data/src/share/vm/runtime/interfaceSupport.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SADebugServer.java.i
data/src/share/vm/memory/universe.inline.hpp.i
data/src/share/vm/oops/oopsHierarchy.cpp.i
+data/agent/make/dumpflagsproc.sh.i
+data/src/share/vm/oops/arrayOop.hpp.i
data/agent/src/os/bsd/symtab.h.i
data/src/cpu/x86/vm/vm_version_x86_32.cpp.i
data/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.i
@@ -3562,17 +3564,16 @@ data/src/share/vm/c1/c1_LIR.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java.i
data/test/compiler/6851282/Test.java.i
data/src/share/vm/ci/ciTypeFlow.cpp.i
-data/src/share/vm/opto/compile.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThreadFactory.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFStringTable.java.i
data/src/share/vm/memory/sharedHeap.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicTypeSize.java.i
-data/make/bsd/adlc_updater.i
-data/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp.i
+data/src/os/linux/vm/dtraceJSDT_linux.cpp.i
+data/src/share/vm/ci/ciConstantPoolCache.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JFloatField.java.i
-data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp.i
+data/src/share/vm/utilities/decoder.hpp.i
data/THIRD_PARTY_README.i
+data/src/cpu/x86/vm/c1_FpuStackSim_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/HSDB.java.i
data/make/solaris/makefiles/reorder_TIERED_sparcv9.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java.i
@@ -3582,69 +3583,70 @@ data/build/solaris/makefiles/mapfile-vers-TIERED.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Helper.java.i
data/build/solaris/makefiles/top.make.i
data/make/linux/platform_amd64.i
-data/src/cpu/sparc/vm/bytecodes_sparc.cpp.i
+data/src/share/vm/ci/ciExceptionHandler.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COMDATSelectionTypes.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BitType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/ResolveListener.java.i
data/make/solaris/platform_amd64.gcc.i
-data/src/share/vm/utilities/accessFlags.hpp.i
+data/agent/make/jhistoproc64.sh.i
data/agent/src/scripts/start-debug-server.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java.i
data/test/compiler/6695810/Test.java.i
data/test/compiler/6711117/Test.java.i
data/src/os/solaris/vm/osThread_solaris.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/PageFetcher.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/MoveDecoder.java.i
+data/make/bsd/makefiles/gcc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/OffsetTableContigSpace.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/ReadResult.java.i
data/src/share/vm/adlc/formssel.cpp.i
data/src/share/vm/runtime/vmStructs.cpp.i
-data/src/share/vm/c1/c1_ValueStack.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java.i
-data/make/windows/makefiles/launcher.make.i
+data/test/runtime/6626217/many_loader2.java.foo.i
data/build/solaris/platform_sparc.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/build.xml.i
-data/src/share/vm/services/heapDumper.cpp.i
+data/src/share/vm/opto/regalloc.cpp.i
data/src/os/linux/vm/hpi_linux.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Block_List.java.i
-data/src/share/vm/services/memoryService.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/InstructionVisitor.java.i
+data/build/solaris/makefiles/reorder_CORE_sparc.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderWindowsSpecificFields.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RdprInstruction.java.i
data/src/share/vm/classfile/stackMapFrame.hpp.i
+data/src/share/vm/opto/generateOptoStub.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/Interval.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/layer.xml.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java.i
data/src/cpu/x86/vm/interpreterRT_x86_32.cpp.i
data/src/cpu/x86/vm/interp_masm_x86_32.hpp.i
-data/src/share/vm/utilities/preserveException.cpp.i
+data/make/windows/makefiles/shared.make.i
data/src/share/vm/c1/c1_Optimizer.cpp.i
data/build/solaris/makefiles/jvmti.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/DefaultOopVisitor.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FloatRegister.java.i
data/src/share/vm/runtime/jniPeriodicChecker.cpp.i
data/src/cpu/sparc/vm/frame_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V8FPop1Decoder.java.i
-data/make/solaris/makefiles/reorder_CORE_i486.i
+data/build/windows/makefiles/debug.make.i
data/src/os/solaris/dtrace/jhelper.d.i
data/src/share/vm/shark/shark_globals.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeBipush.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/MemoryInstructionDecoder.java.i
-data/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp.i
data/build/linux/makefiles/mapfile-vers-product.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java.i
data/src/os/windows/launcher/java_md.c.i
data/src/share/vm/memory/classify.cpp.i
data/build/solaris/makefiles/jsig.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java.i
-data/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java.i
-data/src/share/vm/ci/ciTypeArray.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationFactory.java.i
+data/make/solaris/makefiles/mapfile-vers-jvm_dtrace.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/Open16.gif.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/SlotLayout.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/LoopNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/RawHeapVisitor.java.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionSym.java.i
data/src/share/vm/adlc/output_c.cpp.i
data/make/solaris/platform_i486.gcc.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java.i
+data/agent/make/start-debug-server-windbg.bat.i
data/src/os_cpu/linux_sparc/vm/linux_sparc.s.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicPointerType.java.i
data/make/linux/platform_i486.suncc.i
@@ -3656,427 +3658,442 @@ data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Diag
data/agent/src/os/win32/initWinsock.cpp.i
data/src/share/vm/shark/sharkEntry.hpp.i
data/src/share/vm/services/g1MemoryPool.cpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp.i
+data/src/share/vm/classfile/classFileStream.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/PMap.java.i
+data/make/solaris/makefiles/adlc.make.i
data/src/share/vm/classfile/stackMapFrame.cpp.i
data/src/share/vm/c1/c1_ValueType.hpp.i
data/src/os/linux/launcher/java.c.i
data/src/share/vm/ci/ciKlass.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbolBase.java.i
data/make/windows/build_vm_def.sh.i
-data/make/solaris/makefiles/hp1.make.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeSelfLoops.filter.i
data/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp.i
data/src/share/vm/shark/llvmValue.hpp.i
data/src/share/vm/interpreter/cppInterpreter.cpp.i
data/make/linux/makefiles/zero.make.i
-data/src/share/vm/gc_implementation/shared/coTracker.cpp.i
-data/make/solaris/adlc_updater.i
+data/src/share/vm/shark/sharkIntrinsics.cpp.i
+data/src/share/vm/oops/instanceKlass.cpp.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java.i
-data/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp.i
-data/src/share/vm/adlc/dict2.cpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java.i
+data/agent/test/jdi/VMConnection.java.i
+data/make/windows/projectfiles/compiler2/Makefile.i
data/src/share/vm/oops/arrayKlass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java.i
data/src/share/vm/oops/instanceMirrorKlass.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form.i
+data/make/linux/makefiles/buildtree.make.i
data/src/share/vm/libadt/dict.hpp.i
data/src/cpu/x86/vm/jniTypes_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/BitData.java.i
-data/src/share/vm/prims/jvmtiEventController.hpp.i
+data/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml.i
data/src/share/vm/runtime/vframe_hp.cpp.i
data/agent/make/mkinstall.i
data/test/compiler/6901572/Test.java.i
+data/src/share/vm/utilities/vmError.cpp.i
data/test/compiler/6797305/Test6797305.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArray.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveLoadInstruction.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMObject.java.i
data/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/BooleanTypeImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadProxy.java.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java.i
-data/agent/src/os/bsd/salibelf.h.i
-data/src/share/vm/adlc/archDesc.hpp.i
-data/agent/make/dumpflagsproc64.sh.i
+data/make/solaris/platform_sparc.gcc.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86JmpInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java.i
+data/make/windows/get_msc_ver.sh.i
+data/test/compiler/6912517/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/Main.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEMoveDecoder.java.i
data/src/os/bsd/vm/os_bsd.hpp.i
data/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAMD64.java.i
-data/src/share/vm/gc_implementation/g1/heapRegion.cpp.i
+data/src/share/vm/code/nmethod.hpp.i
data/test/compiler/5057225/Test5057225.java.i
-data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Registers.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphCountGroupOrganizer.java.i
data/src/cpu/x86/vm/cppInterpreterGenerator_x86.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java.i
-data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSPermGen.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/InterfaceTypeImpl.java.i
data/agent/src/os/win32/serverLists.hpp.i
-data/src/share/tools/MakeDeps/DirectoryTreeNode.java.i
+data/test/compiler/6866651/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FindPanel.java.i
data/build/linux/makefiles/buildtree.make.i
data/make/linux/makefiles/profiled.make.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerField.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java.i
data/make/linux/makefiles/gcc.make.i
data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp.i
-data/src/share/vm/gc_implementation/parNew/parOopClosures.hpp.i
-data/src/cpu/x86/vm/copy_x86.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArrayKlass.java.i
data/src/cpu/x86/vm/templateInterpreter_x86_32.cpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/About24.gif.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java.i
data/src/cpu/zero/vm/methodHandles_zero.cpp.i
-data/test/compiler/6987555/Test6987555.java.i
+data/src/share/vm/memory/cardTableRS.cpp.i
data/src/share/vm/prims/jvmtiRedefineClassesTrace.hpp.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java.i
+data/test/compiler/7100757/Test7100757.java.i
+data/src/os/solaris/vm/os_share_solaris.hpp.i
data/src/cpu/x86/vm/relocInfo_x86.hpp.i
-data/src/share/vm/services/lowMemoryDetector.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/suite.properties.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java.i
data/src/share/vm/code/vtableStubs.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java.i
data/agent/make/soqlwindbg64.bat.i
-data/agent/make/jdbproc64.sh.i
+data/src/share/vm/ci/ciInstanceKlassKlass.hpp.i
+data/src/share/vm/c1/c1_InstructionPrinter.hpp.i
data/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MutationException.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadContext.java.i
-data/test/compiler/6636138/Test1.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java.i
+data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java.i
data/make/linux/Makefile.i
data/src/share/vm/oops/oopsHierarchy.hpp.i
+data/src/os/bsd/dtrace/jhelper.d.i
data/src/share/vm/memory/tenuredGeneration.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/suite.properties.i
data/src/os/posix/launcher/launcher.script.i
data/src/share/vm/oops/generateOopMap.cpp.i
data/src/share/vm/oops/symbolOop.cpp.i
-data/src/share/vm/utilities/bitMap.inline.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/suite.properties.i
data/src/share/vm/interpreter/bytecodeTracer.hpp.i
data/src/share/vm/ci/ciSymbol.cpp.i
-data/src/cpu/zero/vm/stubRoutines_zero.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/Inspector.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSTypes.java.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java.i
-data/src/share/vm/utilities/hashtable.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArray.java.i
+data/make/bsd/makefiles/arm.make.i
+data/src/share/tools/launcher/wildcard.h.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebugger.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.form.i
-data/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp.i
data/src/os/bsd/vm/jvm_bsd.cpp.i
data/src/share/vm/gc_implementation/shared/immutableSpace.cpp.i
-data/src/share/vm/services/psMemoryPool.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java.i
data/test/gc/6581734/Test6581734.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/Immediate.java.i
data/src/share/vm/classfile/systemDictionary.hpp.i
-data/src/share/vm/oops/typeArrayKlass.cpp.i
-data/src/share/vm/prims/jvmtiRedefineClasses.cpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter.i
+data/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp.i
data/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp.i
data/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32OopHandle.java.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/ZoomIn16.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeIterator.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArray.java.i
+data/src/share/vm/shark/sharkConstant.hpp.i
+data/make/bsd/makefiles/ia64.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DebugEvent.java.i
data/src/share/vm/runtime/biasedLocking.cpp.i
+data/src/os_cpu/linux_x86/vm/assembler_linux_x86_64.cpp.i
data/src/share/vm/runtime/fieldDescriptor.hpp.i
-data/src/share/vm/runtime/vframe.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaString.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxBfEfRecord.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/AccessControl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntervalNode.java.i
-data/src/share/vm/runtime/frame.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLdstubInstruction.java.i
data/src/share/vm/opto/idealKit.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlassKlass.java.i
data/agent/src/scripts/start-debug-server.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciEnv.java.i
-data/src/os/windows/vm/c1_globals_windows.hpp.i
+data/make/templates/gpl-header.i
data/test/compiler/6968348/Test6968348.java.i
data/agent/src/os/win32/Makefile.i
data/src/share/vm/oops/klassOop.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupReceiver.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ByteField.java.i
+data/agent/src/os/bsd/salibelf.c.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/Bundle.properties.i
data/src/share/vm/asm/assembler.inline.hpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.InputGraphProvider.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java.i
data/src/share/vm/memory/referencePolicy.cpp.i
data/src/share/vm/opto/opcodes.cpp.i
data/src/share/vm/gc_implementation/g1/sparsePRT.hpp.i
data/src/os/bsd/vm/c2_globals_bsd.hpp.i
data/src/cpu/sparc/vm/c1_LinearScan_sparc.hpp.i
-data/src/share/vm/memory/specialized_oop_closures.hpp.i
+data/src/cpu/sparc/vm/vm_version_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java.i
data/src/cpu/sparc/vm/globals_sparc.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLdstubDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcCDebugger.java.i
-data/src/cpu/zero/vm/icache_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestParser.java.i
+data/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInstanceOf.java.i
data/agent/make/hsdbproc.sh.i
data/src/share/vm/opto/indexSet.hpp.i
-data/test/compiler/6689060/Test.java.i
-data/src/share/vm/c1/c1_FrameMap.hpp.i
-data/src/share/vm/opto/callnode.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/BooleanTreeNodeAdapter.java.i
+data/src/cpu/x86/vm/register_x86.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Register.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ConcreteMethodImpl.java.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.gif.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/build-impl.xml.i
data/src/share/vm/utilities/debug.hpp.i
data/src/share/vm/prims/jvmtiThreadState.cpp.i
data/test/jprt.config.i
data/src/share/vm/code/relocInfo.hpp.i
-data/agent/make/start-debug-server-proc64.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ScriptObject.java.i
data/make/bsd/makefiles/mapfile-vers-product.i
data/test/compiler/5091921/Test6559156.java.i
data/src/share/vm/prims/jvmti.xml.i
data/src/cpu/zero/vm/depChecker_zero.hpp.i
-data/src/share/vm/prims/jniFastGetField.hpp.i
+data/make/solaris/Queens.class.i
data/agent/test/jdi/runjpda.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java.i
+data/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSPermGen.java.i
data/src/cpu/x86/vm/icBuffer_x86.cpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/BranchInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/TestHelloWorld.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif.i
+data/agent/make/clhsdbproc64.sh.i
+data/build/solaris/platform_sparcv9.gcc.i
data/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp.i
data/build/linux/makefiles/core.make.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutManager.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp.i
-data/src/share/vm/shark/sharkContext.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java.i
data/src/share/vm/opto/runtime.hpp.i
-data/src/share/vm/classfile/verifier.cpp.i
+data/make/linux/makefiles/product.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceSwapDecoder.java.i
data/src/share/vm/utilities/yieldingWorkgroup.hpp.i
data/src/os/bsd/vm/jsig.c.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeNew.java.i
data/src/share/tools/IdealGraphVisualizer/View/nbproject/suite.properties.i
-data/make/solaris/makefiles/mapfile-vers-jvm_db.i
-data/src/share/vm/utilities/vmError.cpp.i
+data/src/share/vm/utilities/bitMap.inline.hpp.i
+data/src/share/vm/gc_implementation/g1/survRateGroup.hpp.i
data/src/share/vm/adlc/Doc/Syntax.doc.i
data/src/share/vm/shark/sharkInliner.hpp.i
data/src/share/vm/compiler/methodLiveness.hpp.i
data/src/share/vm/prims/jvmtiTagMap.hpp.i
data/test/gc/6845368/bigobj.java.d
-data/make/linux/makefiles/top.make.i
+data/test/runtime/6819213/TestBootNativeLibraryPath.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CCBranchDecoder.java.i
data/test/gc/6845368/bigobj.java.i
-data/make/linux/makefiles/debug.make.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FlushDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/ProjNode.java.i
data/src/share/vm/compiler/oopMap.hpp.i
-data/src/cpu/zero/vm/vtableStubs_zero.cpp.i
+data/test/compiler/6909839/Test6909839.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/genfiles.properties.i
-data/src/share/vm/utilities/intHisto.hpp.i
+data/make/solaris/makefiles/saproc.make.i
data/src/share/vm/prims/jvmtiExtensions.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntry.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64JavaCallWrapper.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.xml.i
data/src/share/vm/prims/jvmtiGetLoadedClasses.cpp.i
data/src/cpu/x86/vm/disassembler_x86.hpp.i
-data/src/share/vm/gc_implementation/shared/collectorCounters.cpp.i
-data/agent/src/os/linux/ps_proc.c.i
+data/src/share/vm/utilities/intHisto.hpp.i
+data/src/share/vm/services/heapDumper.hpp.i
data/src/cpu/x86/vm/interpreter_x86_32.cpp.i
data/src/os/bsd/vm/perfMemory_bsd.cpp.i
data/build/linux/makefiles/optimized.make.i
data/src/share/vm/code/stubs.hpp.i
data/agent/src/os/bsd/symtab.c.i
data/src/share/vm/utilities/elfSymbolTable.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/VMModifiers.java.i
data/src/share/vm/utilities/xmlstream.cpp.i
-data/make/windows/projectfiles/tiered/vm.def.i
-data/src/share/vm/adlc/filebuff.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVccInstruction.java.i
+data/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp.i
data/src/share/vm/prims/jvmtiEnvBase.hpp.i
-data/src/share/vm/memory/heapInspection.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ReturnInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java.i
+data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCDebugInfoDataBase.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties.i
-data/build/solaris/makefiles/fastdebug.make.i
+data/agent/src/share/classes/com/sun/java/swing/action/SaveAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ArgumentSizeComputer.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/WriteDecoder.java.i
data/src/os/linux/vm/hpi_linux.hpp.i
data/src/share/vm/prims/privilegedStack.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/PointerType.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSFileIndex.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC64Bit.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/DebugInformationRecorder.java.i
-data/build/linux/README.i
+data/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.i
data/src/os_cpu/linux_x86/vm/linux_x86_64.ad.i
-data/src/share/vm/oops/klassVtable.cpp.i
+data/make/windows/projectfiles/core/vm.def.i
data/build/linux/platform_i486.i
data/src/os_cpu/windows_x86/vm/vm_version_windows_x86.cpp.i
data/build/linux/makefiles/dtrace.make.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java.i
data/src/share/vm/runtime/compilationPolicy.cpp.i
-data/src/share/vm/classfile/classFileParser.cpp.i
-data/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp.i
+data/src/share/vm/ci/ciObjectFactory.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassFilter.java.i
data/agent/src/share/classes/com/sun/java/swing/action/ActionUtilities.java.i
data/build/linux/makefiles/top.make.i
data/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge.i
data/agent/src/os/solaris/proc/mapfile.i
data/make/linux/makefiles/adlc.make.i
data/agent/make/saenv64.bat.i
+data/src/os_cpu/windows_x86/vm/os_windows_x86.hpp.i
data/src/share/vm/oops/instanceKlassKlass.cpp.i
data/make/solaris/makefiles/jsig.make.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler.i
+data/build/windows/projectfiles/kernel/vm.dsw.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/SignatureConverter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedFloat.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java.i
data/src/share/vm/ci/bcEscapeAnalyzer.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSStaticSym.java.i
data/test/compiler/5091921/Test6357214.java.i
-data/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp.i
data/test/runtime/6981737/Test6981737.java.i
-data/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.hpp.i
-data/agent/doc/hsdb.html.i
+data/src/share/vm/interpreter/bytecode.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/WrongTypeException.java.i
data/src/share/vm/compiler/disassemblerEnv.hpp.i
-data/src/share/vm/opto/c2_globals.hpp.i
+data/make/jprt.gmk.i
data/src/share/vm/runtime/park.hpp.i
+data/build/windows/projectfiles/tiered/vm.def.i
+data/src/share/vm/memory/barrierSet.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/FindObjectByType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/UnmappedAddressException.java.i
data/make/linux/makefiles/core.make.i
-data/src/share/vm/runtime/handles.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLogicInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50WrongNumericTypeException.java.i
data/make/bsd/Makefile.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/build.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntryConstants.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/register.filter.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Mark.java.i
data/test/runtime/6626217/from_loader2.java.i
-data/make/hotspot_distro.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/Block_Array.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCCFrame.java.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/suite.properties.i
-data/test/compiler/6661247/Test.java.i
+data/src/cpu/zero/vm/frame_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteAddress.java.i
data/test/compiler/6769124/TestUnalignedLoad6769124.java.i
data/src/share/vm/shark/sharkCompiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/project.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java.i
+data/agent/src/os/bsd/MacosxDebuggerLocal.m.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ConditionFlags.java.i
data/src/share/vm/ci/compilerInterface.hpp.i
-data/test/runtime/6888954/vmerrors.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java.i
data/src/share/vm/prims/jvmtiUtil.cpp.i
data/src/os/windows/vm/os_share_windows.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/OkAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactoryImpl.java.i
+data/make/linux/makefiles/saproc.make.i
data/src/os/solaris/dtrace/generateJvmOffsets.h.i
data/src/share/vm/c1/c1_globals.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeIf.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteTypeImpl.java.i
-data/src/share/vm/ci/ciInstance.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/CompoundTypeKind.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/TypeVisitor.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_sparc/SolarisSPARCJavaThreadPDAccess.java.i
data/src/share/vm/c1/c1_Defs.hpp.i
data/make/solaris/makefiles/mapfile-vers-COMPILER2.i
data/build/solaris/makefiles/defs.make.i
-data/src/share/vm/runtime/unhandledOops.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/RTLOperations.java.i
data/src/share/vm/interpreter/abstractInterpreter.hpp.i
+data/src/cpu/sparc/vm/debug_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32OopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PopcInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgThreadFactory.java.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java.i
data/agent/src/os/win32/libInfo.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js.i
data/src/os/solaris/vm/jsig.c.i
data/src/cpu/zero/vm/globalDefinitions_zero.hpp.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CMoveDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Selector.java.i
-data/src/share/vm/ci/ciObjArray.hpp.i
-data/src/cpu/sparc/vm/dump_sparc.cpp.i
-data/src/share/vm/prims/hpi_imported.h.i
+data/src/share/vm/ci/ciCallSite.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java.i
data/src/share/vm/memory/filemap.hpp.i
data/src/share/vm/ci/ciExceptionHandler.hpp.i
data/build/linux/makefiles/adlc.make.i
data/src/share/vm/opto/loopPredicate.cpp.i
data/test/runtime/7020373/Test7020373.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlassKlass.java.i
+data/src/os/solaris/dtrace/jvm_dtrace.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRestoreInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/DataLayout.java.i
data/make/windows/projectfiles/kernel/Makefile.i
-data/src/share/vm/prims/jvmtiEnvThreadState.cpp.i
-data/test/compiler/6778657/Test.java.i
-data/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp.i
-data/src/share/vm/runtime/fprofiler.cpp.i
+data/make/solaris/makefiles/reorder_COMPILER1_sparc.i
+data/src/share/vm/opto/output.cpp.i
+data/test/runtime/7100935/TestConjointAtomicArraycopy.java.i
+data/make/solaris/makefiles/buildtree.make.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/NameFilter.java.i
-data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.hpp.i
+data/test/compiler/7048332/Test7048332.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FloatDecoder.java.i
data/test/compiler/6942326/Test.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java.i
+data/make/linux/makefiles/compiler2.make.i
data/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad.i
data/agent/test/jdi/sasanity.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Help24.gif.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java.i
-data/src/share/vm/services/memoryService.hpp.i
+data/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/DoubleTreeNodeAdapter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/platform.properties.i
data/src/share/tools/IdealGraphVisualizer/View/nbproject/platform.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java.i
-data/src/share/vm/runtime/sweeper.cpp.i
+data/src/share/vm/oops/klassOop.hpp.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java.i
data/make/windows/projectfiles/compiler2/ADLCompiler.dsp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/OneContigSpaceCardGeneration.java.i
data/src/os/bsd/vm/thread_bsd.inline.hpp.i
data/src/share/vm/classfile/vmSymbols.cpp.i
data/src/share/vm/opto/indexSet.cpp.i
data/src/cpu/x86/vm/cppInterpreter_x86.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCNoopInstruction.java.i
data/make/windows/platform_amd64.i
-data/src/os_cpu/linux_x86/vm/assembler_linux_x86_64.cpp.i
+data/src/cpu/sparc/vm/vm_version_sparc.hpp.i
data/test/compiler/6982370/Test6982370.java.i
data/src/share/vm/utilities/elfSymbolTable.hpp.i
data/src/cpu/sparc/vm/c1_LinearScan_sparc.cpp.i
-data/build/linux/Queens.class.i
+data/src/os_cpu/linux_x86/vm/assembler_linux_x86_32.cpp.i
+data/make/bsd/makefiles/hp1.make.i
data/src/share/vm/opto/connode.cpp.i
data/src/os/solaris/vm/mutex_solaris.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LogicDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java.i
data/src/cpu/x86/vm/c1_CodeStubs_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java.i
-data/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicType.java.i
data/src/share/vm/memory/cardTableModRefBS.hpp.i
-data/src/share/vm/runtime/jniHandles.hpp.i
-data/src/os/windows/launcher/java_md.h.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp.i
+data/agent/src/share/classes/com/sun/java/swing/action/SaveAsAction.java.i
data/src/share/vm/gc_implementation/includeDB_gc_serial.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/project.xml.i
data/src/share/vm/runtime/objectMonitor.inline.hpp.i
data/src/share/vm/gc_implementation/shared/gcUtil.cpp.i
-data/src/share/vm/opto/loopUnswitch.cpp.i
-data/test/compiler/7009231/Test7009231.java.i
+data/src/cpu/x86/vm/assembler_x86_64.cpp.i
+data/test/compiler/6775880/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/VMRegImpl.java.i
-data/src/share/vm/gc_implementation/shared/coTracker.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxAddress.java.i
data/make/bsd/makefiles/compiler1.make.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ProfileData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/DefNewGeneration.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlass.java.i
+data/agent/src/os/win32/README.txt.i
data/test/compiler/6891750/Test6891750.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp.i
data/src/cpu/x86/vm/jniFastGetField_x86_64.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/nbproject/build-impl.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/bugspot/RegisterPanel.java.i
data/src/os/bsd/vm/stubRoutines_bsd.cpp.i
data/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp.i
data/src/cpu/x86/vm/frame_x86.cpp.i
data/make/windows/projectfiles/kernel/vm.def.i
-data/src/share/tools/MakeDeps/UnixPlatform.java.i
+data/src/cpu/zero/vm/relocInfo_zero.hpp.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/build-impl.xml.i
data/agent/make/hsdbproc64.sh.i
-data/src/share/vm/code/location.hpp.i
-data/src/share/vm/runtime/mutex.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedObject.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/HeapBlock.java.i
data/src/share/vm/runtime/jniPeriodicChecker.hpp.i
-data/src/share/vm/services/g1MemoryPool.hpp.i
-data/make/windows/projectfiles/core/vm.dsw.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/JmpDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SACoreAttachingConnector.java.i
data/src/share/vm/opto/chaitin.cpp.i
data/build/solaris/makefiles/product.make.i
data/agent/src/os/solaris/dbx/README-commands.txt.i
+data/src/share/vm/prims/nativeLookup.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/HistoryComboBox.java.i
-data/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties.i
-data/src/share/vm/ci/ciMethodHandle.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/ReturnInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java.i
+data/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/Space.java.i
+data/src/share/vm/utilities/dtrace_usdt2_disabled.hpp.i
data/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp.i
data/src/share/vm/asm/register.hpp.i
-data/make/README.i
+data/src/cpu/sparc/vm/frame_sparc.cpp.i
data/src/os/solaris/vm/vmError_solaris.cpp.i
data/src/share/vm/oops/oop.inline.hpp.i
-data/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp.i
-data/build/solaris/makefiles/adjust-mflags.sh.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java.i
-data/build/solaris/makefiles/mapfile-vers-COMPILER1.i
-data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.xml.i
-data/src/share/vm/opto/connode.hpp.i
-data/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.i
+data/agent/test/jdi/serialvm.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/LocationValue.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86Thread.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapSet.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/IndirectAddress.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArray.java.i
data/src/share/vm/opto/machnode.cpp.i
-data/src/share/vm/prims/jvmtiExtensions.hpp.i
+data/src/share/vm/gc_implementation/shared/collectorCounters.hpp.i
+data/src/share/vm/services/threadService.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/InlineTree.java.i
data/src/share/vm/ci/ciSymbolKlass.cpp.i
@@ -4085,22 +4102,23 @@ data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Cont
data/src/share/vm/runtime/task.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/folder.gif.i
data/src/share/tools/MakeDeps/WinGammaPlatform.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIndirectCallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPStoreDecoder.java.i
-data/build/solaris/makefiles/reorder_CORE_sparc.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterIndirectAddress.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactingPermGen.java.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml.i
data/src/cpu/sparc/vm/runtime_sparc.cpp.i
-data/src/share/vm/classfile/symbolTable.hpp.i
-data/make/windows/makefiles/debug.make.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp.i
+data/src/cpu/x86/vm/nativeInst_x86.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java.i
data/src/share/vm/c1/c1_LIRGenerator.cpp.i
data/src/cpu/x86/vm/cppInterpreter_x86.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadReferenceImpl.java.i
+data/src/cpu/sparc/vm/interp_masm_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/MachineTypes.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/RTLDataTypes.java.i
data/src/share/vm/opto/gcm.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicLock.java.i
+data/src/cpu/x86/vm/interpreterRT_x86_64.cpp.i
data/make/linux/makefiles/adjust-mflags.sh.i
data/src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp.i
data/build/linux/makefiles/product.make.i
@@ -4108,7 +4126,7 @@ data/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace
data/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderEntry.java.i
data/src/share/vm/compiler/disassembler.hpp.i
data/src/share/vm/libadt/port.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java.i
+data/src/share/vm/opto/compile.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Instruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java.i
data/src/cpu/zero/vm/jniFastGetField_zero.cpp.i
@@ -4118,14 +4136,15 @@ data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArray.java.i
data/src/share/vm/memory/classify.hpp.i
data/build/solaris/makefiles/sparc.make.i
data/src/cpu/sparc/vm/relocInfo_sparc.hpp.i
-data/src/share/vm/interpreter/templateTable.hpp.i
-data/src/cpu/zero/vm/register_definitions_zero.cpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp.i
+data/src/os_cpu/solaris_sparc/vm/prefetch_solaris_sparc.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SirInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicAddressFieldWrapper.java.i
data/src/share/vm/opto/type.cpp.i
data/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp.i
-data/src/os_cpu/solaris_x86/vm/os_solaris_x86.hpp.i
+data/src/cpu/sparc/vm/nativeInst_sparc.hpp.i
data/test/compiler/7052494/Test7052494.java.i
-data/agent/src/os/win32/README.txt.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbols.java.i
data/make/bsd/makefiles/profiled.make.i
data/src/os/solaris/vm/c1_globals_solaris.hpp.i
@@ -4135,43 +4154,45 @@ data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCount
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java.i
data/src/share/tools/MakeDeps/Util.java.i
-data/src/os/posix/vm/os_posix.cpp.i
+data/agent/src/os/solaris/proc/libproc.h.i
data/src/share/vm/ci/ciObjArray.cpp.i
data/build/windows/makefiles/product.make.i
-data/test/runtime/6878713/Test6878713.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/RootNode.java.i
data/src/share/vm/classfile/javaAssertions.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFException.java.i
+data/src/share/vm/utilities/numberSeq.cpp.i
+data/src/share/vm/oops/objArrayKlassKlass.hpp.i
data/src/share/vm/oops/typeArrayOop.hpp.i
data/src/share/vm/includeDB_core.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp.i
-data/src/share/vm/oops/klassVtable.hpp.i
+data/src/share/vm/interpreter/bytecodeTracer.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java.i
-data/src/share/vm/opto/loopTransform.cpp.i
+data/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp.i
+data/src/cpu/sparc/vm/register_definitions_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCTrapInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/MessageQueue.java.i
data/src/share/vm/oops/objArrayKlass.cpp.i
data/build/windows/get_msc_ver.sh.i
data/src/share/vm/utilities/exceptions.hpp.i
-data/src/share/vm/code/vtableStubs.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ReturnInstruction.java.i
data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp.i
data/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPath.java.i
-data/src/share/vm/ci/ciMethod.cpp.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties.i
-data/build/solaris/makefiles/mapfile-vers-nonproduct.i
+data/agent/src/os/win32/libInfo.hpp.i
+data/agent/test/libproc/libproctest.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WrprInstruction.java.i
+data/src/cpu/x86/vm/templateTable_x86_32.cpp.i
data/src/share/vm/prims/methodHandleWalk.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/suite.properties.i
data/src/share/vm/ci/ciConstant.cpp.i
data/src/cpu/zero/vm/vmStructs_zero.hpp.i
data/agent/src/os/win32/IOBuf.cpp.i
data/src/os/bsd/vm/os_bsd.cpp.i
-data/agent/src/share/classes/com/sun/java/swing/action/BackAction.java.i
+data/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp.i
data/src/share/vm/oops/klassPS.hpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter.i
-data/src/share/vm/ci/ciArray.hpp.i
+data/src/os/windows/vm/jvm_windows.h.i
+data/agent/src/os/bsd/ps_core.c.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/JNIHandleAccessor.java.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp.i
data/src/os/solaris/dtrace/jvm_dtrace.c.i
@@ -4184,169 +4205,172 @@ data/test/compiler/6855164/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlassKlass.java.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java.i
data/README.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEShiftDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java.i
data/test/runtime/6878713/testcase.jar.i
-data/src/share/vm/gc_implementation/g1/concurrentMark.hpp.i
-data/src/share/vm/gc_implementation/shared/mutableSpace.cpp.i
+data/make/README.i
data/src/cpu/sparc/vm/c1_FpuStackSim_sparc.cpp.i
-data/make/bsd/makefiles/tiered.make.i
data/src/cpu/x86/vm/templateTable_x86_64.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisters.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/LongHashMap.java.i
-data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp.i
+data/make/windows/create.bat.i
data/agent/make/grantAll.policy.i
data/test/compiler/6646019/Test.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.i
data/src/os_cpu/bsd_x86/vm/bsd_x86_32.s.i
data/src/share/tools/MakeDeps/ArgsParser.java.i
data/src/share/vm/oops/cpCacheOop.cpp.i
-data/src/cpu/sparc/vm/templateTable_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/OopField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java.i
data/src/share/vm/opto/rootnode.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThreadFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrefetchInstruction.java.i
-data/agent/make/dumpflagsproc.sh.i
+data/make/bsd/makefiles/fastdebug.make.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Phase.java.i
data/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.i
-data/src/share/vm/utilities/numberSeq.cpp.i
-data/src/share/vm/memory/barrierSet.hpp.i
-data/src/share/vm/Xusage.txt.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThreadFactory.java.i
+data/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp.i
+data/agent/make/jcoreproc64.sh.i
data/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp.i
data/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHistogram.java.i
-data/src/share/vm/opto/mulnode.cpp.i
+data/src/share/vm/runtime/sweeper.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RotateInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/BranchData.java.i
+data/make/altsrc.make.i
data/src/share/vm/opto/classes.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9BranchDecoder.java.i
data/src/share/vm/shark/sharkStateScanner.cpp.i
-data/src/share/tools/MakeDeps/DirectoryTree.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/MemoryInstructionDecoder.java.i
data/src/share/vm/interpreter/interpreter.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java.i
data/src/os/bsd/vm/interfaceSupport_bsd.hpp.i
data/src/share/vm/runtime/java.hpp.i
data/make/test/Queens.java.i
-data/src/share/vm/services/dtraceAttacher.hpp.i
+data/src/share/vm/c1/c1_FrameMap.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/layer.xml.i
data/src/share/tools/IdealGraphVisualizer/Filter/build.xml.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/MouseOverAction.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java.i
-data/src/share/vm/ci/ciConstant.hpp.i
+data/src/cpu/sparc/vm/bytecodes_sparc.cpp.i
+data/src/share/vm/runtime/mutex.hpp.i
data/src/os_cpu/linux_sparc/vm/linux_sparc.ad.i
data/build/hotspot_distro.i
data/src/os/linux/vm/objectMonitor_linux.hpp.i
data/src/share/vm/prims/methodHandleWalk.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ResultTypeFinder.java.i
data/src/share/vm/runtime/perfData.hpp.i
-data/src/share/vm/runtime/globals.hpp.i
+data/make/bsd/makefiles/i486.make.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CharTreeNodeAdapter.java.i
-data/src/share/vm/oops/arrayOop.hpp.i
+data/src/cpu/zero/vm/icBuffer_zero.cpp.i
data/test/compiler/7070134/words.d
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPLoadDecoder.java.i
-data/make/solaris/makefiles/compiler1.make.i
+data/test/compiler/7070134/words.i
data/src/share/vm/code/dependencies.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java.i
data/make/bsd/makefiles/product.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFrame.java.i
data/src/share/vm/utilities/vmError.hpp.i
data/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp.i
-data/src/share/vm/memory/heapInspection.cpp.i
+data/src/share/vm/ci/ciConstant.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java.i
data/src/cpu/zero/vm/templateInterpreter_zero.hpp.i
-data/src/share/tools/LogCompilation/README.i
-data/src/share/vm/memory/collectorPolicy.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFunctionDefinitionRecord.java.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/manifest.mf.i
data/src/share/vm/opto/runtime.cpp.i
data/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/linestyle.filter.i
+data/src/share/vm/runtime/threadCritical.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/AddressException.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/up.gif.i
-data/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.i
+data/src/share/vm/runtime/safepoint.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/prev_diagram.png.i
data/src/share/vm/classfile/stackMapTable.hpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java.i
data/src/share/vm/oops/arrayKlassKlass.cpp.i
data/src/share/vm/runtime/thread.cpp.i
-data/build/windows/projectfiles/tiered/vm.def.i
+data/make/windows/projectfiles/tiered/ADLCompiler.dsw.i
data/agent/src/share/classes/com/sun/java/swing/ui/CommonMenuBar.java.i
data/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp.i
+data/make/hotspot_distro.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java.i
+data/build/solaris/platform_i486.i
data/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp.i
data/test/compiler/6772683/InterruptedTest.java.i
-data/make/linux/makefiles/saproc.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactoryImpl.java.i
data/src/share/vm/memory/generation.inline.hpp.i
-data/src/share/vm/ci/ciCPCache.hpp.i
+data/src/cpu/sparc/vm/dump_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/SALauncherLoader.java.i
-data/test/compiler/6714694/Tester.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/FieldIdentifier.java.i
data/src/share/vm/opto/idealKit.hpp.i
data/src/share/vm/memory/resourceArea.cpp.i
data/src/share/vm/ci/ciNullObject.cpp.i
-data/src/share/vm/prims/unsafe.cpp.i
+data/src/share/vm/prims/jvmtiEnvThreadState.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerType.java.i
data/build/windows/makefiles/makedeps.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapProgressThunk.java.i
data/src/share/vm/asm/register.cpp.i
data/src/cpu/x86/vm/frame_x86.inline.hpp.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java.i
data/src/share/vm/ci/ciSymbolKlass.hpp.i
-data/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp.i
-data/agent/make/heapsumproc.sh.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml.i
+data/make/windows/makefiles/launcher.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/MoveDecoder.java.i
data/src/share/vm/interpreter/rewriter.hpp.i
data/src/cpu/x86/vm/c1_globals_x86.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux/LinuxSignals.java.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/platform.properties.i
-data/src/share/vm/opto/generateOptoStub.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif.i
+data/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer.i
+data/src/cpu/x86/vm/runtime_x86_32.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java.i
-data/agent/test/jdi/VMConnection.java.i
-data/test/compiler/6910484/Test.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java.i
data/make/bsd/README.i
data/make/windows/makefiles/compile.make.i
-data/src/share/vm/shark/sharkInliner.cpp.i
-data/src/cpu/sparc/vm/interp_masm_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLdstubDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadReferenceImpl.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp.i
-data/src/share/vm/opto/classes.cpp.i
-data/src/cpu/x86/vm/interpreterRT_x86_64.cpp.i
+data/agent/make/pmapproc.sh.i
+data/src/share/vm/opto/mulnode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSymbolRecord.java.i
data/src/share/vm/runtime/stubCodeGenerator.hpp.i
data/test/compiler/6833129/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/SingletonBlob.java.i
-data/test/runtime/6929067/Test6929067.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntry.java.i
+data/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.i
data/src/share/vm/runtime/unhandledOops.cpp.i
-data/src/share/vm/oops/objArrayKlassKlass.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PopcDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArrayKlass.java.i
-data/test/runtime/6626217/many_loader2.java.foo.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentGCThread.hpp.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC6.java.i
-data/src/cpu/x86/vm/templateTable_x86_32.cpp.i
-data/src/share/tools/MakeDeps/WinGammaPlatformVC9.java.i
+data/build/solaris/makefiles/mapfile-vers-nonproduct.i
+data/src/share/vm/c1/c1_ValueStack.hpp.i
data/src/share/vm/opto/subnode.hpp.i
data/make/windows/makefiles/generated.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java.i
-data/src/share/vm/gc_implementation/shared/collectorCounters.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlassKlass.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.i
data/agent/src/os/win32/Reaper.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp.i
-data/src/share/vm/libadt/set.hpp.i
-data/test/compiler/5091921/Test6890943.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialStoreDecoder.java.i
+data/src/cpu/zero/vm/interp_masm_zero.cpp.i
data/agent/make/jsdbproc64.sh.i
data/src/share/vm/oops/klass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50MemberAttributes.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeIinc.java.i
+data/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp.i
data/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp.i
-data/src/cpu/sparc/vm/jni_sparc.h.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java.i
+data/agent/src/share/classes/com/sun/java/swing/action/HelpMenu.java.i
+data/src/share/vm/opto/block.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstanceKlass.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32ThreadContext.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCWriteInstruction.java.i
data/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java.i
+data/agent/make/heapsumproc.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux/LinuxSignals.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedBoolean.java.i
-data/src/share/vm/runtime/threadCritical.hpp.i
+data/src/share/vm/interpreter/bytecodes.hpp.i
data/src/share/vm/runtime/monitorChunk.hpp.i
-data/make/solaris/makefiles/adlc.make.i
+data/build/windows/projectfiles/tiered/ADLCompiler.dsp.i
data/build/solaris/makefiles/mapfile-vers-jsig.i
-data/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp.i
-data/agent/make/soqlwindbg.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveLoadInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java.i
data/src/share/vm/utilities/numberSeq.hpp.i
-data/src/share/vm/gc_implementation/shared/spaceDecorator.hpp.i
+data/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp.i
diff --git a/hotspot/.hg/store/undo b/hotspot/.hg/store/undo
index 718c907..4b1c5b9 100644
Binary files a/hotspot/.hg/store/undo and b/hotspot/.hg/store/undo differ
diff --git a/hotspot/.hg/undo.desc b/hotspot/.hg/undo.desc
index 9db92fd..f4d3096 100644
--- a/hotspot/.hg/undo.desc
+++ b/hotspot/.hg/undo.desc
@@ -1,3 +1,3 @@
-2621
+2779
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/hotspot
diff --git a/hotspot/.hg/undo.dirstate b/hotspot/.hg/undo.dirstate
index 556ad91..77c959c 100644
Binary files a/hotspot/.hg/undo.dirstate and b/hotspot/.hg/undo.dirstate differ
diff --git a/hotspot/.hgignore b/hotspot/.hgignore
index 4824708..c652de1 100644
--- a/hotspot/.hgignore
+++ b/hotspot/.hgignore
@@ -6,3 +6,4 @@
^src/share/tools/IdealGraphVisualizer/build/
^src/share/tools/IdealGraphVisualizer/dist/
^.hgtip
+.DS_Store
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index d39a5b8..b777c2f 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -189,7 +189,7 @@ fe189d4a44e9e8f0c7d78fcbd1c63701745752ca jdk7-b144
dce7d24674f4d0bed00de24f00119057fdce7cfb jdk8-b05
0db80d8e77fccddf5e6fa49963226b54ac7d0f62 jdk8-b06
3f0cf875af83f55ec5e1a5cea80455315f9322a2 jdk8-b07
-3a2fb61165dfc72e6de2adab1f2649a408f5e577 hs22-b01
+0cc8a70952c368e06de2adab1f2649a408f5e577 hs22-b01
7c29742c41b44fb0cd5a13c7ac8834f3f2ca649e hs22-b02
3a2fb61165dfc72e398179a2796d740c8da5b8c0 hs22-b03
ce9bde819dcba4a5d2822229d9183e69c74326ca hs22-b04
@@ -197,3 +197,14 @@ ce9bde819dcba4a5d2822229d9183e69c74326ca hs22-b04
650d15d8f37255d3b805aa00c5bd1c30984b203d hs22-b06
da883b9e6d3788057f9577e72712998ed82c9b7e hs23-b01
49ed7eacfd16616166ff066493143889741097af jdk8-b08
+7c20d272643f47195478708eff593a9cce40fec4 jdk8-b09
+e4f412d2b75d2c797acff965aa2c420e3d358f09 hs23-b02
+d815de2e85e511b7deab2a83cf80c0224d011da9 jdk8-b10
+4d3850d9d326ac3a9bee2d867727e954322d014e hs23-b03
+4538caeef7b6cbd4302bebced805d65e68ccf301 jdk8-b11
+6534482ff68ad79066dfe15dfb6d8905f09681bd hs23-b04
+1d3900713a67a0a39faf4e12c9c158d55aebef87 jdk8-b12
+3e609627e780736f372eb14d29bb9b5e53b21fbf hs23-b05
+b92ca8e229d29004f840c67e620833d23a346761 jdk8-b13
+088d09a130ff02d8f5f05e92256baabe412f0439 jdk8-b14
+6c2a55d4902f202e1c2de1df17b7da083a2c31e8 hs23-b06
diff --git a/hotspot/agent/make/Makefile b/hotspot/agent/make/Makefile
index 981d2c8..fd54993 100644
--- a/hotspot/agent/make/Makefile
+++ b/hotspot/agent/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2011, 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
@@ -84,6 +84,7 @@ sun.jvm.hotspot.debugger.windbg.ia64 \
sun.jvm.hotspot.debugger.windbg.x86 \
sun.jvm.hotspot.debugger.x86 \
sun.jvm.hotspot.gc_implementation \
+sun.jvm.hotspot.gc_implementation.g1 \
sun.jvm.hotspot.gc_implementation.parallelScavenge \
sun.jvm.hotspot.gc_implementation.shared \
sun.jvm.hotspot.gc_interface \
@@ -176,6 +177,9 @@ sun/jvm/hotspot/debugger/windbg/*.java \
sun/jvm/hotspot/debugger/windbg/ia64/*.java \
sun/jvm/hotspot/debugger/windbg/x86/*.java \
sun/jvm/hotspot/debugger/x86/*.java \
+sun/jvm/hotspot/gc_implementation/g1/*.java \
+sun/jvm/hotspot/gc_implementation/parallelScavenge/*.java \
+sun/jvm/hotspot/gc_implementation/shared/*.java \
sun/jvm/hotspot/interpreter/*.java \
sun/jvm/hotspot/jdi/*.java \
sun/jvm/hotspot/livejvm/*.java \
diff --git a/hotspot/agent/src/os/bsd/MacosxDebuggerLocal.m b/hotspot/agent/src/os/bsd/MacosxDebuggerLocal.m
new file mode 100644
index 0000000..04eaf94
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/MacosxDebuggerLocal.m
@@ -0,0 +1,406 @@
+/*
+ * Copyright (c) 2002, 2007, 2011, 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.
+ *
+ */
+
+#include <objc/objc-runtime.h>
+#import <Foundation/Foundation.h>
+#import <JavaNativeFoundation/JavaNativeFoundation.h>
+
+#include <JavaVM/jni.h>
+
+#import <mach/mach.h>
+#import <mach/mach_types.h>
+#import <sys/sysctl.h>
+#import <stdlib.h>
+
+jboolean debug = JNI_FALSE;
+
+static jfieldID symbolicatorID = 0; // set in _init0
+static jfieldID taskID = 0; // set in _init0
+
+static void putSymbolicator(JNIEnv *env, jobject this_obj, id symbolicator) {
+ (*env)->SetLongField(env, this_obj, symbolicatorID, (jlong)(intptr_t)symbolicator);
+}
+
+static id getSymbolicator(JNIEnv *env, jobject this_obj) {
+ jlong ptr = (*env)->GetLongField(env, this_obj, symbolicatorID);
+ return (id)(intptr_t)ptr;
+}
+
+static void putTask(JNIEnv *env, jobject this_obj, task_t task) {
+ (*env)->SetLongField(env, this_obj, taskID, (jlong)task);
+}
+
+static task_t getTask(JNIEnv *env, jobject this_obj) {
+ jlong ptr = (*env)->GetLongField(env, this_obj, taskID);
+ return (task_t)ptr;
+}
+
+#define CHECK_EXCEPTION_(value) if ((*env)->ExceptionOccurred(env)) { return value; }
+#define CHECK_EXCEPTION if ((*env)->ExceptionOccurred(env)) { return;}
+#define THROW_NEW_DEBUGGER_EXCEPTION_(str, value) { throw_new_debugger_exception(env, str); return value; }
+#define THROW_NEW_DEBUGGER_EXCEPTION(str) { throw_new_debugger_exception(env, str); return;}
+
+static void throw_new_debugger_exception(JNIEnv* env, const char* errMsg) {
+ (*env)->ThrowNew(env, (*env)->FindClass(env, "sun/jvm/hotspot/debugger/DebuggerException"), errMsg);
+}
+
+#if defined(__i386__)
+ #define hsdb_thread_state_t x86_thread_state32_t
+ #define hsdb_float_state_t x86_float_state32_t
+ #define HSDB_THREAD_STATE x86_THREAD_STATE32
+ #define HSDB_FLOAT_STATE x86_FLOAT_STATE32
+ #define HSDB_THREAD_STATE_COUNT x86_THREAD_STATE32_COUNT
+ #define HSDB_FLOAT_STATE_COUNT x86_FLOAT_STATE32_COUNT
+#elif defined(__x86_64__)
+ #define hsdb_thread_state_t x86_thread_state64_t
+ #define hsdb_float_state_t x86_float_state64_t
+ #define HSDB_THREAD_STATE x86_THREAD_STATE64
+ #define HSDB_FLOAT_STATE x86_FLOAT_STATE64
+ #define HSDB_THREAD_STATE_COUNT x86_THREAD_STATE64_COUNT
+ #define HSDB_FLOAT_STATE_COUNT x86_FLOAT_STATE64_COUNT
+#else
+ #error "Unsupported architecture"
+#endif
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: init0
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_init0(JNIEnv *env, jclass cls) {
+ symbolicatorID = (*env)->GetFieldID(env, cls, "symbolicator", "J");
+ taskID = (*env)->GetFieldID(env, cls, "task", "J");
+ CHECK_EXCEPTION;
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: lookupByName0
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)J
+ */
+JNIEXPORT jlong JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByName0(JNIEnv *env, jobject this_obj, jstring objectName, jstring symbolName) {
+ jlong address = 0;
+
+JNF_COCOA_ENTER(env);
+ NSString *symbolNameString = JNFJavaToNSString(env, symbolName);
+
+ if (debug) {
+ printf("lookupInProcess called for %s\n", [symbolNameString UTF8String]);
+ }
+
+ id symbolicator = getSymbolicator(env, this_obj);
+ if (symbolicator != nil) {
+ uint64_t (*dynamicCall)(id, SEL, NSString *) = (uint64_t (*)(id, SEL, NSString *))&objc_msgSend;
+ address = (jlong) dynamicCall(symbolicator, @selector(addressForSymbol:), symbolNameString);
+ }
+
+ if (debug) {
+ printf("address of symbol %s = %llx\n", [symbolNameString UTF8String], address);
+ }
+JNF_COCOA_EXIT(env);
+
+ return address;
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: readBytesFromProcess0
+ * Signature: (JJ)Lsun/jvm/hotspot/debugger/ReadResult;
+ */
+JNIEXPORT jbyteArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_readBytesFromProcess0(JNIEnv *env, jobject this_obj, jlong addr, jlong numBytes) {
+ if (debug) printf("readBytesFromProcess called. addr = %llx numBytes = %lld\n", addr, numBytes);
+
+ // must allocate storage instead of using former parameter buf
+ jboolean isCopy;
+ jbyteArray array;
+ jbyte *bufPtr;
+
+ array = (*env)->NewByteArray(env, numBytes);
+ CHECK_EXCEPTION_(0);
+
+ unsigned long alignedAddress;
+ unsigned long alignedLength;
+ kern_return_t result;
+ vm_offset_t *pages;
+ int *mapped;
+ long pageCount;
+ uint byteCount;
+ int i;
+ unsigned long remaining;
+
+ alignedAddress = trunc_page(addr);
+ if (addr != alignedAddress) {
+ alignedLength += addr - alignedAddress;
+ }
+ alignedLength = round_page(numBytes);
+ pageCount = alignedLength/vm_page_size;
+
+ // Allocate storage for pages and flags.
+ pages = malloc(pageCount * sizeof(vm_offset_t));
+ mapped = calloc(pageCount, sizeof(int));
+
+ task_t gTask = getTask(env, this_obj);
+ // Try to read each of the pages.
+ for (i = 0; i < pageCount; i++) {
+ result = vm_read(gTask, alignedAddress + i*vm_page_size, vm_page_size,
+ &pages[i], &byteCount);
+ mapped[i] = (result == KERN_SUCCESS);
+ // assume all failures are unmapped pages
+ }
+
+ if (debug) fprintf(stderr, "%ld pages\n", pageCount);
+
+ remaining = numBytes;
+
+ for (i = 0; i < pageCount; i++) {
+ unsigned long len = vm_page_size;
+ unsigned long start = 0;
+
+ if (i == 0) {
+ start = addr - alignedAddress;
+ len = vm_page_size - start;
+ }
+
+ if (i == (pageCount - 1)) {
+ len = remaining;
+ }
+
+ if (mapped[i]) {
+ if (debug) fprintf(stderr, "page %d mapped (len %ld start %ld)\n", i, len, start);
+ (*env)->SetByteArrayRegion(env, array, 0, len, ((jbyte *) pages[i] + start));
+ vm_deallocate(mach_task_self(), pages[i], vm_page_size);
+ }
+
+ remaining -= len;
+ }
+
+ free (pages);
+ free (mapped);
+ return array;
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_macosx_MacOSXDebuggerLocal
+ * Method: getThreadIntegerRegisterSet0
+ * Signature: (I)[J
+ */
+JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0(JNIEnv *env, jobject this_obj, jint lwp_id) {
+ if (debug)
+ printf("getThreadRegisterSet0 called\n");
+
+ kern_return_t result;
+ thread_t tid;
+ mach_msg_type_number_t count = HSDB_THREAD_STATE_COUNT;
+ hsdb_thread_state_t state;
+ unsigned int *r;
+ int i;
+ jlongArray registerArray;
+ jlong *primitiveArray;
+
+ tid = lwp_id;
+
+ result = thread_get_state(tid, HSDB_THREAD_STATE, (thread_state_t)&state, &count);
+
+ if (result != KERN_SUCCESS) {
+ if (debug)
+ printf("getregs: thread_get_state(%d) failed (%d)\n", tid, result);
+ return NULL;
+ }
+
+ // 40 32-bit registers on ppc, 16 on x86.
+ // Output order is the same as the order in the ppc_thread_state/i386_thread_state struct.
+#if defined(__i386__)
+ r = (unsigned int *)&state;
+ registerArray = (*env)->NewLongArray(env, 8);
+ primitiveArray = (*env)->GetLongArrayElements(env, registerArray, NULL);
+ primitiveArray[0] = r[0]; // eax
+ primitiveArray[1] = r[2]; // ecx
+ primitiveArray[2] = r[3]; // edx
+ primitiveArray[3] = r[1]; // ebx
+ primitiveArray[4] = r[7]; // esp
+ primitiveArray[5] = r[6]; // ebp
+ primitiveArray[6] = r[5]; // esi
+ primitiveArray[7] = r[4]; // edi
+ (*env)->ReleaseLongArrayElements(env, registerArray, primitiveArray, 0);
+#elif defined(__x86_64__)
+ /* From AMD64ThreadContext.java
+ public static final int R15 = 0;
+ public static final int R14 = 1;
+ public static final int R13 = 2;
+ public static final int R12 = 3;
+ public static final int R11 = 4;
+ public static final int R10 = 5;
+ public static final int R9 = 6;
+ public static final int R8 = 7;
+ public static final int RDI = 8;
+ public static final int RSI = 9;
+ public static final int RBP = 10;
+ public static final int RBX = 11;
+ public static final int RDX = 12;
+ public static final int RCX = 13;
+ public static final int RAX = 14;
+ public static final int TRAPNO = 15;
+ public static final int ERR = 16;
+ public static final int RIP = 17;
+ public static final int CS = 18;
+ public static final int RFL = 19;
+ public static final int RSP = 20;
+ public static final int SS = 21;
+ public static final int FS = 22;
+ public static final int GS = 23;
+ public static final int ES = 24;
+ public static final int DS = 25;
+ public static final int FSBASE = 26;
+ public static final int GSBASE = 27;
+ */
+ // 64 bit
+ if (debug) printf("Getting threads for a 64-bit process\n");
+ registerArray = (*env)->NewLongArray(env, 28);
+ primitiveArray = (*env)->GetLongArrayElements(env, registerArray, NULL);
+
+ primitiveArray[0] = state.__r15;
+ primitiveArray[1] = state.__r14;
+ primitiveArray[2] = state.__r13;
+ primitiveArray[3] = state.__r12;
+ primitiveArray[4] = state.__r11;
+ primitiveArray[5] = state.__r10;
+ primitiveArray[6] = state.__r9;
+ primitiveArray[7] = state.__r8;
+ primitiveArray[8] = state.__rdi;
+ primitiveArray[9] = state.__rsi;
+ primitiveArray[10] = state.__rbp;
+ primitiveArray[11] = state.__rbx;
+ primitiveArray[12] = state.__rdx;
+ primitiveArray[13] = state.__rcx;
+ primitiveArray[14] = state.__rax;
+ primitiveArray[15] = 0; // trapno ?
+ primitiveArray[16] = 0; // err ?
+ primitiveArray[17] = state.__rip;
+ primitiveArray[18] = state.__cs;
+ primitiveArray[19] = state.__rflags;
+ primitiveArray[20] = state.__rsp;
+ primitiveArray[21] = 0; // We don't have SS
+ primitiveArray[22] = state.__fs;
+ primitiveArray[23] = state.__gs;
+ primitiveArray[24] = 0;
+ primitiveArray[25] = 0;
+ primitiveArray[26] = 0;
+ primitiveArray[27] = 0;
+
+ if (debug) printf("set registers\n");
+
+ (*env)->ReleaseLongArrayElements(env, registerArray, primitiveArray, 0);
+#else
+#error Unsupported architecture
+#endif
+
+ return registerArray;
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_macosx_MacOSXDebuggerLocal
+ * Method: translateTID0
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL
+Java_sun_jvm_hotspot_debugger_macosx_MacOSXDebuggerLocal_translateTID0(JNIEnv *env, jobject this_obj, jint tid) {
+ if (debug)
+ printf("translateTID0 called on tid = 0x%x\n", (int)tid);
+
+ kern_return_t result;
+ thread_t foreign_tid, usable_tid;
+ mach_msg_type_name_t type;
+
+ foreign_tid = tid;
+
+ task_t gTask = getTask(env, this_obj);
+ result = mach_port_extract_right(gTask, foreign_tid,
+ MACH_MSG_TYPE_COPY_SEND,
+ &usable_tid, &type);
+ if (result != KERN_SUCCESS)
+ return -1;
+
+ if (debug)
+ printf("translateTID0: 0x%x -> 0x%x\n", foreign_tid, usable_tid);
+
+ return (jint) usable_tid;
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: attach0
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_attach0__I(JNIEnv *env, jobject this_obj, jint jpid) {
+JNF_COCOA_ENTER(env);
+ if (getenv("JAVA_SAPROC_DEBUG") != NULL)
+ debug = JNI_TRUE;
+ else
+ debug = JNI_FALSE;
+ if (debug) printf("attach0 called for jpid=%d\n", (int)jpid);
+
+ kern_return_t result;
+ task_t gTask = 0;
+ result = task_for_pid(mach_task_self(), jpid, &gTask);
+ if (result != KERN_SUCCESS) {
+ fprintf(stderr, "attach: task_for_pid(%d) failed (%d)\n", (int)jpid, result);
+ THROW_NEW_DEBUGGER_EXCEPTION("Can't attach to the process");
+ }
+ putTask(env, this_obj, gTask);
+
+ id symbolicator = nil;
+ id jrsSymbolicator = objc_lookUpClass("JRSSymbolicator");
+ if (jrsSymbolicator != nil) {
+ id (*dynamicCall)(id, SEL, pid_t) = (id (*)(id, SEL, pid_t))&objc_msgSend;
+ symbolicator = dynamicCall(jrsSymbolicator, @selector(symbolicatorForPid:), (pid_t)jpid);
+ }
+ if (symbolicator != nil) {
+ CFRetain(symbolicator); // pin symbolicator while in java heap
+ }
+
+ putSymbolicator(env, this_obj, symbolicator);
+ if (symbolicator == nil) {
+ THROW_NEW_DEBUGGER_EXCEPTION("Can't attach symbolicator to the process");
+ }
+
+JNF_COCOA_EXIT(env);
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: detach0
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_detach0(JNIEnv *env, jobject this_obj) {
+JNF_COCOA_ENTER(env);
+ if (debug) printf("detach0 called\n");
+
+ task_t gTask = getTask(env, this_obj);
+ mach_port_deallocate(mach_task_self(), gTask);
+ id symbolicator = getSymbolicator(env, this_obj);
+ if (symbolicator != nil) {
+ CFRelease(symbolicator);
+ }
+JNF_COCOA_EXIT(env);
+}
diff --git a/hotspot/agent/src/os/bsd/Makefile b/hotspot/agent/src/os/bsd/Makefile
index 65909bd..90085c6 100644
--- a/hotspot/agent/src/os/bsd/Makefile
+++ b/hotspot/agent/src/os/bsd/Makefile
@@ -32,7 +32,6 @@ SOURCES = salibelf.c \
libproc_impl.c \
ps_proc.c \
ps_core.c \
- hsearch_r.c \
BsdDebuggerLocal.c
INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
diff --git a/hotspot/agent/src/os/bsd/symtab.c b/hotspot/agent/src/os/bsd/symtab.c
index 0362cf0..9a9fbd2 100644
--- a/hotspot/agent/src/os/bsd/symtab.c
+++ b/hotspot/agent/src/os/bsd/symtab.c
@@ -116,7 +116,7 @@ struct symtab* build_symtab(int fd) {
if (shdr->sh_type == symsection) {
ELF_SYM *syms;
- int j, n, rslt;
+ int j, n;
size_t size;
// FIXME: there could be multiple data buffers associated with the
@@ -138,6 +138,8 @@ struct symtab* build_symtab(int fd) {
// manipulate the hash table.
symtab->hash_table = dbopen(NULL, O_CREAT | O_RDWR, 0600, DB_HASH, NULL);
// guarantee(symtab->hash_table, "unexpected failure: dbopen");
+ if (symtab->hash_table == NULL)
+ goto bad;
// shdr->sh_link points to the section that contains the actual strings
// for symbol names. the st_name field in ELF_SYM is just the
@@ -145,11 +147,15 @@ struct symtab* build_symtab(int fd) {
// strings will not be destroyed by elf_end.
size = scn_cache[shdr->sh_link].c_shdr->sh_size;
symtab->strs = malloc(size);
+ if (symtab->strs == NULL)
+ goto bad;
memcpy(symtab->strs, scn_cache[shdr->sh_link].c_data, size);
// allocate memory for storing symbol offset and size;
symtab->num_symbols = n;
symtab->symbols = calloc(n , sizeof(*symtab->symbols));
+ if (symtab->symbols == NULL)
+ goto bad;
// copy symbols info our symtab and enter them info the hash table
for (j = 0; j < n; j++, syms++) {
@@ -175,6 +181,11 @@ struct symtab* build_symtab(int fd) {
}
}
}
+ goto quit;
+
+bad:
+ destroy_symtab(symtab);
+ symtab = NULL;
quit:
if (shbuf) free(shbuf);
@@ -195,7 +206,7 @@ void destroy_symtab(struct symtab* symtab) {
if (symtab->strs) free(symtab->strs);
if (symtab->symbols) free(symtab->symbols);
if (symtab->hash_table) {
- symtab->hash_table->close(symtab->hash_table);
+ (*symtab->hash_table->close)(symtab->hash_table);
}
free(symtab);
}
@@ -219,7 +230,6 @@ uintptr_t search_symbol(struct symtab* symtab, uintptr_t base,
return rslt;
}
-quit:
return 0;
}
@@ -228,12 +238,12 @@ const char* nearest_symbol(struct symtab* symtab, uintptr_t offset,
int n = 0;
if (!symtab) return NULL;
for (; n < symtab->num_symbols; n++) {
- struct elf_symbol* sym = &(symtab->symbols[n]);
- if (sym->name != NULL &&
- offset >= sym->offset && offset < sym->offset + sym->size) {
- if (poffset) *poffset = (offset - sym->offset);
- return sym->name;
- }
+ struct elf_symbol* sym = &(symtab->symbols[n]);
+ if (sym->name != NULL &&
+ offset >= sym->offset && offset < sym->offset + sym->size) {
+ if (poffset) *poffset = (offset - sym->offset);
+ return sym->name;
+ }
}
return NULL;
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
index ce508e6..13785ef 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
@@ -52,6 +52,8 @@ public class BsdDebuggerLocal extends DebuggerBase implements BsdDebugger {
private boolean useGCC32ABI;
private boolean attached;
private long p_ps_prochandle; // native debugger handle
+ private long symbolicator; // macosx symbolicator handle
+ private long task; // macosx task handle
private boolean isCore;
// CDebugger support
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java
new file mode 100644
index 0000000..502d8e4
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ */
+
+package sun.jvm.hotspot.gc_implementation.g1;
+
+import java.util.Iterator;
+import java.util.Observable;
+import java.util.Observer;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.gc_interface.CollectedHeapName;
+import sun.jvm.hotspot.memory.MemRegion;
+import sun.jvm.hotspot.memory.SharedHeap;
+import sun.jvm.hotspot.memory.SpaceClosure;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObjectFactory;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+// Mirror class for G1CollectedHeap.
+
+public class G1CollectedHeap extends SharedHeap {
+ // HeapRegionSeq _seq;
+ static private long hrsFieldOffset;
+ // MemRegion _g1_committed;
+ static private long g1CommittedFieldOffset;
+ // size_t _summary_bytes_used;
+ static private CIntegerField summaryBytesUsedField;
+ // G1MonitoringSupport* _g1mm
+ static private AddressField g1mmField;
+
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ static private synchronized void initialize(TypeDataBase db) {
+ Type type = db.lookupType("G1CollectedHeap");
+
+ hrsFieldOffset = type.getField("_hrs").getOffset();
+ g1CommittedFieldOffset = type.getField("_g1_committed").getOffset();
+ summaryBytesUsedField = type.getCIntegerField("_summary_bytes_used");
+ g1mmField = type.getAddressField("_g1mm");
+ }
+
+ public long capacity() {
+ Address g1CommittedAddr = addr.addOffsetTo(g1CommittedFieldOffset);
+ MemRegion g1_committed = new MemRegion(g1CommittedAddr);
+ return g1_committed.byteSize();
+ }
+
+ public long used() {
+ return summaryBytesUsedField.getValue(addr);
+ }
+
+ public long n_regions() {
+ return hrs().length();
+ }
+
+ private HeapRegionSeq hrs() {
+ Address hrsAddr = addr.addOffsetTo(hrsFieldOffset);
+ return (HeapRegionSeq) VMObjectFactory.newObject(HeapRegionSeq.class,
+ hrsAddr);
+ }
+
+ public G1MonitoringSupport g1mm() {
+ Address g1mmAddr = g1mmField.getValue(addr);
+ return (G1MonitoringSupport) VMObjectFactory.newObject(G1MonitoringSupport.class, g1mmAddr);
+ }
+
+ private Iterator<HeapRegion> heapRegionIterator() {
+ return hrs().heapRegionIterator();
+ }
+
+ public void heapRegionIterate(SpaceClosure scl) {
+ Iterator<HeapRegion> iter = heapRegionIterator();
+ while (iter.hasNext()) {
+ HeapRegion hr = iter.next();
+ scl.doSpace(hr);
+ }
+ }
+
+ public CollectedHeapName kind() {
+ return CollectedHeapName.G1_COLLECTED_HEAP;
+ }
+
+ public G1CollectedHeap(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java
new file mode 100644
index 0000000..7b03aed
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ */
+
+package sun.jvm.hotspot.gc_implementation.g1;
+
+import java.util.Observable;
+import java.util.Observer;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+// Mirror class for G1MonitoringSupport.
+
+public class G1MonitoringSupport extends VMObject {
+ // size_t _eden_committed;
+ static private CIntegerField edenCommittedField;
+ // size_t _eden_used;
+ static private CIntegerField edenUsedField;
+ // size_t _survivor_committed;
+ static private CIntegerField survivorCommittedField;
+ // size_t _survivor_used;
+ static private CIntegerField survivorUsedField;
+ // size_t _old_committed;
+ static private CIntegerField oldCommittedField;
+ // size_t _old_used;
+ static private CIntegerField oldUsedField;
+
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ static private synchronized void initialize(TypeDataBase db) {
+ Type type = db.lookupType("G1MonitoringSupport");
+
+ edenCommittedField = type.getCIntegerField("_eden_committed");
+ edenUsedField = type.getCIntegerField("_eden_used");
+ survivorCommittedField = type.getCIntegerField("_survivor_committed");
+ survivorUsedField = type.getCIntegerField("_survivor_used");
+ oldCommittedField = type.getCIntegerField("_old_committed");
+ oldUsedField = type.getCIntegerField("_old_used");
+ }
+
+ public long edenCommitted() {
+ return edenCommittedField.getValue(addr);
+ }
+
+ public long edenUsed() {
+ return edenUsedField.getValue(addr);
+ }
+
+ public long survivorCommitted() {
+ return survivorCommittedField.getValue(addr);
+ }
+
+ public long survivorUsed() {
+ return survivorUsedField.getValue(addr);
+ }
+
+ public long oldCommitted() {
+ return oldCommittedField.getValue(addr);
+ }
+
+ public long oldUsed() {
+ return oldUsedField.getValue(addr);
+ }
+
+ public G1MonitoringSupport(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java
new file mode 100644
index 0000000..4aa7620
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ */
+
+package sun.jvm.hotspot.gc_implementation.g1;
+
+import java.util.Observable;
+import java.util.Observer;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.memory.ContiguousSpace;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+// Mirror class for HeapRegion. Currently we don't actually include
+// any of its fields but only iterate over it (which we get "for free"
+// as HeapRegion ultimately inherits from ContiguousSpace).
+
+public class HeapRegion extends ContiguousSpace {
+ // static int GrainBytes;
+ static private CIntegerField grainBytesField;
+
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ static private synchronized void initialize(TypeDataBase db) {
+ Type type = db.lookupType("HeapRegion");
+
+ grainBytesField = type.getCIntegerField("GrainBytes");
+ }
+
+ static public long grainBytes() {
+ return grainBytesField.getValue();
+ }
+
+ public HeapRegion(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java
new file mode 100644
index 0000000..d0da28b
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ */
+
+package sun.jvm.hotspot.gc_implementation.g1;
+
+import java.util.Iterator;
+import java.util.Observable;
+import java.util.Observer;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.runtime.VMObjectFactory;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.types.CIntegerField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+// Mirror class for HeapRegionSeq. It's essentially an index -> HeapRegion map.
+
+public class HeapRegionSeq extends VMObject {
+ // HeapRegion** _regions;
+ static private AddressField regionsField;
+ // size_t _length;
+ static private CIntegerField lengthField;
+
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ static private synchronized void initialize(TypeDataBase db) {
+ Type type = db.lookupType("HeapRegionSeq");
+
+ regionsField = type.getAddressField("_regions");
+ lengthField = type.getCIntegerField("_length");
+ }
+
+ private HeapRegion at(long index) {
+ Address arrayAddr = regionsField.getValue(addr);
+ // Offset of &_region[index]
+ long offset = index * VM.getVM().getAddressSize();
+ Address regionAddr = arrayAddr.getAddressAt(offset);
+ return (HeapRegion) VMObjectFactory.newObject(HeapRegion.class,
+ regionAddr);
+ }
+
+ public long length() {
+ return lengthField.getValue(addr);
+ }
+
+ private class HeapRegionIterator implements Iterator<HeapRegion> {
+ private long index;
+ private long length;
+
+ @Override
+ public boolean hasNext() { return index < length; }
+
+ @Override
+ public HeapRegion next() { return at(index++); }
+
+ @Override
+ public void remove() { /* not supported */ }
+
+ HeapRegionIterator(Address addr) {
+ index = 0;
+ length = length();
+ }
+ }
+
+ public Iterator<HeapRegion> heapRegionIterator() {
+ return new HeapRegionIterator(addr);
+ }
+
+ public HeapRegionSeq(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java
index 1561a25..2e57740 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -34,6 +34,7 @@ public class CollectedHeapName {
public static final CollectedHeapName ABSTRACT = new CollectedHeapName("abstract");
public static final CollectedHeapName SHARED_HEAP = new CollectedHeapName("SharedHeap");
public static final CollectedHeapName GEN_COLLECTED_HEAP = new CollectedHeapName("GenCollectedHeap");
+ public static final CollectedHeapName G1_COLLECTED_HEAP = new CollectedHeapName("G1CollectedHeap");
public static final CollectedHeapName PARALLEL_SCAVENGE_HEAP = new CollectedHeapName("ParallelScavengeHeap");
public String toString() {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java
index c25f7c7..41f45a5 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -28,6 +28,7 @@ import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc_implementation.g1.G1CollectedHeap;
import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.types.*;
@@ -72,6 +73,7 @@ public class Universe {
heapConstructor = new VirtualConstructor(db);
heapConstructor.addMapping("GenCollectedHeap", GenCollectedHeap.class);
heapConstructor.addMapping("ParallelScavengeHeap", ParallelScavengeHeap.class);
+ heapConstructor.addMapping("G1CollectedHeap", G1CollectedHeap.class);
mainThreadGroupField = type.getOopField("_main_thread_group");
systemThreadGroupField = type.getOopField("_system_thread_group");
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
index 749c49d..961e167 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
@@ -33,6 +33,7 @@ import java.util.*;
import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc_implementation.g1.*;
import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
@@ -514,9 +515,16 @@ public class ObjectHeap {
private void addPermGenLiveRegions(List output, CollectedHeap heap) {
LiveRegionsCollector lrc = new LiveRegionsCollector(output);
- if (heap instanceof GenCollectedHeap) {
- GenCollectedHeap genHeap = (GenCollectedHeap) heap;
- Generation gen = genHeap.permGen();
+ if (heap instanceof SharedHeap) {
+ if (Assert.ASSERTS_ENABLED) {
+ Assert.that(heap instanceof GenCollectedHeap ||
+ heap instanceof G1CollectedHeap,
+ "Expecting GenCollectedHeap or G1CollectedHeap, " +
+ "but got " + heap.getClass().getName());
+ }
+ // Handles both GenCollectedHeap and G1CollectedHeap
+ SharedHeap sharedHeap = (SharedHeap) heap;
+ Generation gen = sharedHeap.permGen();
gen.spaceIterate(lrc, true);
} else if (heap instanceof ParallelScavengeHeap) {
ParallelScavengeHeap psh = (ParallelScavengeHeap) heap;
@@ -524,8 +532,9 @@ public class ObjectHeap {
addLiveRegions(permGen.objectSpace().getLiveRegions(), output);
} else {
if (Assert.ASSERTS_ENABLED) {
- Assert.that(false, "Expecting GenCollectedHeap or ParallelScavengeHeap, but got " +
- heap.getClass().getName());
+ Assert.that(false,
+ "Expecting SharedHeap or ParallelScavengeHeap, " +
+ "but got " + heap.getClass().getName());
}
}
}
@@ -588,10 +597,14 @@ public class ObjectHeap {
addLiveRegions(youngGen.fromSpace().getLiveRegions(), liveRegions);
PSOldGen oldGen = psh.oldGen();
addLiveRegions(oldGen.objectSpace().getLiveRegions(), liveRegions);
+ } else if (heap instanceof G1CollectedHeap) {
+ G1CollectedHeap g1h = (G1CollectedHeap) heap;
+ g1h.heapRegionIterate(lrc);
} else {
if (Assert.ASSERTS_ENABLED) {
- Assert.that(false, "Expecting GenCollectedHeap or ParallelScavengeHeap, but got " +
- heap.getClass().getName());
+ Assert.that(false, "Expecting GenCollectedHeap, G1CollectedHeap, " +
+ "or ParallelScavengeHeap, but got " +
+ heap.getClass().getName());
}
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java
index 3d55dab..c756ec8 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java
@@ -956,7 +956,7 @@ public class SPARCFrame extends Frame {
map.makeIntegerRegsUnsaved();
map.shiftWindow(sp, youngerSP);
boolean thisFrameAdjustedStack = true; // I5_savedSP is live in this RF
- return new SPARCFrame(sp, youngerSP, thisFrameAdjustedStack);
+ return new SPARCFrame(biasSP(sp), biasSP(youngerSP), thisFrameAdjustedStack);
}
private Frame senderForEntryFrame(RegisterMap regMap) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
index 3e2cfa3..bcfc015 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
@@ -26,11 +26,12 @@ package sun.jvm.hotspot.tools;
import java.util.*;
import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc_implementation.g1.*;
import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
import sun.jvm.hotspot.gc_implementation.shared.*;
import sun.jvm.hotspot.memory.*;
+import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.tools.*;
public class HeapSummary extends Tool {
@@ -70,32 +71,45 @@ public class HeapSummary extends Tool {
System.out.println();
System.out.println("Heap Usage:");
- if (heap instanceof GenCollectedHeap) {
- GenCollectedHeap genHeap = (GenCollectedHeap) heap;
- for (int n = 0; n < genHeap.nGens(); n++) {
- Generation gen = genHeap.getGen(n);
- if (gen instanceof sun.jvm.hotspot.memory.DefNewGeneration) {
- System.out.println("New Generation (Eden + 1 Survivor Space):");
- printGen(gen);
-
- ContiguousSpace eden = ((DefNewGeneration)gen).eden();
- System.out.println("Eden Space:");
- printSpace(eden);
-
- ContiguousSpace from = ((DefNewGeneration)gen).from();
- System.out.println("From Space:");
- printSpace(from);
-
- ContiguousSpace to = ((DefNewGeneration)gen).to();
- System.out.println("To Space:");
- printSpace(to);
- } else {
- System.out.println(gen.name() + ":");
- printGen(gen);
+ if (heap instanceof SharedHeap) {
+ SharedHeap sharedHeap = (SharedHeap) heap;
+ if (sharedHeap instanceof GenCollectedHeap) {
+ GenCollectedHeap genHeap = (GenCollectedHeap) sharedHeap;
+ for (int n = 0; n < genHeap.nGens(); n++) {
+ Generation gen = genHeap.getGen(n);
+ if (gen instanceof sun.jvm.hotspot.memory.DefNewGeneration) {
+ System.out.println("New Generation (Eden + 1 Survivor Space):");
+ printGen(gen);
+
+ ContiguousSpace eden = ((DefNewGeneration)gen).eden();
+ System.out.println("Eden Space:");
+ printSpace(eden);
+
+ ContiguousSpace from = ((DefNewGeneration)gen).from();
+ System.out.println("From Space:");
+ printSpace(from);
+
+ ContiguousSpace to = ((DefNewGeneration)gen).to();
+ System.out.println("To Space:");
+ printSpace(to);
+ } else {
+ System.out.println(gen.name() + ":");
+ printGen(gen);
+ }
}
+ } else if (sharedHeap instanceof G1CollectedHeap) {
+ G1CollectedHeap g1h = (G1CollectedHeap) sharedHeap;
+ G1MonitoringSupport g1mm = g1h.g1mm();
+ System.out.println("G1 Young Generation");
+ printG1Space("Eden Space:", g1mm.edenUsed(), g1mm.edenCommitted());
+ printG1Space("From Space:", g1mm.survivorUsed(), g1mm.survivorCommitted());
+ printG1Space("To Space:", 0, 0);
+ printG1Space("G1 Old Generation", g1mm.oldUsed(), g1mm.oldCommitted());
+ } else {
+ throw new RuntimeException("unknown SharedHeap type : " + heap.getClass());
}
- // Perm generation
- Generation permGen = genHeap.permGen();
+ // Perm generation shared by the above
+ Generation permGen = sharedHeap.permGen();
System.out.println("Perm Generation:");
printGen(permGen);
} else if (heap instanceof ParallelScavengeHeap) {
@@ -119,8 +133,11 @@ public class HeapSummary extends Tool {
printValMB("free = ", permFree);
System.out.println(alignment + (double)permGen.used() * 100.0 / permGen.capacity() + "% used");
} else {
- throw new RuntimeException("unknown heap type : " + heap.getClass());
+ throw new RuntimeException("unknown CollectedHeap type : " + heap.getClass());
}
+
+ System.out.println();
+ printInternStringStatistics();
}
// Helper methods
@@ -151,6 +168,14 @@ public class HeapSummary extends Tool {
return;
}
+ l = getFlagValue("UseG1GC", flagMap);
+ if (l == 1L) {
+ System.out.print("Garbage-First (G1) GC ");
+ l = getFlagValue("ParallelGCThreads", flagMap);
+ System.out.println("with " + l + " thread(s)");
+ return;
+ }
+
System.out.println("Mark Sweep Compact GC");
}
@@ -191,6 +216,16 @@ public class HeapSummary extends Tool {
System.out.println(alignment + (double)space.used() * 100.0 / space.capacity() + "% used");
}
+ private void printG1Space(String spaceName, long used, long capacity) {
+ long free = capacity - used;
+ System.out.println(spaceName);
+ printValMB("capacity = ", capacity);
+ printValMB("used = ", used);
+ printValMB("free = ", free);
+ double occPerc = (capacity > 0) ? (double) used * 100.0 / capacity : 0.0;
+ System.out.println(alignment + occPerc + "% used");
+ }
+
private static final double FACTOR = 1024*1024;
private void printValMB(String title, long value) {
if (value < 0) {
@@ -217,4 +252,41 @@ public class HeapSummary extends Tool {
return -1;
}
}
+
+ private void printInternStringStatistics() {
+ class StringStat implements StringTable.StringVisitor {
+ private int count;
+ private long size;
+ private OopField stringValueField;
+
+ StringStat() {
+ VM vm = VM.getVM();
+ SystemDictionary sysDict = vm.getSystemDictionary();
+ InstanceKlass strKlass = sysDict.getStringKlass();
+ // String has a field named 'value' of type 'char[]'.
+ stringValueField = (OopField) strKlass.findField("value", "[C");
+ }
+
+ private long stringSize(Instance instance) {
+ // We include String content in size calculation.
+ return instance.getObjectSize() +
+ stringValueField.getValue(instance).getObjectSize();
+ }
+
+ public void visit(Instance str) {
+ count++;
+ size += stringSize(str);
+ }
+
+ public void print() {
+ System.out.println(count +
+ " interned Strings occupying " + size + " bytes.");
+ }
+ }
+
+ StringStat stat = new StringStat();
+ StringTable strTable = VM.getVM().getStringTable();
+ strTable.stringsDo(stat);
+ stat.print();
+ }
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PermStat.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PermStat.java
index 8f34967..375a58f 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PermStat.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PermStat.java
@@ -63,47 +63,9 @@ public class PermStat extends Tool {
}
public void run() {
- printInternStringStatistics();
printClassLoaderStatistics();
}
- private void printInternStringStatistics() {
- class StringStat implements StringTable.StringVisitor {
- private int count;
- private long size;
- private OopField stringValueField;
-
- StringStat() {
- VM vm = VM.getVM();
- SystemDictionary sysDict = vm.getSystemDictionary();
- InstanceKlass strKlass = sysDict.getStringKlass();
- // String has a field named 'value' of type 'char[]'.
- stringValueField = (OopField) strKlass.findField("value", "[C");
- }
-
- private long stringSize(Instance instance) {
- // We include String content in size calculation.
- return instance.getObjectSize() +
- stringValueField.getValue(instance).getObjectSize();
- }
-
- public void visit(Instance str) {
- count++;
- size += stringSize(str);
- }
-
- public void print() {
- System.out.println(count +
- " intern Strings occupying " + size + " bytes.");
- }
- }
-
- StringStat stat = new StringStat();
- StringTable strTable = VM.getVM().getStringTable();
- strTable.stringsDo(stat);
- stat.print();
- }
-
private void printClassLoaderStatistics() {
final PrintStream out = System.out;
final PrintStream err = System.err;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
index baec86b..eff3405 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
@@ -43,7 +43,7 @@ public class PlatformInfo {
return "bsd";
} else if (os.equals("OpenBSD")) {
return "bsd";
- } else if (os.equals("Darwin")) {
+ } else if (os.equals("Darwin") || os.startsWith("Mac OS X")) {
return "bsd";
} else if (os.startsWith("Windows")) {
return "win32";
diff --git a/hotspot/make/Makefile b/hotspot/make/Makefile
index 325ca89..5bef049 100644
--- a/hotspot/make/Makefile
+++ b/hotspot/make/Makefile
@@ -471,6 +471,36 @@ copy_debug_jdk:
($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
fi
+# macosx universal builds
+
+ifeq ($(MACOSX_UNIVERSAL), true)
+$(UNIVERSAL_LIPO_LIST):
+ lipo -create -output $@ $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@)
+
+$(UNIVERSAL_COPY_LIST):
+ $(CP) $(EXPORT_JRE_LIB_DIR)/i386/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) $@
+
+universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST)
+endif
+
+universal_product:
+ $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_product
+ $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_product
+ $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
+ $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
+
+universal_fastdebug:
+ $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_fastdebug
+ $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_fastdebug
+ $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
+ $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
+
+universal_debug:
+ $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_debug
+ $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_debug
+ $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
+ $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
+
#
# Check target
#
@@ -599,5 +629,6 @@ include $(GAMMADIR)/make/jprt.gmk
export_product export_fastdebug export_debug export_optimized \
export_jdk_product export_jdk_fastdebug export_jdk_debug \
create_jdk copy_jdk update_jdk test_jdk \
- copy_product_jdk copy_fastdebug_jdk copy_debug_jdk
+ copy_product_jdk copy_fastdebug_jdk copy_debug_jdk universalize \
+ universal_product
diff --git a/hotspot/make/bsd/makefiles/adlc.make b/hotspot/make/bsd/makefiles/adlc.make
index 0c15c1c..69797ab 100644
--- a/hotspot/make/bsd/makefiles/adlc.make
+++ b/hotspot/make/bsd/makefiles/adlc.make
@@ -61,7 +61,9 @@ CPPFLAGS += -DASSERT
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
# Compiler warnings are treated as errors
-CFLAGS_WARN = -Werror
+ifneq ($(COMPILER_WARNINGS_FATAL),false)
+ CFLAGS_WARN = -Werror
+endif
CFLAGS += $(CFLAGS_WARN)
OBJECTNAMES = \
diff --git a/hotspot/make/bsd/makefiles/buildtree.make b/hotspot/make/bsd/makefiles/buildtree.make
index a62f69a..f412310 100644
--- a/hotspot/make/bsd/makefiles/buildtree.make
+++ b/hotspot/make/bsd/makefiles/buildtree.make
@@ -114,10 +114,12 @@ endif
# Get things from the platform file.
COMPILER = $(shell sed -n 's/^compiler[ ]*=[ ]*//p' $(PLATFORM_FILE))
+# dtracefiles is used on BSD versions that implement Dtrace (like MacOS X)
SIMPLE_DIRS = \
$(PLATFORM_DIR)/generated/dependencies \
$(PLATFORM_DIR)/generated/adfiles \
- $(PLATFORM_DIR)/generated/jvmtifiles
+ $(PLATFORM_DIR)/generated/jvmtifiles \
+ $(PLATFORM_DIR)/generated/dtracefiles
TARGETS = debug fastdebug jvmg optimized product profiled
SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
@@ -125,7 +127,9 @@ SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
# For dependencies and recursive makes.
BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
-BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \
+# dtrace.make is used on BSD versions that implement Dtrace (like MacOS X)
+BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make \
+ jvmti.make sa.make dtrace.make \
env.sh env.csh jdkpath.sh .dbxrc test_gamma
BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
@@ -155,6 +159,13 @@ ifndef HOTSPOT_VM_DISTRO
endif
endif
+# MACOSX FIXME: we should be able to run test_gamma (see MACOSX_PORT-214)
+ifdef ALWAYS_PASS_TEST_GAMMA
+ TEST_GAMMA_STATUS= echo 'exit 0';
+else
+ TEST_GAMMA_STATUS=
+endif
+
BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
BUILDTREE = \
@@ -223,6 +234,8 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
echo "$(call gamma-path,commonsrc,share/vm/prims) \\"; \
echo "$(call gamma-path,altsrc,share/vm) \\"; \
echo "$(call gamma-path,commonsrc,share/vm) \\"; \
+ echo "$(call gamma-path,altsrc,share/vm/precompiled) \\"; \
+ echo "$(call gamma-path,commonsrc,share/vm/precompiled) \\"; \
echo "$(call gamma-path,altsrc,cpu/$(SRCARCH)/vm) \\"; \
echo "$(call gamma-path,commonsrc,cpu/$(SRCARCH)/vm) \\"; \
echo "$(call gamma-path,altsrc,os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm) \\"; \
@@ -314,6 +327,16 @@ sa.make: $(BUILDTREE_MAKE)
echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
) > $@
+dtrace.make: $(BUILDTREE_MAKE)
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ echo; \
+ echo include flags.make; \
+ echo; \
+ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
+ ) > $@
+
env.sh: $(BUILDTREE_MAKE)
@echo Creating $@ ...
$(QUIETLY) ( \
@@ -390,7 +413,6 @@ test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
echo '#!/bin/sh'; \
$(BUILDTREE_COMMENT); \
echo '. ./env.sh'; \
- echo "exit 0;"; \
echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \
echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
@@ -401,6 +423,7 @@ test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
+ $(TEST_GAMMA_STATUS) \
) > $@
$(QUIETLY) chmod +x $@
diff --git a/hotspot/make/bsd/makefiles/defs.make b/hotspot/make/bsd/makefiles/defs.make
index 7911365..040cd7b 100644
--- a/hotspot/make/bsd/makefiles/defs.make
+++ b/hotspot/make/bsd/makefiles/defs.make
@@ -162,9 +162,19 @@ ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
+ADD_SA_BINARIES/universal = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
ADD_SA_BINARIES/ppc =
ADD_SA_BINARIES/ia64 =
ADD_SA_BINARIES/arm =
ADD_SA_BINARIES/zero =
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
+
+UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
+UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
+UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
+
+UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
+UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
+UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
diff --git a/hotspot/make/bsd/makefiles/dtrace.make b/hotspot/make/bsd/makefiles/dtrace.make
index 6ee23a3..77e9c2f 100644
--- a/hotspot/make/bsd/makefiles/dtrace.make
+++ b/hotspot/make/bsd/makefiles/dtrace.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, 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
@@ -22,6 +22,282 @@
#
#
-# Bsd does not build jvm_db
-LIBJVM_DB =
+# Rules to build jvm_db/dtrace, used by vm.make
+# We build libjvm_dtrace/libjvm_db/dtrace for COMPILER1 and COMPILER2
+# but not for CORE or KERNEL configurations.
+
+ifneq ("${TYPE}", "CORE")
+ifneq ("${TYPE}", "KERNEL")
+
+ifeq ($(OS_VENDOR), Darwin)
+# we build dtrace for macosx using USDT2 probes
+
+DtraceOutDir = $(GENERATED)/dtracefiles
+
+# Bsd does not build libjvm_db, does not compile on macosx
+# disabled in build: rule in vm.make
+JVM_DB = libjvm_db
+#LIBJVM_DB = libjvm_db.dylib
+LIBJVM_DB = libjvm$(G_SUFFIX)_db.dylib
+
+JVM_DTRACE = jvm_dtrace
+#LIBJVM_DTRACE = libjvm_dtrace.dylib
+LIBJVM_DTRACE = libjvm$(G_SUFFIX)_dtrace.dylib
+
+JVMOFFS = JvmOffsets
+JVMOFFS.o = $(JVMOFFS).o
+GENOFFS = generate$(JVMOFFS)
+
+DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/dtrace
+DTRACE = dtrace
+DTRACE.o = $(DTRACE).o
+
+# to remove '-g' option which causes link problems
+# also '-z nodefs' is used as workaround
+GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g';)
+
+ifdef LP64
+DTRACE_OPTS = -D_LP64
+endif
+
+# making libjvm_db
+
+# Use mapfile with libjvm_db.so
+LIBJVM_DB_MAPFILE = # no mapfile for usdt2 # $(MAKEFILES_DIR)/mapfile-vers-jvm_db
+#LFLAGS_JVM_DB += $(MAPFLAG:FILENAME=$(LIBJVM_DB_MAPFILE))
+
+# Use mapfile with libjvm_dtrace.so
+LIBJVM_DTRACE_MAPFILE = # no mapfile for usdt2 # $(MAKEFILES_DIR)/mapfile-vers-jvm_dtrace
+#LFLAGS_JVM_DTRACE += $(MAPFLAG:FILENAME=$(LIBJVM_DTRACE_MAPFILE))
+
+LFLAGS_JVM_DB += $(PICFLAG) # -D_REENTRANT
+LFLAGS_JVM_DTRACE += $(PICFLAG) # -D_REENTRANT
+
+ISA = $(subst i386,i486,$(BUILDARCH))
+
+# Making 64/libjvm_db.so: 64-bit version of libjvm_db.so which handles 32-bit libjvm.so
+ifneq ("${ISA}","${BUILDARCH}")
+
+XLIBJVM_DB = 64/$(LIBJVM_DB)
+XLIBJVM_DB_G = 64/$(LIBJVM_DB_G)
+XLIBJVM_DTRACE = 64/$(LIBJVM_DTRACE)
+XLIBJVM_DTRACE_G = 64/$(LIBJVM_DTRACE_G)
+XARCH = $(subst sparcv9,v9,$(shell echo $(ISA)))
+
+$(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
+ @echo Making $@
+ $(QUIETLY) mkdir -p 64/ ; \
+ $(CC) $(SYMFLAG) -xarch=$(XARCH) -D$(TYPE) -I. -I$(GENERATED) \
+ $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c #-lc
+# [ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); }
+
+$(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
+ @echo Making $@
+ $(QUIETLY) mkdir -p 64/ ; \
+ $(CC) $(SYMFLAG) -xarch=$(XARCH) -D$(TYPE) -I. \
+ $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c #-lc -lthread -ldoor
+# [ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); }
+
+endif # ifneq ("${ISA}","${BUILDARCH}")
+
+LFLAGS_GENOFFS += -L.
+
+lib$(GENOFFS).dylib: $(DTRACE_SRCDIR)/$(GENOFFS).cpp $(DTRACE_SRCDIR)/$(GENOFFS).h \
+ $(LIBJVM.o)
+ $(QUIETLY) $(CCC) $(CPPFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \
+ $(LFLAGS_GENOFFS) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS).cpp -ljvm
+
+$(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).dylib
+ $(QUIETLY) $(LINK.CC) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
+ ./lib$(GENOFFS).dylib
+
+# $@.tmp is created first to avoid an empty $(JVMOFFS).h if an error occurs.
+$(JVMOFFS).h: $(GENOFFS)
+ $(QUIETLY) DYLD_LIBRARY_PATH=. ./$(GENOFFS) -header > $@.tmp; touch $@; \
+ if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
+ then rm -f $@; mv $@.tmp $@; \
+ else rm -f $@.tmp; \
+ fi
+
+$(JVMOFFS)Index.h: $(GENOFFS)
+ $(QUIETLY) DYLD_LIBRARY_PATH=. ./$(GENOFFS) -index > $@.tmp; touch $@; \
+ if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
+ then rm -f $@; mv $@.tmp $@; \
+ else rm -f $@.tmp; \
+ fi
+
+$(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h
+ $(QUIETLY) DYLD_LIBRARY_PATH=. ./$(GENOFFS) -table > $@.tmp; touch $@; \
+ if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
+ then rm -f $@; mv $@.tmp $@; \
+ else rm -f $@.tmp; \
+ fi
+
+$(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp
+ $(QUIETLY) $(CCC) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
+
+$(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
+ @echo Making $@
+ $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
+ $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -Wall # -lc
+# [ -f $(LIBJVM_DB_G) ] || { ln -s $@ $(LIBJVM_DB_G); }
+
+$(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
+ @echo Making $@
+ $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \
+ $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c #-lc -lthread -ldoor
+# [ -f $(LIBJVM_DTRACE_G) ] || { ln -s $@ $(LIBJVM_DTRACE_G); }
+
+#$(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \
+# $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d
+# $(QUIETLY) cat $^ > $@
+
+$(DtraceOutDir):
+ mkdir $(DtraceOutDir)
+
+$(DtraceOutDir)/hotspot.h: $(DTRACE_SRCDIR)/hotspot.d | $(DtraceOutDir)
+ $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/hotspot.d
+
+$(DtraceOutDir)/hotspot_jni.h: $(DTRACE_SRCDIR)/hotspot_jni.d | $(DtraceOutDir)
+ $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/hotspot_jni.d
+
+$(DtraceOutDir)/hs_private.h: $(DTRACE_SRCDIR)/hs_private.d | $(DtraceOutDir)
+ $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/hs_private.d
+
+$(DtraceOutDir)/jhelper.h: $(DTRACE_SRCDIR)/jhelper.d $(JVMOFFS).o | $(DtraceOutDir)
+ $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -h -o $@ -s $(DTRACE_SRCDIR)/jhelper.d
+
+# jhelper currently disabled
+dtrace_gen_headers: $(DtraceOutDir)/hotspot.h $(DtraceOutDir)/hotspot_jni.h $(DtraceOutDir)/hs_private.h
+
+DTraced_Files = ciEnv.o \
+ classLoadingService.o \
+ compileBroker.o \
+ hashtable.o \
+ instanceKlass.o \
+ java.o \
+ jni.o \
+ jvm.o \
+ memoryManager.o \
+ nmethod.o \
+ objectMonitor.o \
+ runtimeService.o \
+ sharedRuntime.o \
+ synchronizer.o \
+ thread.o \
+ unsafe.o \
+ vmThread.o \
+ vmCMSOperations.o \
+ vmPSOperations.o \
+ vmGCOperations.o \
+
+# Dtrace is available, so we build $(DTRACE.o)
+#$(DTRACE.o): $(DTRACE).d $(JVMOFFS).h $(JVMOFFS)Index.h $(DTraced_Files)
+# @echo Compiling $(DTRACE).d
+
+# $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -G -xlazyload -o $@ -s $(DTRACE).d \
+# $(DTraced_Files) ||\
+# STATUS=$$?;\
+# if [ x"$$STATUS" = x"1" -a \
+# x`uname -r` = x"5.10" -a \
+# x`uname -p` = x"sparc" ]; then\
+# echo "*****************************************************************";\
+# echo "* If you are building server compiler, and the error message is ";\
+# echo "* \"incorrect ELF machine type...\", you have run into solaris bug ";\
+# echo "* 6213962, \"dtrace -G doesn't work on sparcv8+ object files\".";\
+# echo "* Either patch/upgrade your system (>= S10u1_15), or set the ";\
+# echo "* environment variable HOTSPOT_DISABLE_DTRACE_PROBES to disable ";\
+# echo "* dtrace probes for this build.";\
+# echo "*****************************************************************";\
+# fi;\
+# exit $$STATUS
+ # Since some DTraced_Files are in LIBJVM.o and they are touched by this
+ # command, and libgenerateJvmOffsets.so depends on LIBJVM.o, 'make' will
+ # think it needs to rebuild libgenerateJvmOffsets.so and thus JvmOffsets*
+ # files, but it doesn't, so we touch the necessary files to prevent later
+ # recompilation. Note: we only touch the necessary files if they already
+ # exist in order to close a race where an empty file can be created
+ # before the real build rule is executed.
+ # But, we can't touch the *.h files: This rule depends
+ # on them, and that would cause an infinite cycle of rebuilding.
+ # Neither the *.h or *.ccp files need to be touched, since they have
+ # rules which do not update them when the generator file has not
+ # changed their contents.
+# $(QUIETLY) if [ -f lib$(GENOFFS).so ]; then touch lib$(GENOFFS).so; fi
+# $(QUIETLY) if [ -f $(GENOFFS) ]; then touch $(GENOFFS); fi
+# $(QUIETLY) if [ -f $(JVMOFFS.o) ]; then touch $(JVMOFFS.o); fi
+
+.PHONY: dtraceCheck
+
+#SYSTEM_DTRACE_H = /usr/include/dtrace.h
+SYSTEM_DTRACE_PROG = /usr/sbin/dtrace
+#PATCH_DTRACE_PROG = /opt/SUNWdtrd/sbin/dtrace
+systemDtraceFound := $(wildcard ${SYSTEM_DTRACE_PROG})
+#patchDtraceFound := $(wildcard ${PATCH_DTRACE_PROG})
+#systemDtraceHdrFound := $(wildcard $(SYSTEM_DTRACE_H))
+
+#ifneq ("$(systemDtraceHdrFound)", "")
+#CFLAGS += -DHAVE_DTRACE_H
+#endif
+
+#ifneq ("$(patchDtraceFound)", "")
+#DTRACE_PROG=$(PATCH_DTRACE_PROG)
+#DTRACE_INCL=-I/opt/SUNWdtrd/include
+#else
+ifneq ("$(systemDtraceFound)", "")
+DTRACE_PROG=$(SYSTEM_DTRACE_PROG)
+else
+
+endif # ifneq ("$(systemDtraceFound)", "")
+#endif # ifneq ("$(patchDtraceFound)", "")
+
+ifneq ("${DTRACE_PROG}", "")
+ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
+
+DTRACE_OBJS = $(DTRACE.o) #$(JVMOFFS.o)
+CFLAGS += -DDTRACE_ENABLED #$(DTRACE_INCL)
+#clangCFLAGS += -DDTRACE_ENABLED -fno-optimize-sibling-calls
+#MAPFILE_DTRACE_OPT = $(MAPFILE_DTRACE)
+
+
+dtraceCheck:
+
+dtrace_stuff: dtrace_gen_headers
+ $(QUIETLY) echo "dtrace headers generated"
+
+
+else # manually disabled
+
+dtraceCheck:
+ $(QUIETLY) echo "**NOTICE** Dtrace support disabled via environment variable"
+
+dtrace_stuff:
+
+endif # ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
+
+else # No dtrace program found
+
+dtraceCheck:
+ $(QUIETLY) echo "**NOTICE** Dtrace support disabled: not supported by system"
+
+dtrace_stuff:
+
+endif # ifneq ("${dtraceFound}", "")
+
+endif # ifeq ($(OS_VENDOR), Darwin)
+
+
+else # KERNEL build
+
+dtraceCheck:
+ $(QUIETLY) echo "**NOTICE** Dtrace support disabled for KERNEL builds"
+
+endif # ifneq ("${TYPE}", "KERNEL")
+
+else # CORE build
+
+dtraceCheck:
+ $(QUIETLY) echo "**NOTICE** Dtrace support disabled for CORE builds"
+
+endif # ifneq ("${TYPE}", "CORE")
diff --git a/hotspot/make/bsd/makefiles/gcc.make b/hotspot/make/bsd/makefiles/gcc.make
index 3b340dc..6214845 100644
--- a/hotspot/make/bsd/makefiles/gcc.make
+++ b/hotspot/make/bsd/makefiles/gcc.make
@@ -30,17 +30,49 @@ OS_VENDOR = $(shell uname -s)
# When cross-compiling the ALT_COMPILER_PATH points
# to the cross-compilation toolset
ifdef CROSS_COMPILE_ARCH
-CXX = $(ALT_COMPILER_PATH)/g++
-CPP = $(ALT_COMPILER_PATH)/g++
-CC = $(ALT_COMPILER_PATH)/gcc
-HOSTCPP = g++
-HOSTCC = gcc
-else
-CXX ?= g++
-CPP = $(CXX)
-CC ?= gcc
-HOSTCPP = $(CPP)
-HOSTCC = $(CPP)
+ CPP = $(ALT_COMPILER_PATH)/g++
+ CC = $(ALT_COMPILER_PATH)/gcc
+ HOSTCPP = g++
+ HOSTCC = gcc
+else ifneq ($(OS_VENDOR), Darwin)
+ CXX = g++
+ CPP = $(CXX)
+ CC = gcc
+ HOSTCPP = $(CPP)
+ HOSTCC = $(CC)
+endif
+
+# i486 hotspot requires -mstackrealign on Darwin.
+# llvm-gcc supports this in Xcode 3.2.6 and 4.0.
+# gcc-4.0 supports this on earlier versions.
+# Prefer llvm-gcc where available.
+ifeq ($(OS_VENDOR), Darwin)
+ ifeq ($(origin CXX), default)
+ CXX = llvm-g++
+ endif
+ ifeq ($(origin CC), default)
+ CC = llvm-gcc
+ endif
+ CPP = $(CXX)
+
+ ifeq ($(ARCH), i486)
+ LLVM_SUPPORTS_STACKREALIGN := $(shell \
+ [ "0"`llvm-gcc -v 2>&1 | grep LLVM | sed -E "s/.*LLVM build ([0-9]+).*/\1/"` -gt "2333" ] \
+ && echo true || echo false)
+
+ ifeq ($(LLVM_SUPPORTS_STACKREALIGN), true)
+ CXX32 ?= llvm-g++
+ CC32 ?= llvm-gcc
+ else
+ CXX32 ?= g++-4.0
+ CC32 ?= gcc-4.0
+ endif
+ CPP = $(CXX32)
+ CC = $(CC32)
+ endif
+
+ HOSTCPP = $(CPP)
+ HOSTCC = $(CC)
endif
AS = $(CC) -c -x assembler-with-cpp
@@ -56,7 +88,7 @@ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \
ifneq ($(USE_PRECOMPILED_HEADER),0)
USE_PRECOMPILED_HEADER=1
PRECOMPILED_HEADER_DIR=.
-PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled.hpp
+PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled/precompiled.hpp
PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch
endif
endif
@@ -130,7 +162,9 @@ else
endif
# Compiler warnings are treated as errors
-WARNINGS_ARE_ERRORS = -Werror
+ifneq ($(COMPILER_WARNINGS_FATAL),false)
+ WARNINGS_ARE_ERRORS = -Werror
+endif
# Except for a few acceptable ones
# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
@@ -152,7 +186,13 @@ endif
# The flags to use for an Optimized g++ build
-OPT_CFLAGS += -O3
+ifeq ($(OS_VENDOR), Darwin)
+ # use -Os by default, unless -O3 can be proved to be worth the cost, as per policy
+ # <http://wikis.sun.com/display/OpenJDK/Mac+OS+X+Port+Compilers>
+ OPT_CFLAGS += -Os
+else
+ OPT_CFLAGS += -O3
+endif
# Hotspot uses very unstrict aliasing turn this optimization off
OPT_CFLAGS += -fno-strict-aliasing
@@ -212,7 +252,7 @@ ifeq ($(OS_VENDOR), Darwin)
SONAMEFLAG =
# Build shared library
- SHARED_FLAG = -dynamiclib $(VM_PICFLAG)
+ SHARED_FLAG = -Wl,-install_name, at rpath/$(@F) -dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $(VM_PICFLAG)
# Keep symbols even they are not used
#AOUT_FLAGS += -Xlinker -export-dynamic
diff --git a/hotspot/make/bsd/makefiles/sa.make b/hotspot/make/bsd/makefiles/sa.make
index 4e6a00e..d01d2bb 100644
--- a/hotspot/make/bsd/makefiles/sa.make
+++ b/hotspot/make/bsd/makefiles/sa.make
@@ -38,18 +38,16 @@ TOPDIR = $(shell echo `pwd`)
GENERATED = $(TOPDIR)/../generated
# tools.jar is needed by the JDI - SA binding
-SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
+ifeq ($(SA_APPLE_BOOT_JAVA),true)
+ SA_CLASSPATH = $(BOOT_JAVA_HOME)/bundle/Classes/classes.jar
+else
+ SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
+endif
# TODO: if it's a modules image, check if SA module is installed.
MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
-# gnumake 3.78.1 does not accept the *s that
-# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
-AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
-AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
-
-AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
-AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
+AGENT_FILES_LIST := $(GENERATED)/agent.classes.list
SA_CLASSDIR = $(GENERATED)/saclasses
@@ -68,7 +66,7 @@ all:
$(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
fi
-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
+$(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
$(QUIETLY) echo "Making $@"
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
@@ -82,7 +80,6 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
mkdir -p $(SA_CLASSDIR); \
fi
-
# Note: When indented, make tries to execute the '$(shell' comment.
# In some environments, cmd processors have limited line length.
# To prevent the javac invocation in the next block from using
@@ -93,13 +90,12 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
# the initialization of the lists is also done in the same phase
# using '$(shell rm ...' instead of using the more traditional
# 'rm ...' rule.
- $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
- $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
- $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
-
- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-
+ $(shell rm -rf $(AGENT_FILES_LIST))
+# gnumake 3.78.1 does not accept the *'s that
+# are in AGENT_FILES, so use the shell to expand them.
+# Be extra carefull to not produce too long command lines in the shell!
+ $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
$(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
@@ -118,4 +114,4 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
clean:
rm -rf $(SA_CLASSDIR)
rm -rf $(GENERATED)/sa-jdi.jar
- rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
+ rm -rf $(AGENT_FILES_LIST)
diff --git a/hotspot/make/bsd/makefiles/saproc.make b/hotspot/make/bsd/makefiles/saproc.make
index 6303b1b..458cd3a 100644
--- a/hotspot/make/bsd/makefiles/saproc.make
+++ b/hotspot/make/bsd/makefiles/saproc.make
@@ -40,20 +40,29 @@ AGENT_DIR = $(GAMMADIR)/agent
SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
-# disable building saproc until hsearch_r license issues are resolved
-#ifeq ($(OS_VENDOR), FreeBSD)
-#SASRCFILES = $(SASRCDIR)/salibelf.c \
-# $(SASRCDIR)/symtab.c \
-# $(SASRCDIR)/libproc_impl.c \
-# $(SASRCDIR)/ps_proc.c \
-# $(SASRCDIR)/ps_core.c \
-# $(SASRCDIR)/hsearch_r.c \
-# $(SASRCDIR)/BsdDebuggerLocal.c
-#SALIBS = -lutil -lthread_db
-#else
-SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c
-SALIBS =
-#endif
+NON_STUB_SASRCFILES = $(SASRCDIR)/salibelf.c \
+ $(SASRCDIR)/symtab.c \
+ $(SASRCDIR)/libproc_impl.c \
+ $(SASRCDIR)/ps_proc.c \
+ $(SASRCDIR)/ps_core.c \
+ $(SASRCDIR)/BsdDebuggerLocal.c
+
+ifeq ($(OS_VENDOR), FreeBSD)
+ SASRCFILES = $(NON_STUB_SASRCFILES)
+ SALIBS = -lutil -lthread_db
+ SAARCH = $(ARCHFLAG)
+else
+ ifeq ($(OS_VENDOR), Darwin)
+ SASRCFILES = $(SASRCDIR)/MacosxDebuggerLocal.m
+ SALIBS = -g -framework Foundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks -framework JavaNativeFoundation -framework Security -framework CoreFoundation
+ #objc compiler blows up on -march=i586, perhaps it should not be included in the macosx intel 32-bit C++ compiles?
+ SAARCH = $(subst -march=i586,,$(ARCHFLAG))
+ else
+ SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c
+ SALIBS =
+ SAARCH = $(ARCHFLAG)
+ endif
+endif
SAMAPFILE = $(SASRCDIR)/mapfile
@@ -79,6 +88,15 @@ SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE))
endif
SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
+ifeq ($(OS_VENDOR), Darwin)
+ BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
+ -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") \
+ -I/System/Library/Frameworks/JavaVM.framework/Headers
+else
+ BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
+ -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
+endif
+
$(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
@@ -86,11 +104,10 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
fi
@echo Making SA debugger back-end...
$(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \
- $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+ $(SYMFLAG) $(SAARCH) $(SHARED_FLAG) $(PICFLAG) \
-I$(SASRCDIR) \
-I$(GENERATED) \
- -I$(BOOT_JAVA_HOME)/include \
- -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") \
+ $(BOOT_JAVA_INCLUDES) \
$(SASRCFILES) \
$(SA_LFLAGS) \
$(SA_DEBUG_CFLAGS) \
diff --git a/hotspot/make/bsd/makefiles/top.make b/hotspot/make/bsd/makefiles/top.make
index 1b674dc..f85d196 100644
--- a/hotspot/make/bsd/makefiles/top.make
+++ b/hotspot/make/bsd/makefiles/top.make
@@ -82,7 +82,7 @@ default: vm_build_preliminaries the_vm
@echo All done.
# This is an explicit dependency for the sake of parallel makes.
-vm_build_preliminaries: checks $(Cached_plat) $(AD_Files_If_Required) jvmti_stuff sa_stuff
+vm_build_preliminaries: checks $(Cached_plat) $(AD_Files_If_Required) jvmti_stuff sa_stuff dtrace_stuff
@# We need a null action here, so implicit rules don't get consulted.
$(Cached_plat): $(Plat_File)
@@ -96,6 +96,15 @@ ad_stuff: $(Cached_plat) $(adjust-mflags)
jvmti_stuff: $(Cached_plat) $(adjust-mflags)
@$(MAKE) -f jvmti.make $(MFLAGS-adjusted)
+ifeq ($(OS_VENDOR), Darwin)
+# generate dtrace header files
+dtrace_stuff: $(Cached_plat) $(adjust-mflags)
+ @$(MAKE) -f dtrace.make dtrace_stuff $(MFLAGS-adjusted) GENERATED=$(GENERATED)
+else
+dtrace_stuff:
+ @# We need a null action here, so implicit rules don't get consulted.
+endif
+
# generate SA jar files and native header
sa_stuff:
@$(MAKE) -f sa.make $(MFLAGS-adjusted)
diff --git a/hotspot/make/bsd/makefiles/vm.make b/hotspot/make/bsd/makefiles/vm.make
index bced094..35eca5d 100644
--- a/hotspot/make/bsd/makefiles/vm.make
+++ b/hotspot/make/bsd/makefiles/vm.make
@@ -108,6 +108,7 @@ LFLAGS += $(EXTRA_CFLAGS)
# Don't set excutable bit on stack segment
# the same could be done by separate execstack command
+# Darwin is non-executable-stack by default
ifneq ($(OS_VENDOR), Darwin)
LFLAGS += -Xlinker -z -Xlinker noexecstack
endif
@@ -322,7 +323,16 @@ include $(MAKEFILES_DIR)/saproc.make
#----------------------------------------------------------------------
+ifeq ($(OS_VENDOR), Darwin)
+$(LIBJVM).dSYM: $(LIBJVM)
+ dsymutil $(LIBJVM)
+
+# no launcher or libjvm_db for macosx
+build: $(LIBJVM) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM
+ echo "Doing vm.make build:"
+else
build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
+endif
install: install_jvm install_jsig install_saproc
diff --git a/hotspot/make/defs.make b/hotspot/make/defs.make
index 44f873d..7434dae 100644
--- a/hotspot/make/defs.make
+++ b/hotspot/make/defs.make
@@ -281,6 +281,13 @@ EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin
EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib
EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH)
+# non-universal macosx builds need to appear universal
+ifeq ($(OS_VENDOR), Darwin)
+ ifneq ($(MACOSX_UNIVERSAL), true)
+ EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)
+ endif
+endif
+
# Common export list of files
EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h
EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index f5de8cd..9a906cc 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2011
HS_MAJOR_VER=23
HS_MINOR_VER=0
-HS_BUILD_NUMBER=01
+HS_BUILD_NUMBER=06
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
diff --git a/hotspot/make/jprt.properties b/hotspot/make/jprt.properties
index 4c88ed0..76944a0 100644
--- a/hotspot/make/jprt.properties
+++ b/hotspot/make/jprt.properties
@@ -541,9 +541,20 @@ jprt.make.rule.test.targets.standard.server = \
${jprt.my.windows.i586}-*-c2-servertest, \
${jprt.my.windows.x64}-*-c2-servertest
+jprt.make.rule.test.targets.standard.internalvmtests = \
+ ${jprt.my.solaris.sparc}-fastdebug-c2-internalvmtests, \
+ ${jprt.my.solaris.sparcv9}-fastdebug-c2-internalvmtests, \
+ ${jprt.my.solaris.i586}-fastdebug-c2-internalvmtests, \
+ ${jprt.my.solaris.x64}-fastdebug-c2-internalvmtests, \
+ ${jprt.my.linux.i586}-fastdebug-c2-internalvmtests, \
+ ${jprt.my.linux.x64}-fastdebug-c2-internalvmtests, \
+ ${jprt.my.windows.i586}-fastdebug-c2-internalvmtests, \
+ ${jprt.my.windows.x64}-fastdebug-c2-internalvmtests
+
jprt.make.rule.test.targets.standard = \
${jprt.make.rule.test.targets.standard.client}, \
- ${jprt.make.rule.test.targets.standard.server}
+ ${jprt.make.rule.test.targets.standard.server}, \
+ ${jprt.make.rule.test.targets.standard.internalvmtests}
jprt.make.rule.test.targets.embedded = \
${jprt.make.rule.test.targets.standard.client}
diff --git a/hotspot/make/linux/makefiles/buildtree.make b/hotspot/make/linux/makefiles/buildtree.make
index f8a1e885..b1eb00b 100644
--- a/hotspot/make/linux/makefiles/buildtree.make
+++ b/hotspot/make/linux/makefiles/buildtree.make
@@ -223,6 +223,8 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
echo "$(call gamma-path,commonsrc,share/vm/prims) \\"; \
echo "$(call gamma-path,altsrc,share/vm) \\"; \
echo "$(call gamma-path,commonsrc,share/vm) \\"; \
+ echo "$(call gamma-path,altsrc,share/vm/precompiled) \\"; \
+ echo "$(call gamma-path,commonsrc,share/vm/precompiled) \\"; \
echo "$(call gamma-path,altsrc,cpu/$(SRCARCH)/vm) \\"; \
echo "$(call gamma-path,commonsrc,cpu/$(SRCARCH)/vm) \\"; \
echo "$(call gamma-path,altsrc,os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm) \\"; \
diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make
index e36cec6..2da5273 100644
--- a/hotspot/make/linux/makefiles/gcc.make
+++ b/hotspot/make/linux/makefiles/gcc.make
@@ -52,7 +52,7 @@ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \
ifneq ($(USE_PRECOMPILED_HEADER),0)
USE_PRECOMPILED_HEADER=1
PRECOMPILED_HEADER_DIR=.
-PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled.hpp
+PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled/precompiled.hpp
PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch
endif
endif
diff --git a/hotspot/make/sa.files b/hotspot/make/sa.files
index 4836c96..c634590 100644
--- a/hotspot/make/sa.files
+++ b/hotspot/make/sa.files
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2011, 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
@@ -82,6 +82,7 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windbg/amd64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windbg/ia64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windbg/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/x86/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_implementation/g1/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_implementation/parallelScavenge/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_implementation/shared/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_interface/*.java \
diff --git a/hotspot/make/solaris/makefiles/buildtree.make b/hotspot/make/solaris/makefiles/buildtree.make
index 30e03be..a46d6b3 100644
--- a/hotspot/make/solaris/makefiles/buildtree.make
+++ b/hotspot/make/solaris/makefiles/buildtree.make
@@ -216,6 +216,8 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
echo "$(call gamma-path,commonsrc,share/vm/prims) \\"; \
echo "$(call gamma-path,altsrc,share/vm) \\"; \
echo "$(call gamma-path,commonsrc,share/vm) \\"; \
+ echo "$(call gamma-path,altsrc,share/vm/precompiled) \\"; \
+ echo "$(call gamma-path,commonsrc,share/vm/precompiled) \\"; \
echo "$(call gamma-path,altsrc,cpu/$(ARCH)/vm) \\"; \
echo "$(call gamma-path,commonsrc,cpu/$(ARCH)/vm) \\"; \
echo "$(call gamma-path,altsrc,os_cpu/$(OS_FAMILY)_$(ARCH)/vm) \\"; \
diff --git a/hotspot/make/solaris/makefiles/gcc.make b/hotspot/make/solaris/makefiles/gcc.make
index b0cdfc9..15e43ea 100644
--- a/hotspot/make/solaris/makefiles/gcc.make
+++ b/hotspot/make/solaris/makefiles/gcc.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2011, 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
@@ -51,7 +51,7 @@ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \
ifneq ($(USE_PRECOMPILED_HEADER),0)
USE_PRECOMPILED_HEADER=1
PRECOMPILED_HEADER_DIR=.
-PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled.hpp
+PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled/precompiled.hpp
PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch
endif
endif
diff --git a/hotspot/make/windows/makefiles/vm.make b/hotspot/make/windows/makefiles/vm.make
index abd92ec..039beef 100644
--- a/hotspot/make/windows/makefiles/vm.make
+++ b/hotspot/make/windows/makefiles/vm.make
@@ -135,6 +135,7 @@ CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm"
CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) \
/I "$(COMMONSRC)\share\vm" \
+ /I "$(COMMONSRC)\share\vm\precompiled" \
/I "$(COMMONSRC)\share\vm\prims" \
/I "$(COMMONSRC)\os\windows\vm" \
/I "$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm" \
diff --git a/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp b/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp
index bbacbe9..d9b1aa5 100644
--- a/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp
+++ b/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp
@@ -597,6 +597,10 @@ inline void MacroAssembler::jmp( Register s1, Register s2 ) { jmpl( s1, s2, G0 )
inline void MacroAssembler::jmp( Register s1, int simm13a, RelocationHolder const& rspec ) { jmpl( s1, simm13a, G0, rspec); }
inline bool MacroAssembler::is_far_target(address d) {
+ if (ForceUnreachable) {
+ // References outside the code cache should be treated as far
+ return d < CodeCache::low_bound() || d > CodeCache::high_bound();
+ }
return !is_in_wdisp30_range(d, CodeCache::low_bound()) || !is_in_wdisp30_range(d, CodeCache::high_bound());
}
@@ -679,28 +683,44 @@ inline intptr_t MacroAssembler::load_pc_address( Register reg, int bytes_to_skip
inline void MacroAssembler::load_contents(const AddressLiteral& addrlit, Register d, int offset) {
assert_not_delayed();
- sethi(addrlit, d);
+ if (ForceUnreachable) {
+ patchable_sethi(addrlit, d);
+ } else {
+ sethi(addrlit, d);
+ }
ld(d, addrlit.low10() + offset, d);
}
inline void MacroAssembler::load_ptr_contents(const AddressLiteral& addrlit, Register d, int offset) {
assert_not_delayed();
- sethi(addrlit, d);
+ if (ForceUnreachable) {
+ patchable_sethi(addrlit, d);
+ } else {
+ sethi(addrlit, d);
+ }
ld_ptr(d, addrlit.low10() + offset, d);
}
inline void MacroAssembler::store_contents(Register s, const AddressLiteral& addrlit, Register temp, int offset) {
assert_not_delayed();
- sethi(addrlit, temp);
+ if (ForceUnreachable) {
+ patchable_sethi(addrlit, temp);
+ } else {
+ sethi(addrlit, temp);
+ }
st(s, temp, addrlit.low10() + offset);
}
inline void MacroAssembler::store_ptr_contents(Register s, const AddressLiteral& addrlit, Register temp, int offset) {
assert_not_delayed();
- sethi(addrlit, temp);
+ if (ForceUnreachable) {
+ patchable_sethi(addrlit, temp);
+ } else {
+ sethi(addrlit, temp);
+ }
st_ptr(s, temp, addrlit.low10() + offset);
}
diff --git a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
index e155153..a54b68c 100644
--- a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
@@ -367,10 +367,10 @@ void PatchingStub::emit_code(LIR_Assembler* ce) {
void DeoptimizeStub::emit_code(LIR_Assembler* ce) {
__ bind(_entry);
- __ call(SharedRuntime::deopt_blob()->unpack_with_reexecution());
+ __ call(Runtime1::entry_for(Runtime1::deoptimize_id), relocInfo::runtime_call_type);
__ delayed()->nop();
ce->add_call_info_here(_info);
- debug_only(__ should_not_reach_here());
+ DEBUG_ONLY(__ should_not_reach_here());
}
diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
index 7a8b555..15be6d3 100644
--- a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
@@ -1116,7 +1116,7 @@ void LIR_Assembler::const2mem(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmi
} else {
__ set(value_hi, O7);
}
- offset = store(tmp, base, addr->disp() + hi_word_offset_in_bytes, T_INT, wide, false);
+ store(tmp, base, addr->disp() + hi_word_offset_in_bytes, T_INT, wide, false);
break;
}
case T_OBJECT: {
diff --git a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
index 23bf235..64f15e0 100644
--- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
@@ -766,7 +766,22 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
__ ret();
__ delayed()->restore();
+ }
+ break;
+ case deoptimize_id:
+ {
+ __ set_info("deoptimize", dont_gc_arguments);
+ OopMap* oop_map = save_live_registers(sasm);
+ int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, deoptimize));
+ oop_maps = new OopMapSet();
+ oop_maps->add_gc_map(call_offset, oop_map);
+ restore_live_registers(sasm);
+ DeoptimizationBlob* deopt_blob = SharedRuntime::deopt_blob();
+ assert(deopt_blob != NULL, "deoptimization blob must have been created");
+ AddressLiteral dest(deopt_blob->unpack_with_reexecution());
+ __ jump_to(dest, O0);
+ __ delayed()->restore();
}
break;
diff --git a/hotspot/src/cpu/sparc/vm/copy_sparc.hpp b/hotspot/src/cpu/sparc/vm/copy_sparc.hpp
index 176ed04..13829b1 100644
--- a/hotspot/src/cpu/sparc/vm/copy_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/copy_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
@@ -82,13 +82,35 @@ static void pd_conjoint_bytes_atomic(void* from, void* to, size_t count) {
}
static void pd_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
- // FIXME
- (void)memmove(to, from, count << LogBytesPerShort);
+ if (from > to) {
+ while (count-- > 0) {
+ // Copy forwards
+ *to++ = *from++;
+ }
+ } else {
+ from += count - 1;
+ to += count - 1;
+ while (count-- > 0) {
+ // Copy backwards
+ *to-- = *from--;
+ }
+ }
}
static void pd_conjoint_jints_atomic(jint* from, jint* to, size_t count) {
- // FIXME
- (void)memmove(to, from, count << LogBytesPerInt);
+ if (from > to) {
+ while (count-- > 0) {
+ // Copy forwards
+ *to++ = *from++;
+ }
+ } else {
+ from += count - 1;
+ to += count - 1;
+ while (count-- > 0) {
+ // Copy backwards
+ *to-- = *from--;
+ }
+ }
}
static void pd_conjoint_jlongs_atomic(jlong* from, jlong* to, size_t count) {
diff --git a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp
index 14030c0..3b2b5dd 100644
--- a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp
@@ -352,6 +352,7 @@ void MethodHandles::load_stack_move(MacroAssembler* _masm,
BLOCK_COMMENT("load_stack_move {");
__ ldsw(G3_amh_conversion, stack_move_reg);
__ sra(stack_move_reg, CONV_STACK_MOVE_SHIFT, stack_move_reg);
+#ifdef ASSERT
if (VerifyMethodHandles) {
Label L_ok, L_bad;
int32_t stack_move_limit = 0x0800; // extra-large
@@ -363,6 +364,7 @@ void MethodHandles::load_stack_move(MacroAssembler* _masm,
__ stop("load_stack_move of garbage value");
__ BIND(L_ok);
}
+#endif
BLOCK_COMMENT("} load_stack_move");
}
diff --git a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.hpp b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.hpp
index 4a0bca8..0c28510 100644
--- a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.hpp
@@ -27,7 +27,7 @@
// Adapters
enum /* platform_dependent_constants */ {
- adapter_code_size = NOT_LP64(22000 DEBUG_ONLY(+ 40000)) LP64_ONLY(32000 DEBUG_ONLY(+ 80000))
+ adapter_code_size = NOT_LP64(23000 DEBUG_ONLY(+ 40000)) LP64_ONLY(35000 DEBUG_ONLY(+ 50000))
};
public:
diff --git a/hotspot/src/cpu/sparc/vm/sparc.ad b/hotspot/src/cpu/sparc/vm/sparc.ad
index d7bf2d8..92f3c86 100644
--- a/hotspot/src/cpu/sparc/vm/sparc.ad
+++ b/hotspot/src/cpu/sparc/vm/sparc.ad
@@ -1860,6 +1860,14 @@ const bool Matcher::init_array_count_is_in_bytes = true;
// Threshold size for cleararray.
const int Matcher::init_array_short_size = 8 * BytesPerLong;
+// No additional cost for CMOVL.
+const int Matcher::long_cmove_cost() { return 0; }
+
+// CMOVF/CMOVD are expensive on T4 and on SPARC64.
+const int Matcher::float_cmove_cost() {
+ return (VM_Version::is_T4() || VM_Version::is_sparc64()) ? ConditionalMoveLimit : 0;
+}
+
// Should the Matcher clone shifts on addressing modes, expecting them to
// be subsumed into complex addressing expressions or compute them into
// registers? True for Intel but false for most RISCs
@@ -10476,7 +10484,7 @@ instruct countTrailingZerosI(iRegI dst, iRegI src, flagsReg cr) %{
ins_pipe(ialu_reg);
%}
-instruct countTrailingZerosL(iRegI dst, iRegL src, flagsReg cr) %{
+instruct countTrailingZerosL(iRegIsafe dst, iRegL src, flagsReg cr) %{
predicate(UsePopCountInstruction); // See Matcher::match_rule_supported
match(Set dst (CountTrailingZerosL src));
effect(TEMP dst, KILL cr);
diff --git a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp
index e1429c6..1d49662 100644
--- a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, 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
@@ -211,7 +211,7 @@ void VM_Version::initialize() {
#ifdef COMPILER2
// T4 and newer Sparc cpus have fast RDPC.
if (has_fast_rdpc() && FLAG_IS_DEFAULT(UseRDPCForConstantTableBase)) {
-// FLAG_SET_DEFAULT(UseRDPCForConstantTableBase, true);
+ FLAG_SET_DEFAULT(UseRDPCForConstantTableBase, true);
}
// Currently not supported anywhere.
diff --git a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
index 5e2d7fe..f276df9 100644
--- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
@@ -387,9 +387,9 @@ void PatchingStub::emit_code(LIR_Assembler* ce) {
void DeoptimizeStub::emit_code(LIR_Assembler* ce) {
__ bind(_entry);
- __ call(RuntimeAddress(SharedRuntime::deopt_blob()->unpack_with_reexecution()));
+ __ call(RuntimeAddress(Runtime1::entry_for(Runtime1::deoptimize_id)));
ce->add_call_info_here(_info);
- debug_only(__ should_not_reach_here());
+ DEBUG_ONLY(__ should_not_reach_here());
}
diff --git a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
index 9ad2e58..9d13221 100644
--- a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
@@ -1447,7 +1447,22 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
oop_maps = new OopMapSet();
oop_maps->add_gc_map(call_offset, map);
restore_live_registers(sasm, save_fpu_registers);
+ }
+ break;
+ case deoptimize_id:
+ {
+ StubFrame f(sasm, "deoptimize", dont_gc_arguments);
+ const int num_rt_args = 1; // thread
+ OopMap* oop_map = save_live_registers(sasm, num_rt_args);
+ int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, deoptimize));
+ oop_maps = new OopMapSet();
+ oop_maps->add_gc_map(call_offset, oop_map);
+ restore_live_registers(sasm);
+ DeoptimizationBlob* deopt_blob = SharedRuntime::deopt_blob();
+ assert(deopt_blob != NULL, "deoptimization blob must have been created");
+ __ leave();
+ __ jump(RuntimeAddress(deopt_blob->unpack_with_reexecution()));
}
break;
diff --git a/hotspot/src/cpu/x86/vm/frame_x86.cpp b/hotspot/src/cpu/x86/vm/frame_x86.cpp
index 3d82d06..5d4da62 100644
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp
@@ -232,11 +232,15 @@ bool frame::safe_for_sender(JavaThread *thread) {
void frame::patch_pc(Thread* thread, address pc) {
+ address* pc_addr = &(((address*) sp())[-1]);
if (TracePcPatching) {
- tty->print_cr("patch_pc at address" INTPTR_FORMAT " [" INTPTR_FORMAT " -> " INTPTR_FORMAT "] ",
- &((address *)sp())[-1], ((address *)sp())[-1], pc);
+ tty->print_cr("patch_pc at address " INTPTR_FORMAT " [" INTPTR_FORMAT " -> " INTPTR_FORMAT "]",
+ pc_addr, *pc_addr, pc);
}
- ((address *)sp())[-1] = pc;
+ // Either the return address is the original one or we are going to
+ // patch in the same address that's already there.
+ assert(_pc == *pc_addr || pc == *pc_addr, "must be");
+ *pc_addr = pc;
_cb = CodeCache::find_blob(pc);
address original_pc = nmethod::get_deopt_original_pc(this);
if (original_pc != NULL) {
@@ -671,4 +675,3 @@ intptr_t *frame::initial_deoptimization_info() {
// used to reset the saved FP
return fp();
}
-
diff --git a/hotspot/src/cpu/x86/vm/jni_x86.h b/hotspot/src/cpu/x86/vm/jni_x86.h
index d1b37b9..d724c86 100644
--- a/hotspot/src/cpu/x86/vm/jni_x86.h
+++ b/hotspot/src/cpu/x86/vm/jni_x86.h
@@ -38,10 +38,14 @@
#define JNICALL
typedef int jint;
-
-#ifdef _LP64
+#if defined(_LP64) && !defined(__APPLE__)
typedef long jlong;
#else
+ /*
+ * On _LP64 __APPLE__ "long" and "long long" are both 64 bits,
+ * but we use the "long long" typedef to avoid complaints from
+ * the __APPLE__ compiler about fprintf formats.
+ */
typedef long long jlong;
#endif
diff --git a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp b/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
index dd741fd..254d087 100644
--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
@@ -382,6 +382,7 @@ void MethodHandles::load_stack_move(MacroAssembler* _masm,
__ movslq(rdi_stack_move, rdi_stack_move);
}
#endif //_LP64
+#ifdef ASSERT
if (VerifyMethodHandles) {
Label L_ok, L_bad;
int32_t stack_move_limit = 0x4000; // extra-large
@@ -393,6 +394,7 @@ void MethodHandles::load_stack_move(MacroAssembler* _masm,
__ stop("load_stack_move of garbage value");
__ BIND(L_ok);
}
+#endif
BLOCK_COMMENT("} load_stack_move");
}
@@ -410,8 +412,8 @@ void MethodHandles::RicochetFrame::verify_offsets() {
void MethodHandles::RicochetFrame::verify() const {
verify_offsets();
- assert(magic_number_1() == MAGIC_NUMBER_1, "");
- assert(magic_number_2() == MAGIC_NUMBER_2, "");
+ assert(magic_number_1() == MAGIC_NUMBER_1, err_msg(PTR_FORMAT " == " PTR_FORMAT, magic_number_1(), MAGIC_NUMBER_1));
+ assert(magic_number_2() == MAGIC_NUMBER_2, err_msg(PTR_FORMAT " == " PTR_FORMAT, magic_number_2(), MAGIC_NUMBER_2));
if (!Universe::heap()->is_gc_active()) {
if (saved_args_layout() != NULL) {
assert(saved_args_layout()->is_method(), "must be valid oop");
diff --git a/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp b/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp
index bf85c33..9d7168a 100644
--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp
@@ -27,7 +27,7 @@
// Adapters
enum /* platform_dependent_constants */ {
- adapter_code_size = NOT_LP64(30000 DEBUG_ONLY(+ 10000)) LP64_ONLY(80000 DEBUG_ONLY(+ 120000))
+ adapter_code_size = NOT_LP64(16000 DEBUG_ONLY(+ 15000)) LP64_ONLY(32000 DEBUG_ONLY(+ 80000))
};
public:
@@ -132,7 +132,10 @@ class RicochetFrame {
intptr_t* sender_link() const { return _sender_link; }
address sender_pc() const { return _sender_pc; }
- intptr_t* extended_sender_sp() const { return saved_args_base(); }
+ intptr_t* extended_sender_sp() const {
+ // The extended sender SP is above the current RicochetFrame.
+ return (intptr_t*) (((address) this) + sizeof(RicochetFrame));
+ }
intptr_t return_value_slot_number() const {
return adapter_conversion_vminfo(conversion());
diff --git a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp
index effb3ce..b03eb92 100644
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp
@@ -2797,17 +2797,25 @@ void SharedRuntime::generate_deopt_blob() {
// void Deoptimization::unpack_frames(JavaThread* thread, int exec_mode)
// Use rbp because the frames look interpreted now
- __ set_last_Java_frame(noreg, rbp, NULL);
+ // Save "the_pc" since it cannot easily be retrieved using the last_java_SP after we aligned SP.
+ // Don't need the precise return PC here, just precise enough to point into this code blob.
+ address the_pc = __ pc();
+ __ set_last_Java_frame(noreg, rbp, the_pc);
+ __ andptr(rsp, -(StackAlignmentInBytes)); // Fix stack alignment as required by ABI
__ mov(c_rarg0, r15_thread);
__ movl(c_rarg1, r14); // second arg: exec_mode
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
+ // Revert SP alignment after call since we're going to do some SP relative addressing below
+ __ movptr(rsp, Address(r15_thread, JavaThread::last_Java_sp_offset()));
// Set an oopmap for the call site
- oop_maps->add_gc_map(__ pc() - start,
+ // Use the same PC we used for the last java frame
+ oop_maps->add_gc_map(the_pc - start,
new OopMap( frame_size_in_words, 0 ));
- __ reset_last_Java_frame(true, false);
+ // Clear fp AND pc
+ __ reset_last_Java_frame(true, true);
// Collect return values
__ movdbl(xmm0, Address(rsp, RegisterSaver::xmm0_offset_in_bytes()));
@@ -2968,7 +2976,10 @@ void SharedRuntime::generate_uncommon_trap_blob() {
// Prolog
// Use rbp because the frames look interpreted now
- __ set_last_Java_frame(noreg, rbp, NULL);
+ // Save "the_pc" since it cannot easily be retrieved using the last_java_SP after we aligned SP.
+ // Don't need the precise return PC here, just precise enough to point into this code blob.
+ address the_pc = __ pc();
+ __ set_last_Java_frame(noreg, rbp, the_pc);
// Call C code. Need thread but NOT official VM entry
// crud. We cannot block on this call, no GC can happen. Call should
@@ -2977,14 +2988,17 @@ void SharedRuntime::generate_uncommon_trap_blob() {
//
// BasicType unpack_frames(JavaThread* thread, int exec_mode);
+ __ andptr(rsp, -(StackAlignmentInBytes)); // Align SP as required by ABI
__ mov(c_rarg0, r15_thread);
__ movl(c_rarg1, Deoptimization::Unpack_uncommon_trap);
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
// Set an oopmap for the call site
- oop_maps->add_gc_map(__ pc() - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
+ // Use the same PC we used for the last java frame
+ oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
- __ reset_last_Java_frame(true, false);
+ // Clear fp AND pc
+ __ reset_last_Java_frame(true, true);
// Pop self-frame.
__ leave(); // Epilog
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
index 3f3370e..6f8e35a 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
@@ -1609,6 +1609,12 @@ int AbstractInterpreter::layout_activation(methodOop method,
// and sender_sp is fp+8
intptr_t* locals = interpreter_frame->sender_sp() + max_locals - 1;
+#ifdef ASSERT
+ if (caller->is_interpreted_frame()) {
+ assert(locals < caller->fp() + frame::interpreter_frame_initial_sp_offset, "bad placement");
+ }
+#endif
+
interpreter_frame->interpreter_frame_set_locals(locals);
BasicObjectLock* montop = interpreter_frame->interpreter_frame_monitor_begin();
BasicObjectLock* monbot = montop - moncount;
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
index 9aa8c34..40c7d63 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
@@ -1622,6 +1622,12 @@ int AbstractInterpreter::layout_activation(methodOop method,
// sender_sp is fp+16 XXX
intptr_t* locals = interpreter_frame->sender_sp() + max_locals - 1;
+#ifdef ASSERT
+ if (caller->is_interpreted_frame()) {
+ assert(locals < caller->fp() + frame::interpreter_frame_initial_sp_offset, "bad placement");
+ }
+#endif
+
interpreter_frame->interpreter_frame_set_locals(locals);
BasicObjectLock* montop = interpreter_frame->interpreter_frame_monitor_begin();
BasicObjectLock* monbot = montop - moncount;
diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad
index b403752..e00df3a 100644
--- a/hotspot/src/cpu/x86/vm/x86_32.ad
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad
@@ -1393,6 +1393,12 @@ const bool Matcher::init_array_count_is_in_bytes = false;
// Threshold size for cleararray.
const int Matcher::init_array_short_size = 8 * BytesPerLong;
+// Needs 2 CMOV's for longs.
+const int Matcher::long_cmove_cost() { return 1; }
+
+// No CMOVF/CMOVD with SSE/SSE2
+const int Matcher::float_cmove_cost() { return (UseSSE>=1) ? ConditionalMoveLimit : 0; }
+
// Should the Matcher clone shifts on addressing modes, expecting them to
// be subsumed into complex addressing expressions or compute them into
// registers? True for Intel but false for most RISCs
@@ -7905,6 +7911,40 @@ instruct castP2X(eRegI dst, eRegP src ) %{
//----------Conditional Move---------------------------------------------------
// Conditional move
+instruct jmovI_reg(cmpOp cop, eFlagsReg cr, eRegI dst, eRegI src) %{
+ predicate(!VM_Version::supports_cmov() );
+ match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
+ ins_cost(200);
+ format %{ "J$cop,us skip\t# signed cmove\n\t"
+ "MOV $dst,$src\n"
+ "skip:" %}
+ ins_encode %{
+ Label Lskip;
+ // Invert sense of branch from sense of CMOV
+ __ jccb((Assembler::Condition)($cop$$cmpcode^1), Lskip);
+ __ movl($dst$$Register, $src$$Register);
+ __ bind(Lskip);
+ %}
+ ins_pipe( pipe_cmov_reg );
+%}
+
+instruct jmovI_regU(cmpOpU cop, eFlagsRegU cr, eRegI dst, eRegI src) %{
+ predicate(!VM_Version::supports_cmov() );
+ match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
+ ins_cost(200);
+ format %{ "J$cop,us skip\t# unsigned cmove\n\t"
+ "MOV $dst,$src\n"
+ "skip:" %}
+ ins_encode %{
+ Label Lskip;
+ // Invert sense of branch from sense of CMOV
+ __ jccb((Assembler::Condition)($cop$$cmpcode^1), Lskip);
+ __ movl($dst$$Register, $src$$Register);
+ __ bind(Lskip);
+ %}
+ ins_pipe( pipe_cmov_reg );
+%}
+
instruct cmovI_reg(eRegI dst, eRegI src, eFlagsReg cr, cmpOp cop ) %{
predicate(VM_Version::supports_cmov() );
match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
diff --git a/hotspot/src/cpu/x86/vm/x86_64.ad b/hotspot/src/cpu/x86/vm/x86_64.ad
index 4f6fa3c..3e76c40 100644
--- a/hotspot/src/cpu/x86/vm/x86_64.ad
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad
@@ -1993,6 +1993,12 @@ const bool Matcher::init_array_count_is_in_bytes = false;
// Threshold size for cleararray.
const int Matcher::init_array_short_size = 8 * BytesPerLong;
+// No additional cost for CMOVL.
+const int Matcher::long_cmove_cost() { return 0; }
+
+// No CMOVF/CMOVD with SSE2
+const int Matcher::float_cmove_cost() { return ConditionalMoveLimit; }
+
// Should the Matcher clone shifts on addressing modes, expecting them
// to be subsumed into complex addressing expressions or compute them
// into registers? True for Intel but false for most RISCs
diff --git a/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp b/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp
new file mode 100644
index 0000000..8f47282
--- /dev/null
+++ b/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2003, 2011, 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.
+ *
+ */
+
+/*
+ * This is to provide sanity check in jhelper.d which compares SCCS
+ * versions of generateJvmOffsets.cpp used to create and extract
+ * contents of __JvmOffsets[] table.
+ * The __JvmOffsets[] table is located in generated JvmOffsets.cpp.
+ *
+ * GENOFFS_SCCS_VER 34
+ */
+
+#include "generateJvmOffsets.h"
+
+/* A workaround for private and protected fields */
+#define private public
+#define protected public
+
+// not on macosx #include <proc_service.h>
+#include "code/codeBlob.hpp"
+#include "code/nmethod.hpp"
+#include "code/pcDesc.hpp"
+#include "gc_interface/collectedHeap.hpp"
+#include "memory/heap.hpp"
+#include "memory/memRegion.hpp"
+#include "memory/universe.hpp"
+#include "oops/constMethodOop.hpp"
+#include "oops/klass.hpp"
+#include "oops/methodOop.hpp"
+#include "oops/oop.hpp"
+#include "oops/symbol.hpp"
+#include "runtime/virtualspace.hpp"
+#include "runtime/vmStructs.hpp"
+#include "utilities/accessFlags.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+// These are defined somewhere for Solaris
+#define PR_MODEL_ILP32 1
+#define PR_MODEL_LP64 2
+
+#ifdef COMPILER1
+#if defined(DEBUG) || defined(FASTDEBUG)
+
+/*
+ * To avoid the most part of potential link errors
+ * we link this program with -z nodefs .
+ *
+ * But for 'debug1' and 'fastdebug1' we still have to provide
+ * a particular workaround for the following symbols bellow.
+ * It will be good to find out a generic way in the future.
+ */
+
+#pragma weak tty
+#pragma weak CMSExpAvgFactor
+
+#if defined(i386) || defined(__i386) || defined(__amd64)
+#pragma weak noreg
+#endif /* i386 */
+
+LIR_Opr LIR_OprFact::illegalOpr = (LIR_Opr) 0;
+
+address StubRoutines::_call_stub_return_address = NULL;
+
+StubQueue* AbstractInterpreter::_code = NULL;
+
+#endif /* defined(DEBUG) || defined(FASTDEBUG) */
+#endif /* COMPILER1 */
+
+#define GEN_OFFS(Type,Name) \
+ switch(gen_variant) { \
+ case GEN_OFFSET: \
+ printf("#define OFFSET_%-33s %ld\n", \
+ #Type #Name, offset_of(Type, Name)); \
+ break; \
+ case GEN_INDEX: \
+ printf("#define IDX_OFFSET_%-33s %d\n", \
+ #Type #Name, index++); \
+ break; \
+ case GEN_TABLE: \
+ printf("\tOFFSET_%s,\n", #Type #Name); \
+ break; \
+ }
+
+#define GEN_SIZE(Type) \
+ switch(gen_variant) { \
+ case GEN_OFFSET: \
+ printf("#define SIZE_%-35s %ld\n", \
+ #Type, sizeof(Type)); \
+ break; \
+ case GEN_INDEX: \
+ printf("#define IDX_SIZE_%-35s %d\n", \
+ #Type, index++); \
+ break; \
+ case GEN_TABLE: \
+ printf("\tSIZE_%s,\n", #Type); \
+ break; \
+ }
+
+#define GEN_VALUE(String,Value) \
+ switch(gen_variant) { \
+ case GEN_OFFSET: \
+ printf("#define %-40s %d\n", #String, Value); \
+ break; \
+ case GEN_INDEX: \
+ printf("#define IDX_%-40s %d\n", #String, index++); \
+ break; \
+ case GEN_TABLE: \
+ printf("\t" #String ",\n"); \
+ break; \
+ }
+
+void gen_prologue(GEN_variant gen_variant) {
+ const char *suffix;
+
+ switch(gen_variant) {
+ case GEN_OFFSET: suffix = ".h"; break;
+ case GEN_INDEX: suffix = "Index.h"; break;
+ case GEN_TABLE: suffix = ".cpp"; break;
+ }
+
+ printf("/*\n");
+ printf(" * JvmOffsets%s !!!DO NOT EDIT!!! \n", suffix);
+ printf(" * The generateJvmOffsets program generates this file!\n");
+ printf(" */\n\n");
+ switch(gen_variant) {
+
+ case GEN_OFFSET:
+ case GEN_INDEX:
+ break;
+
+ case GEN_TABLE:
+ printf("#include \"JvmOffsets.h\"\n");
+ printf("\n");
+ printf("int __JvmOffsets[] = {\n");
+ break;
+ }
+}
+
+void gen_epilogue(GEN_variant gen_variant) {
+ if (gen_variant != GEN_TABLE) {
+ return;
+ }
+ printf("};\n\n");
+ return;
+}
+
+int generateJvmOffsets(GEN_variant gen_variant) {
+ int index = 0; /* It is used to generate JvmOffsetsIndex.h */
+ int pointer_size = sizeof(void *);
+ int data_model = (pointer_size == 4) ? PR_MODEL_ILP32 : PR_MODEL_LP64;
+
+ gen_prologue(gen_variant);
+
+ GEN_VALUE(DATA_MODEL, data_model);
+ GEN_VALUE(POINTER_SIZE, pointer_size);
+#if defined(TIERED)
+ GEN_VALUE(COMPILER, 3);
+#elif COMPILER1
+ GEN_VALUE(COMPILER, 1);
+#elif COMPILER2
+ GEN_VALUE(COMPILER, 2);
+#else
+ GEN_VALUE(COMPILER, 0);
+#endif // COMPILER1 && COMPILER2
+ printf("\n");
+
+ GEN_OFFS(CollectedHeap, _reserved);
+ GEN_OFFS(MemRegion, _start);
+ GEN_OFFS(MemRegion, _word_size);
+ GEN_SIZE(HeapWord);
+ printf("\n");
+
+ GEN_OFFS(VMStructEntry, typeName);
+ GEN_OFFS(VMStructEntry, fieldName);
+ GEN_OFFS(VMStructEntry, address);
+ GEN_SIZE(VMStructEntry);
+ printf("\n");
+
+ GEN_VALUE(MAX_METHOD_CODE_SIZE, max_method_code_size);
+#if defined(sparc) || defined(__sparc)
+ GEN_VALUE(OFFSET_interpreter_frame_method, 2 * pointer_size); /* L2 in saved window */
+ GEN_VALUE(OFFSET_interpreter_frame_sender_sp, 13 * pointer_size); /* I5 in saved window */
+ // Fake value for consistency. It is not going to be used.
+ GEN_VALUE(OFFSET_interpreter_frame_bcx_offset, 0xFFFF);
+#elif defined(i386) || defined(__i386) || defined(__amd64)
+ GEN_VALUE(OFFSET_interpreter_frame_sender_sp, -1 * pointer_size);
+ GEN_VALUE(OFFSET_interpreter_frame_method, -3 * pointer_size);
+ GEN_VALUE(OFFSET_interpreter_frame_bcx_offset, -7 * pointer_size);
+#endif
+
+ GEN_OFFS(Klass, _name);
+ GEN_OFFS(constantPoolOopDesc, _pool_holder);
+ printf("\n");
+
+ GEN_VALUE(OFFSET_HeapBlockHeader_used, (int) offset_of(HeapBlock::Header, _used));
+ GEN_OFFS(oopDesc, _metadata);
+ printf("\n");
+
+ GEN_VALUE(AccessFlags_NATIVE, JVM_ACC_NATIVE);
+ GEN_VALUE(constMethodOopDesc_has_linenumber_table, constMethodOopDesc::_has_linenumber_table);
+ GEN_OFFS(AccessFlags, _flags);
+ GEN_OFFS(Symbol, _length);
+ GEN_OFFS(Symbol, _body);
+ printf("\n");
+
+ GEN_OFFS(methodOopDesc, _constMethod);
+ GEN_OFFS(methodOopDesc, _constants);
+ GEN_OFFS(methodOopDesc, _access_flags);
+ printf("\n");
+
+ GEN_OFFS(constMethodOopDesc, _flags);
+ GEN_OFFS(constMethodOopDesc, _code_size);
+ GEN_OFFS(constMethodOopDesc, _name_index);
+ GEN_OFFS(constMethodOopDesc, _signature_index);
+ printf("\n");
+
+ GEN_OFFS(CodeHeap, _memory);
+ GEN_OFFS(CodeHeap, _segmap);
+ GEN_OFFS(CodeHeap, _log2_segment_size);
+ printf("\n");
+
+ GEN_OFFS(VirtualSpace, _low_boundary);
+ GEN_OFFS(VirtualSpace, _high_boundary);
+ GEN_OFFS(VirtualSpace, _low);
+ GEN_OFFS(VirtualSpace, _high);
+ printf("\n");
+
+ GEN_OFFS(CodeBlob, _name);
+ GEN_OFFS(CodeBlob, _header_size);
+ GEN_OFFS(CodeBlob, _content_offset);
+ GEN_OFFS(CodeBlob, _code_offset);
+ GEN_OFFS(CodeBlob, _data_offset);
+ GEN_OFFS(CodeBlob, _frame_size);
+ printf("\n");
+
+ GEN_OFFS(nmethod, _method);
+ GEN_OFFS(nmethod, _oops_offset);
+ GEN_OFFS(nmethod, _scopes_data_offset);
+ GEN_OFFS(nmethod, _scopes_pcs_offset);
+ GEN_OFFS(nmethod, _handler_table_offset);
+ GEN_OFFS(nmethod, _deoptimize_offset);
+ GEN_OFFS(nmethod, _orig_pc_offset);
+
+ GEN_OFFS(PcDesc, _pc_offset);
+ GEN_OFFS(PcDesc, _scope_decode_offset);
+
+ printf("\n");
+
+ GEN_OFFS(NarrowOopStruct, _base);
+ GEN_OFFS(NarrowOopStruct, _shift);
+ printf("\n");
+
+ GEN_VALUE(SIZE_HeapBlockHeader, (int) sizeof(HeapBlock::Header));
+ GEN_SIZE(oopDesc);
+ GEN_SIZE(constantPoolOopDesc);
+ printf("\n");
+
+ GEN_SIZE(PcDesc);
+ GEN_SIZE(methodOopDesc);
+ GEN_SIZE(constMethodOopDesc);
+ GEN_SIZE(nmethod);
+ GEN_SIZE(CodeBlob);
+ GEN_SIZE(BufferBlob);
+ GEN_SIZE(SingletonBlob);
+ GEN_SIZE(RuntimeStub);
+ GEN_SIZE(SafepointBlob);
+
+ gen_epilogue(gen_variant);
+ printf("\n");
+
+ fflush(stdout);
+ return 0;
+}
diff --git a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.h b/hotspot/src/os/bsd/dtrace/generateJvmOffsets.h
similarity index 100%
copy from hotspot/src/os/solaris/dtrace/generateJvmOffsets.h
copy to hotspot/src/os/bsd/dtrace/generateJvmOffsets.h
diff --git a/hotspot/src/os/solaris/dtrace/generateJvmOffsetsMain.c b/hotspot/src/os/bsd/dtrace/generateJvmOffsetsMain.c
similarity index 100%
copy from hotspot/src/os/solaris/dtrace/generateJvmOffsetsMain.c
copy to hotspot/src/os/bsd/dtrace/generateJvmOffsetsMain.c
diff --git a/hotspot/src/os/bsd/dtrace/hotspot.d b/hotspot/src/os/bsd/dtrace/hotspot.d
new file mode 100644
index 0000000..0e4802b
--- /dev/null
+++ b/hotspot/src/os/bsd/dtrace/hotspot.d
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2005, 2010, 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.
+ *
+ */
+
+provider hotspot {
+ probe class__loaded(char*, uintptr_t, void*, uintptr_t);
+ probe class__unloaded(char*, uintptr_t, void*, uintptr_t);
+ probe class__initialization__required(char*, uintptr_t, void*, intptr_t);
+ probe class__initialization__recursive(char*, uintptr_t, void*, intptr_t,int);
+ probe class__initialization__concurrent(char*, uintptr_t, void*, intptr_t,int);
+ probe class__initialization__erroneous(char*, uintptr_t, void*, intptr_t, int);
+ probe class__initialization__super__failed(char*, uintptr_t, void*, intptr_t,int);
+ probe class__initialization__clinit(char*, uintptr_t, void*, intptr_t,int);
+ probe class__initialization__error(char*, uintptr_t, void*, intptr_t,int);
+ probe class__initialization__end(char*, uintptr_t, void*, intptr_t,int);
+ probe vm__init__begin();
+ probe vm__init__end();
+ probe vm__shutdown();
+ probe vmops__request(char*, uintptr_t, int);
+ probe vmops__begin(char*, uintptr_t, int);
+ probe vmops__end(char*, uintptr_t, int);
+ probe gc__begin(uintptr_t);
+ probe gc__end();
+ probe mem__pool__gc__begin(
+ char*, uintptr_t, char*, uintptr_t,
+ uintptr_t, uintptr_t, uintptr_t, uintptr_t);
+ probe mem__pool__gc__end(
+ char*, uintptr_t, char*, uintptr_t,
+ uintptr_t, uintptr_t, uintptr_t, uintptr_t);
+ probe thread__probe__start(char*, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
+ probe thread__probe__stop(char*, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
+ probe thread__sleep__begin(long long);
+ probe thread__sleep__end(int);
+ probe thread__yield();
+ probe thread__park__begin(uintptr_t, int, long long);
+ probe thread__park__end(uintptr_t);
+ probe thread__unpark(uintptr_t);
+ probe method__compile__begin(
+ const char*, uintptr_t, const char*, uintptr_t, const char*, uintptr_t, const char*, uintptr_t);
+ probe method__compile__end(
+ char*, uintptr_t, char*, uintptr_t, char*, uintptr_t,
+ char*, uintptr_t, uintptr_t);
+ probe compiled__method__load(
+ char*, uintptr_t, char*, uintptr_t, char*, uintptr_t, void*, uintptr_t);
+ probe compiled__method__unload(
+ char*, uintptr_t, char*, uintptr_t, char*, uintptr_t);
+ probe monitor__contended__enter(uintptr_t, uintptr_t, char*, uintptr_t);
+ probe monitor__contended__entered(uintptr_t, uintptr_t, char*, uintptr_t);
+ probe monitor__contended__exit(uintptr_t, uintptr_t, char*, uintptr_t);
+ probe monitor__wait(uintptr_t, uintptr_t, char*, uintptr_t, uintptr_t);
+ probe monitor__probe__waited(uintptr_t, uintptr_t, char*, uintptr_t);
+ probe monitor__notify(uintptr_t, uintptr_t, char*, uintptr_t);
+ probe monitor__notifyAll(uintptr_t, uintptr_t, char*, uintptr_t);
+
+ probe object__alloc(int, char*, uintptr_t, uintptr_t);
+ probe method__entry(
+ int, char*, int, char*, int, char*, int);
+ probe method__return(
+ int, char*, int, char*, int, char*, int);
+};
+
+#pragma D attributes Evolving/Evolving/Common provider hotspot provider
+#pragma D attributes Private/Private/Unknown provider hotspot module
+#pragma D attributes Private/Private/Unknown provider hotspot function
+#pragma D attributes Evolving/Evolving/Common provider hotspot name
+#pragma D attributes Evolving/Evolving/Common provider hotspot args
diff --git a/hotspot/src/os/bsd/dtrace/hotspot_jni.d b/hotspot/src/os/bsd/dtrace/hotspot_jni.d
new file mode 100644
index 0000000..cca1c51
--- /dev/null
+++ b/hotspot/src/os/bsd/dtrace/hotspot_jni.d
@@ -0,0 +1,506 @@
+/*
+ * Copyright (c) 2005, 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.
+ *
+ */
+
+provider hotspot_jni {
+ probe AllocObject__entry(void*, void*);
+ probe AllocObject__return(void*);
+ probe AttachCurrentThreadAsDaemon__entry(void*, void**, void*);
+ probe AttachCurrentThreadAsDaemon__return(uint32_t);
+ probe AttachCurrentThread__entry(void*, void**, void*);
+ probe AttachCurrentThread__return(uint32_t);
+ probe CallBooleanMethodA__entry(void*, void*, uintptr_t);
+ probe CallBooleanMethodA__return(uintptr_t);
+ probe CallBooleanMethod__entry(void*, void*, uintptr_t);
+ probe CallBooleanMethod__return(uintptr_t);
+ probe CallBooleanMethodV__entry(void*, void*, uintptr_t);
+ probe CallBooleanMethodV__return(uintptr_t);
+ probe CallByteMethodA__entry(void*, void*, uintptr_t);
+ probe CallByteMethodA__return(char);
+ probe CallByteMethod__entry(void*, void*, uintptr_t);
+ probe CallByteMethod__return(char);
+ probe CallByteMethodV__entry(void*, void*, uintptr_t);
+ probe CallByteMethodV__return(char);
+ probe CallCharMethodA__entry(void*, void*, uintptr_t);
+ probe CallCharMethodA__return(uint16_t);
+ probe CallCharMethod__entry(void*, void*, uintptr_t);
+ probe CallCharMethod__return(uint16_t);
+ probe CallCharMethodV__entry(void*, void*, uintptr_t);
+ probe CallCharMethodV__return(uint16_t);
+ probe CallDoubleMethodA__entry(void*, void*, uintptr_t);
+ probe CallDoubleMethodA__return();
+ probe CallDoubleMethod__entry(void*, void*, uintptr_t);
+ probe CallDoubleMethod__return();
+ probe CallDoubleMethodV__entry(void*, void*, uintptr_t);
+ probe CallDoubleMethodV__return();
+ probe CallFloatMethodA__entry(void*, void*, uintptr_t);
+ probe CallFloatMethodA__return();
+ probe CallFloatMethod__entry(void*, void*, uintptr_t);
+ probe CallFloatMethod__return();
+ probe CallFloatMethodV__entry(void*, void*, uintptr_t);
+ probe CallFloatMethodV__return();
+ probe CallIntMethodA__entry(void*, void*, uintptr_t);
+ probe CallIntMethodA__return(uint32_t);
+ probe CallIntMethod__entry(void*, void*, uintptr_t);
+ probe CallIntMethod__return(uint32_t);
+ probe CallIntMethodV__entry(void*, void*, uintptr_t);
+ probe CallIntMethodV__return(uint32_t);
+ probe CallLongMethodA__entry(void*, void*, uintptr_t);
+ probe CallLongMethodA__return(uintptr_t);
+ probe CallLongMethod__entry(void*, void*, uintptr_t);
+ probe CallLongMethod__return(uintptr_t);
+ probe CallLongMethodV__entry(void*, void*, uintptr_t);
+ probe CallLongMethodV__return(uintptr_t);
+ probe CallNonvirtualBooleanMethodA__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualBooleanMethodA__return(uintptr_t);
+ probe CallNonvirtualBooleanMethod__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualBooleanMethod__return(uintptr_t);
+ probe CallNonvirtualBooleanMethodV__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualBooleanMethodV__return(uintptr_t);
+ probe CallNonvirtualByteMethodA__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualByteMethodA__return(char);
+ probe CallNonvirtualByteMethod__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualByteMethod__return(char);
+ probe CallNonvirtualByteMethodV__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualByteMethodV__return(char);
+ probe CallNonvirtualCharMethodA__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualCharMethodA__return(uint16_t);
+ probe CallNonvirtualCharMethod__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualCharMethod__return(uint16_t);
+ probe CallNonvirtualCharMethodV__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualCharMethodV__return(uint16_t);
+ probe CallNonvirtualDoubleMethodA__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualDoubleMethodA__return();
+ probe CallNonvirtualDoubleMethod__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualDoubleMethod__return();
+ probe CallNonvirtualDoubleMethodV__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualDoubleMethodV__return();
+ probe CallNonvirtualFloatMethodA__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualFloatMethodA__return();
+ probe CallNonvirtualFloatMethod__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualFloatMethod__return();
+ probe CallNonvirtualFloatMethodV__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualFloatMethodV__return();
+ probe CallNonvirtualIntMethodA__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualIntMethodA__return(uint32_t);
+ probe CallNonvirtualIntMethod__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualIntMethod__return(uint32_t);
+ probe CallNonvirtualIntMethodV__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualIntMethodV__return(uint32_t);
+ probe CallNonvirtualLongMethodA__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualLongMethodA__return(uintptr_t);
+ probe CallNonvirtualLongMethod__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualLongMethod__return(uintptr_t);
+ probe CallNonvirtualLongMethodV__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualLongMethodV__return(uintptr_t);
+ probe CallNonvirtualObjectMethodA__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualObjectMethodA__return(void*);
+ probe CallNonvirtualObjectMethod__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualObjectMethod__return(void*);
+ probe CallNonvirtualObjectMethodV__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualObjectMethodV__return(void*);
+ probe CallNonvirtualShortMethodA__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualShortMethodA__return(uint16_t);
+ probe CallNonvirtualShortMethod__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualShortMethod__return(uint16_t);
+ probe CallNonvirtualShortMethodV__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualShortMethodV__return(uint16_t);
+ probe CallNonvirtualVoidMethodA__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualVoidMethodA__return();
+ probe CallNonvirtualVoidMethod__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualVoidMethod__return();
+ probe CallNonvirtualVoidMethodV__entry(void*, void*, void*, uintptr_t);
+ probe CallNonvirtualVoidMethodV__return();
+ probe CallObjectMethodA__entry(void*, void*, uintptr_t);
+ probe CallObjectMethodA__return(void*);
+ probe CallObjectMethod__entry(void*, void*, uintptr_t);
+ probe CallObjectMethod__return(void*);
+ probe CallObjectMethodV__entry(void*, void*, uintptr_t);
+ probe CallObjectMethodV__return(void*);
+ probe CallShortMethodA__entry(void*, void*, uintptr_t);
+ probe CallShortMethodA__return(uint16_t);
+ probe CallShortMethod__entry(void*, void*, uintptr_t);
+ probe CallShortMethod__return(uint16_t);
+ probe CallShortMethodV__entry(void*, void*, uintptr_t);
+ probe CallShortMethodV__return(uint16_t);
+ probe CallStaticBooleanMethodA__entry(void*, void*, uintptr_t);
+ probe CallStaticBooleanMethodA__return(uintptr_t);
+ probe CallStaticBooleanMethod__entry(void*, void*, uintptr_t);
+ probe CallStaticBooleanMethod__return(uintptr_t);
+ probe CallStaticBooleanMethodV__entry(void*, void*, uintptr_t);
+ probe CallStaticBooleanMethodV__return(uintptr_t);
+ probe CallStaticByteMethodA__entry(void*, void*, uintptr_t);
+ probe CallStaticByteMethodA__return(char);
+ probe CallStaticByteMethod__entry(void*, void*, uintptr_t);
+ probe CallStaticByteMethod__return(char);
+ probe CallStaticByteMethodV__entry(void*, void*, uintptr_t);
+ probe CallStaticByteMethodV__return(char);
+ probe CallStaticCharMethodA__entry(void*, void*, uintptr_t);
+ probe CallStaticCharMethodA__return(uint16_t);
+ probe CallStaticCharMethod__entry(void*, void*, uintptr_t);
+ probe CallStaticCharMethod__return(uint16_t);
+ probe CallStaticCharMethodV__entry(void*, void*, uintptr_t);
+ probe CallStaticCharMethodV__return(uint16_t);
+ probe CallStaticDoubleMethodA__entry(void*, void*, uintptr_t);
+ probe CallStaticDoubleMethodA__return();
+ probe CallStaticDoubleMethod__entry(void*, void*, uintptr_t);
+ probe CallStaticDoubleMethod__return();
+ probe CallStaticDoubleMethodV__entry(void*, void*, uintptr_t);
+ probe CallStaticDoubleMethodV__return();
+ probe CallStaticFloatMethodA__entry(void*, void*, uintptr_t);
+ probe CallStaticFloatMethodA__return();
+ probe CallStaticFloatMethod__entry(void*, void*, uintptr_t);
+ probe CallStaticFloatMethod__return();
+ probe CallStaticFloatMethodV__entry(void*, void*, uintptr_t);
+ probe CallStaticFloatMethodV__return();
+ probe CallStaticIntMethodA__entry(void*, void*, uintptr_t);
+ probe CallStaticIntMethodA__return(uint32_t);
+ probe CallStaticIntMethod__entry(void*, void*, uintptr_t);
+ probe CallStaticIntMethod__return(uint32_t);
+ probe CallStaticIntMethodV__entry(void*, void*, uintptr_t);
+ probe CallStaticIntMethodV__return(uint32_t);
+ probe CallStaticLongMethodA__entry(void*, void*, uintptr_t);
+ probe CallStaticLongMethodA__return(uintptr_t);
+ probe CallStaticLongMethod__entry(void*, void*, uintptr_t);
+ probe CallStaticLongMethod__return(uintptr_t);
+ probe CallStaticLongMethodV__entry(void*, void*, uintptr_t);
+ probe CallStaticLongMethodV__return(uintptr_t);
+ probe CallStaticObjectMethodA__entry(void*, void*, uintptr_t);
+ probe CallStaticObjectMethodA__return(void*);
+ probe CallStaticObjectMethod__entry(void*, void*, uintptr_t);
+ probe CallStaticObjectMethod__return(void*);
+ probe CallStaticObjectMethodV__entry(void*, void*, uintptr_t);
+ probe CallStaticObjectMethodV__return(void*);
+ probe CallStaticShortMethodA__entry(void*, void*, uintptr_t);
+ probe CallStaticShortMethodA__return(uint16_t);
+ probe CallStaticShortMethod__entry(void*, void*, uintptr_t);
+ probe CallStaticShortMethod__return(uint16_t);
+ probe CallStaticShortMethodV__entry(void*, void*, uintptr_t);
+ probe CallStaticShortMethodV__return(uint16_t);
+ probe CallStaticVoidMethodA__entry(void*, void*, uintptr_t);
+ probe CallStaticVoidMethodA__return();
+ probe CallStaticVoidMethod__entry(void*, void*, uintptr_t);
+ probe CallStaticVoidMethod__return();
+ probe CallStaticVoidMethodV__entry(void*, void*, uintptr_t);
+ probe CallStaticVoidMethodV__return();
+ probe CallVoidMethodA__entry(void*, void*, uintptr_t);
+ probe CallVoidMethodA__return();
+ probe CallVoidMethod__entry(void*, void*, uintptr_t);
+ probe CallVoidMethod__return();
+ probe CallVoidMethodV__entry(void*, void*, uintptr_t);
+ probe CallVoidMethodV__return();
+ probe CreateJavaVM__entry(void**, void**, void*);
+ probe CreateJavaVM__return(uint32_t);
+ probe DefineClass__entry(void*, const char*, void*, char*, uintptr_t);
+ probe DefineClass__return(void*);
+ probe DeleteGlobalRef__entry(void*, void*);
+ probe DeleteGlobalRef__return();
+ probe DeleteLocalRef__entry(void*, void*);
+ probe DeleteLocalRef__return();
+ probe DeleteWeakGlobalRef__entry(void*, void*);
+ probe DeleteWeakGlobalRef__return();
+ probe DestroyJavaVM__entry(void*);
+ probe DestroyJavaVM__return(uint32_t);
+ probe DetachCurrentThread__entry(void*);
+ probe DetachCurrentThread__return(uint32_t);
+ probe EnsureLocalCapacity__entry(void*, uint32_t);
+ probe EnsureLocalCapacity__return(uint32_t);
+ probe ExceptionCheck__entry(void*);
+ probe ExceptionCheck__return(uintptr_t);
+ probe ExceptionClear__entry(void*);
+ probe ExceptionClear__return();
+ probe ExceptionDescribe__entry(void*);
+ probe ExceptionDescribe__return();
+ probe ExceptionOccurred__entry(void*);
+ probe ExceptionOccurred__return(void*);
+ probe FatalError__entry(void* env, const char*);
+ probe FindClass__entry(void*, const char*);
+ probe FindClass__return(void*);
+ probe FromReflectedField__entry(void*, void*);
+ probe FromReflectedField__return(uintptr_t);
+ probe FromReflectedMethod__entry(void*, void*);
+ probe FromReflectedMethod__return(uintptr_t);
+ probe GetArrayLength__entry(void*, void*);
+ probe GetArrayLength__return(uintptr_t);
+ probe GetBooleanArrayElements__entry(void*, void*, uintptr_t*);
+ probe GetBooleanArrayElements__return(uintptr_t*);
+ probe GetBooleanArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, uintptr_t*);
+ probe GetBooleanArrayRegion__return();
+ probe GetBooleanField__entry(void*, void*, uintptr_t);
+ probe GetBooleanField__return(uintptr_t);
+ probe GetByteArrayElements__entry(void*, void*, uintptr_t*);
+ probe GetByteArrayElements__return(char*);
+ probe GetByteArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, char*);
+ probe GetByteArrayRegion__return();
+ probe GetByteField__entry(void*, void*, uintptr_t);
+ probe GetByteField__return(char);
+ probe GetCharArrayElements__entry(void*, void*, uintptr_t*);
+ probe GetCharArrayElements__return(uint16_t*);
+ probe GetCharArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, uint16_t*);
+ probe GetCharArrayRegion__return();
+ probe GetCharField__entry(void*, void*, uintptr_t);
+ probe GetCharField__return(uint16_t);
+ probe GetCreatedJavaVMs__entry(void**, uintptr_t, uintptr_t*);
+ probe GetCreatedJavaVMs__return(uintptr_t);
+ probe GetDefaultJavaVMInitArgs__entry(void*);
+ probe GetDefaultJavaVMInitArgs__return(uint32_t);
+ probe GetDirectBufferAddress__entry(void*, void*);
+ probe GetDirectBufferAddress__return(void*);
+ probe GetDirectBufferCapacity__entry(void*, void*);
+ probe GetDirectBufferCapacity__return(uintptr_t);
+ probe GetDoubleArrayElements__entry(void*, void*, uintptr_t*);
+ probe GetDoubleArrayElements__return(double*);
+ probe GetDoubleArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, double*);
+ probe GetDoubleArrayRegion__return();
+ probe GetDoubleField__entry(void*, void*, uintptr_t);
+ probe GetDoubleField__return();
+ probe GetEnv__entry(void*, void*, uint32_t);
+ probe GetEnv__return(uint32_t);
+ probe GetFieldID__entry(void*, void*, const char*, const char*);
+ probe GetFieldID__return(uintptr_t);
+ probe GetFloatArrayElements__entry(void*, void*, uintptr_t*);
+ probe GetFloatArrayElements__return(float*);
+ probe GetFloatArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, float*);
+ probe GetFloatArrayRegion__return();
+ probe GetFloatField__entry(void*, void*, uintptr_t);
+ probe GetFloatField__return();
+ probe GetIntArrayElements__entry(void*, void*, uintptr_t*);
+ probe GetIntArrayElements__return(uint32_t*);
+ probe GetIntArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, uint32_t*);
+ probe GetIntArrayRegion__return();
+ probe GetIntField__entry(void*, void*, uintptr_t);
+ probe GetIntField__return(uint32_t);
+ probe GetJavaVM__entry(void*, void**);
+ probe GetJavaVM__return(uint32_t);
+ probe GetLongArrayElements__entry(void*, void*, uintptr_t*);
+ probe GetLongArrayElements__return(uintptr_t*);
+ probe GetLongArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, uintptr_t*);
+ probe GetLongArrayRegion__return();
+ probe GetLongField__entry(void*, void*, uintptr_t);
+ probe GetLongField__return(uintptr_t);
+ probe GetMethodID__entry(void*, void*, const char*, const char*);
+ probe GetMethodID__return(uintptr_t);
+ probe GetObjectArrayElement__entry(void*, void*, uintptr_t);
+ probe GetObjectArrayElement__return(void*);
+ probe GetObjectClass__entry(void*, void*);
+ probe GetObjectClass__return(void*);
+ probe GetObjectField__entry(void*, void*, uintptr_t);
+ probe GetObjectField__return(void*);
+ probe GetObjectRefType__entry(void*, void*);
+ probe GetObjectRefType__return(void*);
+ probe GetPrimitiveArrayCritical__entry(void*, void*, uintptr_t*);
+ probe GetPrimitiveArrayCritical__return(void*);
+ probe GetShortArrayElements__entry(void*, void*, uintptr_t*);
+ probe GetShortArrayElements__return(uint16_t*);
+ probe GetShortArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, uint16_t*);
+ probe GetShortArrayRegion__return();
+ probe GetShortField__entry(void*, void*, uintptr_t);
+ probe GetShortField__return(uint16_t);
+ probe GetStaticBooleanField__entry(void*, void*, uintptr_t);
+ probe GetStaticBooleanField__return(uintptr_t);
+ probe GetStaticByteField__entry(void*, void*, uintptr_t);
+ probe GetStaticByteField__return(char);
+ probe GetStaticCharField__entry(void*, void*, uintptr_t);
+ probe GetStaticCharField__return(uint16_t);
+ probe GetStaticDoubleField__entry(void*, void*, uintptr_t);
+ probe GetStaticDoubleField__return();
+ probe GetStaticFieldID__entry(void*, void*, const char*, const char*);
+ probe GetStaticFieldID__return(uintptr_t);
+ probe GetStaticFloatField__entry(void*, void*, uintptr_t);
+ probe GetStaticFloatField__return();
+ probe GetStaticIntField__entry(void*, void*, uintptr_t);
+ probe GetStaticIntField__return(uint32_t);
+ probe GetStaticLongField__entry(void*, void*, uintptr_t);
+ probe GetStaticLongField__return(uintptr_t);
+ probe GetStaticMethodID__entry(void*, void*, const char*, const char*);
+ probe GetStaticMethodID__return(uintptr_t);
+ probe GetStaticObjectField__entry(void*, void*, uintptr_t);
+ probe GetStaticObjectField__return(void*);
+ probe GetStaticShortField__entry(void*, void*, uintptr_t);
+ probe GetStaticShortField__return(uint16_t);
+ probe GetStringChars__entry(void*, void*, uintptr_t*);
+ probe GetStringChars__return(const uint16_t*);
+ probe GetStringCritical__entry(void*, void*, uintptr_t*);
+ probe GetStringCritical__return(const uint16_t*);
+ probe GetStringLength__entry(void*, void*);
+ probe GetStringLength__return(uintptr_t);
+ probe GetStringRegion__entry(void*, void*, uintptr_t, uintptr_t, uint16_t*);
+ probe GetStringRegion__return();
+ probe GetStringUTFChars__entry(void*, void*, uintptr_t*);
+ probe GetStringUTFChars__return(const char*);
+ probe GetStringUTFLength__entry(void*, void*);
+ probe GetStringUTFLength__return(uintptr_t);
+ probe GetStringUTFRegion__entry(void*, void*, uintptr_t, uintptr_t, char*);
+ probe GetStringUTFRegion__return();
+ probe GetSuperclass__entry(void*, void*);
+ probe GetSuperclass__return(void*);
+ probe GetVersion__entry(void*);
+ probe GetVersion__return(uint32_t);
+ probe IsAssignableFrom__entry(void*, void*, void*);
+ probe IsAssignableFrom__return(uintptr_t);
+ probe IsInstanceOf__entry(void*, void*, void*);
+ probe IsInstanceOf__return(uintptr_t);
+ probe IsSameObject__entry(void*, void*, void*);
+ probe IsSameObject__return(uintptr_t);
+ probe MonitorEnter__entry(void*, void*);
+ probe MonitorEnter__return(uint32_t);
+ probe MonitorExit__entry(void*, void*);
+ probe MonitorExit__return(uint32_t);
+ probe NewBooleanArray__entry(void*, uintptr_t);
+ probe NewBooleanArray__return(void*);
+ probe NewByteArray__entry(void*, uintptr_t);
+ probe NewByteArray__return(void*);
+ probe NewCharArray__entry(void*, uintptr_t);
+ probe NewCharArray__return(void*);
+ probe NewDirectByteBuffer__entry(void*, void*, uintptr_t);
+ probe NewDirectByteBuffer__return(void*);
+ probe NewDoubleArray__entry(void*, uintptr_t);
+ probe NewDoubleArray__return(void*);
+ probe NewFloatArray__entry(void*, uintptr_t);
+ probe NewFloatArray__return(void*);
+ probe NewGlobalRef__entry(void*, void*);
+ probe NewGlobalRef__return(void*);
+ probe NewIntArray__entry(void*, uintptr_t);
+ probe NewIntArray__return(void*);
+ probe NewLocalRef__entry(void*, void*);
+ probe NewLocalRef__return(void*);
+ probe NewLongArray__entry(void*, uintptr_t);
+ probe NewLongArray__return(void*);
+ probe NewObjectA__entry(void*, void*, uintptr_t);
+ probe NewObjectA__return(void*);
+ probe NewObjectArray__entry(void*, uintptr_t, void*, void*);
+ probe NewObjectArray__return(void*);
+ probe NewObject__entry(void*, void*, uintptr_t);
+ probe NewObject__return(void*);
+ probe NewObjectV__entry(void*, void*, uintptr_t);
+ probe NewObjectV__return(void*);
+ probe NewShortArray__entry(void*, uintptr_t);
+ probe NewShortArray__return(void*);
+ probe NewString__entry(void*, const uint16_t*, uintptr_t);
+ probe NewString__return(void*);
+ probe NewStringUTF__entry(void*, const char*);
+ probe NewStringUTF__return(void*);
+ probe NewWeakGlobalRef__entry(void*, void*);
+ probe NewWeakGlobalRef__return(void*);
+ probe PopLocalFrame__entry(void*, void*);
+ probe PopLocalFrame__return(void*);
+ probe PushLocalFrame__entry(void*, uint32_t);
+ probe PushLocalFrame__return(uint32_t);
+ probe RegisterNatives__entry(void*, void*, const void*, uint32_t);
+ probe RegisterNatives__return(uint32_t);
+ probe ReleaseBooleanArrayElements__entry(void*, void*, uintptr_t*, uint32_t);
+ probe ReleaseBooleanArrayElements__return();
+ probe ReleaseByteArrayElements__entry(void*, void*, char*, uint32_t);
+ probe ReleaseByteArrayElements__return();
+ probe ReleaseCharArrayElements__entry(void*, void*, uint16_t*, uint32_t);
+ probe ReleaseCharArrayElements__return();
+ probe ReleaseDoubleArrayElements__entry(void*, void*, double*, uint32_t);
+ probe ReleaseDoubleArrayElements__return();
+ probe ReleaseFloatArrayElements__entry(void*, void*, float*, uint32_t);
+ probe ReleaseFloatArrayElements__return();
+ probe ReleaseIntArrayElements__entry(void*, void*, uint32_t*, uint32_t);
+ probe ReleaseIntArrayElements__return();
+ probe ReleaseLongArrayElements__entry(void*, void*, uintptr_t*, uint32_t);
+ probe ReleaseLongArrayElements__return();
+ probe ReleasePrimitiveArrayCritical__entry(void*, void*, void*, uint32_t);
+ probe ReleasePrimitiveArrayCritical__return();
+ probe ReleaseShortArrayElements__entry(void*, void*, uint16_t*, uint32_t);
+ probe ReleaseShortArrayElements__return();
+ probe ReleaseStringChars__entry(void*, void*, const uint16_t*);
+ probe ReleaseStringChars__return();
+ probe ReleaseStringCritical__entry(void*, void*, const uint16_t*);
+ probe ReleaseStringCritical__return();
+ probe ReleaseStringUTFChars__entry(void*, void*, const char*);
+ probe ReleaseStringUTFChars__return();
+ probe SetBooleanArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, const uintptr_t*);
+ probe SetBooleanArrayRegion__return();
+ probe SetBooleanField__entry(void*, void*, uintptr_t, uintptr_t);
+ probe SetBooleanField__return();
+ probe SetByteArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, const char*);
+ probe SetByteArrayRegion__return();
+ probe SetByteField__entry(void*, void*, uintptr_t, char);
+ probe SetByteField__return();
+ probe SetCharArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, const uint16_t*);
+ probe SetCharArrayRegion__return();
+ probe SetCharField__entry(void*, void*, uintptr_t, uint16_t);
+ probe SetCharField__return();
+ probe SetDoubleArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, const double*);
+ probe SetDoubleArrayRegion__return();
+ probe SetDoubleField__entry(void*, void*, uintptr_t);
+ probe SetDoubleField__return();
+ probe SetFloatArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, const float*);
+ probe SetFloatArrayRegion__return();
+ probe SetFloatField__entry(void*, void*, uintptr_t);
+ probe SetFloatField__return();
+ probe SetIntArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, const uint32_t*);
+ probe SetIntArrayRegion__return();
+ probe SetIntField__entry(void*, void*, uintptr_t, uint32_t);
+ probe SetIntField__return();
+ probe SetLongArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, const uintptr_t*);
+ probe SetLongArrayRegion__return();
+ probe SetLongField__entry(void*, void*, uintptr_t, uintptr_t);
+ probe SetLongField__return();
+ probe SetObjectArrayElement__entry(void*, void*, uintptr_t, void*);
+ probe SetObjectArrayElement__return();
+ probe SetObjectField__entry(void*, void*, uintptr_t, void*);
+ probe SetObjectField__return();
+ probe SetShortArrayRegion__entry(void*, void*, uintptr_t, uintptr_t, const uint16_t*);
+ probe SetShortArrayRegion__return();
+ probe SetShortField__entry(void*, void*, uintptr_t, uint16_t);
+ probe SetShortField__return();
+ probe SetStaticBooleanField__entry(void*, void*, uintptr_t, uintptr_t);
+ probe SetStaticBooleanField__return();
+ probe SetStaticByteField__entry(void*, void*, uintptr_t, char);
+ probe SetStaticByteField__return();
+ probe SetStaticCharField__entry(void*, void*, uintptr_t, uint16_t);
+ probe SetStaticCharField__return();
+ probe SetStaticDoubleField__entry(void*, void*, uintptr_t);
+ probe SetStaticDoubleField__return();
+ probe SetStaticFloatField__entry(void*, void*, uintptr_t);
+ probe SetStaticFloatField__return();
+ probe SetStaticIntField__entry(void*, void*, uintptr_t, uint32_t);
+ probe SetStaticIntField__return();
+ probe SetStaticLongField__entry(void*, void*, uintptr_t, uintptr_t);
+ probe SetStaticLongField__return();
+ probe SetStaticObjectField__entry(void*, void*, uintptr_t, void*);
+ probe SetStaticObjectField__return();
+ probe SetStaticShortField__entry(void*, void*, uintptr_t, uint16_t);
+ probe SetStaticShortField__return();
+ probe Throw__entry(void*, void*);
+ probe Throw__return(intptr_t);
+ probe ThrowNew__entry(void*, void*, const char*);
+ probe ThrowNew__return(intptr_t);
+ probe ToReflectedField__entry(void*, void*, uintptr_t, uintptr_t);
+ probe ToReflectedField__return(void*);
+ probe ToReflectedMethod__entry(void*, void*, uintptr_t, uintptr_t);
+ probe ToReflectedMethod__return(void*);
+ probe UnregisterNatives__entry(void*, void*);
+ probe UnregisterNatives__return(uint32_t);
+};
+
+#pragma D attributes Standard/Standard/Common provider hotspot_jni provider
+#pragma D attributes Private/Private/Unknown provider hotspot_jni module
+#pragma D attributes Private/Private/Unknown provider hotspot_jni function
+#pragma D attributes Standard/Standard/Common provider hotspot_jni name
+#pragma D attributes Evolving/Evolving/Common provider hotspot_jni args
+
diff --git a/hotspot/src/os/bsd/dtrace/hs_private.d b/hotspot/src/os/bsd/dtrace/hs_private.d
new file mode 100644
index 0000000..50f4264
--- /dev/null
+++ b/hotspot/src/os/bsd/dtrace/hs_private.d
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2005, 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.
+ *
+ */
+
+provider hs_private {
+ probe hashtable__new_entry(void*, uint32_t, uintptr_t, void*);
+ probe safepoint__begin();
+ probe safepoint__end();
+ probe cms__initmark__begin();
+ probe cms__initmark__end();
+ probe cms__remark__begin();
+ probe cms__remark__end();
+};
+
+#pragma D attributes Private/Private/Common provider hs_private provider
+#pragma D attributes Private/Private/Unknown provider hs_private module
+#pragma D attributes Private/Private/Unknown provider hs_private function
+#pragma D attributes Private/Private/Common provider hs_private name
+#pragma D attributes Private/Private/Common provider hs_private args
+
diff --git a/hotspot/src/os/solaris/dtrace/jhelper.d b/hotspot/src/os/bsd/dtrace/jhelper.d
similarity index 100%
copy from hotspot/src/os/solaris/dtrace/jhelper.d
copy to hotspot/src/os/bsd/dtrace/jhelper.d
diff --git a/hotspot/src/os/solaris/dtrace/jvm_dtrace.c b/hotspot/src/os/bsd/dtrace/jvm_dtrace.c
similarity index 100%
copy from hotspot/src/os/solaris/dtrace/jvm_dtrace.c
copy to hotspot/src/os/bsd/dtrace/jvm_dtrace.c
diff --git a/hotspot/src/os/solaris/dtrace/jvm_dtrace.h b/hotspot/src/os/bsd/dtrace/jvm_dtrace.h
similarity index 100%
copy from hotspot/src/os/solaris/dtrace/jvm_dtrace.h
copy to hotspot/src/os/bsd/dtrace/jvm_dtrace.h
diff --git a/hotspot/src/os/bsd/dtrace/libjvm_db.c b/hotspot/src/os/bsd/dtrace/libjvm_db.c
new file mode 100644
index 0000000..bffa08a
--- /dev/null
+++ b/hotspot/src/os/bsd/dtrace/libjvm_db.c
@@ -0,0 +1,1548 @@
+/*
+ * Copyright (c) 2003, 2011, 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.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+// not available on macosx #include <gelf.h>
+
+#include "libjvm_db.h"
+#include "JvmOffsets.h"
+
+#define LIBJVM_SO "libjvm.so"
+
+#if defined(i386) || defined(__i386) || defined(__amd64)
+#ifdef COMPILER2
+#define X86_COMPILER2
+#endif /* COMPILER2 */
+#endif /* i386 */
+
+typedef struct {
+ short vf_cnt; /* number of recognized java vframes */
+ short bci; /* current frame method byte code index */
+ int line; /* current frame method source line */
+ uint64_t new_fp; /* fp for the next frame */
+ uint64_t new_pc; /* pc for the next frame */
+ uint64_t new_sp; /* "raw" sp for the next frame (includes extension by interpreter/adapter */
+ char locinf; /* indicates there is valid location info */
+} Jframe_t;
+
+int Jlookup_by_regs(jvm_agent_t* J, const prgregset_t regs, char *name,
+ size_t size, Jframe_t *jframe);
+
+int main(int arg) { return arg; }
+
+static int debug = 0;
+
+static void failed(int err, const char * file, int line) {
+ if (debug) {
+ fprintf(stderr, "failed %d at %s:%d\n", err, file, line);
+ }
+}
+
+static void warn(const char * file, int line, const char * msg) {
+ if (debug) {
+ fprintf(stderr, "warning: %s at %s:%d\n", msg, file, line);
+ }
+}
+
+static void warn1(const char * file, int line, const char * msg, intptr_t arg1) {
+ if (debug) {
+ fprintf(stderr, "warning: ");
+ fprintf(stderr, msg, arg1);
+ fprintf(stderr, " at %s:%d\n", file, line);
+ }
+}
+
+#define CHECK_FAIL(err) \
+ if (err != PS_OK) { failed(err, __FILE__, __LINE__); goto fail; }
+#define WARN(msg) warn(__FILE__, __LINE__, msg)
+#define WARN1(msg, arg1) warn1(__FILE__, __LINE__, msg, arg1)
+
+typedef struct VMStructEntry {
+ const char * typeName; /* The type name containing the given field (example: "Klass") */
+ const char * fieldName; /* The field name within the type (example: "_name") */
+ uint64_t address; /* Address of field; only used for static fields */
+ /* ("offset" can not be reused because of apparent SparcWorks compiler bug */
+ /* in generation of initializer data) */
+} VMStructEntry;
+
+/* Prototyping inlined methods */
+
+int sprintf(char *s, const char *format, ...);
+
+#define SZ16 sizeof(int16_t)
+#define SZ32 sizeof(int32_t)
+
+#define COMP_METHOD_SIGN '*'
+
+#define MAX_VFRAMES_CNT 256
+
+typedef struct vframe {
+ uint64_t methodOop;
+ int32_t sender_decode_offset;
+ int32_t methodIdx;
+ int32_t bci;
+ int32_t line;
+} Vframe_t;
+
+typedef struct frame {
+ uintptr_t fp;
+ uintptr_t pc;
+ uintptr_t sp;
+ uintptr_t sender_sp; // The unextended sp of the caller
+} Frame_t;
+
+typedef struct Nmethod_t {
+ struct jvm_agent* J;
+ Jframe_t *jframe;
+
+ uint64_t nm; /* _nmethod */
+ uint64_t pc;
+ uint64_t pc_desc;
+
+ int32_t orig_pc_offset; /* _orig_pc_offset */
+ int32_t instrs_beg; /* _code_offset */
+ int32_t instrs_end;
+ int32_t deopt_beg; /* _deoptimize_offset */
+ int32_t scopes_data_beg; /* _scopes_data_offset */
+ int32_t scopes_data_end;
+ int32_t oops_beg; /* _oops_offset */
+ int32_t oops_end;
+ int32_t scopes_pcs_beg; /* _scopes_pcs_offset */
+ int32_t scopes_pcs_end;
+
+ int vf_cnt;
+ Vframe_t vframes[MAX_VFRAMES_CNT];
+} Nmethod_t;
+
+struct jvm_agent {
+ struct ps_prochandle* P;
+
+ uint64_t nmethod_vtbl;
+ uint64_t CodeBlob_vtbl;
+ uint64_t BufferBlob_vtbl;
+ uint64_t RuntimeStub_vtbl;
+
+ uint64_t Use_Compressed_Oops_address;
+ uint64_t Universe_methodKlassObj_address;
+ uint64_t Universe_narrow_oop_base_address;
+ uint64_t Universe_narrow_oop_shift_address;
+ uint64_t CodeCache_heap_address;
+
+ /* Volatiles */
+ uint8_t Use_Compressed_Oops;
+ uint64_t Universe_methodKlassObj;
+ uint64_t Universe_narrow_oop_base;
+ uint32_t Universe_narrow_oop_shift;
+ uint64_t CodeCache_low;
+ uint64_t CodeCache_high;
+ uint64_t CodeCache_segmap_low;
+ uint64_t CodeCache_segmap_high;
+
+ int32_t SIZE_CodeCache_log2_segment;
+
+ uint64_t methodOopPtr;
+ uint64_t bcx;
+
+ Nmethod_t *N; /*Inlined methods support */
+ Frame_t prev_fr;
+ Frame_t curr_fr;
+};
+
+static int
+read_string(struct ps_prochandle *P,
+ char *buf, /* caller's buffer */
+ size_t size, /* upper limit on bytes to read */
+ uintptr_t addr) /* address in process */
+{
+ int err = PS_OK;
+ while (size-- > 1 && err == PS_OK) {
+ err = ps_pread(P, addr, buf, 1);
+ if (*buf == '\0') {
+ return PS_OK;
+ }
+ addr += 1;
+ buf += 1;
+ }
+ return -1;
+}
+
+static int read_compressed_pointer(jvm_agent_t* J, uint64_t base, uint32_t *ptr) {
+ int err = -1;
+ uint32_t ptr32;
+ err = ps_pread(J->P, base, &ptr32, sizeof(uint32_t));
+ *ptr = ptr32;
+ return err;
+}
+
+static int read_pointer(jvm_agent_t* J, uint64_t base, uint64_t* ptr) {
+ int err = -1;
+ uint32_t ptr32;
+
+ switch (DATA_MODEL) {
+ case PR_MODEL_LP64:
+ err = ps_pread(J->P, base, ptr, sizeof(uint64_t));
+ break;
+ case PR_MODEL_ILP32:
+ err = ps_pread(J->P, base, &ptr32, sizeof(uint32_t));
+ *ptr = ptr32;
+ break;
+ }
+
+ return err;
+}
+
+static int read_string_pointer(jvm_agent_t* J, uint64_t base, const char ** stringp) {
+ uint64_t ptr;
+ int err;
+ char buffer[1024];
+
+ *stringp = NULL;
+ err = read_pointer(J, base, &ptr);
+ CHECK_FAIL(err);
+ if (ptr != 0) {
+ err = read_string(J->P, buffer, sizeof(buffer), ptr);
+ CHECK_FAIL(err);
+ *stringp = strdup(buffer);
+ }
+ return PS_OK;
+
+ fail:
+ return err;
+}
+
+static int parse_vmstruct_entry(jvm_agent_t* J, uint64_t base, VMStructEntry* vmp) {
+ uint64_t ptr;
+ int err;
+
+ err = read_string_pointer(J, base + OFFSET_VMStructEntrytypeName, &vmp->typeName);
+ CHECK_FAIL(err);
+ err = read_string_pointer(J, base + OFFSET_VMStructEntryfieldName, &vmp->fieldName);
+ CHECK_FAIL(err);
+ err = read_pointer(J, base + OFFSET_VMStructEntryaddress, &vmp->address);
+ CHECK_FAIL(err);
+
+ return PS_OK;
+
+ fail:
+ if (vmp->typeName != NULL) free((void*)vmp->typeName);
+ if (vmp->fieldName != NULL) free((void*)vmp->fieldName);
+ return err;
+}
+
+static int parse_vmstructs(jvm_agent_t* J) {
+ VMStructEntry vmVar;
+ VMStructEntry* vmp = &vmVar;
+ uint64_t gHotSpotVMStructs;
+ psaddr_t sym_addr;
+ uint64_t base;
+ int err;
+
+ err = ps_pglobal_lookup(J->P, LIBJVM_SO, "gHotSpotVMStructs", &sym_addr);
+ CHECK_FAIL(err);
+ err = read_pointer(J, sym_addr, &gHotSpotVMStructs);
+ CHECK_FAIL(err);
+ base = gHotSpotVMStructs;
+
+ err = PS_OK;
+ while (err == PS_OK) {
+ memset(vmp, 0, sizeof(VMStructEntry));
+ err = parse_vmstruct_entry(J, base, vmp);
+ if (err != PS_OK || vmp->typeName == NULL) {
+ break;
+ }
+
+ if (vmp->typeName[0] == 'C' && strcmp("CodeCache", vmp->typeName) == 0) {
+ if (strcmp("_heap", vmp->fieldName) == 0) {
+ err = read_pointer(J, vmp->address, &J->CodeCache_heap_address);
+ }
+ } else if (vmp->typeName[0] == 'U' && strcmp("Universe", vmp->typeName) == 0) {
+ if (strcmp("_methodKlassObj", vmp->fieldName) == 0) {
+ J->Universe_methodKlassObj_address = vmp->address;
+ }
+ if (strcmp("_narrow_oop._base", vmp->fieldName) == 0) {
+ J->Universe_narrow_oop_base_address = vmp->address;
+ }
+ if (strcmp("_narrow_oop._shift", vmp->fieldName) == 0) {
+ J->Universe_narrow_oop_shift_address = vmp->address;
+ }
+ }
+ CHECK_FAIL(err);
+
+ base += SIZE_VMStructEntry;
+ if (vmp->typeName != NULL) free((void*)vmp->typeName);
+ if (vmp->fieldName != NULL) free((void*)vmp->fieldName);
+ }
+
+ return PS_OK;
+
+ fail:
+ if (vmp->typeName != NULL) free((void*)vmp->typeName);
+ if (vmp->fieldName != NULL) free((void*)vmp->fieldName);
+ return -1;
+}
+
+static int find_symbol(jvm_agent_t* J, const char *name, uint64_t* valuep) {
+ psaddr_t sym_addr;
+ int err;
+
+ err = ps_pglobal_lookup(J->P, LIBJVM_SO, name, &sym_addr);
+ if (err != PS_OK) goto fail;
+ *valuep = sym_addr;
+ return PS_OK;
+
+ fail:
+ return err;
+}
+
+static int read_volatiles(jvm_agent_t* J) {
+ uint64_t ptr;
+ int err;
+
+ err = find_symbol(J, "UseCompressedOops", &J->Use_Compressed_Oops_address);
+ if (err == PS_OK) {
+ err = ps_pread(J->P, J->Use_Compressed_Oops_address, &J->Use_Compressed_Oops, sizeof(uint8_t));
+ CHECK_FAIL(err);
+ } else {
+ J->Use_Compressed_Oops = 0;
+ }
+
+ err = read_pointer(J, J->Universe_methodKlassObj_address, &J->Universe_methodKlassObj);
+ CHECK_FAIL(err);
+
+ err = read_pointer(J, J->Universe_narrow_oop_base_address, &J->Universe_narrow_oop_base);
+ CHECK_FAIL(err);
+ err = ps_pread(J->P, J->Universe_narrow_oop_shift_address, &J->Universe_narrow_oop_shift, sizeof(uint32_t));
+ CHECK_FAIL(err);
+
+ err = read_pointer(J, J->CodeCache_heap_address + OFFSET_CodeHeap_memory +
+ OFFSET_VirtualSpace_low, &J->CodeCache_low);
+ CHECK_FAIL(err);
+ err = read_pointer(J, J->CodeCache_heap_address + OFFSET_CodeHeap_memory +
+ OFFSET_VirtualSpace_high, &J->CodeCache_high);
+ CHECK_FAIL(err);
+ err = read_pointer(J, J->CodeCache_heap_address + OFFSET_CodeHeap_segmap +
+ OFFSET_VirtualSpace_low, &J->CodeCache_segmap_low);
+ CHECK_FAIL(err);
+ err = read_pointer(J, J->CodeCache_heap_address + OFFSET_CodeHeap_segmap +
+ OFFSET_VirtualSpace_high, &J->CodeCache_segmap_high);
+ CHECK_FAIL(err);
+
+ err = ps_pread(J->P, J->CodeCache_heap_address + OFFSET_CodeHeap_log2_segment_size,
+ &J->SIZE_CodeCache_log2_segment, sizeof(J->SIZE_CodeCache_log2_segment));
+ CHECK_FAIL(err);
+
+ return PS_OK;
+
+ fail:
+ return err;
+}
+
+
+static int codecache_contains(jvm_agent_t* J, uint64_t ptr) {
+ /* make sure the code cache is up to date */
+ return (J->CodeCache_low <= ptr && ptr < J->CodeCache_high);
+}
+
+static uint64_t segment_for(jvm_agent_t* J, uint64_t p) {
+ return (p - J->CodeCache_low) >> J->SIZE_CodeCache_log2_segment;
+}
+
+static uint64_t block_at(jvm_agent_t* J, int i) {
+ return J->CodeCache_low + (i << J->SIZE_CodeCache_log2_segment);
+}
+
+static int find_start(jvm_agent_t* J, uint64_t ptr, uint64_t *startp) {
+ int err;
+
+ *startp = 0;
+ if (J->CodeCache_low <= ptr && ptr < J->CodeCache_high) {
+ int32_t used;
+ uint64_t segment = segment_for(J, ptr);
+ uint64_t block = J->CodeCache_segmap_low;
+ uint8_t tag;
+ err = ps_pread(J->P, block + segment, &tag, sizeof(tag));
+ CHECK_FAIL(err);
+ if (tag == 0xff)
+ return PS_OK;
+ while (tag > 0) {
+ err = ps_pread(J->P, block + segment, &tag, sizeof(tag));
+ CHECK_FAIL(err);
+ segment -= tag;
+ }
+ block = block_at(J, segment);
+ err = ps_pread(J->P, block + OFFSET_HeapBlockHeader_used, &used, sizeof(used));
+ CHECK_FAIL(err);
+ if (used) {
+ *startp = block + SIZE_HeapBlockHeader;
+ }
+ }
+ return PS_OK;
+
+ fail:
+ return -1;
+}
+
+static int find_jlong_constant(jvm_agent_t* J, const char *name, uint64_t* valuep) {
+ psaddr_t sym_addr;
+ int err = ps_pglobal_lookup(J->P, LIBJVM_SO, name, &sym_addr);
+ if (err == PS_OK) {
+ err = ps_pread(J->P, sym_addr, valuep, sizeof(uint64_t));
+ return err;
+ }
+ *valuep = -1;
+ return -1;
+}
+
+jvm_agent_t *Jagent_create(struct ps_prochandle *P, int vers) {
+ jvm_agent_t* J;
+ int err;
+
+ if (vers != JVM_DB_VERSION) {
+ errno = ENOTSUP;
+ return NULL;
+ }
+
+ J = (jvm_agent_t*)calloc(sizeof(struct jvm_agent), 1);
+
+ debug = getenv("LIBJVMDB_DEBUG") != NULL;
+ if (debug) debug = 3;
+
+ if (debug) {
+ fprintf(stderr, "Jagent_create: debug=%d\n", debug);
+#ifdef X86_COMPILER2
+ fprintf(stderr, "Jagent_create: R_SP=%d, R_FP=%d, POINTER_SIZE=%d\n", R_SP, R_FP, POINTER_SIZE);
+#endif /* X86_COMPILER2 */
+ }
+
+ J->P = P;
+
+ // Initialize the initial previous frame
+
+ J->prev_fr.fp = 0;
+ J->prev_fr.pc = 0;
+ J->prev_fr.sp = 0;
+ J->prev_fr.sender_sp = 0;
+
+ err = find_symbol(J, "__1cHnmethodG__vtbl_", &J->nmethod_vtbl);
+ CHECK_FAIL(err);
+ err = find_symbol(J, "__1cKBufferBlobG__vtbl_", &J->BufferBlob_vtbl);
+ if (err != PS_OK) J->BufferBlob_vtbl = 0;
+ err = find_symbol(J, "__1cICodeBlobG__vtbl_", &J->CodeBlob_vtbl);
+ CHECK_FAIL(err);
+ err = find_symbol(J, "__1cLRuntimeStubG__vtbl_", &J->RuntimeStub_vtbl);
+ CHECK_FAIL(err);
+
+ err = parse_vmstructs(J);
+ CHECK_FAIL(err);
+ err = read_volatiles(J);
+ CHECK_FAIL(err);
+
+ return J;
+
+ fail:
+ Jagent_destroy(J);
+ return NULL;
+}
+
+void Jagent_destroy(jvm_agent_t *J) {
+ if (J != NULL) {
+ free(J);
+ }
+}
+
+static int is_methodOop(jvm_agent_t* J, uint64_t methodOopPtr) {
+ uint64_t klass;
+ int err;
+ // If UseCompressedOops, this was a compressed oop.
+ if (J->Use_Compressed_Oops != 0) {
+ uint32_t cklass;
+ err = read_compressed_pointer(J, methodOopPtr + OFFSET_oopDesc_metadata,
+ &cklass);
+ // decode heap oop, same as oop.inline.hpp
+ klass = (uint64_t)((uintptr_t)J->Universe_narrow_oop_base +
+ ((uintptr_t)cklass << J->Universe_narrow_oop_shift));
+ } else {
+ err = read_pointer(J, methodOopPtr + OFFSET_oopDesc_metadata, &klass);
+ }
+ if (err != PS_OK) goto fail;
+ return klass == J->Universe_methodKlassObj;
+
+ fail:
+ return 0;
+}
+
+static int
+name_for_methodOop(jvm_agent_t* J, uint64_t methodOopPtr, char * result, size_t size)
+{
+ short nameIndex;
+ short signatureIndex;
+ uint64_t constantPool;
+ uint64_t constMethod;
+ uint64_t nameSymbol;
+ uint64_t signatureSymbol;
+ uint64_t klassPtr;
+ uint64_t klassSymbol;
+ short klassSymbolLength;
+ short nameSymbolLength;
+ short signatureSymbolLength;
+ char * nameString = NULL;
+ char * klassString = NULL;
+ char * signatureString = NULL;
+ int err;
+
+ err = read_pointer(J, methodOopPtr + OFFSET_methodOopDesc_constants, &constantPool);
+ CHECK_FAIL(err);
+ err = read_pointer(J, methodOopPtr + OFFSET_methodOopDesc_constMethod, &constMethod);
+ CHECK_FAIL(err);
+
+ /* To get name string */
+ err = ps_pread(J->P, constMethod + OFFSET_constMethodOopDesc_name_index, &nameIndex, 2);
+ CHECK_FAIL(err);
+ err = read_pointer(J, constantPool + nameIndex * POINTER_SIZE + SIZE_constantPoolOopDesc, &nameSymbol);
+ CHECK_FAIL(err);
+ // The symbol is a CPSlot and has lower bit set to indicate metadata
+ nameSymbol &= (~1); // remove metadata lsb
+ err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_length, &nameSymbolLength, 2);
+ CHECK_FAIL(err);
+ nameString = (char*)calloc(nameSymbolLength + 1, 1);
+ err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_body, nameString, nameSymbolLength);
+ CHECK_FAIL(err);
+
+ /* To get signature string */
+ err = ps_pread(J->P, constMethod + OFFSET_constMethodOopDesc_signature_index, &signatureIndex, 2);
+ CHECK_FAIL(err);
+ err = read_pointer(J, constantPool + signatureIndex * POINTER_SIZE + SIZE_constantPoolOopDesc, &signatureSymbol);
+ CHECK_FAIL(err);
+ signatureSymbol &= (~1); // remove metadata lsb
+ err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_length, &signatureSymbolLength, 2);
+ CHECK_FAIL(err);
+ signatureString = (char*)calloc(signatureSymbolLength + 1, 1);
+ err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_body, signatureString, signatureSymbolLength);
+ CHECK_FAIL(err);
+
+ /* To get klass string */
+ err = read_pointer(J, constantPool + OFFSET_constantPoolOopDesc_pool_holder, &klassPtr);
+ CHECK_FAIL(err);
+ err = read_pointer(J, klassPtr + OFFSET_Klass_name + SIZE_oopDesc, &klassSymbol);
+ CHECK_FAIL(err);
+ err = ps_pread(J->P, klassSymbol + OFFSET_Symbol_length, &klassSymbolLength, 2);
+ CHECK_FAIL(err);
+ klassString = (char*)calloc(klassSymbolLength + 1, 1);
+ err = ps_pread(J->P, klassSymbol + OFFSET_Symbol_body, klassString, klassSymbolLength);
+ CHECK_FAIL(err);
+
+ result[0] = '\0';
+ strncat(result, klassString, size);
+ size -= strlen(klassString);
+ strncat(result, ".", size);
+ size -= 1;
+ strncat(result, nameString, size);
+ size -= strlen(nameString);
+ strncat(result, signatureString, size);
+
+ if (nameString != NULL) free(nameString);
+ if (klassString != NULL) free(klassString);
+ if (signatureString != NULL) free(signatureString);
+
+ return PS_OK;
+
+ fail:
+ if (debug) {
+ fprintf(stderr, "name_for_methodOop: FAIL \n\n");
+ }
+ if (nameString != NULL) free(nameString);
+ if (klassString != NULL) free(klassString);
+ if (signatureString != NULL) free(signatureString);
+ return -1;
+}
+
+static int nmethod_info(Nmethod_t *N)
+{
+ jvm_agent_t *J = N->J;
+ uint64_t nm = N->nm;
+ int32_t err;
+
+ if (debug > 2 )
+ fprintf(stderr, "\t nmethod_info: BEGIN \n");
+
+ /* Instructions */
+ err = ps_pread(J->P, nm + OFFSET_CodeBlob_code_offset, &N->instrs_beg, SZ32);
+ CHECK_FAIL(err);
+ err = ps_pread(J->P, nm + OFFSET_CodeBlob_data_offset, &N->instrs_end, SZ32);
+ CHECK_FAIL(err);
+ err = ps_pread(J->P, nm + OFFSET_nmethod_deoptimize_offset, &N->deopt_beg, SZ32);
+ CHECK_FAIL(err);
+ err = ps_pread(J->P, nm + OFFSET_nmethod_orig_pc_offset, &N->orig_pc_offset, SZ32);
+ CHECK_FAIL(err);
+
+ /* Oops */
+ err = ps_pread(J->P, nm + OFFSET_nmethod_oops_offset, &N->oops_beg, SZ32);
+ CHECK_FAIL(err);
+ err = ps_pread(J->P, nm + OFFSET_nmethod_scopes_data_offset, &N->oops_end, SZ32);
+ CHECK_FAIL(err);
+
+ /* scopes_pcs */
+ err = ps_pread(J->P, nm + OFFSET_nmethod_scopes_pcs_offset, &N->scopes_pcs_beg, SZ32);
+ CHECK_FAIL(err);
+ err = ps_pread(J->P, nm + OFFSET_nmethod_handler_table_offset, &N->scopes_pcs_end, SZ32);
+ CHECK_FAIL(err);
+
+ /* scopes_data */
+ err = ps_pread(J->P, nm + OFFSET_nmethod_scopes_data_offset, &N->scopes_data_beg, SZ32);
+ CHECK_FAIL(err);
+
+ if (debug > 2 ) {
+ N->scopes_data_end = N->scopes_pcs_beg;
+
+ fprintf(stderr, "\t nmethod_info: instrs_beg: %#x, instrs_end: %#x\n",
+ N->instrs_beg, N->instrs_end);
+
+ fprintf(stderr, "\t nmethod_info: deopt_beg: %#x \n",
+ N->deopt_beg);
+
+ fprintf(stderr, "\t nmethod_info: orig_pc_offset: %#x \n",
+ N->orig_pc_offset);
+
+ fprintf(stderr, "\t nmethod_info: oops_beg: %#x, oops_end: %#x\n",
+ N->oops_beg, N->oops_end);
+
+ fprintf(stderr, "\t nmethod_info: scopes_data_beg: %#x, scopes_data_end: %#x\n",
+ N->scopes_data_beg, N->scopes_data_end);
+
+ fprintf(stderr, "\t nmethod_info: scopes_pcs_beg: %#x, scopes_pcs_end: %#x\n",
+ N->scopes_pcs_beg, N->scopes_pcs_end);
+
+ fprintf(stderr, "\t nmethod_info: END \n\n");
+ }
+ return PS_OK;
+
+ fail:
+ return err;
+}
+
+static int
+raw_read_int(jvm_agent_t* J, uint64_t *buffer, int32_t *val)
+{
+ int shift = 0;
+ int value = 0;
+ uint8_t ch = 0;
+ int32_t err;
+ int32_t sum;
+ // Constants for UNSIGNED5 coding of Pack200
+ // see compressedStream.hpp
+ enum {
+ lg_H = 6,
+ H = 1<<lg_H,
+ BitsPerByte = 8,
+ L = (1<<BitsPerByte)-H,
+ };
+ int i;
+
+ err = ps_pread(J->P, (*buffer)++, &ch, sizeof(uint8_t));
+ CHECK_FAIL(err);
+ if (debug > 2)
+ fprintf(stderr, "\t\t\t raw_read_int: *buffer: %#llx, ch: %#x\n", *buffer, ch);
+
+ sum = ch;
+ if ( sum >= L ) {
+ int32_t lg_H_i = lg_H;
+ // Read maximum of 5 total bytes (we've already read 1).
+ // See CompressedReadStream::read_int_mb
+ for ( i = 0; i < 4; i++) {
+ err = ps_pread(J->P, (*buffer)++, &ch, sizeof(uint8_t));
+ CHECK_FAIL(err);
+ sum += ch << lg_H_i;
+ if (ch < L ) {
+ *val = sum;
+ return PS_OK;
+ }
+ lg_H_i += lg_H;
+ }
+ }
+ *val = sum;
+ return PS_OK;
+
+ fail:
+ return err;
+}
+
+static int
+read_pair(jvm_agent_t* J, uint64_t *buffer, int32_t *bci, int32_t *line)
+{
+ uint8_t next = 0;
+ int32_t bci_delta;
+ int32_t line_delta;
+ int32_t err;
+
+ if (debug > 2)
+ fprintf(stderr, "\t\t read_pair: BEGIN\n");
+
+ err = ps_pread(J->P, (*buffer)++, &next, sizeof(uint8_t));
+ CHECK_FAIL(err);
+
+ if (next == 0) {
+ if (debug > 2)
+ fprintf(stderr, "\t\t read_pair: END: next == 0\n");
+ return 1; /* stream terminated */
+ }
+ if (next == 0xFF) {
+ if (debug > 2)
+ fprintf(stderr, "\t\t read_pair: END: next == 0xFF\n");
+
+ /* Escape character, regular compression used */
+
+ err = raw_read_int(J, buffer, &bci_delta);
+ CHECK_FAIL(err);
+
+ err = raw_read_int(J, buffer, &line_delta);
+ CHECK_FAIL(err);
+
+ *bci += bci_delta;
+ *line += line_delta;
+
+ if (debug > 2) {
+ fprintf(stderr, "\t\t read_pair: delta = (line %d: %d)\n",
+ line_delta, bci_delta);
+ fprintf(stderr, "\t\t read_pair: unpack= (line %d: %d)\n",
+ *line, *bci);
+ }
+ } else {
+ /* Single byte compression used */
+ *bci += next >> 3;
+ *line += next & 0x7;
+ if (debug > 2) {
+ fprintf(stderr, "\t\t read_pair: delta = (line %d: %d)\n",
+ next & 0x7, next >> 3);
+ fprintf(stderr, "\t\t read_pair: unpack= (line %d: %d)\n",
+ *line, *bci);
+ }
+ }
+ if (debug > 2)
+ fprintf(stderr, "\t\t read_pair: END\n");
+ return PS_OK;
+
+ fail:
+ if (debug)
+ fprintf(stderr, "\t\t read_pair: FAIL\n");
+ return err;
+}
+
+static int
+line_number_from_bci(jvm_agent_t* J, Vframe_t *vf)
+{
+ uint64_t buffer;
+ uint16_t code_size;
+ uint64_t code_end_delta;
+ uint64_t constMethod;
+ int8_t access_flags;
+ int32_t best_bci = 0;
+ int32_t stream_bci = 0;
+ int32_t stream_line = 0;
+ int32_t err;
+
+ if (debug > 2) {
+ char name[256];
+ err = name_for_methodOop(J, vf->methodOop, name, 256);
+ CHECK_FAIL(err);
+ fprintf(stderr, "\t line_number_from_bci: BEGIN, method name: %s, targ bci: %d\n",
+ name, vf->bci);
+ }
+
+ err = read_pointer(J, vf->methodOop + OFFSET_methodOopDesc_constMethod, &constMethod);
+ CHECK_FAIL(err);
+
+ vf->line = 0;
+ err = ps_pread(J->P, constMethod + OFFSET_constMethodOopDesc_flags, &access_flags, sizeof(int8_t));
+ CHECK_FAIL(err);
+
+ if (!(access_flags & constMethodOopDesc_has_linenumber_table)) {
+ if (debug > 2)
+ fprintf(stderr, "\t line_number_from_bci: END: !HAS_LINE_NUMBER_TABLE \n\n");
+ return PS_OK;
+ }
+
+ /* The line numbers are a short array of 2-tuples [start_pc, line_number].
+ * Not necessarily sorted and not necessarily one-to-one.
+ */
+
+ err = ps_pread(J->P, constMethod + OFFSET_constMethodOopDesc_code_size, &code_size, SZ16);
+ CHECK_FAIL(err);
+
+ /* inlined_table_start() */
+ code_end_delta = (uint64_t) (access_flags & AccessFlags_NATIVE) ? 2*POINTER_SIZE : 0;
+ buffer = constMethod + (uint64_t) SIZE_constMethodOopDesc + (uint64_t) code_size + code_end_delta;
+
+ if (debug > 2) {
+ fprintf(stderr, "\t\t line_number_from_bci: methodOop: %#llx, native: %d\n",
+ vf->methodOop, (access_flags & AccessFlags_NATIVE));
+ fprintf(stderr, "\t\t line_number_from_bci: buffer: %#llx, code_size: %d\n",
+ buffer, (int) code_size);
+ }
+
+ while (read_pair(J, &buffer, &stream_bci, &stream_line) == 0) {
+ if (stream_bci == vf->bci) {
+ /* perfect match */
+ if (debug > 2)
+ fprintf(stderr, "\t line_number_from_bci: END: exact line: %ld \n\n", vf->line);
+ vf->line = stream_line;
+ return PS_OK;
+ } else {
+ /* update best_bci/line */
+ if (stream_bci < vf->bci && stream_bci >= best_bci) {
+ best_bci = stream_bci;
+ vf->line = stream_line;
+ if (debug > 2) {
+ fprintf(stderr, "\t line_number_from_bci: best_bci: %ld, best_line: %ld\n",
+ best_bci, vf->line);
+ }
+ }
+ }
+ }
+ if (debug > 2)
+ fprintf(stderr, "\t line_number_from_bci: END: line: %ld \n\n", vf->line);
+ return PS_OK;
+
+ fail:
+ if (debug)
+ fprintf(stderr, "\t line_number_from_bci: FAIL\n");
+ return err;
+}
+
+static int
+get_real_pc(Nmethod_t *N, uint64_t pc_desc, uint64_t *real_pc)
+{
+ int32_t pc_offset;
+ int32_t err;
+
+ err = ps_pread(N->J->P, pc_desc + OFFSET_PcDesc_pc_offset, &pc_offset, SZ32);
+ CHECK_FAIL(err);
+
+ *real_pc = N->nm + N->instrs_beg + pc_offset;
+ if (debug > 2) {
+ fprintf(stderr, "\t\t get_real_pc: pc_offset: %lx, real_pc: %llx\n",
+ pc_offset, *real_pc);
+ }
+ return PS_OK;
+
+ fail:
+ return err;
+}
+
+/* Finds a PcDesc with real-pc equal to N->pc */
+static int pc_desc_at(Nmethod_t *N)
+{
+ uint64_t pc_diff;
+ int32_t offs;
+ int32_t err;
+
+ if (debug > 2)
+ fprintf(stderr, "\t pc_desc_at: BEGIN\n");
+
+ N->vf_cnt = 0;
+ N->pc_desc = 0;
+
+ for (offs = N->scopes_pcs_beg; offs < N->scopes_pcs_end; offs += SIZE_PcDesc) {
+ uint64_t pd;
+ uint64_t best_pc_diff = 16; /* some approximation */
+ uint64_t real_pc = 0;
+
+ pd = N->nm + offs;
+ err = get_real_pc(N, pd, &real_pc);
+ CHECK_FAIL(err);
+
+ pc_diff = real_pc - N->pc;
+
+ /* In general, this fragment should work */
+ if (pc_diff == 0) {
+ N->pc_desc = pd;
+ if (debug) {
+ fprintf(stderr, "\t pc_desc_at: END: pc_desc: FOUND: %#lx \n\n", pd);
+ }
+ return PS_OK;
+ }
+ /* This fragment is to be able to find out an appropriate
+ * pc_desc entry even if pc_desc info is inaccurate.
+ */
+ if (best_pc_diff > pc_diff && pc_diff > 0) {
+ best_pc_diff = pc_diff;
+ N->pc_desc = pd;
+ }
+ }
+ if (debug) {
+ fprintf(stderr, "\t pc_desc_at: END: pc_desc NOT FOUND");
+ if (pc_diff < 20)
+ fprintf(stderr, ", best pc_diff: %d\n\n", pc_diff);
+ else
+ fprintf(stderr, "\n\n");
+ }
+ return PS_OK;
+
+ fail:
+ return err;
+}
+
+static int
+scope_desc_at(Nmethod_t *N, int32_t decode_offset, Vframe_t *vf)
+{
+ uint64_t buffer;
+ int32_t err;
+
+ if (debug > 2) {
+ fprintf(stderr, "\t\t scope_desc_at: BEGIN \n");
+ }
+
+ buffer = N->nm + N->scopes_data_beg + decode_offset;
+
+ err = raw_read_int(N->J, &buffer, &vf->sender_decode_offset);
+ CHECK_FAIL(err);
+
+ err = raw_read_int(N->J, &buffer, &vf->methodIdx);
+ CHECK_FAIL(err);
+
+ err = raw_read_int(N->J, &buffer, &vf->bci);
+ CHECK_FAIL(err);
+
+ if (debug > 2) {
+ fprintf(stderr, "\t\t scope_desc_at: sender_decode_offset: %#x\n",
+ vf->sender_decode_offset);
+ fprintf(stderr, "\t\t scope_desc_at: methodIdx: %d\n", vf->methodIdx);
+ fprintf(stderr, "\t\t scope_desc_at: bci: %d\n", vf->bci);
+
+ fprintf(stderr, "\t\t scope_desc_at: END \n\n");
+ }
+ return PS_OK;
+
+ fail:
+ return err;
+}
+
+static int scopeDesc_chain(Nmethod_t *N) {
+ int32_t decode_offset = 0;
+ int32_t err;
+
+ if (debug > 2) {
+ fprintf(stderr, "\t scopeDesc_chain: BEGIN\n");
+ }
+
+ err = ps_pread(N->J->P, N->pc_desc + OFFSET_PcDesc_scope_decode_offset,
+ &decode_offset, SZ32);
+ CHECK_FAIL(err);
+
+ while (decode_offset > 0) {
+ Vframe_t *vf = &N->vframes[N->vf_cnt];
+
+ if (debug > 2) {
+ fprintf(stderr, "\t scopeDesc_chain: decode_offset: %#x\n", decode_offset);
+ }
+
+ err = scope_desc_at(N, decode_offset, vf);
+ CHECK_FAIL(err);
+
+ if (vf->methodIdx > ((N->oops_end - N->oops_beg) / POINTER_SIZE)) {
+ fprintf(stderr, "\t scopeDesc_chain: (methodIdx > oops length) !\n");
+ return -1;
+ }
+ err = read_pointer(N->J, N->nm + N->oops_beg + (vf->methodIdx-1)*POINTER_SIZE,
+ &vf->methodOop);
+ CHECK_FAIL(err);
+
+ if (vf->methodOop) {
+ N->vf_cnt++;
+ err = line_number_from_bci(N->J, vf);
+ CHECK_FAIL(err);
+ if (debug > 2) {
+ fprintf(stderr, "\t scopeDesc_chain: methodOop: %#8llx, line: %ld\n",
+ vf->methodOop, vf->line);
+ }
+ }
+ decode_offset = vf->sender_decode_offset;
+ }
+ if (debug > 2) {
+ fprintf(stderr, "\t scopeDesc_chain: END \n\n");
+ }
+ return PS_OK;
+
+ fail:
+ if (debug) {
+ fprintf(stderr, "\t scopeDesc_chain: FAIL \n\n");
+ }
+ return err;
+}
+
+
+static int
+name_for_nmethod(jvm_agent_t* J,
+ uint64_t nm,
+ uint64_t pc,
+ uint64_t methodOop,
+ char *result,
+ size_t size,
+ Jframe_t *jframe
+) {
+ Nmethod_t *N;
+ Vframe_t *vf;
+ int32_t err;
+ int deoptimized = 0;
+
+ if (debug) {
+ fprintf(stderr, "name_for_nmethod: BEGIN: nmethod: %#llx, pc: %#llx\n", nm, pc);
+ }
+ if (J->N == NULL) {
+ J->N = (Nmethod_t *) malloc(sizeof(Nmethod_t));
+ }
+ memset(J->N, 0, sizeof(Nmethod_t)); /* Initial stat: all values are zeros */
+ N = J->N;
+ N->J = J;
+ N->nm = nm;
+ N->pc = pc;
+ N->jframe = jframe;
+
+ err = nmethod_info(N);
+ CHECK_FAIL(err);
+ if (debug) {
+ fprintf(stderr, "name_for_nmethod: pc: %#llx, deopt_pc: %#llx\n",
+ pc, N->nm + N->deopt_beg);
+ }
+
+ /* check for a deoptimized frame */
+ if ( pc == N->nm + N->deopt_beg) {
+ uint64_t base;
+ if (debug) {
+ fprintf(stderr, "name_for_nmethod: found deoptimized frame\n");
+ }
+ if (J->prev_fr.sender_sp != 0) {
+ base = J->prev_fr.sender_sp + N->orig_pc_offset;
+ } else {
+ base = J->curr_fr.sp + N->orig_pc_offset;
+ }
+ err = read_pointer(J, base, &N->pc);
+ CHECK_FAIL(err);
+ if (debug) {
+ fprintf(stderr, "name_for_nmethod: found deoptimized frame converting pc from %#8llx to %#8llx\n",
+ pc, N->pc);
+ }
+ deoptimized = 1;
+ }
+
+ err = pc_desc_at(N);
+ CHECK_FAIL(err);
+
+ if (N->pc_desc > 0) {
+ jframe->locinf = 1;
+ err = scopeDesc_chain(N);
+ CHECK_FAIL(err);
+ }
+ result[0] = COMP_METHOD_SIGN;
+ vf = &N->vframes[0];
+ if (N->vf_cnt > 0) {
+ jframe->vf_cnt = N->vf_cnt;
+ jframe->bci = vf->bci;
+ jframe->line = vf->line;
+ err = name_for_methodOop(J, N->vframes[0].methodOop, result+1, size-1);
+ CHECK_FAIL(err);
+ } else {
+ err = name_for_methodOop(J, methodOop, result+1, size-1);
+ CHECK_FAIL(err);
+ }
+ if (deoptimized) {
+ strncat(result + 1, " [deoptimized frame]; ", size-1);
+ } else {
+ strncat(result + 1, " [compiled] ", size-1);
+ }
+ if (debug)
+ fprintf(stderr, "name_for_nmethod: END: method name: %s, vf_cnt: %d\n\n",
+ result, N->vf_cnt);
+ return PS_OK;
+
+ fail:
+ if (debug)
+ fprintf(stderr, "name_for_nmethod: FAIL \n\n");
+ return err;
+}
+
+int is_bci(intptr_t bcx) {
+ switch (DATA_MODEL) {
+ case PR_MODEL_LP64:
+ return ((uintptr_t) bcx) <= ((uintptr_t) MAX_METHOD_CODE_SIZE) ;
+ case PR_MODEL_ILP32:
+ default:
+ return 0 <= bcx && bcx <= MAX_METHOD_CODE_SIZE;
+ }
+}
+
+static int
+name_for_imethod(jvm_agent_t* J,
+ uint64_t bcx,
+ uint64_t methodOop,
+ char *result,
+ size_t size,
+ Jframe_t *jframe
+) {
+ uint64_t bci;
+ uint64_t constMethod;
+ Vframe_t vframe = {0};
+ Vframe_t *vf = &vframe;
+ int32_t err;
+
+ err = read_pointer(J, methodOop + OFFSET_methodOopDesc_constMethod, &constMethod);
+ CHECK_FAIL(err);
+
+ bci = is_bci(bcx) ? bcx : bcx - (constMethod + (uint64_t) SIZE_constMethodOopDesc);
+
+ if (debug)
+ fprintf(stderr, "\t name_for_imethod: BEGIN: methodOop: %#llx\n", methodOop);
+
+ err = name_for_methodOop(J, methodOop, result, size);
+ CHECK_FAIL(err);
+ if (debug)
+ fprintf(stderr, "\t name_for_imethod: method name: %s\n", result);
+
+ if (bci > 0) {
+ vf->methodOop = methodOop;
+ vf->bci = bci;
+ err = line_number_from_bci(J, vf);
+ CHECK_FAIL(err);
+ }
+ jframe->bci = vf->bci;
+ jframe->line = vf->line;
+ jframe->locinf = 1;
+
+ if (debug) {
+ fprintf(stderr, "\t name_for_imethod: END: bci: %d, line: %d\n\n",
+ vf->bci, vf->line);
+ }
+ return PS_OK;
+
+ fail:
+ if (debug)
+ fprintf(stderr, "\t name_for_imethod: FAIL\n");
+ return err;
+}
+
+static int
+name_for_codecache(jvm_agent_t* J, uint64_t fp, uint64_t pc, char * result,
+ size_t size, Jframe_t *jframe, int* is_interpreted)
+{
+ uint64_t start;
+ uint64_t vtbl;
+ int32_t err;
+ *is_interpreted = 0;
+
+ result[0] = '\0';
+
+ err = find_start(J, pc, &start);
+ CHECK_FAIL(err);
+
+ err = read_pointer(J, start, &vtbl);
+ CHECK_FAIL(err);
+
+ if (vtbl == J->nmethod_vtbl) {
+ uint64_t methodOop;
+
+ err = read_pointer(J, start + OFFSET_nmethod_method, &methodOop);
+ CHECK_FAIL(err);
+
+ if (debug) {
+ fprintf(stderr, "name_for_codecache: start: %#8llx, pc: %#8llx, methodOop: %#8llx \n",
+ start, pc, methodOop);
+ }
+ err = name_for_nmethod(J, start, pc, methodOop, result, size, jframe);
+ CHECK_FAIL(err);
+ } else if (vtbl == J->BufferBlob_vtbl) {
+ const char * name;
+
+ err = read_string_pointer(J, start + OFFSET_CodeBlob_name, &name);
+
+ /*
+ * Temporary usage of string "Interpreter".
+ * We need some other way to distinguish "StubRoutines"
+ * and regular interpreted frames.
+ */
+ if (err == PS_OK && strncmp(name, "Interpreter", 11) == 0) {
+ *is_interpreted = 1;
+ if (is_methodOop(J, J->methodOopPtr)) {
+ return name_for_imethod(J, J->bcx, J->methodOopPtr, result, size, jframe);
+ }
+ }
+
+ if (err == PS_OK) {
+ strncpy(result, name, size);
+ free((void*)name);
+ } else {
+ strncpy(result, "<unknown BufferBlob>", size);
+ }
+ /* return PS_OK; */
+ } else {
+ const char * name;
+
+ err = read_string_pointer(J, start + OFFSET_CodeBlob_name, &name);
+ if (err == PS_OK) {
+ strncpy(result, name, size);
+ free((void*)name);
+ } else {
+ strncpy(result, "<unknown CodeBlob>", size);
+ WARN1("unknown CodeBlob: vtbl = 0x%x", vtbl);
+ }
+ }
+ result[size-1] = '\0';
+
+#ifdef X86_COMPILER2
+ if (vtbl != J->RuntimeStub_vtbl) {
+ uint64_t trial_pc;
+ int frame_size;
+ err = ps_pread(J->P, start + OFFSET_CodeBlob_frame_size,
+ &frame_size, SZ32);
+ CHECK_FAIL(err);
+
+ // frame_size is in words, we want bytes.
+ frame_size *= POINTER_SIZE; /* word => byte conversion */
+
+ /*
+ Because c2 doesn't use FP as a framepointer the value of sp/fp we receive
+ in the initial entry to a set of stack frames containing server frames
+ will pretty much be nonsense. We can detect that nonsense by looking to
+ see if the PC we received is correct if we look at the expected storage
+ location in relation to the FP (ie. POINTER_SIZE(FP) )
+ */
+
+ err = read_pointer(J, fp + POINTER_SIZE , &trial_pc);
+ if ( (err != PS_OK || trial_pc != pc) && frame_size > 0 ) {
+ // Either we couldn't even read at the "fp" or the pc didn't match
+ // both are sure clues that the fp is bogus. We no search the stack
+ // for a reasonable number of words trying to find the bogus fp
+ // and the current pc in adjacent words. The we will be able to
+ // deduce an approximation of the frame pointer and actually get
+ // the correct stack pointer. Which we can then unwind for the
+ // next frame.
+ int i;
+ uint64_t check;
+ uint64_t base = J->curr_fr.sp;
+ uint64_t prev_fp = 0;
+ for ( i = 0; i < frame_size * 5 ; i++, base += POINTER_SIZE ) {
+ err = read_pointer(J, base , &check);
+ CHECK_FAIL(err);
+ if (check == fp) {
+ base += POINTER_SIZE;
+ err = read_pointer(J, base , &check);
+ CHECK_FAIL(err);
+ if (check == pc) {
+ if (debug) {
+ fprintf(stderr, "name_for_codecache: found matching fp/pc combo at 0x%llx\n", base - POINTER_SIZE);
+ }
+ prev_fp = base - 2 * POINTER_SIZE;
+ break;
+ }
+ }
+ }
+ if ( prev_fp != 0 ) {
+ // real_sp is the sp we should have received for this frame
+ uint64_t real_sp = prev_fp + 2 * POINTER_SIZE;
+ // +POINTER_SIZE because callee owns the return address so caller's sp is +1 word
+ jframe->new_sp = real_sp + frame_size + POINTER_SIZE;
+ err = read_pointer(J, jframe->new_sp - POINTER_SIZE , &jframe->new_pc);
+ CHECK_FAIL(err);
+ err = read_pointer(J, jframe->new_sp - 2*POINTER_SIZE, &jframe->new_fp);
+ CHECK_FAIL(err);
+ return PS_OK;
+ }
+ }
+
+ /* A prototype to workaround FP absence */
+ /*
+ * frame_size can be 0 for StubRoutines (1) frame.
+ * In this case it should work with fp as usual.
+ */
+ if (frame_size > 0) {
+ jframe->new_fp = J->prev_fr.fp + frame_size;
+ jframe->new_sp = jframe->new_fp + 2 * POINTER_SIZE;
+ } else {
+ memset(&J->curr_fr, 0, sizeof(Frame_t));
+ err = read_pointer(J, fp, &jframe->new_fp);
+ CHECK_FAIL(err);
+
+ err = read_pointer(J, jframe->new_fp + POINTER_SIZE, &jframe->new_pc);
+ CHECK_FAIL(err);
+ }
+ if (debug) {
+ fprintf(stderr, "name_for_codecache: %s, frame_size=%#lx\n",
+ result, frame_size);
+ fprintf(stderr, "name_for_codecache: prev_fr.fp=%#lx, fp=%#lx\n",
+ J->prev_fr.fp, jframe->new_fp);
+ }
+ }
+#endif /* X86_COMPILER2 */
+
+ return PS_OK;
+
+ fail:
+ return err;
+}
+
+int Jget_vframe(jvm_agent_t* J, int vframe_no,
+ char *name, size_t size, Jframe_t *jframe)
+{
+ Nmethod_t *N = J->N;
+ Vframe_t *vf;
+ int32_t err;
+
+ if (vframe_no >= N->vf_cnt) {
+ (void) sprintf(name, "Wrong inlinedMethod%1d()", vframe_no);
+ return -1;
+ }
+ vf = N->vframes + vframe_no;
+ name[0] = COMP_METHOD_SIGN;
+ err = name_for_methodOop(J, vf->methodOop, name + 1, size);
+ CHECK_FAIL(err);
+
+ jframe->bci = vf->bci;
+ jframe->line = vf->line;
+ if (debug) {
+ fprintf(stderr, "\t Jget_vframe: method name: %s, line: %ld\n",
+ name, vf->line);
+ }
+ return PS_OK;
+
+ fail:
+ if (debug) {
+ fprintf(stderr, "\t Jget_vframe: FAIL\n");
+ }
+ return err;
+}
+
+#define MAX_SYM_SIZE 256
+
+int Jlookup_by_regs(jvm_agent_t* J, const prgregset_t regs, char *name,
+ size_t size, Jframe_t *jframe) {
+ uintptr_t fp;
+ uintptr_t pc;
+ /* arguments given to read_pointer need to be worst case sized */
+ uint64_t methodOopPtr = 0;
+ uint64_t sender_sp;
+ uint64_t bcx = 0;
+ int is_interpreted = 0;
+ int result = PS_OK;
+ int err = PS_OK;
+
+ if (J == NULL) {
+ return -1;
+ }
+
+ jframe->vf_cnt = 1;
+ jframe->new_fp = 0;
+ jframe->new_pc = 0;
+ jframe->line = 0;
+ jframe->bci = 0;
+ jframe->locinf = 0;
+
+ read_volatiles(J);
+ pc = (uintptr_t) regs[R_PC];
+ J->curr_fr.pc = pc;
+ J->curr_fr.fp = regs[R_FP];
+ J->curr_fr.sp = regs[R_SP];
+
+ if (debug)
+ fprintf(stderr, "Jlookup_by_regs: BEGINs: fp=%#lx, pc=%#lx\n", regs[R_FP], pc);
+
+#if defined(sparc) || defined(__sparc)
+ /* The following workaround is for SPARC. CALL instruction occupates 8 bytes.
+ * In the pcDesc structure return pc offset is recorded for CALL instructions.
+ * regs[R_PC] contains a CALL instruction pc offset.
+ */
+ pc += 8;
+ bcx = (uintptr_t) regs[R_L1];
+ methodOopPtr = (uintptr_t) regs[R_L2];
+ sender_sp = regs[R_I5];
+ if (debug > 2) {
+ fprintf(stderr, "\nregs[R_I1]=%lx, regs[R_I2]=%lx, regs[R_I5]=%lx, regs[R_L1]=%lx, regs[R_L2]=%lx\n",
+ regs[R_I1], regs[R_I2], regs[R_I5], regs[R_L1], regs[R_L2]);
+ }
+#elif defined(i386) || defined(__i386) || defined(__amd64)
+
+ fp = (uintptr_t) regs[R_FP];
+ if (J->prev_fr.fp == 0) {
+#ifdef X86_COMPILER2
+ /* A workaround for top java frames */
+ J->prev_fr.fp = (uintptr_t)(regs[R_SP] - 2 * POINTER_SIZE);
+#else
+ J->prev_fr.fp = (uintptr_t)(regs[R_SP] - POINTER_SIZE);
+#endif /* COMPILER2 */
+ }
+ if (debug > 2) {
+ printf("Jlookup_by_regs: J->prev_fr.fp = %#lx\n", J->prev_fr.fp);
+ }
+
+ if (read_pointer(J, fp + OFFSET_interpreter_frame_method, &methodOopPtr) != PS_OK) {
+ methodOopPtr = 0;
+ }
+ if (read_pointer(J, fp + OFFSET_interpreter_frame_sender_sp, &sender_sp) != PS_OK) {
+ sender_sp = 0;
+ }
+ if (read_pointer(J, fp + OFFSET_interpreter_frame_bcx_offset, &bcx) != PS_OK) {
+ bcx = 0;
+ }
+#endif /* i386 */
+
+ J->methodOopPtr = methodOopPtr;
+ J->bcx = bcx;
+
+ /* On x86 with C2 JVM: native frame may have wrong regs[R_FP]
+ * For example: JVM_SuspendThread frame poins to the top interpreted frame.
+ * If we call is_methodOop(J, methodOopPtr) before codecache_contains(J, pc)
+ * then we go over and omit both: nmethod and I2CAdapter frames.
+ * Note, that regs[R_PC] is always correct if frame defined correctly.
+ * So it is better to call codecache_contains(J, pc) from the beginning.
+ */
+#ifndef X86_COMPILER2
+ if (is_methodOop(J, J->methodOopPtr)) {
+ result = name_for_imethod(J, bcx, J->methodOopPtr, name, size, jframe);
+ /* If the methodOopPtr is a method then this is highly likely to be
+ an interpreter frame */
+ if (result >= 0) {
+ is_interpreted = 1;
+ }
+ } else
+#endif /* ! X86_COMPILER2 */
+
+ if (codecache_contains(J, pc)) {
+ result = name_for_codecache(J, fp, pc, name, size, jframe, &is_interpreted);
+ }
+#ifdef X86_COMPILER2
+ else if (is_methodOop(J, J->methodOopPtr)) {
+ result = name_for_imethod(J, bcx, J->methodOopPtr, name, size, jframe);
+ /* If the methodOopPtr is a method then this is highly likely to be
+ an interpreter frame */
+ if (result >= 0) {
+ is_interpreted = 1;
+ }
+ }
+#endif /* X86_COMPILER2 */
+ else {
+ if (debug) {
+ fprintf(stderr, "Jlookup_by_regs: END with -1\n\n");
+ }
+ result = -1;
+ }
+ if (!is_interpreted) {
+ sender_sp = 0;
+ }
+ J->curr_fr.sender_sp = sender_sp;
+
+#ifdef X86_COMPILER2
+ if (!J->curr_fr.fp) {
+ J->curr_fr.fp = (jframe->new_fp) ? jframe->new_fp : (uintptr_t)regs[R_FP];
+ }
+ if (!jframe->new_pc && jframe->new_fp) {
+ // This seems dubious
+ read_pointer(J, jframe->new_fp + POINTER_SIZE, &jframe->new_pc);
+ CHECK_FAIL(err);
+ if (debug > 2) {
+ printf("Jlookup_by_regs: (update pc) jframe->new_fp: %#llx, jframe->new_pc: %#llx\n",
+ jframe->new_fp, jframe->new_pc);
+ }
+ }
+
+#endif /* X86_COMPILER2 */
+ J->prev_fr = J->curr_fr;
+
+ if (debug)
+ fprintf(stderr, "Jlookup_by_regs: END\n\n");
+
+ return result;
+
+ fail:
+ return err;
+}
+
+void update_gregs(prgregset_t gregs, Jframe_t jframe) {
+#ifdef X86_COMPILER2
+ if (debug > 0) {
+ fprintf(stderr, "update_gregs: before update sp = 0x%llx, fp = 0x%llx, pc = 0x%llx\n", gregs[R_SP], gregs[R_FP], gregs[R_PC]);
+ }
+ /*
+ * A workaround for java C2 frames with unconventional FP.
+ * may have to modify regset with new values for FP/PC/SP when needed.
+ */
+ if (jframe.new_sp) {
+ *((uintptr_t *) &gregs[R_SP]) = (uintptr_t) jframe.new_sp;
+ } else {
+ // *((uintptr_t *) &gregs[R_SP]) = (uintptr_t) gregs[R_FP] + 2 * POINTER_SIZE;
+ }
+
+ if (jframe.new_fp) {
+ *((uintptr_t *) &gregs[R_FP]) = (uintptr_t) jframe.new_fp;
+ }
+ if (jframe.new_pc) {
+ *((uintptr_t *) &gregs[R_PC]) = (uintptr_t) jframe.new_pc;
+ }
+ if (debug > 0) {
+ fprintf(stderr, "update_gregs: after update sp = 0x%llx, fp = 0x%llx, pc = 0x%llx\n", gregs[R_SP], gregs[R_FP], gregs[R_PC]);
+ }
+#endif /* X86_COMPILER2 */
+}
+
+/*
+ * Iterates over java frames at current location given by 'gregs'.
+ *
+ * Returns -1 if no java frames are present or if an error is encountered.
+ * Returns the result of calling 'func' if the return value is non-zero.
+ * Returns 0 otherwise.
+ */
+int Jframe_iter(jvm_agent_t *J, prgregset_t gregs, java_stack_f *func, void* cld) {
+ char buf[MAX_SYM_SIZE + 1];
+ Jframe_t jframe;
+ int i = 0, res;
+#ifdef X86_COMPILER2
+ if (debug > 0) {
+ fprintf(stderr, "Jframe_iter: Entry sp = 0x%llx, fp = 0x%llx, pc = 0x%llx\n", gregs[R_SP], gregs[R_FP], gregs[R_PC]);
+ }
+#endif /* X86_COMPILER2 */
+
+ memset(&jframe, 0, sizeof(Jframe_t));
+ memset(buf, 0, sizeof(buf));
+ res = Jlookup_by_regs(J, gregs, buf, sizeof(buf), &jframe);
+ if (res != PS_OK)
+ return (-1);
+
+
+ res = func(cld, gregs, buf, (jframe.locinf)? jframe.bci : -1,
+ jframe.line, NULL);
+ if (res != 0) {
+ update_gregs(gregs, jframe);
+ return (res);
+ }
+ for (i = 1; i < jframe.vf_cnt; i++) {
+ Jget_vframe(J, i, buf, sizeof(buf), &jframe);
+ res = func(cld, gregs, buf, (jframe.locinf)? jframe.bci : -1,
+ jframe.line, NULL);
+ if (res != 0) {
+ update_gregs(gregs, jframe);
+ return (res);
+ }
+ }
+ update_gregs(gregs, jframe);
+ return (0);
+}
diff --git a/hotspot/src/os/bsd/dtrace/libjvm_db.h b/hotspot/src/os/bsd/dtrace/libjvm_db.h
new file mode 100644
index 0000000..f56b9d8
--- /dev/null
+++ b/hotspot/src/os/bsd/dtrace/libjvm_db.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2003, 2010, 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.
+ *
+ */
+
+#ifndef OS_SOLARIS_DTRACE_LIBJVM_DB_H
+#define OS_SOLARIS_DTRACE_LIBJVM_DB_H
+
+// not available on macosx #include <proc_service.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct jvm_agent jvm_agent_t;
+
+#define JVM_DB_VERSION 1
+
+jvm_agent_t *Jagent_create(struct ps_prochandle *P, int vers);
+
+/*
+ * Called from Jframe_iter() for each java frame. If it returns 0, then
+ * Jframe_iter() proceeds to the next frame. Otherwise, the return value is
+ * immediately returned to the caller of Jframe_iter().
+ *
+ * Parameters:
+ * 'cld' is client supplied data (to maintain iterator state, if any).
+ * 'name' is java method name.
+ * 'bci' is byte code index. it will be -1 if not available.
+ * 'line' is java source line number. it will be 0 if not available.
+ * 'handle' is an abstract client handle, reserved for future expansions
+ */
+
+typedef int java_stack_f(void *cld, const prgregset_t regs, const char* name, int bci, int line, void *handle);
+
+/*
+ * Iterates over the java frames at the current location. Returns -1 if no java
+ * frames were found, or if there was some unrecoverable error. Otherwise,
+ * returns the last value returned from 'func'.
+ */
+int Jframe_iter(jvm_agent_t *agent, prgregset_t gregs, java_stack_f *func, void* cld);
+
+void Jagent_destroy(jvm_agent_t *J);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif // OS_SOLARIS_DTRACE_LIBJVM_DB_H
diff --git a/hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp b/hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp
index 0f340fb..d6c091b 100644
--- a/hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp
@@ -33,6 +33,13 @@
#include "runtime/signature.hpp"
#include "utilities/globalDefinitions.hpp"
+/*
+ * JSDT java dtrace probes have never been implemented in macosx. It is unknown if the solaris implementation
+ * is close or if significant implementation work is necessary. The future of the solaris implementation also
+ * appears to be unclear since compiling code with JSDT probes produces the following warning:
+ * "warning: ProviderFactory is internal proprietary API and may be removed in a future release"
+ */
+
int DTraceJSDT::pd_activate(
void* baseAddress, jstring module,
jint providers_count, JVM_DTraceProvider* providers) {
diff --git a/hotspot/src/os/bsd/vm/jvm_bsd.h b/hotspot/src/os/bsd/vm/jvm_bsd.h
index 971d98a..5f96410 100644
--- a/hotspot/src/os/bsd/vm/jvm_bsd.h
+++ b/hotspot/src/os/bsd/vm/jvm_bsd.h
@@ -41,6 +41,21 @@
* This file is currently collecting system-specific dregs for the
* JNI conversion, which should be sorted out later.
*/
+#ifdef __NetBSD__
+/*
+ * Since we are compiling with c++, we need the following to make c macros
+ * visible.
+ */
+# if !defined(__STDC_LIMIT_MACROS)
+# define __STDC_LIMIT_MACROS 1
+# endif
+# if !defined(__STDC_CONSTANT_MACROS)
+# define __STDC_CONSTANT_MACROS 1
+# endif
+# if !defined(__STDC_FORMAT_MACROS)
+# define __STDC_FORMAT_MACROS 1
+# endif
+#endif
#include <dirent.h> /* For DIR */
#include <sys/param.h> /* For MAXPATHLEN */
diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/hotspot/src/os/bsd/vm/os_bsd.cpp
index b783de6..2a3faa0 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -136,8 +136,10 @@
#endif
#ifdef __APPLE__
-#include <mach/mach.h> // semaphore_* API
-#include <mach-o/dyld.h>
+# include <mach/mach.h> // semaphore_* API
+# include <mach-o/dyld.h>
+# include <sys/proc_info.h>
+# include <objc/objc-auto.h>
#endif
#ifndef MAP_ANONYMOUS
@@ -388,6 +390,20 @@ void os::Bsd::initialize_system_info() {
}
#endif
+#ifdef __APPLE__
+static const char *get_home() {
+ const char *home_dir = ::getenv("HOME");
+ if ((home_dir == NULL) || (*home_dir == '\0')) {
+ struct passwd *passwd_info = getpwuid(geteuid());
+ if (passwd_info != NULL) {
+ home_dir = passwd_info->pw_dir;
+ }
+ }
+
+ return home_dir;
+}
+#endif
+
void os::init_system_properties_values() {
// char arch[12];
// sysinfo(SI_ARCHITECTURE, arch, sizeof(arch));
@@ -438,6 +454,15 @@ void os::init_system_properties_values() {
#define ENDORSED_DIR "/lib/endorsed"
#define REG_DIR "/usr/java/packages"
+#ifdef __APPLE__
+#define SYS_EXTENSIONS_DIR "/Library/Java/Extensions"
+#define SYS_EXTENSIONS_DIRS SYS_EXTENSIONS_DIR ":/Network" SYS_EXTENSIONS_DIR ":/System" SYS_EXTENSIONS_DIR ":/usr/lib/java"
+ const char *user_home_dir = get_home();
+ // the null in SYS_EXTENSIONS_DIRS counts for the size of the colon after user_home_dir
+ int system_ext_size = strlen(user_home_dir) + sizeof(SYS_EXTENSIONS_DIR) +
+ sizeof(SYS_EXTENSIONS_DIRS);
+#endif
+
{
/* sysclasspath, java_home, dll_dir */
{
@@ -462,10 +487,12 @@ void os::init_system_properties_values() {
if (pslash != NULL) {
pslash = strrchr(buf, '/');
if (pslash != NULL) {
- *pslash = '\0'; /* get rid of /<arch> */
+ *pslash = '\0'; /* get rid of /<arch> (/lib on macosx) */
+#ifndef __APPLE__
pslash = strrchr(buf, '/');
if (pslash != NULL)
*pslash = '\0'; /* get rid of /lib */
+#endif
}
}
@@ -500,9 +527,14 @@ void os::init_system_properties_values() {
* nulls included by the sizeof operator (so actually we allocate
* a byte more than necessary).
*/
+#ifdef __APPLE__
+ ld_library_path = (char *) malloc(system_ext_size);
+ sprintf(ld_library_path, "%s" SYS_EXTENSIONS_DIR ":" SYS_EXTENSIONS_DIRS, user_home_dir);
+#else
ld_library_path = (char *) malloc(sizeof(REG_DIR) + sizeof("/lib/") +
strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH));
sprintf(ld_library_path, REG_DIR "/lib/%s:" DEFAULT_LIBPATH, cpu_arch);
+#endif
/*
* Get the user setting of LD_LIBRARY_PATH, and prepended it. It
@@ -510,6 +542,16 @@ void os::init_system_properties_values() {
* addressed).
*/
#ifdef __APPLE__
+ // Prepend the default path with the JAVA_LIBRARY_PATH so that the app launcher code can specify a directory inside an app wrapper
+ char *l = getenv("JAVA_LIBRARY_PATH");
+ if (l != NULL) {
+ char *t = ld_library_path;
+ /* That's +1 for the colon and +1 for the trailing '\0' */
+ ld_library_path = (char *) malloc(strlen(l) + 1 + strlen(t) + 1);
+ sprintf(ld_library_path, "%s:%s", l, t);
+ free(t);
+ }
+
char *v = getenv("DYLD_LIBRARY_PATH");
#else
char *v = getenv("LD_LIBRARY_PATH");
@@ -519,6 +561,7 @@ void os::init_system_properties_values() {
/* That's +1 for the colon and +1 for the trailing '\0' */
ld_library_path = (char *) malloc(strlen(v) + 1 + strlen(t) + 1);
sprintf(ld_library_path, "%s:%s", v, t);
+ free(t);
}
Arguments::set_library_path(ld_library_path);
}
@@ -531,10 +574,18 @@ void os::init_system_properties_values() {
* than necessary is allocated).
*/
{
+#ifdef __APPLE__
+ char *buf = malloc(strlen(Arguments::get_java_home()) +
+ sizeof(EXTENSIONS_DIR) + system_ext_size);
+ sprintf(buf, "%s" SYS_EXTENSIONS_DIR ":%s" EXTENSIONS_DIR ":"
+ SYS_EXTENSIONS_DIRS, user_home_dir, Arguments::get_java_home());
+#else
char *buf = malloc(strlen(Arguments::get_java_home()) +
sizeof(EXTENSIONS_DIR) + sizeof(REG_DIR) + sizeof(EXTENSIONS_DIR));
sprintf(buf, "%s" EXTENSIONS_DIR ":" REG_DIR EXTENSIONS_DIR,
Arguments::get_java_home());
+#endif
+
Arguments::set_ext_dirs(buf);
}
@@ -547,6 +598,9 @@ void os::init_system_properties_values() {
}
}
+#ifdef __APPLE__
+#undef SYS_EXTENSIONS_DIR
+#endif
#undef malloc
#undef getenv
#undef EXTENSIONS_DIR
@@ -884,6 +938,16 @@ static bool _thread_safety_check(Thread* thread) {
#endif
}
+#ifdef __APPLE__
+// library handle for calling objc_registerThreadWithCollector()
+// without static linking to the libobjc library
+#define OBJC_LIB "/usr/lib/libobjc.dylib"
+#define OBJC_GCREGISTER "objc_registerThreadWithCollector"
+typedef void (*objc_registerThreadWithCollector_t)();
+extern "C" objc_registerThreadWithCollector_t objc_registerThreadWithCollectorFunction;
+objc_registerThreadWithCollector_t objc_registerThreadWithCollectorFunction = NULL;
+#endif
+
// Thread start routine for all newly created threads
static void *java_start(Thread *thread) {
// Try to randomize the cache line index of hot stack frames.
@@ -929,6 +993,13 @@ static void *java_start(Thread *thread) {
// initialize floating point control register
os::Bsd::init_thread_fpu_state();
+#ifdef __APPLE__
+ // register thread with objc gc
+ if (objc_registerThreadWithCollectorFunction != NULL) {
+ objc_registerThreadWithCollectorFunction();
+ }
+#endif
+
// handshaking with parent thread
{
MutexLockerEx ml(sync, Mutex::_no_safepoint_check_flag);
@@ -1747,7 +1818,23 @@ const char* os::dll_file_extension() { return JNI_LIB_SUFFIX; }
// This must be hard coded because it's the system's temporary
// directory not the java application's temp directory, ala java.io.tmpdir.
+#ifdef __APPLE__
+// macosx has a secure per-user temporary directory
+char temp_path_storage[PATH_MAX];
+const char* os::get_temp_directory() {
+ static char *temp_path = NULL;
+ if (temp_path == NULL) {
+ int pathSize = confstr(_CS_DARWIN_USER_TEMP_DIR, temp_path_storage, PATH_MAX);
+ if (pathSize == 0 || pathSize > PATH_MAX) {
+ strlcpy(temp_path_storage, "/tmp/", sizeof(temp_path_storage));
+ }
+ temp_path = temp_path_storage;
+ }
+ return temp_path;
+}
+#else /* __APPLE__ */
const char* os::get_temp_directory() { return "/tmp"; }
+#endif /* __APPLE__ */
static bool file_exists(const char* filename) {
struct stat statbuf;
@@ -4531,6 +4618,14 @@ jint os::init_2(void)
// initialize thread priority policy
prio_init();
+#ifdef __APPLE__
+ // dynamically link to objective c gc registration
+ void *handleLibObjc = dlopen(OBJC_LIB, RTLD_LAZY);
+ if (handleLibObjc != NULL) {
+ objc_registerThreadWithCollectorFunction = (objc_registerThreadWithCollector_t) dlsym(handleLibObjc, OBJC_GCREGISTER);
+ }
+#endif
+
return JNI_OK;
}
@@ -4562,6 +4657,18 @@ int os::active_processor_count() {
#endif
}
+void os::set_native_thread_name(const char *name) {
+#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5
+ // This is only supported in Snow Leopard and beyond
+ if (name != NULL) {
+ // Add a "Java: " prefix to the name
+ char buf[MAXTHREADNAMESIZE];
+ snprintf(buf, sizeof(buf), "Java: %s", name);
+ pthread_setname_np(buf);
+ }
+#endif
+}
+
bool os::distribute_processes(uint length, uint* distribution) {
// Not yet implemented.
return false;
@@ -5678,8 +5785,8 @@ bool os::is_headless_jre() {
struct stat statbuf;
char buf[MAXPATHLEN];
char libmawtpath[MAXPATHLEN];
- const char *xawtstr = "/xawt/libmawt.so";
- const char *motifstr = "/motif21/libmawt.so";
+ const char *xawtstr = "/xawt/libmawt" JNI_LIB_SUFFIX;
+ const char *motifstr = "/motif21/libmawt" JNI_LIB_SUFFIX;
char *p;
// Get path to libjvm.so
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index 5a50873..3bf1039 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -4357,6 +4357,11 @@ int os::active_processor_count() {
return online_cpus;
}
+void os::set_native_thread_name(const char *name) {
+ // Not yet implemented.
+ return;
+}
+
bool os::distribute_processes(uint length, uint* distribution) {
// Not yet implemented.
return false;
diff --git a/hotspot/src/os/posix/launcher/launcher.script b/hotspot/src/os/posix/launcher/launcher.script
index 21bf44e..c4db5a4 100644
--- a/hotspot/src/os/posix/launcher/launcher.script
+++ b/hotspot/src/os/posix/launcher/launcher.script
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, 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
@@ -69,8 +69,8 @@ EMACS=emacs
#
# Make sure the paths are fully specified, i.e. they must begin with /.
-SCRIPT=$(cd $(dirname $0) && pwd)/$(basename $0)
-RUNDIR=$(pwd)
+REL_MYDIR=`dirname $0`
+MYDIR=`cd $REL_MYDIR && pwd`
# Look whether the user wants to run inside gdb
case "$1" in
@@ -95,12 +95,9 @@ case "$1" in
;;
esac
-# Find out the absolute path to this script
-MYDIR=$(cd $(dirname $SCRIPT) && pwd)
-
JDK=
if [ "${ALT_JAVA_HOME}" = "" ]; then
- source ${MYDIR}/jdkpath.sh
+ . ${MYDIR}/jdkpath.sh
else
JDK=${ALT_JAVA_HOME%%/jre};
fi
@@ -119,9 +116,6 @@ JRE=$JDK/jre
JAVA_HOME=$JDK
ARCH=@@LIBARCH@@
-# Find out the absolute path to this script
-MYDIR=$(cd $(dirname $SCRIPT) && pwd)
-
SBP=${MYDIR}:${JRE}/lib/${ARCH}
# Set up a suitable LD_LIBRARY_PATH
@@ -146,7 +140,7 @@ if [ ! -x $LAUNCHER ] ; then
fi
GDBSRCDIR=$MYDIR
-BASEDIR=$(cd $MYDIR/../../.. && pwd)
+BASEDIR=`cd $MYDIR/../../.. && pwd`
init_gdb() {
# Create a gdb script in case we should run inside gdb
@@ -179,7 +173,7 @@ case "$MODE" in
init_gdb
# First find out what emacs version we're using, so that we can
# use the new pretty GDB mode if emacs -version >= 22.1
- case $($EMACS -version 2> /dev/null) in
+ case `$EMACS -version 2> /dev/null` in
*GNU\ Emacs\ 2[23]*)
emacs_gud_cmd="gdba"
emacs_gud_args="--annotate=3"
diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/hotspot/src/os/solaris/vm/os_solaris.cpp
index fb03515..92664d6 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -669,6 +669,11 @@ static bool assign_distribution(processorid_t* id_array,
return true;
}
+void os::set_native_thread_name(const char *name) {
+ // Not yet implemented.
+ return;
+}
+
bool os::distribute_processes(uint length, uint* distribution) {
bool result = false;
// Find the processor id's of all the available CPUs.
diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp
index 9de05fa..e80ffb5 100644
--- a/hotspot/src/os/windows/vm/os_windows.cpp
+++ b/hotspot/src/os/windows/vm/os_windows.cpp
@@ -710,6 +710,11 @@ int os::active_processor_count() {
}
}
+void os::set_native_thread_name(const char *name) {
+ // Not yet implemented.
+ return;
+}
+
bool os::distribute_processes(uint length, uint* distribution) {
// Not yet implemented.
return false;
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
index d35b4a6..402c8da 100644
--- a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
+++ b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
@@ -1,4 +1,4 @@
-#
+#
# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
@@ -19,9 +19,9 @@
# 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.
-#
+#
+
-
#ifdef __APPLE__
# Darwin uses _ prefixed global symbols
#define SYMBOL(s) _ ## s
@@ -31,37 +31,37 @@
#define ELF_TYPE(name, description) .type name,description
#endif
- .globl SYMBOL(fixcw)
-
+ .globl SYMBOL(fixcw)
+
# NOTE WELL! The _Copy functions are called directly
- # from server-compiler-generated code via CallLeafNoFP,
- # which means that they *must* either not use floating
- # point or use it in the same manner as does the server
- # compiler.
-
+ # from server-compiler-generated code via CallLeafNoFP,
+ # which means that they *must* either not use floating
+ # point or use it in the same manner as does the server
+ # compiler.
+
.globl SYMBOL(_Copy_conjoint_bytes)
.globl SYMBOL(_Copy_arrayof_conjoint_bytes)
.globl SYMBOL(_Copy_conjoint_jshorts_atomic)
- .globl SYMBOL(_Copy_arrayof_conjoint_jshorts)
+ .globl SYMBOL(_Copy_arrayof_conjoint_jshorts)
.globl SYMBOL(_Copy_conjoint_jints_atomic)
.globl SYMBOL(_Copy_arrayof_conjoint_jints)
- .globl SYMBOL(_Copy_conjoint_jlongs_atomic)
- .globl SYMBOL(_mmx_Copy_arrayof_conjoint_jshorts)
+ .globl SYMBOL(_Copy_conjoint_jlongs_atomic)
+ .globl SYMBOL(_mmx_Copy_arrayof_conjoint_jshorts)
.globl SYMBOL(_Atomic_cmpxchg_long)
.globl SYMBOL(_Atomic_move_long)
- .text
+ .text
# Support for void os::Solaris::init_thread_fpu_state() in os_solaris_i486.cpp
# Set fpu to 53 bit precision. This happens too early to use a stub.
# ported from solaris_x86_32.s
.p2align 4,,15
SYMBOL(fixcw):
- pushl $0x27f
- fldcw 0(%esp)
- popl %eax
- ret
+ pushl $0x27f
+ fldcw 0(%esp)
+ popl %eax
+ ret
.globl SYMBOL(SafeFetch32), SYMBOL(Fetch32PFI), SYMBOL(Fetch32Resume)
.globl SYMBOL(SafeFetchN)
@@ -69,7 +69,7 @@ SYMBOL(fixcw):
## Instead, the signal handler would call a new SafeFetchTriage(FaultingEIP)
## routine to vet the address. If the address is the faulting LD then
## SafeFetchTriage() would return the resume-at EIP, otherwise null.
- ELF_TYPE(SafeFetch32, at function)
+ ELF_TYPE(SafeFetch32, at function)
.p2align 4,,15
SYMBOL(SafeFetch32):
SYMBOL(SafeFetchN):
@@ -82,7 +82,7 @@ SYMBOL(Fetch32Resume):
.globl SYMBOL(SpinPause)
- ELF_TYPE(SpinPause, at function)
+ ELF_TYPE(SpinPause, at function)
.p2align 4,,15
SYMBOL(SpinPause):
rep
@@ -94,7 +94,7 @@ SYMBOL(SpinPause):
# void* to,
# size_t count)
.p2align 4,,15
- ELF_TYPE(_Copy_conjoint_bytes, at function)
+ ELF_TYPE(_Copy_conjoint_bytes, at function)
SYMBOL(_Copy_conjoint_bytes):
pushl %esi
movl 4+12(%esp),%ecx # count
@@ -188,7 +188,7 @@ cb_CopyLeft:
addl $3,%esi
6: movb (%esi),%dl
movb %dl,(%edi,%esi,1)
- subl $1,%esi
+ subl $1,%esi
subl $1,%ecx
jnz 6b
7: cld
@@ -202,7 +202,7 @@ cb_CopyLeft:
#
# Same as _Copy_conjoint_bytes, except no source alignment check.
.p2align 4,,15
- ELF_TYPE(_Copy_arrayof_conjoint_bytes, at function)
+ ELF_TYPE(_Copy_arrayof_conjoint_bytes, at function)
SYMBOL(_Copy_arrayof_conjoint_bytes):
pushl %esi
movl 4+12(%esp),%ecx # count
@@ -213,7 +213,7 @@ SYMBOL(_Copy_arrayof_conjoint_bytes):
leal -1(%esi,%ecx),%eax # from + count - 1
jbe acb_CopyRight
cmpl %eax,%edi
- jbe acb_CopyLeft
+ jbe acb_CopyLeft
# copy from low to high
acb_CopyRight:
cmpl $3,%ecx
@@ -262,7 +262,7 @@ acb_CopyLeft:
jbe 2f # <= 32 dwords
rep; smovl
jmp 4f
- .=.+8
+ .space 8
2: subl %esi,%edi
.p2align 4,,15
3: movl (%esi),%edx
@@ -278,7 +278,7 @@ acb_CopyLeft:
addl $3,%esi
6: movb (%esi),%dl
movb %dl,(%edi,%esi,1)
- subl $1,%esi
+ subl $1,%esi
subl $1,%ecx
jnz 6b
7: cld
@@ -290,7 +290,7 @@ acb_CopyLeft:
# void* to,
# size_t count)
.p2align 4,,15
- ELF_TYPE(_Copy_conjoint_jshorts_atomic, at function)
+ ELF_TYPE(_Copy_conjoint_jshorts_atomic, at function)
SYMBOL(_Copy_conjoint_jshorts_atomic):
pushl %esi
movl 4+12(%esp),%ecx # count
@@ -301,7 +301,7 @@ SYMBOL(_Copy_conjoint_jshorts_atomic):
leal -2(%esi,%ecx,2),%eax # from + count*2 - 2
jbe cs_CopyRight
cmpl %eax,%edi
- jbe cs_CopyLeft
+ jbe cs_CopyLeft
# copy from low to high
cs_CopyRight:
# align source address at dword address boundary
@@ -322,7 +322,7 @@ cs_CopyRight:
jbe 2f # <= 32 dwords
# copy aligned dwords
rep; smovl
- jmp 4f
+ jmp 4f
# copy aligned dwords
2: subl %esi,%edi
.p2align 4,,15
@@ -377,7 +377,7 @@ cs_CopyLeft:
# void* to,
# size_t count)
.p2align 4,,15
- ELF_TYPE(_Copy_arrayof_conjoint_jshorts, at function)
+ ELF_TYPE(_Copy_arrayof_conjoint_jshorts, at function)
SYMBOL(_Copy_arrayof_conjoint_jshorts):
pushl %esi
movl 4+12(%esp),%ecx # count
@@ -388,7 +388,7 @@ SYMBOL(_Copy_arrayof_conjoint_jshorts):
leal -2(%esi,%ecx,2),%eax # from + count*2 - 2
jbe acs_CopyRight
cmpl %eax,%edi
- jbe acs_CopyLeft
+ jbe acs_CopyLeft
acs_CopyRight:
movl %ecx,%eax # word count
sarl %ecx # dword count
@@ -397,10 +397,10 @@ acs_CopyRight:
jbe 2f # <= 32 dwords
# copy aligned dwords
rep; smovl
- jmp 4f
+ jmp 4f
# copy aligned dwords
- .=.+5
-2: subl %esi,%edi
+ .space 5
+2: subl %esi,%edi
.p2align 4,,15
3: movl (%esi),%edx
movl %edx,(%edi,%esi,1)
@@ -454,8 +454,8 @@ acs_CopyLeft:
# Equivalent to
# arrayof_conjoint_jints
.p2align 4,,15
- ELF_TYPE(_Copy_conjoint_jints_atomic, at function)
- ELF_TYPE(_Copy_arrayof_conjoint_jints, at function)
+ ELF_TYPE(_Copy_conjoint_jints_atomic, at function)
+ ELF_TYPE(_Copy_arrayof_conjoint_jints, at function)
SYMBOL(_Copy_conjoint_jints_atomic):
SYMBOL(_Copy_arrayof_conjoint_jints):
pushl %esi
@@ -467,7 +467,7 @@ SYMBOL(_Copy_arrayof_conjoint_jints):
leal -4(%esi,%ecx,4),%eax # from + count*4 - 4
jbe ci_CopyRight
cmpl %eax,%edi
- jbe ci_CopyLeft
+ jbe ci_CopyLeft
ci_CopyRight:
cmpl $32,%ecx
jbe 2f # <= 32 dwords
@@ -475,7 +475,7 @@ ci_CopyRight:
popl %edi
popl %esi
ret
- .=.+10
+ .space 10
2: subl %esi,%edi
jmp 4f
.p2align 4,,15
@@ -510,7 +510,7 @@ ci_CopyLeft:
popl %edi
popl %esi
ret
-
+
# Support for void Copy::conjoint_jlongs_atomic(jlong* from,
# jlong* to,
# size_t count)
@@ -529,7 +529,7 @@ ci_CopyLeft:
# }
# }
.p2align 4,,15
- ELF_TYPE(_Copy_conjoint_jlongs_atomic, at function)
+ ELF_TYPE(_Copy_conjoint_jlongs_atomic, at function)
SYMBOL(_Copy_conjoint_jlongs_atomic):
movl 4+8(%esp),%ecx # count
movl 4+0(%esp),%eax # from
@@ -558,7 +558,7 @@ cla_CopyLeft:
# void* to,
# size_t count)
.p2align 4,,15
- ELF_TYPE(_mmx_Copy_arrayof_conjoint_jshorts, at function)
+ ELF_TYPE(_mmx_Copy_arrayof_conjoint_jshorts, at function)
SYMBOL(_mmx_Copy_arrayof_conjoint_jshorts):
pushl %esi
movl 4+12(%esp),%ecx
@@ -576,7 +576,7 @@ mmx_acs_CopyRight:
je 5f
cmpl $33,%ecx
jae 3f
-1: subl %esi,%edi
+1: subl %esi,%edi
.p2align 4,,15
2: movl (%esi),%edx
movl %edx,(%edi,%esi,1)
@@ -584,7 +584,7 @@ mmx_acs_CopyRight:
subl $1,%ecx
jnz 2b
addl %esi,%edi
- jmp 5f
+ jmp 5f
3: smovl # align to 8 bytes, we know we are 4 byte aligned to start
subl $1,%ecx
4: .p2align 4,,15
@@ -610,13 +610,13 @@ mmx_acs_CopyRight:
cmpl $16,%ecx
jge 4b
emms
- testl %ecx,%ecx
- ja 1b
+ testl %ecx,%ecx
+ ja 1b
5: andl $1,%eax
je 7f
6: movw (%esi),%dx
movw %dx,(%edi)
-7: popl %edi
+7: popl %edi
popl %esi
ret
mmx_acs_CopyLeft:
@@ -657,7 +657,7 @@ mmx_acs_CopyLeft:
# bool is_MP)
#
.p2align 4,,15
- ELF_TYPE(_Atomic_cmpxchg_long, at function)
+ ELF_TYPE(_Atomic_cmpxchg_long, at function)
SYMBOL(_Atomic_cmpxchg_long):
# 8(%esp) : return PC
pushl %ebx # 4(%esp) : old %ebx
@@ -679,7 +679,7 @@ SYMBOL(_Atomic_cmpxchg_long):
# Support for jlong Atomic::load and Atomic::store.
# void _Atomic_move_long(volatile jlong* src, volatile jlong* dst)
.p2align 4,,15
- ELF_TYPE(_Atomic_move_long, at function)
+ ELF_TYPE(_Atomic_move_long, at function)
SYMBOL(_Atomic_move_long):
movl 4(%esp), %eax # src
fildll (%eax)
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
index 11374ac..df67421 100644
--- a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
+++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
@@ -275,7 +275,11 @@
#endif
address os::current_stack_pointer() {
-#ifdef SPARC_WORKS
+#if defined(__clang__) || defined(__llvm__)
+ register void *esp;
+ __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
+ return (address) esp;
+#elif defined(SPARC_WORKS)
register void *esp;
__asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
return (address) ((char*)esp + sizeof(long)*2);
@@ -358,7 +362,7 @@ frame os::get_sender_for_C_frame(frame* fr) {
}
intptr_t* _get_previous_fp() {
-#ifdef SPARC_WORKS
+#if defined(SPARC_WORKS) || defined(__clang__)
register intptr_t **ebp;
__asm__("mov %%"SPELL_REG_FP", %0":"=r"(ebp));
#else
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp b/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp
index b8217b4..368e90c 100644
--- a/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp
+++ b/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp
@@ -29,7 +29,7 @@
// ordering to native byte ordering and vice versa.
#ifdef __APPLE__
-#include <libkern/OSByteOrder.h>
+# include <libkern/OSByteOrder.h>
#else
# include <sys/endian.h>
#endif
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
index 675ee54..ff5b32d 100644
--- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
@@ -169,7 +169,7 @@ JVM_handle_bsd_signal(int sig,
if (info != NULL && thread != NULL) {
// Handle ALL stack overflow variations here
- if (sig == SIGSEGV) {
+ if (sig == SIGSEGV || sig == SIGBUS) {
address addr = (address) info->si_addr;
// check if fault address is within thread stack
@@ -228,7 +228,7 @@ JVM_handle_bsd_signal(int sig,
// of write protecting the memory serialization page. It write
// enables the page immediately after protecting it so we can
// just return to retry the write.
- if (sig == SIGSEGV &&
+ if ((sig == SIGSEGV || sig == SIGBUS) &&
os::is_memory_serialize_page(thread, (address) info->si_addr)) {
// Block current thread until permission is restored.
os::block_on_serialize_page_trap();
@@ -260,10 +260,11 @@ JVM_handle_bsd_signal(int sig,
}
#endif // !PRODUCT
- const char *fmt = "caught unhandled signal %d";
- char buf[64];
+ const char *fmt =
+ "caught unhandled signal " INT32_FORMAT " at address " PTR_FORMAT;
+ char buf[128];
- sprintf(buf, fmt, sig);
+ sprintf(buf, fmt, sig, info->si_addr);
fatal(buf);
}
@@ -338,7 +339,8 @@ static void current_stack_region(address *bottom, size_t *size) {
int rslt = pthread_stackseg_np(pthread_self(), &ss);
if (rslt != 0)
- fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
+ fatal(err_msg("pthread_stackseg_np failed with err = " INT32_FORMAT,
+ rslt));
stack_top = (address) ss.ss_sp;
stack_bytes = ss.ss_size;
@@ -350,12 +352,13 @@ static void current_stack_region(address *bottom, size_t *size) {
// JVM needs to know exact stack location, abort if it fails
if (rslt != 0)
- fatal(err_msg("pthread_attr_init failed with err = %d", rslt));
+ fatal(err_msg("pthread_attr_init failed with err = " INT32_FORMAT, rslt));
rslt = pthread_attr_get_np(pthread_self(), &attr);
if (rslt != 0)
- fatal(err_msg("pthread_attr_get_np failed with err = %d", rslt));
+ fatal(err_msg("pthread_attr_get_np failed with err = " INT32_FORMAT,
+ rslt));
if (pthread_attr_getstackaddr(&attr, (void **) &stack_bottom) != 0 ||
pthread_attr_getstacksize(&attr, &stack_bytes) != 0) {
@@ -373,13 +376,15 @@ static void current_stack_region(address *bottom, size_t *size) {
vm_exit_out_of_memory(0, "pthread_getattr_np");
}
else {
- fatal(err_msg("pthread_getattr_np failed with errno = %d", res));
+ fatal(err_msg("pthread_getattr_np failed with errno = " INT32_FORMAT,
+ res));
}
}
res = pthread_attr_getstack(&attr, (void **) &stack_bottom, &stack_bytes);
if (res != 0) {
- fatal(err_msg("pthread_attr_getstack failed with errno = %d", res));
+ fatal(err_msg("pthread_attr_getstack failed with errno = " INT32_FORMAT,
+ res));
}
stack_top = stack_bottom + stack_bytes;
@@ -391,7 +396,8 @@ static void current_stack_region(address *bottom, size_t *size) {
size_t guard_bytes;
res = pthread_attr_getguardsize(&attr, &guard_bytes);
if (res != 0) {
- fatal(err_msg("pthread_attr_getguardsize failed with errno = %d", res));
+ fatal(err_msg(
+ "pthread_attr_getguardsize failed with errno = " INT32_FORMAT, res));
}
int guard_pages = align_size_up(guard_bytes, page_bytes) / page_bytes;
assert(guard_bytes == guard_pages * page_bytes, "unaligned guard");
diff --git a/hotspot/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp b/hotspot/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp
index f39b7a0..c064210 100644
--- a/hotspot/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp
+++ b/hotspot/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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,13 +85,35 @@ static void pd_conjoint_bytes_atomic(void* from, void* to, size_t count) {
}
static void pd_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
- // FIXME
- (void)memmove(to, from, count << LogBytesPerShort);
+ if (from > to) {
+ while (count-- > 0) {
+ // Copy forwards
+ *to++ = *from++;
+ }
+ } else {
+ from += count - 1;
+ to += count - 1;
+ while (count-- > 0) {
+ // Copy backwards
+ *to-- = *from--;
+ }
+ }
}
static void pd_conjoint_jints_atomic(jint* from, jint* to, size_t count) {
- // FIXME
- (void)memmove(to, from, count << LogBytesPerInt);
+ if (from > to) {
+ while (count-- > 0) {
+ // Copy forwards
+ *to++ = *from++;
+ }
+ } else {
+ from += count - 1;
+ to += count - 1;
+ while (count-- > 0) {
+ // Copy backwards
+ *to-- = *from--;
+ }
+ }
}
static void pd_conjoint_jlongs_atomic(jlong* from, jlong* to, size_t count) {
diff --git a/hotspot/src/share/vm/asm/codeBuffer.cpp b/hotspot/src/share/vm/asm/codeBuffer.cpp
index f2d9bbc..f52b942 100644
--- a/hotspot/src/share/vm/asm/codeBuffer.cpp
+++ b/hotspot/src/share/vm/asm/codeBuffer.cpp
@@ -26,6 +26,7 @@
#include "asm/codeBuffer.hpp"
#include "compiler/disassembler.hpp"
#include "utilities/copy.hpp"
+#include "utilities/xmlstream.hpp"
// The structure of a CodeSection:
//
@@ -81,7 +82,7 @@ typedef CodeBuffer::csize_t csize_t; // file-local definition
CodeBuffer::CodeBuffer(CodeBlob* blob) {
initialize_misc("static buffer");
initialize(blob->content_begin(), blob->content_size());
- assert(verify_section_allocation(), "initial use of buffer OK");
+ verify_section_allocation();
}
void CodeBuffer::initialize(csize_t code_size, csize_t locs_size) {
@@ -108,17 +109,18 @@ void CodeBuffer::initialize(csize_t code_size, csize_t locs_size) {
_insts.initialize_locs(locs_size / sizeof(relocInfo));
}
- assert(verify_section_allocation(), "initial use of blob is OK");
+ verify_section_allocation();
}
CodeBuffer::~CodeBuffer() {
+ verify_section_allocation();
+
// If we allocate our code buffer from the CodeCache
// via a BufferBlob, and it's not permanent, then
// free the BufferBlob.
// The rest of the memory will be freed when the ResourceObj
// is released.
- assert(verify_section_allocation(), "final storage configuration still OK");
for (CodeBuffer* cb = this; cb != NULL; cb = cb->before_expand()) {
// Previous incarnations of this buffer are held live, so that internal
// addresses constructed before expansions will not be confused.
@@ -484,7 +486,7 @@ void CodeBuffer::compute_final_layout(CodeBuffer* dest) const {
// Done calculating sections; did it come out to the right end?
assert(buf_offset == total_content_size(), "sanity");
- assert(dest->verify_section_allocation(), "final configuration works");
+ dest->verify_section_allocation();
}
csize_t CodeBuffer::total_offset_of(CodeSection* cs) const {
@@ -632,7 +634,8 @@ void CodeBuffer::copy_code_to(CodeBlob* dest_blob) {
// CodeBuffer gets the final layout (consts, insts, stubs in order of
// ascending address).
void CodeBuffer::relocate_code_to(CodeBuffer* dest) const {
- DEBUG_ONLY(address dest_end = dest->_total_start + dest->_total_size);
+ address dest_end = dest->_total_start + dest->_total_size;
+ address dest_filled = NULL;
for (int n = (int) SECT_FIRST; n < (int) SECT_LIMIT; n++) {
// pull code out of each section
const CodeSection* cs = code_section(n);
@@ -654,6 +657,8 @@ void CodeBuffer::relocate_code_to(CodeBuffer* dest) const {
Copy::fill_to_bytes(dest_cs->end(), dest_cs->remaining(),
Assembler::code_fill_byte());
}
+ // Keep track of the highest filled address
+ dest_filled = MAX2(dest_filled, dest_cs->end() + dest_cs->remaining());
assert(cs->locs_start() != (relocInfo*)badAddress,
"this section carries no reloc storage, but reloc was attempted");
@@ -668,6 +673,14 @@ void CodeBuffer::relocate_code_to(CodeBuffer* dest) const {
}
}
}
+
+ if (dest->blob() == NULL) {
+ // Destination is a final resting place, not just another buffer.
+ // Normalize uninitialized bytes in the final padding.
+ Copy::fill_to_bytes(dest_filled, dest_end - dest_filled,
+ Assembler::code_fill_byte());
+
+ }
}
csize_t CodeBuffer::figure_expanded_capacities(CodeSection* which_cs,
@@ -799,7 +812,7 @@ void CodeBuffer::expand(CodeSection* which_cs, csize_t amount) {
_decode_begin = NULL; // sanity
// Make certain that the new sections are all snugly inside the new blob.
- assert(verify_section_allocation(), "expanded allocation is ship-shape");
+ verify_section_allocation();
#ifndef PRODUCT
if (PrintNMethods && (WizardMode || Verbose)) {
@@ -828,35 +841,48 @@ void CodeBuffer::take_over_code_from(CodeBuffer* cb) {
DEBUG_ONLY(cb->_blob = (BufferBlob*)badAddress);
}
-#ifdef ASSERT
-bool CodeBuffer::verify_section_allocation() {
+void CodeBuffer::verify_section_allocation() {
address tstart = _total_start;
- if (tstart == badAddress) return true; // smashed by set_blob(NULL)
+ if (tstart == badAddress) return; // smashed by set_blob(NULL)
address tend = tstart + _total_size;
if (_blob != NULL) {
- assert(tstart >= _blob->content_begin(), "sanity");
- assert(tend <= _blob->content_end(), "sanity");
+
+ guarantee(tstart >= _blob->content_begin(), "sanity");
+ guarantee(tend <= _blob->content_end(), "sanity");
}
// Verify disjointness.
for (int n = (int) SECT_FIRST; n < (int) SECT_LIMIT; n++) {
CodeSection* sect = code_section(n);
if (!sect->is_allocated() || sect->is_empty()) continue;
- assert((intptr_t)sect->start() % sect->alignment() == 0
+ guarantee((intptr_t)sect->start() % sect->alignment() == 0
|| sect->is_empty() || _blob == NULL,
"start is aligned");
for (int m = (int) SECT_FIRST; m < (int) SECT_LIMIT; m++) {
CodeSection* other = code_section(m);
if (!other->is_allocated() || other == sect) continue;
- assert(!other->contains(sect->start() ), "sanity");
+ guarantee(!other->contains(sect->start() ), "sanity");
// limit is an exclusive address and can be the start of another
// section.
- assert(!other->contains(sect->limit() - 1), "sanity");
+ guarantee(!other->contains(sect->limit() - 1), "sanity");
}
- assert(sect->end() <= tend, "sanity");
+ guarantee(sect->end() <= tend, "sanity");
+ guarantee(sect->end() <= sect->limit(), "sanity");
+ }
+}
+
+void CodeBuffer::log_section_sizes(const char* name) {
+ if (xtty != NULL) {
+ // log info about buffer usage
+ xtty->print_cr("<blob name='%s' size='%d'>", name, _total_size);
+ for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) {
+ CodeSection* sect = code_section(n);
+ if (!sect->is_allocated() || sect->is_empty()) continue;
+ xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>",
+ n, sect->limit() - sect->start(), sect->limit() - sect->end());
+ }
+ xtty->print_cr("</blob>");
}
- return true;
}
-#endif //ASSERT
#ifndef PRODUCT
@@ -884,7 +910,6 @@ void CodeBuffer::block_comment(intptr_t offset, const char * comment) {
_comments.add_comment(offset, comment);
}
-
class CodeComment: public CHeapObj {
private:
friend class CodeComments;
diff --git a/hotspot/src/share/vm/asm/codeBuffer.hpp b/hotspot/src/share/vm/asm/codeBuffer.hpp
index e9b2950..53c90c2 100644
--- a/hotspot/src/share/vm/asm/codeBuffer.hpp
+++ b/hotspot/src/share/vm/asm/codeBuffer.hpp
@@ -362,10 +362,8 @@ class CodeBuffer: public StackObj {
// helper for CodeBuffer::expand()
void take_over_code_from(CodeBuffer* cs);
-#ifdef ASSERT
// ensure sections are disjoint, ordered, and contained in the blob
- bool verify_section_allocation();
-#endif
+ void verify_section_allocation();
// copies combined relocations to the blob, returns bytes copied
// (if target is null, it is a dry run only, just for sizing)
@@ -393,7 +391,7 @@ class CodeBuffer: public StackObj {
assert(code_start != NULL, "sanity");
initialize_misc("static buffer");
initialize(code_start, code_size);
- assert(verify_section_allocation(), "initial use of buffer OK");
+ verify_section_allocation();
}
// (2) CodeBuffer referring to pre-allocated CodeBlob.
@@ -545,6 +543,9 @@ class CodeBuffer: public StackObj {
void block_comment(intptr_t offset, const char * comment) PRODUCT_RETURN;
+ // Log a little info about section usage in the CodeBuffer
+ void log_section_sizes(const char* name);
+
#ifndef PRODUCT
public:
// Printing / Decoding
diff --git a/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp b/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp
index c5048c7..571e707 100644
--- a/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp
+++ b/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp
@@ -51,6 +51,7 @@ class Canonicalizer: InstructionVisitor {
public:
Canonicalizer(Compilation* c, Value x, int bci) : _compilation(c), _canonical(x), _bci(bci) {
+ NOT_PRODUCT(x->set_printable_bci(bci));
if (CanonicalizeNodes) x->visit(this);
}
Value canonical() const { return _canonical; }
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
index e103fbf..0c3f32b 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
@@ -1165,11 +1165,11 @@ void GraphBuilder::_goto(int from_bci, int to_bci) {
Goto *x = new Goto(block_at(to_bci), to_bci <= from_bci);
if (is_profiling()) {
compilation()->set_would_profile(true);
- }
- if (profile_branches()) {
- x->set_profiled_method(method());
x->set_profiled_bci(bci());
- x->set_should_profile(true);
+ if (profile_branches()) {
+ x->set_profiled_method(method());
+ x->set_should_profile(true);
+ }
}
append(x);
}
@@ -1203,9 +1203,9 @@ void GraphBuilder::if_node(Value x, If::Condition cond, Value y, ValueStack* sta
Goto *goto_node = i->as_Goto();
if (goto_node != NULL) {
compilation()->set_would_profile(true);
+ goto_node->set_profiled_bci(bci());
if (profile_branches()) {
goto_node->set_profiled_method(method());
- goto_node->set_profiled_bci(bci());
goto_node->set_should_profile(true);
// Find out which successor is used.
if (goto_node->default_sux() == tsux) {
diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
index c2c2f7c..f9099e9 100644
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
@@ -2493,7 +2493,7 @@ void LIRGenerator::do_Goto(Goto* x) {
// increment backedge counter if needed
CodeEmitInfo* info = state_for(x, state);
- increment_backedge_counter(info, info->stack()->bci());
+ increment_backedge_counter(info, x->profiled_bci());
CodeEmitInfo* safepoint_info = state_for(x, state);
__ safepoint(safepoint_poll_register(), safepoint_info);
}
diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.cpp b/hotspot/src/share/vm/c1/c1_LinearScan.cpp
index 38ee82a..ebb0683 100644
--- a/hotspot/src/share/vm/c1/c1_LinearScan.cpp
+++ b/hotspot/src/share/vm/c1/c1_LinearScan.cpp
@@ -2619,6 +2619,24 @@ int LinearScan::append_scope_value_for_operand(LIR_Opr opr, GrowableArray<ScopeV
Location::Type loc_type = float_saved_as_double ? Location::float_in_dbl : Location::normal;
VMReg rname = frame_map()->fpu_regname(opr->fpu_regnr());
+#ifndef __SOFTFP__
+#ifndef VM_LITTLE_ENDIAN
+ if (! float_saved_as_double) {
+ // On big endian system, we may have an issue if float registers use only
+ // the low half of the (same) double registers.
+ // Both the float and the double could have the same regnr but would correspond
+ // to two different addresses once saved.
+
+ // get next safely (no assertion checks)
+ VMReg next = VMRegImpl::as_VMReg(1+rname->value());
+ if (next->is_reg() &&
+ (next->as_FloatRegister() == rname->as_FloatRegister())) {
+ // the back-end does use the same numbering for the double and the float
+ rname = next; // VMReg for the low bits, e.g. the real VMReg for the float
+ }
+ }
+#endif
+#endif
LocationValue* sv = new LocationValue(Location::new_reg_loc(loc_type, rname));
scope_values->append(sv);
diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
index 675d389..183be88 100644
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
@@ -681,6 +681,23 @@ JRT_LEAF(void, Runtime1::monitorexit(JavaThread* thread, BasicObjectLock* lock))
}
JRT_END
+// Cf. OptoRuntime::deoptimize_caller_frame
+JRT_ENTRY(void, Runtime1::deoptimize(JavaThread* thread))
+ // Called from within the owner thread, so no need for safepoint
+ RegisterMap reg_map(thread, false);
+ frame stub_frame = thread->last_frame();
+ assert(stub_frame.is_runtime_frame(), "sanity check");
+ frame caller_frame = stub_frame.sender(®_map);
+
+ // We are coming from a compiled method; check this is true.
+ assert(CodeCache::find_nmethod(caller_frame.pc()) != NULL, "sanity");
+
+ // Deoptimize the caller frame.
+ Deoptimization::deoptimize_frame(thread, caller_frame.id());
+
+ // Return to the now deoptimized frame.
+JRT_END
+
static klassOop resolve_field_return_klass(methodHandle caller, int bci, TRAPS) {
Bytecode_field field_access(caller, bci);
diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.hpp b/hotspot/src/share/vm/c1/c1_Runtime1.hpp
index 5499740..2032564 100644
--- a/hotspot/src/share/vm/c1/c1_Runtime1.hpp
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.hpp
@@ -63,6 +63,7 @@ class StubAssembler;
stub(monitorenter_nofpu) /* optimized version that does not preserve fpu registers */ \
stub(monitorexit) \
stub(monitorexit_nofpu) /* optimized version that does not preserve fpu registers */ \
+ stub(deoptimize) \
stub(access_field_patching) \
stub(load_klass_patching) \
stub(g1_pre_barrier_slow) \
@@ -152,6 +153,8 @@ class Runtime1: public AllStatic {
static void monitorenter(JavaThread* thread, oopDesc* obj, BasicObjectLock* lock);
static void monitorexit (JavaThread* thread, BasicObjectLock* lock);
+ static void deoptimize(JavaThread* thread);
+
static int access_field_patching(JavaThread* thread);
static int move_klass_patching(JavaThread* thread);
diff --git a/hotspot/src/share/vm/ci/ciEnv.cpp b/hotspot/src/share/vm/ci/ciEnv.cpp
index 82492a0..1366177 100644
--- a/hotspot/src/share/vm/ci/ciEnv.cpp
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp
@@ -473,6 +473,7 @@ ciKlass* ciEnv::get_klass_by_name_impl(ciKlass* accessing_klass,
}
if (require_local) return NULL;
+
// Not yet loaded into the VM, or not governed by loader constraints.
// Make a CI representative for it.
return get_unloaded_klass(accessing_klass, name);
@@ -498,7 +499,7 @@ ciKlass* ciEnv::get_klass_by_index_impl(constantPoolHandle cpool,
bool& is_accessible,
ciInstanceKlass* accessor) {
EXCEPTION_CONTEXT;
- KlassHandle klass (THREAD, constantPoolOopDesc::klass_at_if_loaded(cpool, index));
+ KlassHandle klass(THREAD, constantPoolOopDesc::klass_at_if_loaded(cpool, index));
Symbol* klass_name = NULL;
if (klass.is_null()) {
// The klass has not been inserted into the constant pool.
@@ -785,17 +786,17 @@ ciMethod* ciEnv::get_method_by_index_impl(constantPoolHandle cpool,
// Either the declared holder was not loaded, or the method could
// not be found. Create a dummy ciMethod to represent the failed
// lookup.
-
- return get_unloaded_method(declared_holder,
- get_symbol(name_sym),
- get_symbol(sig_sym));
+ ciSymbol* name = get_symbol(name_sym);
+ ciSymbol* signature = get_symbol(sig_sym);
+ return get_unloaded_method(declared_holder, name, signature, accessor);
}
// ------------------------------------------------------------------
// ciEnv::get_fake_invokedynamic_method_impl
ciMethod* ciEnv::get_fake_invokedynamic_method_impl(constantPoolHandle cpool,
- int index, Bytecodes::Code bc) {
+ int index, Bytecodes::Code bc,
+ ciInstanceKlass* accessor) {
// Compare the following logic with InterpreterRuntime::resolve_invokedynamic.
assert(bc == Bytecodes::_invokedynamic, "must be invokedynamic");
@@ -807,9 +808,10 @@ ciMethod* ciEnv::get_fake_invokedynamic_method_impl(constantPoolHandle cpool,
// Call site might not be resolved yet. We could create a real invoker method from the
// compiler, but it is simpler to stop the code path here with an unlinked method.
if (!is_resolved) {
- ciInstanceKlass* mh_klass = get_object(SystemDictionary::MethodHandle_klass())->as_instance_klass();
- ciSymbol* sig_sym = get_symbol(cpool->signature_ref_at(index));
- return get_unloaded_method(mh_klass, ciSymbol::invokeExact_name(), sig_sym);
+ ciInstanceKlass* holder = get_object(SystemDictionary::MethodHandle_klass())->as_instance_klass();
+ ciSymbol* name = ciSymbol::invokeExact_name();
+ ciSymbol* signature = get_symbol(cpool->signature_ref_at(index));
+ return get_unloaded_method(holder, name, signature, accessor);
}
// Get the invoker methodOop from the constant pool.
@@ -850,9 +852,9 @@ ciMethod* ciEnv::get_method_by_index(constantPoolHandle cpool,
int index, Bytecodes::Code bc,
ciInstanceKlass* accessor) {
if (bc == Bytecodes::_invokedynamic) {
- GUARDED_VM_ENTRY(return get_fake_invokedynamic_method_impl(cpool, index, bc);)
+ GUARDED_VM_ENTRY(return get_fake_invokedynamic_method_impl(cpool, index, bc, accessor);)
} else {
- GUARDED_VM_ENTRY(return get_method_by_index_impl(cpool, index, bc, accessor);)
+ GUARDED_VM_ENTRY(return get_method_by_index_impl( cpool, index, bc, accessor);)
}
}
diff --git a/hotspot/src/share/vm/ci/ciEnv.hpp b/hotspot/src/share/vm/ci/ciEnv.hpp
index f5242ca..12f4bb2 100644
--- a/hotspot/src/share/vm/ci/ciEnv.hpp
+++ b/hotspot/src/share/vm/ci/ciEnv.hpp
@@ -153,7 +153,8 @@ private:
int method_index, Bytecodes::Code bc,
ciInstanceKlass* loading_klass);
ciMethod* get_fake_invokedynamic_method_impl(constantPoolHandle cpool,
- int index, Bytecodes::Code bc);
+ int index, Bytecodes::Code bc,
+ ciInstanceKlass* accessor);
// Helper methods
bool check_klass_accessibility(ciKlass* accessing_klass,
@@ -192,13 +193,14 @@ private:
// the result.
ciMethod* get_unloaded_method(ciInstanceKlass* holder,
ciSymbol* name,
- ciSymbol* signature) {
- return _factory->get_unloaded_method(holder, name, signature);
+ ciSymbol* signature,
+ ciInstanceKlass* accessor) {
+ return _factory->get_unloaded_method(holder, name, signature, accessor);
}
// Get a ciKlass representing an unloaded klass.
// Ensures uniqueness of the result.
- ciKlass* get_unloaded_klass(ciKlass* accessing_klass,
+ ciKlass* get_unloaded_klass(ciKlass* accessing_klass,
ciSymbol* name) {
return _factory->get_unloaded_klass(accessing_klass, name, true);
}
@@ -224,7 +226,7 @@ private:
// See if we already have an unloaded klass for the given name
// or return NULL if not.
- ciKlass *check_get_unloaded_klass(ciKlass* accessing_klass, ciSymbol* name) {
+ ciKlass *check_get_unloaded_klass(ciKlass* accessing_klass, ciSymbol* name) {
return _factory->get_unloaded_klass(accessing_klass, name, false);
}
diff --git a/hotspot/src/share/vm/ci/ciMethod.cpp b/hotspot/src/share/vm/ci/ciMethod.cpp
index a985d5e..6049d7b 100644
--- a/hotspot/src/share/vm/ci/ciMethod.cpp
+++ b/hotspot/src/share/vm/ci/ciMethod.cpp
@@ -148,21 +148,27 @@ ciMethod::ciMethod(methodHandle h_m) : ciObject(h_m) {
//
// Unloaded method.
ciMethod::ciMethod(ciInstanceKlass* holder,
- ciSymbol* name,
- ciSymbol* signature) : ciObject(ciMethodKlass::make()) {
- // These fields are always filled in.
- _name = name;
- _holder = holder;
- _signature = new (CURRENT_ENV->arena()) ciSignature(_holder, constantPoolHandle(), signature);
- _intrinsic_id = vmIntrinsics::_none;
- _liveness = NULL;
- _can_be_statically_bound = false;
- _method_blocks = NULL;
- _method_data = NULL;
+ ciSymbol* name,
+ ciSymbol* signature,
+ ciInstanceKlass* accessor) :
+ ciObject(ciMethodKlass::make()),
+ _name( name),
+ _holder( holder),
+ _intrinsic_id( vmIntrinsics::_none),
+ _liveness( NULL),
+ _can_be_statically_bound(false),
+ _method_blocks( NULL),
+ _method_data( NULL)
#if defined(COMPILER2) || defined(SHARK)
- _flow = NULL;
- _bcea = NULL;
+ ,
+ _flow( NULL),
+ _bcea( NULL)
#endif // COMPILER2 || SHARK
+{
+ // Usually holder and accessor are the same type but in some cases
+ // the holder has the wrong class loader (e.g. invokedynamic call
+ // sites) so we pass the accessor.
+ _signature = new (CURRENT_ENV->arena()) ciSignature(accessor, constantPoolHandle(), signature);
}
diff --git a/hotspot/src/share/vm/ci/ciMethod.hpp b/hotspot/src/share/vm/ci/ciMethod.hpp
index db71752..45a491f 100644
--- a/hotspot/src/share/vm/ci/ciMethod.hpp
+++ b/hotspot/src/share/vm/ci/ciMethod.hpp
@@ -88,7 +88,7 @@ class ciMethod : public ciObject {
#endif
ciMethod(methodHandle h_m);
- ciMethod(ciInstanceKlass* holder, ciSymbol* name, ciSymbol* signature);
+ ciMethod(ciInstanceKlass* holder, ciSymbol* name, ciSymbol* signature, ciInstanceKlass* accessor);
methodOop get_methodOop() const {
methodOop m = (methodOop)get_oop();
diff --git a/hotspot/src/share/vm/ci/ciMethodHandle.cpp b/hotspot/src/share/vm/ci/ciMethodHandle.cpp
index b4c9161..831c6a5 100644
--- a/hotspot/src/share/vm/ci/ciMethodHandle.cpp
+++ b/hotspot/src/share/vm/ci/ciMethodHandle.cpp
@@ -86,12 +86,12 @@ ciMethod* ciMethodHandle::get_adapter(bool is_invokedynamic) {
}
-#ifndef PRODUCT
+#ifdef ASSERT
// ------------------------------------------------------------------
// ciMethodHandle::print_chain_impl
//
// Implementation of the print method.
-void ciMethodHandle::print_chain_impl(outputStream* st) {
+void ciMethodHandle::print_chain_impl() {
ASSERT_IN_VM;
MethodHandleChain::print(get_oop());
}
@@ -101,7 +101,7 @@ void ciMethodHandle::print_chain_impl(outputStream* st) {
// ciMethodHandle::print_chain
//
// Implementation of the print_chain method.
-void ciMethodHandle::print_chain(outputStream* st) {
- GUARDED_VM_ENTRY(print_chain_impl(st););
+void ciMethodHandle::print_chain() {
+ GUARDED_VM_ENTRY(print_chain_impl(););
}
#endif
diff --git a/hotspot/src/share/vm/ci/ciMethodHandle.hpp b/hotspot/src/share/vm/ci/ciMethodHandle.hpp
index e19d053..536ebef 100644
--- a/hotspot/src/share/vm/ci/ciMethodHandle.hpp
+++ b/hotspot/src/share/vm/ci/ciMethodHandle.hpp
@@ -45,7 +45,7 @@ private:
ciMethod* get_adapter( bool is_invokedynamic);
protected:
- void print_chain_impl(outputStream* st) PRODUCT_RETURN;
+ void print_chain_impl() NOT_DEBUG_RETURN;
public:
ciMethodHandle(instanceHandle h_i) :
@@ -79,7 +79,7 @@ public:
return _invokedynamic_adapter;
}
- void print_chain(outputStream* st = tty) PRODUCT_RETURN;
+ void print_chain() NOT_DEBUG_RETURN;
};
#endif // SHARE_VM_CI_CIMETHODHANDLE_HPP
diff --git a/hotspot/src/share/vm/ci/ciObjectFactory.cpp b/hotspot/src/share/vm/ci/ciObjectFactory.cpp
index b0e9064..9aa6b26 100644
--- a/hotspot/src/share/vm/ci/ciObjectFactory.cpp
+++ b/hotspot/src/share/vm/ci/ciObjectFactory.cpp
@@ -374,20 +374,32 @@ ciObject* ciObjectFactory::create_new_object(oop o) {
// unloaded method. This may need to change.
ciMethod* ciObjectFactory::get_unloaded_method(ciInstanceKlass* holder,
ciSymbol* name,
- ciSymbol* signature) {
- for (int i=0; i<_unloaded_methods->length(); i++) {
+ ciSymbol* signature,
+ ciInstanceKlass* accessor) {
+ ciSignature* that = NULL;
+ for (int i = 0; i < _unloaded_methods->length(); i++) {
ciMethod* entry = _unloaded_methods->at(i);
if (entry->holder()->equals(holder) &&
entry->name()->equals(name) &&
entry->signature()->as_symbol()->equals(signature)) {
- // We've found a match.
- return entry;
+ // Short-circuit slow resolve.
+ if (entry->signature()->accessing_klass() == accessor) {
+ // We've found a match.
+ return entry;
+ } else {
+ // Lazily create ciSignature
+ if (that == NULL) that = new (arena()) ciSignature(accessor, constantPoolHandle(), signature);
+ if (entry->signature()->equals(that)) {
+ // We've found a match.
+ return entry;
+ }
+ }
}
}
// This is a new unloaded method. Create it and stick it in
// the cache.
- ciMethod* new_method = new (arena()) ciMethod(holder, name, signature);
+ ciMethod* new_method = new (arena()) ciMethod(holder, name, signature, accessor);
init_ident_of(new_method);
_unloaded_methods->append(new_method);
diff --git a/hotspot/src/share/vm/ci/ciObjectFactory.hpp b/hotspot/src/share/vm/ci/ciObjectFactory.hpp
index 6222b9f..26cc2c3 100644
--- a/hotspot/src/share/vm/ci/ciObjectFactory.hpp
+++ b/hotspot/src/share/vm/ci/ciObjectFactory.hpp
@@ -108,7 +108,8 @@ public:
// Get the ciMethod representing an unloaded/unfound method.
ciMethod* get_unloaded_method(ciInstanceKlass* holder,
ciSymbol* name,
- ciSymbol* signature);
+ ciSymbol* signature,
+ ciInstanceKlass* accessor);
// Get a ciKlass representing an unloaded klass.
ciKlass* get_unloaded_klass(ciKlass* accessing_klass,
diff --git a/hotspot/src/share/vm/ci/ciSignature.cpp b/hotspot/src/share/vm/ci/ciSignature.cpp
index 8754fb4..229a904 100644
--- a/hotspot/src/share/vm/ci/ciSignature.cpp
+++ b/hotspot/src/share/vm/ci/ciSignature.cpp
@@ -80,7 +80,7 @@ ciSignature::ciSignature(ciKlass* accessing_klass, constantPoolHandle cpool, ciS
}
// ------------------------------------------------------------------
-// ciSignature::return_ciType
+// ciSignature::return_type
//
// What is the return type of this signature?
ciType* ciSignature::return_type() const {
@@ -88,7 +88,7 @@ ciType* ciSignature::return_type() const {
}
// ------------------------------------------------------------------
-// ciSignature::ciType_at
+// ciSignature::type_at
//
// What is the type of the index'th element of this
// signature?
@@ -99,6 +99,24 @@ ciType* ciSignature::type_at(int index) const {
}
// ------------------------------------------------------------------
+// ciSignature::equals
+//
+// Compare this signature to another one. Signatures with different
+// accessing classes but with signature-types resolved to the same
+// types are defined to be equal.
+bool ciSignature::equals(ciSignature* that) {
+ // Compare signature
+ if (!this->as_symbol()->equals(that->as_symbol())) return false;
+ // Compare all types of the arguments
+ for (int i = 0; i < _count; i++) {
+ if (this->type_at(i) != that->type_at(i)) return false;
+ }
+ // Compare the return type
+ if (this->return_type() != that->return_type()) return false;
+ return true;
+}
+
+// ------------------------------------------------------------------
// ciSignature::print_signature
void ciSignature::print_signature() {
_symbol->print_symbol();
diff --git a/hotspot/src/share/vm/ci/ciSignature.hpp b/hotspot/src/share/vm/ci/ciSignature.hpp
index aaeac41..25ba097 100644
--- a/hotspot/src/share/vm/ci/ciSignature.hpp
+++ b/hotspot/src/share/vm/ci/ciSignature.hpp
@@ -43,6 +43,7 @@ private:
int _count;
friend class ciMethod;
+ friend class ciObjectFactory;
ciSignature(ciKlass* accessing_klass, constantPoolHandle cpool, ciSymbol* signature);
@@ -52,6 +53,7 @@ private:
public:
ciSymbol* as_symbol() const { return _symbol; }
+ ciKlass* accessing_klass() const { return _accessing_klass; }
ciType* return_type() const;
ciType* type_at(int index) const;
@@ -59,6 +61,8 @@ public:
int size() const { return _size; }
int count() const { return _count; }
+ bool equals(ciSignature* that);
+
void print_signature();
void print();
};
diff --git a/hotspot/src/share/vm/classfile/javaClasses.cpp b/hotspot/src/share/vm/classfile/javaClasses.cpp
index 385899a..59db6c3 100644
--- a/hotspot/src/share/vm/classfile/javaClasses.cpp
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp
@@ -503,12 +503,8 @@ oop java_lang_Class::create_mirror(KlassHandle k, TRAPS) {
if (SystemDictionary::Class_klass_loaded() && (k->oop_is_instance() || k->oop_is_javaArray())) {
// Allocate mirror (java.lang.Class instance)
Handle mirror = instanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(k, CHECK_0);
- // Setup indirections
- mirror->obj_field_put(_klass_offset, k());
- k->set_java_mirror(mirror());
instanceMirrorKlass* mk = instanceMirrorKlass::cast(mirror->klass());
- java_lang_Class::set_oop_size(mirror(), mk->instance_size(k));
java_lang_Class::set_static_oop_field_count(mirror(), mk->compute_static_oop_field_count(mirror()));
// It might also have a component mirror. This mirror must already exist.
@@ -571,9 +567,10 @@ oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, Basic
assert(aklass != NULL, "correct bootstrap");
set_array_klass(java_class, aklass);
}
+#ifdef ASSERT
instanceMirrorKlass* mk = instanceMirrorKlass::cast(SystemDictionary::Class_klass());
- java_lang_Class::set_oop_size(java_class, mk->instance_size(oop(NULL)));
- java_lang_Class::set_static_oop_field_count(java_class, 0);
+ assert(java_lang_Class::static_oop_field_count(java_class) == 0, "should have been zeroed by allocation");
+#endif
return java_class;
}
@@ -587,6 +584,12 @@ klassOop java_lang_Class::as_klassOop(oop java_class) {
}
+void java_lang_Class::set_klass(oop java_class, klassOop klass) {
+ assert(java_lang_Class::is_instance(java_class), "must be a Class object");
+ java_class->obj_field_put(_klass_offset, klass);
+}
+
+
void java_lang_Class::print_signature(oop java_class, outputStream* st) {
assert(java_lang_Class::is_instance(java_class), "must be a Class object");
Symbol* name = NULL;
diff --git a/hotspot/src/share/vm/classfile/javaClasses.hpp b/hotspot/src/share/vm/classfile/javaClasses.hpp
index fca9897..2a32801 100644
--- a/hotspot/src/share/vm/classfile/javaClasses.hpp
+++ b/hotspot/src/share/vm/classfile/javaClasses.hpp
@@ -188,6 +188,7 @@ class java_lang_Class : AllStatic {
static oop create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS);
// Conversion
static klassOop as_klassOop(oop java_class);
+ static void set_klass(oop java_class, klassOop klass);
static BasicType as_BasicType(oop java_class, klassOop* reference_klass = NULL);
static BasicType as_BasicType(oop java_class, KlassHandle* reference_klass) {
klassOop refk_oop = NULL;
diff --git a/hotspot/src/share/vm/code/dependencies.cpp b/hotspot/src/share/vm/code/dependencies.cpp
index 0a19acf..a3fd99e 100644
--- a/hotspot/src/share/vm/code/dependencies.cpp
+++ b/hotspot/src/share/vm/code/dependencies.cpp
@@ -763,9 +763,14 @@ class ClassHierarchyWalker {
// Method m is inherited into ctxk.
return true;
if (lm != NULL) {
- if (!(lm->is_public() || lm->is_protected()))
+ if (!(lm->is_public() || lm->is_protected())) {
// Method is [package-]private, so the override story is complex.
return true; // Must punt the assertion to true.
+ }
+ if (lm->is_static()) {
+ // Static methods don't override non-static so punt
+ return true;
+ }
if ( !Dependencies::is_concrete_method(lm)
&& !Dependencies::is_concrete_method(m)
&& Klass::cast(lm->method_holder())->is_subtype_of(m->method_holder()))
@@ -1091,9 +1096,11 @@ bool Dependencies::is_concrete_klass(klassOop k) {
}
bool Dependencies::is_concrete_method(methodOop m) {
- if (m->is_abstract()) return false;
- // %%% We could treat unexecuted methods as virtually abstract also.
- // This would require a deoptimization barrier on first execution.
+ // Statics are irrelevant to virtual call sites.
+ if (m->is_static()) return false;
+
+ // We could also return false if m does not yet appear to be
+ // executed, if the VM version supports this distinction also.
return !m->is_abstract();
}
@@ -1113,7 +1120,7 @@ Klass* Dependencies::find_finalizable_subclass(Klass* k) {
bool Dependencies::is_concrete_klass(ciInstanceKlass* k) {
if (k->is_abstract()) return false;
- // We could return also false if k does not yet appear to be
+ // We could also return false if k does not yet appear to be
// instantiated, if the VM version supports this distinction also.
//if (k->is_not_instantiated()) return false;
return true;
@@ -1123,7 +1130,7 @@ bool Dependencies::is_concrete_method(ciMethod* m) {
// Statics are irrelevant to virtual call sites.
if (m->is_static()) return false;
- // We could return also false if m does not yet appear to be
+ // We could also return false if m does not yet appear to be
// executed, if the VM version supports this distinction also.
return !m->is_abstract();
}
diff --git a/hotspot/src/share/vm/code/nmethod.cpp b/hotspot/src/share/vm/code/nmethod.cpp
index f375bdc..31424e1 100644
--- a/hotspot/src/share/vm/code/nmethod.cpp
+++ b/hotspot/src/share/vm/code/nmethod.cpp
@@ -50,6 +50,7 @@
// Only bother with this argument setup if dtrace is available
+#ifndef USDT2
HS_DTRACE_PROBE_DECL8(hotspot, compiled__method__load,
const char*, int, const char*, int, const char*, int, void*, size_t);
@@ -69,6 +70,21 @@ HS_DTRACE_PROBE_DECL6(hotspot, compiled__method__unload,
signature->bytes(), signature->utf8_length()); \
} \
}
+#else /* USDT2 */
+#define DTRACE_METHOD_UNLOAD_PROBE(method) \
+ { \
+ methodOop m = (method); \
+ if (m != NULL) { \
+ Symbol* klass_name = m->klass_name(); \
+ Symbol* name = m->name(); \
+ Symbol* signature = m->signature(); \
+ HOTSPOT_COMPILED_METHOD_UNLOAD( \
+ (char *) klass_name->bytes(), klass_name->utf8_length(), \
+ (char *) name->bytes(), name->utf8_length(), \
+ (char *) signature->bytes(), signature->utf8_length()); \
+ } \
+ }
+#endif /* USDT2 */
#else // ndef DTRACE_ENABLED
@@ -1473,6 +1489,7 @@ bool nmethod::can_unload(BoolObjectClosure* is_alive,
void nmethod::post_compiled_method_load_event() {
methodOop moop = method();
+#ifndef USDT2
HS_DTRACE_PROBE8(hotspot, compiled__method__load,
moop->klass_name()->bytes(),
moop->klass_name()->utf8_length(),
@@ -1481,6 +1498,16 @@ void nmethod::post_compiled_method_load_event() {
moop->signature()->bytes(),
moop->signature()->utf8_length(),
insts_begin(), insts_size());
+#else /* USDT2 */
+ HOTSPOT_COMPILED_METHOD_LOAD(
+ (char *) moop->klass_name()->bytes(),
+ moop->klass_name()->utf8_length(),
+ (char *) moop->name()->bytes(),
+ moop->name()->utf8_length(),
+ (char *) moop->signature()->bytes(),
+ moop->signature()->utf8_length(),
+ insts_begin(), insts_size());
+#endif /* USDT2 */
if (JvmtiExport::should_post_compiled_method_load() ||
JvmtiExport::should_post_compiled_method_unload()) {
diff --git a/hotspot/src/share/vm/compiler/compileBroker.cpp b/hotspot/src/share/vm/compiler/compileBroker.cpp
index 504d1a0..55ef1e4 100644
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp
@@ -58,6 +58,7 @@
// Only bother with this argument setup if dtrace is available
+#ifndef USDT2
HS_DTRACE_PROBE_DECL8(hotspot, method__compile__begin,
char*, intptr_t, char*, intptr_t, char*, intptr_t, char*, intptr_t);
HS_DTRACE_PROBE_DECL9(hotspot, method__compile__end,
@@ -89,6 +90,35 @@ HS_DTRACE_PROBE_DECL9(hotspot, method__compile__end,
signature->bytes(), signature->utf8_length(), (success)); \
}
+#else /* USDT2 */
+
+#define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method) \
+ { \
+ char* comp_name = (char*)(compiler)->name(); \
+ Symbol* klass_name = (method)->klass_name(); \
+ Symbol* name = (method)->name(); \
+ Symbol* signature = (method)->signature(); \
+ HOTSPOT_METHOD_COMPILE_BEGIN( \
+ comp_name, strlen(comp_name), \
+ (char *) klass_name->bytes(), klass_name->utf8_length(), \
+ (char *) name->bytes(), name->utf8_length(), \
+ (char *) signature->bytes(), signature->utf8_length()); \
+ }
+
+#define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method, success) \
+ { \
+ char* comp_name = (char*)(compiler)->name(); \
+ Symbol* klass_name = (method)->klass_name(); \
+ Symbol* name = (method)->name(); \
+ Symbol* signature = (method)->signature(); \
+ HOTSPOT_METHOD_COMPILE_END( \
+ comp_name, strlen(comp_name), \
+ (char *) klass_name->bytes(), klass_name->utf8_length(), \
+ (char *) name->bytes(), name->utf8_length(), \
+ (char *) signature->bytes(), signature->utf8_length(), (success)); \
+ }
+#endif /* USDT2 */
+
#else // ndef DTRACE_ENABLED
#define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method)
@@ -1692,11 +1722,11 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
if (PrintCompilation) {
const char* reason = ci_env.failure_reason();
if (compilable == ciEnv::MethodCompilable_not_at_tier) {
- tty->print_cr("%3d COMPILE SKIPPED: %s (retry at different tier)", compile_id, reason);
+ tty->print_cr("%4d COMPILE SKIPPED: %s (retry at different tier)", compile_id, reason);
} else if (compilable == ciEnv::MethodCompilable_never) {
- tty->print_cr("%3d COMPILE SKIPPED: %s (not retryable)", compile_id, reason);
+ tty->print_cr("%4d COMPILE SKIPPED: %s (not retryable)", compile_id, reason);
} else if (compilable == ciEnv::MethodCompilable) {
- tty->print_cr("%3d COMPILE SKIPPED: %s", compile_id, reason);
+ tty->print_cr("%4d COMPILE SKIPPED: %s", compile_id, reason);
}
}
} else {
@@ -1713,6 +1743,14 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
collect_statistics(thread, time, task);
+ if (PrintCompilation && PrintCompilation2) {
+ tty->print("%7d ", (int) tty->time_stamp().milliseconds()); // print timestamp
+ tty->print("%4d ", compile_id); // print compilation number
+ tty->print("%s ", (is_osr ? "%" : " "));
+ int code_size = (task->code() == NULL) ? 0 : task->code()->total_size();
+ tty->print_cr("size: %d time: %d inlined: %d bytes", code_size, time.milliseconds(), task->num_inlined_bytecodes());
+ }
+
if (compilable == ciEnv::MethodCompilable_never) {
if (is_osr) {
method->set_not_osr_compilable();
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
index c989486..eeabe97 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
@@ -50,8 +50,8 @@
int CompactibleFreeListSpace::_lockRank = Mutex::leaf + 3;
// Defaults are 0 so things will break badly if incorrectly initialized.
-int CompactibleFreeListSpace::IndexSetStart = 0;
-int CompactibleFreeListSpace::IndexSetStride = 0;
+size_t CompactibleFreeListSpace::IndexSetStart = 0;
+size_t CompactibleFreeListSpace::IndexSetStride = 0;
size_t MinChunkSize = 0;
@@ -62,7 +62,7 @@ void CompactibleFreeListSpace::set_cms_values() {
MinChunkSize = numQuanta(sizeof(FreeChunk), MinObjAlignmentInBytes) * MinObjAlignment;
assert(IndexSetStart == 0 && IndexSetStride == 0, "already set");
- IndexSetStart = MinObjAlignment;
+ IndexSetStart = MinChunkSize;
IndexSetStride = MinObjAlignment;
}
@@ -138,7 +138,7 @@ CompactibleFreeListSpace::CompactibleFreeListSpace(BlockOffsetSharedArray* bs,
} else {
_fitStrategy = FreeBlockStrategyNone;
}
- checkFreeListConsistency();
+ check_free_list_consistency();
// Initialize locks for parallel case.
@@ -250,7 +250,7 @@ void CompactibleFreeListSpace::initializeIndexedFreeListArray() {
}
void CompactibleFreeListSpace::resetIndexedFreeListArray() {
- for (int i = 1; i < IndexSetSize; i++) {
+ for (size_t i = 1; i < IndexSetSize; i++) {
assert(_indexedFreeList[i].size() == (size_t) i,
"Indexed free list sizes are incorrect");
_indexedFreeList[i].reset(IndexSetSize);
@@ -337,7 +337,7 @@ size_t CompactibleFreeListSpace::sumIndexedFreeListArrayReturnedBytes() {
size_t CompactibleFreeListSpace::totalCountInIndexedFreeLists() const {
size_t count = 0;
- for (int i = (int)MinChunkSize; i < IndexSetSize; i++) {
+ for (size_t i = IndexSetStart; i < IndexSetSize; i++) {
debug_only(
ssize_t total_list_count = 0;
for (FreeChunk* fc = _indexedFreeList[i].head(); fc != NULL;
@@ -1358,17 +1358,29 @@ FreeChunk* CompactibleFreeListSpace::getChunkFromGreater(size_t numWords) {
ShouldNotReachHere();
}
-bool CompactibleFreeListSpace::verifyChunkInIndexedFreeLists(FreeChunk* fc)
- const {
+bool CompactibleFreeListSpace::verifyChunkInIndexedFreeLists(FreeChunk* fc) const {
assert(fc->size() < IndexSetSize, "Size of chunk is too large");
return _indexedFreeList[fc->size()].verifyChunkInFreeLists(fc);
}
+bool CompactibleFreeListSpace::verify_chunk_is_linear_alloc_block(FreeChunk* fc) const {
+ assert((_smallLinearAllocBlock._ptr != (HeapWord*)fc) ||
+ (_smallLinearAllocBlock._word_size == fc->size()),
+ "Linear allocation block shows incorrect size");
+ return ((_smallLinearAllocBlock._ptr == (HeapWord*)fc) &&
+ (_smallLinearAllocBlock._word_size == fc->size()));
+}
+
+// Check if the purported free chunk is present either as a linear
+// allocation block, the size-indexed table of (smaller) free blocks,
+// or the larger free blocks kept in the binary tree dictionary.
bool CompactibleFreeListSpace::verifyChunkInFreeLists(FreeChunk* fc) const {
- if (fc->size() >= IndexSetSize) {
- return dictionary()->verifyChunkInFreeLists(fc);
- } else {
+ if (verify_chunk_is_linear_alloc_block(fc)) {
+ return true;
+ } else if (fc->size() < IndexSetSize) {
return verifyChunkInIndexedFreeLists(fc);
+ } else {
+ return dictionary()->verifyChunkInFreeLists(fc);
}
}
@@ -2188,7 +2200,7 @@ void CompactibleFreeListSpace::setFLHints() {
void CompactibleFreeListSpace::clearFLCensus() {
assert_locked();
- int i;
+ size_t i;
for (i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
FreeList *fl = &_indexedFreeList[i];
fl->set_prevSweep(fl->count());
@@ -2482,7 +2494,7 @@ void CompactibleFreeListSpace::verifyFreeLists() const {
void CompactibleFreeListSpace::verifyIndexedFreeLists() const {
size_t i = 0;
- for (; i < MinChunkSize; i++) {
+ for (; i < IndexSetStart; i++) {
guarantee(_indexedFreeList[i].head() == NULL, "should be NULL");
}
for (; i < IndexSetSize; i++) {
@@ -2495,7 +2507,8 @@ void CompactibleFreeListSpace::verifyIndexedFreeList(size_t size) const {
FreeChunk* tail = _indexedFreeList[size].tail();
size_t num = _indexedFreeList[size].count();
size_t n = 0;
- guarantee((size % 2 == 0) || fc == NULL, "Odd slots should be empty");
+ guarantee(((size >= IndexSetStart) && (size % IndexSetStride == 0)) || fc == NULL,
+ "Slot should have been empty");
for (; fc != NULL; fc = fc->next(), n++) {
guarantee(fc->size() == size, "Size inconsistency");
guarantee(fc->isFree(), "!free?");
@@ -2506,15 +2519,15 @@ void CompactibleFreeListSpace::verifyIndexedFreeList(size_t size) const {
}
#ifndef PRODUCT
-void CompactibleFreeListSpace::checkFreeListConsistency() const {
+void CompactibleFreeListSpace::check_free_list_consistency() const {
assert(_dictionary->minSize() <= IndexSetSize,
"Some sizes can't be allocated without recourse to"
" linear allocation buffers");
assert(MIN_TREE_CHUNK_SIZE*HeapWordSize == sizeof(TreeChunk),
"else MIN_TREE_CHUNK_SIZE is wrong");
- assert((IndexSetStride == 2 && IndexSetStart == 2) ||
- (IndexSetStride == 1 && IndexSetStart == 1), "just checking");
- assert((IndexSetStride != 2) || (MinChunkSize % 2 == 0),
+ assert((IndexSetStride == 2 && IndexSetStart == 4) || // 32-bit
+ (IndexSetStride == 1 && IndexSetStart == 3), "just checking"); // 64-bit
+ assert((IndexSetStride != 2) || (IndexSetStart % 2 == 0),
"Some for-loops may be incorrectly initialized");
assert((IndexSetStride != 2) || (IndexSetSize % 2 == 1),
"For-loops that iterate over IndexSet with stride 2 may be wrong");
@@ -2688,33 +2701,27 @@ void CFLS_LAB::compute_desired_plab_size() {
}
}
+// If this is changed in the future to allow parallel
+// access, one would need to take the FL locks and,
+// depending on how it is used, stagger access from
+// parallel threads to reduce contention.
void CFLS_LAB::retire(int tid) {
// We run this single threaded with the world stopped;
// so no need for locks and such.
-#define CFLS_LAB_PARALLEL_ACCESS 0
NOT_PRODUCT(Thread* t = Thread::current();)
assert(Thread::current()->is_VM_thread(), "Error");
- assert(CompactibleFreeListSpace::IndexSetStart == CompactibleFreeListSpace::IndexSetStride,
- "Will access to uninitialized slot below");
-#if CFLS_LAB_PARALLEL_ACCESS
- for (size_t i = CompactibleFreeListSpace::IndexSetSize - 1;
- i > 0;
- i -= CompactibleFreeListSpace::IndexSetStride) {
-#else // CFLS_LAB_PARALLEL_ACCESS
for (size_t i = CompactibleFreeListSpace::IndexSetStart;
i < CompactibleFreeListSpace::IndexSetSize;
i += CompactibleFreeListSpace::IndexSetStride) {
-#endif // !CFLS_LAB_PARALLEL_ACCESS
assert(_num_blocks[i] >= (size_t)_indexedFreeList[i].count(),
"Can't retire more than what we obtained");
if (_num_blocks[i] > 0) {
size_t num_retire = _indexedFreeList[i].count();
assert(_num_blocks[i] > num_retire, "Should have used at least one");
{
-#if CFLS_LAB_PARALLEL_ACCESS
- MutexLockerEx x(_cfls->_indexedFreeListParLocks[i],
- Mutex::_no_safepoint_check_flag);
-#endif // CFLS_LAB_PARALLEL_ACCESS
+ // MutexLockerEx x(_cfls->_indexedFreeListParLocks[i],
+ // Mutex::_no_safepoint_check_flag);
+
// Update globals stats for num_blocks used
_global_num_blocks[i] += (_num_blocks[i] - num_retire);
_global_num_workers[i]++;
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
index 3f36432..81e220b 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
@@ -104,8 +104,8 @@ class CompactibleFreeListSpace: public CompactibleSpace {
SmallForDictionary = 257, // size < this then use _indexedFreeList
IndexSetSize = SmallForDictionary // keep this odd-sized
};
- static int IndexSetStart;
- static int IndexSetStride;
+ static size_t IndexSetStart;
+ static size_t IndexSetStride;
private:
enum FitStrategyOptions {
@@ -502,10 +502,14 @@ class CompactibleFreeListSpace: public CompactibleSpace {
void verifyFreeLists() const PRODUCT_RETURN;
void verifyIndexedFreeLists() const;
void verifyIndexedFreeList(size_t size) const;
- // verify that the given chunk is in the free lists.
+ // Verify that the given chunk is in the free lists:
+ // i.e. either the binary tree dictionary, the indexed free lists
+ // or the linear allocation block.
bool verifyChunkInFreeLists(FreeChunk* fc) const;
+ // Verify that the given chunk is the linear allocation block
+ bool verify_chunk_is_linear_alloc_block(FreeChunk* fc) const;
// Do some basic checks on the the free lists.
- void checkFreeListConsistency() const PRODUCT_RETURN;
+ void check_free_list_consistency() const PRODUCT_RETURN;
// Printing support
void dump_at_safepoint_with_locks(CMSCollector* c, outputStream* st);
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
index c5bd4ca..54bbb24 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
@@ -2004,7 +2004,7 @@ void CMSCollector::do_compaction_work(bool clear_all_soft_refs) {
ReferenceProcessorMTDiscoveryMutator rp_mut_discovery(ref_processor(), false);
ref_processor()->set_enqueuing_is_done(false);
- ref_processor()->enable_discovery();
+ ref_processor()->enable_discovery(false /*verify_disabled*/, false /*check_no_refs*/);
ref_processor()->setup_policy(clear_all_soft_refs);
// If an asynchronous collection finishes, the _modUnionTable is
// all clear. If we are assuming the collection from an asynchronous
@@ -3490,8 +3490,8 @@ void CMSCollector::checkpointRootsInitial(bool asynch) {
MutexLockerEx x(bitMapLock(),
Mutex::_no_safepoint_check_flag);
checkpointRootsInitialWork(asynch);
- rp->verify_no_references_recorded();
- rp->enable_discovery(); // enable ("weak") refs discovery
+ // enable ("weak") refs discovery
+ rp->enable_discovery(true /*verify_disabled*/, true /*check_no_refs*/);
_collectorState = Marking;
} else {
// (Weak) Refs discovery: this is controlled from genCollectedHeap::do_collection
@@ -3503,7 +3503,8 @@ void CMSCollector::checkpointRootsInitial(bool asynch) {
"ref discovery for this generation kind");
// already have locks
checkpointRootsInitialWork(asynch);
- rp->enable_discovery(); // now enable ("weak") refs discovery
+ // now enable ("weak") refs discovery
+ rp->enable_discovery(true /*verify_disabled*/, false /*verify_no_refs*/);
_collectorState = Marking;
}
SpecializationStats::print();
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
index 0ceec0b..c3b9d54 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
@@ -30,11 +30,15 @@
#include "memory/gcLocker.inline.hpp"
#include "runtime/interfaceSupport.hpp"
#include "utilities/dtrace.hpp"
+
+
+#ifndef USDT2
HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__begin);
HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__end);
HS_DTRACE_PROBE_DECL(hs_private, cms__remark__begin);
HS_DTRACE_PROBE_DECL(hs_private, cms__remark__end);
+#endif /* !USDT2 */
//////////////////////////////////////////////////////////
// Methods in abstract class VM_CMS_Operation
@@ -129,7 +133,12 @@ void VM_CMS_Initial_Mark::doit() {
// Nothing to do.
return;
}
+#ifndef USDT2
HS_DTRACE_PROBE(hs_private, cms__initmark__begin);
+#else /* USDT2 */
+ HS_PRIVATE_CMS_INITMARK_BEGIN(
+ );
+#endif /* USDT2 */
GenCollectedHeap* gch = GenCollectedHeap::heap();
GCCauseSetter gccs(gch, GCCause::_cms_initial_mark);
@@ -140,7 +149,12 @@ void VM_CMS_Initial_Mark::doit() {
_collector->do_CMS_operation(CMSCollector::CMS_op_checkpointRootsInitial);
VM_CMS_Operation::verify_after_gc();
+#ifndef USDT2
HS_DTRACE_PROBE(hs_private, cms__initmark__end);
+#else /* USDT2 */
+ HS_PRIVATE_CMS_INITMARK_END(
+ );
+#endif /* USDT2 */
}
//////////////////////////////////////////////////////////
@@ -151,7 +165,12 @@ void VM_CMS_Final_Remark::doit() {
// Nothing to do.
return;
}
+#ifndef USDT2
HS_DTRACE_PROBE(hs_private, cms__remark__begin);
+#else /* USDT2 */
+ HS_PRIVATE_CMS_REMARK_BEGIN(
+ );
+#endif /* USDT2 */
GenCollectedHeap* gch = GenCollectedHeap::heap();
GCCauseSetter gccs(gch, GCCause::_cms_final_remark);
@@ -162,7 +181,12 @@ void VM_CMS_Final_Remark::doit() {
_collector->do_CMS_operation(CMSCollector::CMS_op_checkpointRootsFinal);
VM_CMS_Operation::verify_after_gc();
+#ifndef USDT2
HS_DTRACE_PROBE(hs_private, cms__remark__end);
+#else /* USDT2 */
+ HS_PRIVATE_CMS_REMARK_END(
+ );
+#endif /* USDT2 */
}
// VM operation to invoke a concurrent collection of a
diff --git a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
index 73d578d..0b78565 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
@@ -118,30 +118,6 @@ HeapRegion *CSetChooserCache::remove_first() {
}
}
-// this is a bit expensive... but we expect that it should not be called
-// to often.
-void CSetChooserCache::remove(HeapRegion *hr) {
- assert(_occupancy > 0, "cache should not be empty");
- assert(hr->sort_index() < -1, "should already be in the cache");
- int index = get_index(hr->sort_index());
- assert(_cache[index] == hr, "index should be correct");
- int next_index = trim_index(index + 1);
- int last_index = trim_index(_first + _occupancy - 1);
- while (index != last_index) {
- assert(_cache[next_index] != NULL, "should not be null");
- _cache[index] = _cache[next_index];
- _cache[index]->set_sort_index(get_sort_index(index));
-
- index = next_index;
- next_index = trim_index(next_index+1);
- }
- assert(index == last_index, "should have reached the last one");
- _cache[index] = NULL;
- hr->set_sort_index(-1);
- --_occupancy;
- assert(verify(), "cache should be consistent");
-}
-
static inline int orderRegions(HeapRegion* hr1, HeapRegion* hr2) {
if (hr1 == NULL) {
if (hr2 == NULL) return 0;
@@ -197,43 +173,34 @@ bool CollectionSetChooser::verify() {
HeapRegion *prev = NULL;
while (index < _numMarkedRegions) {
HeapRegion *curr = _markedRegions.at(index++);
- if (curr != NULL) {
- int si = curr->sort_index();
- guarantee(!curr->is_young(), "should not be young!");
- guarantee(si > -1 && si == (index-1), "sort index invariant");
- if (prev != NULL) {
- guarantee(orderRegions(prev, curr) != 1, "regions should be sorted");
- }
- prev = curr;
+ guarantee(curr != NULL, "Regions in _markedRegions array cannot be NULL");
+ int si = curr->sort_index();
+ guarantee(!curr->is_young(), "should not be young!");
+ guarantee(si > -1 && si == (index-1), "sort index invariant");
+ if (prev != NULL) {
+ guarantee(orderRegions(prev, curr) != 1, "regions should be sorted");
}
+ prev = curr;
}
return _cache.verify();
}
#endif
-bool
-CollectionSetChooser::addRegionToCache() {
- assert(!_cache.is_full(), "cache should not be full");
-
- HeapRegion *hr = NULL;
- while (hr == NULL && _curMarkedIndex < _numMarkedRegions) {
- hr = _markedRegions.at(_curMarkedIndex++);
- }
- if (hr == NULL)
- return false;
- assert(!hr->is_young(), "should not be young!");
- assert(hr->sort_index() == _curMarkedIndex-1, "sort_index invariant");
- _markedRegions.at_put(hr->sort_index(), NULL);
- _cache.insert(hr);
- assert(!_cache.is_empty(), "cache should not be empty");
- assert(verify(), "cache should be consistent");
- return false;
-}
-
void
CollectionSetChooser::fillCache() {
- while (!_cache.is_full() && addRegionToCache()) {
+ while (!_cache.is_full() && (_curMarkedIndex < _numMarkedRegions)) {
+ HeapRegion* hr = _markedRegions.at(_curMarkedIndex);
+ assert(hr != NULL,
+ err_msg("Unexpected NULL hr in _markedRegions at index %d",
+ _curMarkedIndex));
+ _curMarkedIndex += 1;
+ assert(!hr->is_young(), "should not be young!");
+ assert(hr->sort_index() == _curMarkedIndex-1, "sort_index invariant");
+ _markedRegions.at_put(hr->sort_index(), NULL);
+ _cache.insert(hr);
+ assert(!_cache.is_empty(), "cache should not be empty");
}
+ assert(verify(), "cache should be consistent");
}
void
@@ -334,20 +301,6 @@ CollectionSetChooser::updateAfterFullCollection() {
clearMarkedHeapRegions();
}
-void CollectionSetChooser::removeRegion(HeapRegion *hr) {
- int si = hr->sort_index();
- assert(si == -1 || hr->is_marked(), "Sort index not valid.");
- if (si > -1) {
- assert(_markedRegions.at(si) == hr, "Sort index not valid." );
- _markedRegions.at_put(si, NULL);
- } else if (si < -1) {
- assert(_cache.region_in_cache(hr), "should be in the cache");
- _cache.remove(hr);
- assert(hr->sort_index() == -1, "sort index invariant");
- }
- hr->set_sort_index(-1);
-}
-
// if time_remaining < 0.0, then this method should try to return
// a region, whether it fits within the remaining time or not
HeapRegion*
diff --git a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
index c8e2233..ff4bca9 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2011, 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
@@ -29,6 +29,26 @@
#include "utilities/growableArray.hpp"
// We need to sort heap regions by collection desirability.
+// This sorting is currently done in two "stages". An initial sort is
+// done following a cleanup pause as soon as all of the marked but
+// non-empty regions have been identified and the completely empty
+// ones reclaimed.
+// This gives us a global sort on a GC efficiency metric
+// based on predictive data available at that time. However,
+// any of these regions that are collected will only be collected
+// during a future GC pause, by which time it is possible that newer
+// data might allow us to revise and/or refine the earlier
+// pause predictions, leading to changes in expected gc efficiency
+// order. To somewhat mitigate this obsolescence, more so in the
+// case of regions towards the end of the list, which will be
+// picked later, these pre-sorted regions from the _markedRegions
+// array are not used as is, but a small prefix thereof is
+// insertion-sorted again into a small cache, based on more
+// recent remembered set information. Regions are then drawn
+// from this cache to construct the collection set at each
+// incremental GC.
+// This scheme and/or its implementation may be subject to
+// revision in the future.
class CSetChooserCache VALUE_OBJ_CLASS_SPEC {
private:
@@ -37,8 +57,8 @@ private:
} PrivateConstants;
HeapRegion* _cache[CacheLength];
- int _occupancy; // number of region in cache
- int _first; // "first" region in the cache
+ int _occupancy; // number of regions in cache
+ int _first; // (index of) "first" region in the cache
// adding CacheLength to deal with negative values
inline int trim_index(int index) {
@@ -62,7 +82,6 @@ public:
void clear(void);
void insert(HeapRegion *hr);
HeapRegion *remove_first(void);
- void remove (HeapRegion *hr);
inline HeapRegion *get_first(void) {
return _cache[_first];
}
@@ -102,7 +121,6 @@ public:
void sortMarkedHeapRegions();
void fillCache();
- bool addRegionToCache(void);
void addMarkedHeapRegion(HeapRegion *hr);
// Must be called before calls to getParMarkedHeapRegionChunk.
@@ -122,9 +140,6 @@ public:
void updateAfterFullCollection();
- // Ensure that "hr" is not a member of the marked region array or the cache
- void removeRegion(HeapRegion* hr);
-
bool unmarked_age_1_returned_as_new() { return _unmarked_age_1_returned_as_new; }
// Returns true if the used portion of "_markedRegions" is properly
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
index 3679002..f414613 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -818,10 +818,10 @@ void ConcurrentMark::checkpointRootsInitialPost() {
NoteStartOfMarkHRClosure startcl;
g1h->heap_region_iterate(&startcl);
- // Start weak-reference discovery.
- ReferenceProcessor* rp = g1h->ref_processor();
- rp->verify_no_references_recorded();
- rp->enable_discovery(); // enable ("weak") refs discovery
+ // Start Concurrent Marking weak-reference discovery.
+ ReferenceProcessor* rp = g1h->ref_processor_cm();
+ // enable ("weak") refs discovery
+ rp->enable_discovery(true /*verify_disabled*/, true /*verify_no_refs*/);
rp->setup_policy(false); // snapshot the soft ref policy to be used in this cycle
SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set();
@@ -1133,6 +1133,7 @@ void ConcurrentMark::checkpointRootsFinal(bool clear_all_soft_refs) {
// world is stopped at this checkpoint
assert(SafepointSynchronize::is_at_safepoint(),
"world should be stopped");
+
G1CollectedHeap* g1h = G1CollectedHeap::heap();
// If a full collection has happened, we shouldn't do this.
@@ -1517,6 +1518,7 @@ class G1NoteEndOfConcMarkClosure : public HeapRegionClosure {
size_t _regions_claimed;
size_t _freed_bytes;
FreeRegionList* _local_cleanup_list;
+ OldRegionSet* _old_proxy_set;
HumongousRegionSet* _humongous_proxy_set;
HRRSCleanupTask* _hrrs_cleanup_task;
double _claimed_region_time;
@@ -1526,6 +1528,7 @@ public:
G1NoteEndOfConcMarkClosure(G1CollectedHeap* g1,
int worker_num,
FreeRegionList* local_cleanup_list,
+ OldRegionSet* old_proxy_set,
HumongousRegionSet* humongous_proxy_set,
HRRSCleanupTask* hrrs_cleanup_task);
size_t freed_bytes() { return _freed_bytes; }
@@ -1556,9 +1559,11 @@ public:
void work(int i) {
double start = os::elapsedTime();
FreeRegionList local_cleanup_list("Local Cleanup List");
+ OldRegionSet old_proxy_set("Local Cleanup Old Proxy Set");
HumongousRegionSet humongous_proxy_set("Local Cleanup Humongous Proxy Set");
HRRSCleanupTask hrrs_cleanup_task;
G1NoteEndOfConcMarkClosure g1_note_end(_g1h, i, &local_cleanup_list,
+ &old_proxy_set,
&humongous_proxy_set,
&hrrs_cleanup_task);
if (G1CollectedHeap::use_parallel_gc_threads()) {
@@ -1572,6 +1577,7 @@ public:
// Now update the lists
_g1h->update_sets_after_freeing_regions(g1_note_end.freed_bytes(),
NULL /* free_list */,
+ &old_proxy_set,
&humongous_proxy_set,
true /* par */);
{
@@ -1642,6 +1648,7 @@ G1NoteEndOfConcMarkClosure::
G1NoteEndOfConcMarkClosure(G1CollectedHeap* g1,
int worker_num,
FreeRegionList* local_cleanup_list,
+ OldRegionSet* old_proxy_set,
HumongousRegionSet* humongous_proxy_set,
HRRSCleanupTask* hrrs_cleanup_task)
: _g1(g1), _worker_num(worker_num),
@@ -1649,6 +1656,7 @@ G1NoteEndOfConcMarkClosure(G1CollectedHeap* g1,
_freed_bytes(0),
_claimed_region_time(0.0), _max_region_time(0.0),
_local_cleanup_list(local_cleanup_list),
+ _old_proxy_set(old_proxy_set),
_humongous_proxy_set(humongous_proxy_set),
_hrrs_cleanup_task(hrrs_cleanup_task) { }
@@ -1664,6 +1672,7 @@ bool G1NoteEndOfConcMarkClosure::doHeapRegion(HeapRegion *hr) {
_g1->free_region_if_empty(hr,
&_freed_bytes,
_local_cleanup_list,
+ _old_proxy_set,
_humongous_proxy_set,
_hrrs_cleanup_task,
true /* par */);
@@ -1688,6 +1697,7 @@ void ConcurrentMark::cleanup() {
return;
}
+ HRSPhaseSetter x(HRSPhaseCleanup);
g1h->verify_region_sets_optional();
if (VerifyDuringGC) {
@@ -1815,9 +1825,7 @@ void ConcurrentMark::cleanup() {
// this will also free any regions totally full of garbage objects,
// and sort the regions.
- g1h->g1_policy()->record_concurrent_mark_cleanup_end(
- g1_par_note_end_task.freed_bytes(),
- g1_par_note_end_task.max_live_bytes());
+ g1h->g1_policy()->record_concurrent_mark_cleanup_end();
// Statistics.
double end = os::elapsedTime();
@@ -1837,6 +1845,10 @@ void ConcurrentMark::cleanup() {
size_t cleaned_up_bytes = start_used_bytes - g1h->used();
g1p->decrease_known_garbage_bytes(cleaned_up_bytes);
+ // Clean up will have freed any regions completely full of garbage.
+ // Update the soft reference policy with the new heap occupancy.
+ Universe::update_heap_info_at_gc();
+
// We need to make this be a "collection" so any collection pause that
// races with it goes around and waits for completeCleanup to finish.
g1h->increment_total_collections();
@@ -2072,8 +2084,10 @@ class G1CMParDrainMarkingStackClosure: public VoidClosure {
}
};
-// Implementation of AbstractRefProcTaskExecutor for G1
-class G1RefProcTaskExecutor: public AbstractRefProcTaskExecutor {
+// Implementation of AbstractRefProcTaskExecutor for parallel
+// reference processing at the end of G1 concurrent marking
+
+class G1CMRefProcTaskExecutor: public AbstractRefProcTaskExecutor {
private:
G1CollectedHeap* _g1h;
ConcurrentMark* _cm;
@@ -2082,7 +2096,7 @@ private:
int _active_workers;
public:
- G1RefProcTaskExecutor(G1CollectedHeap* g1h,
+ G1CMRefProcTaskExecutor(G1CollectedHeap* g1h,
ConcurrentMark* cm,
CMBitMap* bitmap,
WorkGang* workers,
@@ -2096,7 +2110,7 @@ public:
virtual void execute(EnqueueTask& task);
};
-class G1RefProcTaskProxy: public AbstractGangTask {
+class G1CMRefProcTaskProxy: public AbstractGangTask {
typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
ProcessTask& _proc_task;
G1CollectedHeap* _g1h;
@@ -2104,7 +2118,7 @@ class G1RefProcTaskProxy: public AbstractGangTask {
CMBitMap* _bitmap;
public:
- G1RefProcTaskProxy(ProcessTask& proc_task,
+ G1CMRefProcTaskProxy(ProcessTask& proc_task,
G1CollectedHeap* g1h,
ConcurrentMark* cm,
CMBitMap* bitmap) :
@@ -2122,10 +2136,10 @@ public:
}
};
-void G1RefProcTaskExecutor::execute(ProcessTask& proc_task) {
+void G1CMRefProcTaskExecutor::execute(ProcessTask& proc_task) {
assert(_workers != NULL, "Need parallel worker threads.");
- G1RefProcTaskProxy proc_task_proxy(proc_task, _g1h, _cm, _bitmap);
+ G1CMRefProcTaskProxy proc_task_proxy(proc_task, _g1h, _cm, _bitmap);
// We need to reset the phase for each task execution so that
// the termination protocol of CMTask::do_marking_step works.
@@ -2135,12 +2149,12 @@ void G1RefProcTaskExecutor::execute(ProcessTask& proc_task) {
_g1h->set_par_threads(0);
}
-class G1RefEnqueueTaskProxy: public AbstractGangTask {
+class G1CMRefEnqueueTaskProxy: public AbstractGangTask {
typedef AbstractRefProcTaskExecutor::EnqueueTask EnqueueTask;
EnqueueTask& _enq_task;
public:
- G1RefEnqueueTaskProxy(EnqueueTask& enq_task) :
+ G1CMRefEnqueueTaskProxy(EnqueueTask& enq_task) :
AbstractGangTask("Enqueue reference objects in parallel"),
_enq_task(enq_task)
{ }
@@ -2150,10 +2164,10 @@ public:
}
};
-void G1RefProcTaskExecutor::execute(EnqueueTask& enq_task) {
+void G1CMRefProcTaskExecutor::execute(EnqueueTask& enq_task) {
assert(_workers != NULL, "Need parallel worker threads.");
- G1RefEnqueueTaskProxy enq_task_proxy(enq_task);
+ G1CMRefEnqueueTaskProxy enq_task_proxy(enq_task);
_g1h->set_par_threads(_active_workers);
_workers->run_task(&enq_task_proxy);
@@ -2163,71 +2177,84 @@ void G1RefProcTaskExecutor::execute(EnqueueTask& enq_task) {
void ConcurrentMark::weakRefsWork(bool clear_all_soft_refs) {
ResourceMark rm;
HandleMark hm;
- G1CollectedHeap* g1h = G1CollectedHeap::heap();
- ReferenceProcessor* rp = g1h->ref_processor();
-
- // See the comment in G1CollectedHeap::ref_processing_init()
- // about how reference processing currently works in G1.
-
- // Process weak references.
- rp->setup_policy(clear_all_soft_refs);
- assert(_markStack.isEmpty(), "mark stack should be empty");
-
- G1CMIsAliveClosure g1_is_alive(g1h);
- G1CMKeepAliveClosure g1_keep_alive(g1h, this, nextMarkBitMap());
- G1CMDrainMarkingStackClosure
- g1_drain_mark_stack(nextMarkBitMap(), &_markStack, &g1_keep_alive);
- // We use the work gang from the G1CollectedHeap and we utilize all
- // the worker threads.
- int active_workers = g1h->workers() ? g1h->workers()->total_workers() : 1;
- active_workers = MAX2(MIN2(active_workers, (int)_max_task_num), 1);
-
- G1RefProcTaskExecutor par_task_executor(g1h, this, nextMarkBitMap(),
- g1h->workers(), active_workers);
-
-
- if (rp->processing_is_mt()) {
- // Set the degree of MT here. If the discovery is done MT, there
- // may have been a different number of threads doing the discovery
- // and a different number of discovered lists may have Ref objects.
- // That is OK as long as the Reference lists are balanced (see
- // balance_all_queues() and balance_queues()).
- rp->set_active_mt_degree(active_workers);
-
- rp->process_discovered_references(&g1_is_alive,
+
+ G1CollectedHeap* g1h = G1CollectedHeap::heap();
+
+ // Is alive closure.
+ G1CMIsAliveClosure g1_is_alive(g1h);
+
+ // Inner scope to exclude the cleaning of the string and symbol
+ // tables from the displayed time.
+ {
+ bool verbose = PrintGC && PrintGCDetails;
+ if (verbose) {
+ gclog_or_tty->put(' ');
+ }
+ TraceTime t("GC ref-proc", verbose, false, gclog_or_tty);
+
+ ReferenceProcessor* rp = g1h->ref_processor_cm();
+
+ // See the comment in G1CollectedHeap::ref_processing_init()
+ // about how reference processing currently works in G1.
+
+ // Process weak references.
+ rp->setup_policy(clear_all_soft_refs);
+ assert(_markStack.isEmpty(), "mark stack should be empty");
+
+ G1CMKeepAliveClosure g1_keep_alive(g1h, this, nextMarkBitMap());
+ G1CMDrainMarkingStackClosure
+ g1_drain_mark_stack(nextMarkBitMap(), &_markStack, &g1_keep_alive);
+
+ // We use the work gang from the G1CollectedHeap and we utilize all
+ // the worker threads.
+ int active_workers = g1h->workers() ? g1h->workers()->total_workers() : 1;
+ active_workers = MAX2(MIN2(active_workers, (int)_max_task_num), 1);
+
+ G1CMRefProcTaskExecutor par_task_executor(g1h, this, nextMarkBitMap(),
+ g1h->workers(), active_workers);
+
+ if (rp->processing_is_mt()) {
+ // Set the degree of MT here. If the discovery is done MT, there
+ // may have been a different number of threads doing the discovery
+ // and a different number of discovered lists may have Ref objects.
+ // That is OK as long as the Reference lists are balanced (see
+ // balance_all_queues() and balance_queues()).
+ rp->set_active_mt_degree(active_workers);
+
+ rp->process_discovered_references(&g1_is_alive,
&g1_keep_alive,
&g1_drain_mark_stack,
&par_task_executor);
- // The work routines of the parallel keep_alive and drain_marking_stack
- // will set the has_overflown flag if we overflow the global marking
- // stack.
- } else {
- rp->process_discovered_references(&g1_is_alive,
- &g1_keep_alive,
- &g1_drain_mark_stack,
- NULL);
+ // The work routines of the parallel keep_alive and drain_marking_stack
+ // will set the has_overflown flag if we overflow the global marking
+ // stack.
+ } else {
+ rp->process_discovered_references(&g1_is_alive,
+ &g1_keep_alive,
+ &g1_drain_mark_stack,
+ NULL);
+ }
- }
+ assert(_markStack.overflow() || _markStack.isEmpty(),
+ "mark stack should be empty (unless it overflowed)");
+ if (_markStack.overflow()) {
+ // Should have been done already when we tried to push an
+ // entry on to the global mark stack. But let's do it again.
+ set_has_overflown();
+ }
- assert(_markStack.overflow() || _markStack.isEmpty(),
- "mark stack should be empty (unless it overflowed)");
- if (_markStack.overflow()) {
- // Should have been done already when we tried to push an
- // entry on to the global mark stack. But let's do it again.
- set_has_overflown();
- }
+ if (rp->processing_is_mt()) {
+ assert(rp->num_q() == active_workers, "why not");
+ rp->enqueue_discovered_references(&par_task_executor);
+ } else {
+ rp->enqueue_discovered_references();
+ }
- if (rp->processing_is_mt()) {
- assert(rp->num_q() == active_workers, "why not");
- rp->enqueue_discovered_references(&par_task_executor);
- } else {
- rp->enqueue_discovered_references();
+ rp->verify_no_references_recorded();
+ assert(!rp->discovery_enabled(), "Post condition");
}
- rp->verify_no_references_recorded();
- assert(!rp->discovery_enabled(), "should have been disabled");
-
// Now clean up stale oops in StringTable
StringTable::unlink(&g1_is_alive);
// Clean up unreferenced symbols in symbol table.
@@ -3329,7 +3356,7 @@ G1CMOopClosure::G1CMOopClosure(G1CollectedHeap* g1h,
assert(_ref_processor == NULL, "should be initialized to NULL");
if (G1UseConcMarkReferenceProcessing) {
- _ref_processor = g1h->ref_processor();
+ _ref_processor = g1h->ref_processor_cm();
assert(_ref_processor != NULL, "should not be NULL");
}
}
@@ -4564,6 +4591,15 @@ G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name)
G1PPRL_DOUBLE_H_FORMAT,
"type", "address-range",
"used", "prev-live", "next-live", "gc-eff");
+ _out->print_cr(G1PPRL_LINE_PREFIX
+ G1PPRL_TYPE_H_FORMAT
+ G1PPRL_ADDR_BASE_H_FORMAT
+ G1PPRL_BYTE_H_FORMAT
+ G1PPRL_BYTE_H_FORMAT
+ G1PPRL_BYTE_H_FORMAT
+ G1PPRL_DOUBLE_H_FORMAT,
+ "", "",
+ "(bytes)", "(bytes)", "(bytes)", "(bytes/ms)");
}
// It takes as a parameter a reference to one of the _hum_* fields, it
@@ -4575,7 +4611,7 @@ size_t G1PrintRegionLivenessInfoClosure::get_hum_bytes(size_t* hum_bytes) {
// The > 0 check is to deal with the prev and next live bytes which
// could be 0.
if (*hum_bytes > 0) {
- bytes = MIN2((size_t) HeapRegion::GrainBytes, *hum_bytes);
+ bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes);
*hum_bytes -= bytes;
}
return bytes;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
index 0aca642..c724594 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
@@ -366,8 +366,8 @@ class ConcurrentMark: public CHeapObj {
friend class CMConcurrentMarkingTask;
friend class G1ParNoteEndTask;
friend class CalcLiveObjectsClosure;
- friend class G1RefProcTaskProxy;
- friend class G1RefProcTaskExecutor;
+ friend class G1CMRefProcTaskProxy;
+ friend class G1CMRefProcTaskExecutor;
friend class G1CMParKeepAliveAndDrainClosure;
friend class G1CMParDrainMarkingStackClosure;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
index 85fb9a4..0a4c81a 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
@@ -147,12 +147,8 @@ void ConcurrentMarkThread::run() {
}
}
} while (cm()->restart_for_overflow());
- double counting_start_time = os::elapsedVTime();
-
- // YSR: These look dubious (i.e. redundant) !!! FIX ME
- slt()->manipulatePLL(SurrogateLockerThread::acquirePLL);
- slt()->manipulatePLL(SurrogateLockerThread::releaseAndNotifyPLL);
+ double counting_start_time = os::elapsedVTime();
if (!cm()->has_aborted()) {
double count_start_sec = os::elapsedTime();
if (PrintGC) {
@@ -175,6 +171,7 @@ void ConcurrentMarkThread::run() {
}
}
}
+
double end_time = os::elapsedVTime();
_vtime_count_accum += (end_time - counting_start_time);
// Update the total virtual time before doing this, since it will try
@@ -215,20 +212,20 @@ void ConcurrentMarkThread::run() {
gclog_or_tty->print_cr("[GC concurrent-cleanup-start]");
}
- // Now do the remainder of the cleanup operation.
+ // Now do the concurrent cleanup operation.
_cm->completeCleanup();
+
// Notify anyone who's waiting that there are no more free
- // regions coming. We have to do this before we join the STS,
- // otherwise we might deadlock: a GC worker could be blocked
- // waiting for the notification whereas this thread will be
- // blocked for the pause to finish while it's trying to join
- // the STS, which is conditional on the GC workers finishing.
+ // regions coming. We have to do this before we join the STS
+ // (in fact, we should not attempt to join the STS in the
+ // interval between finishing the cleanup pause and clearing
+ // the free_regions_coming flag) otherwise we might deadlock:
+ // a GC worker could be blocked waiting for the notification
+ // whereas this thread will be blocked for the pause to finish
+ // while it's trying to join the STS, which is conditional on
+ // the GC workers finishing.
g1h->reset_free_regions_coming();
- _sts.join();
- g1_policy->record_concurrent_mark_cleanup_completed();
- _sts.leave();
-
double cleanup_end_sec = os::elapsedTime();
if (PrintGC) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
@@ -240,6 +237,36 @@ void ConcurrentMarkThread::run() {
guarantee(cm()->cleanup_list_is_empty(),
"at this point there should be no regions on the cleanup list");
+ // There is a tricky race before recording that the concurrent
+ // cleanup has completed and a potential Full GC starting around
+ // the same time. We want to make sure that the Full GC calls
+ // abort() on concurrent mark after
+ // record_concurrent_mark_cleanup_completed(), since abort() is
+ // the method that will reset the concurrent mark state. If we
+ // end up calling record_concurrent_mark_cleanup_completed()
+ // after abort() then we might incorrectly undo some of the work
+ // abort() did. Checking the has_aborted() flag after joining
+ // the STS allows the correct ordering of the two methods. There
+ // are two scenarios:
+ //
+ // a) If we reach here before the Full GC, the fact that we have
+ // joined the STS means that the Full GC cannot start until we
+ // leave the STS, so record_concurrent_mark_cleanup_completed()
+ // will complete before abort() is called.
+ //
+ // b) If we reach here during the Full GC, we'll be held up from
+ // joining the STS until the Full GC is done, which means that
+ // abort() will have completed and has_aborted() will return
+ // true to prevent us from calling
+ // record_concurrent_mark_cleanup_completed() (and, in fact, it's
+ // not needed any more as the concurrent mark state has been
+ // already reset).
+ _sts.join();
+ if (!cm()->has_aborted()) {
+ g1_policy->record_concurrent_mark_cleanup_completed();
+ }
+ _sts.leave();
+
if (cm()->has_aborted()) {
if (PrintGC) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
@@ -248,7 +275,7 @@ void ConcurrentMarkThread::run() {
}
}
- // we now want to allow clearing of the marking bitmap to be
+ // We now want to allow clearing of the marking bitmap to be
// suspended by a collection pause.
_sts.join();
_cm->clearNextBitmap();
@@ -305,13 +332,15 @@ void ConcurrentMarkThread::sleepBeforeNextCycle() {
clear_started();
}
-// Note: this method, although exported by the ConcurrentMarkSweepThread,
-// which is a non-JavaThread, can only be called by a JavaThread.
-// Currently this is done at vm creation time (post-vm-init) by the
-// main/Primordial (Java)Thread.
-// XXX Consider changing this in the future to allow the CMS thread
+// Note: As is the case with CMS - this method, although exported
+// by the ConcurrentMarkThread, which is a non-JavaThread, can only
+// be called by a JavaThread. Currently this is done at vm creation
+// time (post-vm-init) by the main/Primordial (Java)Thread.
+// XXX Consider changing this in the future to allow the CM thread
// itself to create this thread?
void ConcurrentMarkThread::makeSurrogateLockerThread(TRAPS) {
+ assert(UseG1GC, "SLT thread needed only for concurrent GC");
+ assert(THREAD->is_Java_thread(), "must be a Java thread");
assert(_slt == NULL, "SLT already created");
_slt = SurrogateLockerThread::make(THREAD);
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
index 9d62845..50eb833 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
@@ -42,6 +42,7 @@
#include "memory/gcLocker.inline.hpp"
#include "memory/genOopClosures.inline.hpp"
#include "memory/generationSpec.hpp"
+#include "memory/referenceProcessor.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
#include "runtime/aprofiler.hpp"
@@ -551,8 +552,7 @@ G1CollectedHeap::new_region_try_secondary_free_list() {
}
HeapRegion* G1CollectedHeap::new_region(size_t word_size, bool do_expand) {
- assert(!isHumongous(word_size) ||
- word_size <= (size_t) HeapRegion::GrainWords,
+ assert(!isHumongous(word_size) || word_size <= HeapRegion::GrainWords,
"the only time we use this to allocate a humongous region is "
"when we are allocating a single humongous region");
@@ -815,6 +815,11 @@ HeapWord* G1CollectedHeap::humongous_obj_allocate(size_t word_size) {
result =
humongous_obj_allocate_initialize_regions(first, num_regions, word_size);
assert(result != NULL, "it should always return a valid result");
+
+ // A successful humongous object allocation changes the used space
+ // information of the old generation so we need to recalculate the
+ // sizes and update the jstat counters here.
+ g1mm()->update_sizes();
}
verify_region_sets_optional();
@@ -1164,7 +1169,7 @@ public:
if (!hr->isHumongous()) {
_hr_printer->post_compaction(hr, G1HRPrinter::Old);
} else if (hr->startsHumongous()) {
- if (hr->capacity() == (size_t) HeapRegion::GrainBytes) {
+ if (hr->capacity() == HeapRegion::GrainBytes) {
// single humongous region
_hr_printer->post_compaction(hr, G1HRPrinter::SingleHumongous);
} else {
@@ -1198,6 +1203,7 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
Universe::print_heap_before_gc();
}
+ HRSPhaseSetter x(HRSPhaseFullGC);
verify_region_sets_optional();
const bool do_clear_all_soft_refs = clear_all_soft_refs ||
@@ -1244,15 +1250,11 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
COMPILER2_PRESENT(DerivedPointerTable::clear());
- // We want to discover references, but not process them yet.
- // This mode is disabled in
- // instanceRefKlass::process_discovered_references if the
- // generation does some collection work, or
- // instanceRefKlass::enqueue_discovered_references if the
- // generation returns without doing any work.
- ref_processor()->disable_discovery();
- ref_processor()->abandon_partial_discovery();
- ref_processor()->verify_no_references_recorded();
+ // Disable discovery and empty the discovered lists
+ // for the CM ref processor.
+ ref_processor_cm()->disable_discovery();
+ ref_processor_cm()->abandon_partial_discovery();
+ ref_processor_cm()->verify_no_references_recorded();
// Abandon current iterations of concurrent marking and concurrent
// refinement, if any are in progress.
@@ -1262,7 +1264,6 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
release_mutator_alloc_region();
abandon_gc_alloc_regions();
g1_rem_set()->cleanupHRRS();
- tear_down_region_lists();
// We should call this after we retire any currently active alloc
// regions so that all the ALLOC / RETIRE events are generated
@@ -1277,34 +1278,34 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
g1_policy()->clear_incremental_cset();
g1_policy()->stop_incremental_cset_building();
- empty_young_list();
+ tear_down_region_sets(false /* free_list_only */);
g1_policy()->set_full_young_gcs(true);
- // See the comment in G1CollectedHeap::ref_processing_init() about
+ // See the comments in g1CollectedHeap.hpp and
+ // G1CollectedHeap::ref_processing_init() about
// how reference processing currently works in G1.
- // Temporarily make reference _discovery_ single threaded (non-MT).
- ReferenceProcessorMTDiscoveryMutator rp_disc_ser(ref_processor(), false);
+ // Temporarily make discovery by the STW ref processor single threaded (non-MT).
+ ReferenceProcessorMTDiscoveryMutator stw_rp_disc_ser(ref_processor_stw(), false);
- // Temporarily make refs discovery atomic
- ReferenceProcessorAtomicMutator rp_disc_atomic(ref_processor(), true);
+ // Temporarily clear the STW ref processor's _is_alive_non_header field.
+ ReferenceProcessorIsAliveMutator stw_rp_is_alive_null(ref_processor_stw(), NULL);
- // Temporarily clear _is_alive_non_header
- ReferenceProcessorIsAliveMutator rp_is_alive_null(ref_processor(), NULL);
+ ref_processor_stw()->enable_discovery(true /*verify_disabled*/, true /*verify_no_refs*/);
+ ref_processor_stw()->setup_policy(do_clear_all_soft_refs);
- ref_processor()->enable_discovery();
- ref_processor()->setup_policy(do_clear_all_soft_refs);
// Do collection work
{
HandleMark hm; // Discard invalid handles created during gc
- G1MarkSweep::invoke_at_safepoint(ref_processor(), do_clear_all_soft_refs);
+ G1MarkSweep::invoke_at_safepoint(ref_processor_stw(), do_clear_all_soft_refs);
}
- assert(free_regions() == 0, "we should not have added any free regions");
- rebuild_region_lists();
- _summary_bytes_used = recalculate_used();
+ assert(free_regions() == 0, "we should not have added any free regions");
+ rebuild_region_sets(false /* free_list_only */);
- ref_processor()->enqueue_discovered_references();
+ // Enqueue any discovered reference objects that have
+ // not been removed from the discovered lists.
+ ref_processor_stw()->enqueue_discovered_references();
COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
@@ -1319,7 +1320,16 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
/* option */ VerifyOption_G1UsePrevMarking);
}
- NOT_PRODUCT(ref_processor()->verify_no_references_recorded());
+
+ assert(!ref_processor_stw()->discovery_enabled(), "Postcondition");
+ ref_processor_stw()->verify_no_references_recorded();
+
+ // Note: since we've just done a full GC, concurrent
+ // marking is no longer active. Therefore we need not
+ // re-enable reference discovery for the CM ref processor.
+ // That will be done at the start of the next marking cycle.
+ assert(!ref_processor_cm()->discovery_enabled(), "Postcondition");
+ ref_processor_cm()->verify_no_references_recorded();
reset_gc_time_stamp();
// Since everything potentially moved, we will clear all remembered
@@ -1414,7 +1424,7 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
if (PrintHeapAtGC) {
Universe::print_heap_after_gc();
}
- g1mm()->update_counters();
+ g1mm()->update_sizes();
post_full_gc_dump();
return true;
@@ -1752,9 +1762,9 @@ void G1CollectedHeap::shrink(size_t shrink_bytes) {
// Instead of tearing down / rebuilding the free lists here, we
// could instead use the remove_all_pending() method on free_list to
// remove only the ones that we need to remove.
- tear_down_region_lists(); // We will rebuild them in a moment.
+ tear_down_region_sets(true /* free_list_only */);
shrink_helper(shrink_bytes);
- rebuild_region_lists();
+ rebuild_region_sets(true /* free_list_only */);
_hrs.verify_optional();
verify_region_sets_optional();
@@ -1772,18 +1782,22 @@ G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
_g1_policy(policy_),
_dirty_card_queue_set(false),
_into_cset_dirty_card_queue_set(false),
- _is_alive_closure(this),
- _ref_processor(NULL),
+ _is_alive_closure_cm(this),
+ _is_alive_closure_stw(this),
+ _ref_processor_cm(NULL),
+ _ref_processor_stw(NULL),
_process_strong_tasks(new SubTasksDone(G1H_PS_NumElements)),
_bot_shared(NULL),
_objs_with_preserved_marks(NULL), _preserved_marks_of_objs(NULL),
_evac_failure_scan_stack(NULL) ,
_mark_in_progress(false),
_cg1r(NULL), _summary_bytes_used(0),
+ _g1mm(NULL),
_refine_cte_cl(NULL),
_full_collection(false),
_free_list("Master Free List"),
_secondary_free_list("Secondary Free List"),
+ _old_set("Old Set"),
_humongous_set("Master Humongous Set"),
_free_regions_coming(false),
_young_list(new YoungList(this)),
@@ -1955,7 +1969,7 @@ jint G1CollectedHeap::initialize() {
size_t max_cards_per_region = ((size_t)1 << (sizeof(CardIdx_t)*BitsPerByte-1)) - 1;
guarantee(HeapRegion::CardsPerRegion > 0, "make sure it's initialized");
- guarantee((size_t) HeapRegion::CardsPerRegion < max_cards_per_region,
+ guarantee(HeapRegion::CardsPerRegion < max_cards_per_region,
"too many cards per region");
HeapRegionSet::set_unrealistically_long_length(max_regions() + 1);
@@ -1996,8 +2010,6 @@ jint G1CollectedHeap::initialize() {
// Perform any initialization actions delegated to the policy.
g1_policy()->init();
- g1_policy()->note_start_of_mark_thread();
-
_refine_cte_cl =
new RefineCardTableEntryClosure(ConcurrentG1RefineThread::sts(),
g1_rem_set(),
@@ -2059,7 +2071,7 @@ jint G1CollectedHeap::initialize() {
// Do create of the monitoring and management support so that
// values in the heap have been properly initialized.
- _g1mm = new G1MonitoringSupport(this, &_g1_storage);
+ _g1mm = new G1MonitoringSupport(this);
return JNI_OK;
}
@@ -2067,34 +2079,81 @@ jint G1CollectedHeap::initialize() {
void G1CollectedHeap::ref_processing_init() {
// Reference processing in G1 currently works as follows:
//
- // * There is only one reference processor instance that
- // 'spans' the entire heap. It is created by the code
- // below.
- // * Reference discovery is not enabled during an incremental
- // pause (see 6484982).
- // * Discoverered refs are not enqueued nor are they processed
- // during an incremental pause (see 6484982).
- // * Reference discovery is enabled at initial marking.
- // * Reference discovery is disabled and the discovered
- // references processed etc during remarking.
- // * Reference discovery is MT (see below).
- // * Reference discovery requires a barrier (see below).
- // * Reference processing is currently not MT (see 6608385).
- // * A full GC enables (non-MT) reference discovery and
- // processes any discovered references.
+ // * There are two reference processor instances. One is
+ // used to record and process discovered references
+ // during concurrent marking; the other is used to
+ // record and process references during STW pauses
+ // (both full and incremental).
+ // * Both ref processors need to 'span' the entire heap as
+ // the regions in the collection set may be dotted around.
+ //
+ // * For the concurrent marking ref processor:
+ // * Reference discovery is enabled at initial marking.
+ // * Reference discovery is disabled and the discovered
+ // references processed etc during remarking.
+ // * Reference discovery is MT (see below).
+ // * Reference discovery requires a barrier (see below).
+ // * Reference processing may or may not be MT
+ // (depending on the value of ParallelRefProcEnabled
+ // and ParallelGCThreads).
+ // * A full GC disables reference discovery by the CM
+ // ref processor and abandons any entries on it's
+ // discovered lists.
+ //
+ // * For the STW processor:
+ // * Non MT discovery is enabled at the start of a full GC.
+ // * Processing and enqueueing during a full GC is non-MT.
+ // * During a full GC, references are processed after marking.
+ //
+ // * Discovery (may or may not be MT) is enabled at the start
+ // of an incremental evacuation pause.
+ // * References are processed near the end of a STW evacuation pause.
+ // * For both types of GC:
+ // * Discovery is atomic - i.e. not concurrent.
+ // * Reference discovery will not need a barrier.
SharedHeap::ref_processing_init();
MemRegion mr = reserved_region();
- _ref_processor =
+
+ // Concurrent Mark ref processor
+ _ref_processor_cm =
+ new ReferenceProcessor(mr, // span
+ ParallelRefProcEnabled && (ParallelGCThreads > 1),
+ // mt processing
+ (int) ParallelGCThreads,
+ // degree of mt processing
+ (ParallelGCThreads > 1) || (ConcGCThreads > 1),
+ // mt discovery
+ (int) MAX2(ParallelGCThreads, ConcGCThreads),
+ // degree of mt discovery
+ false,
+ // Reference discovery is not atomic
+ &_is_alive_closure_cm,
+ // is alive closure
+ // (for efficiency/performance)
+ true);
+ // Setting next fields of discovered
+ // lists requires a barrier.
+
+ // STW ref processor
+ _ref_processor_stw =
new ReferenceProcessor(mr, // span
- ParallelRefProcEnabled && (ParallelGCThreads > 1), // mt processing
- (int) ParallelGCThreads, // degree of mt processing
- ParallelGCThreads > 1 || ConcGCThreads > 1, // mt discovery
- (int) MAX2(ParallelGCThreads, ConcGCThreads), // degree of mt discovery
- false, // Reference discovery is not atomic
- &_is_alive_closure, // is alive closure for efficiency
- true); // Setting next fields of discovered
- // lists requires a barrier.
+ ParallelRefProcEnabled && (ParallelGCThreads > 1),
+ // mt processing
+ MAX2((int)ParallelGCThreads, 1),
+ // degree of mt processing
+ (ParallelGCThreads > 1),
+ // mt discovery
+ MAX2((int)ParallelGCThreads, 1),
+ // degree of mt discovery
+ true,
+ // Reference discovery is atomic
+ &_is_alive_closure_stw,
+ // is alive closure
+ // (for efficiency/performance)
+ false);
+ // Setting next fields of discovered
+ // lists requires a barrier.
}
size_t G1CollectedHeap::capacity() const {
@@ -2947,7 +3006,10 @@ void G1CollectedHeap::verify(bool allow_dirty,
if (failures) {
gclog_or_tty->print_cr("Heap:");
- print_on(gclog_or_tty, true /* extended */);
+ // It helps to have the per-region information in the output to
+ // help us track down what went wrong. This is why we call
+ // print_extended_on() instead of print_on().
+ print_extended_on(gclog_or_tty);
gclog_or_tty->print_cr("");
#ifndef PRODUCT
if (VerifyDuringGC && G1VerifyDuringGCPrintReachable) {
@@ -2973,13 +3035,7 @@ public:
}
};
-void G1CollectedHeap::print() const { print_on(tty); }
-
void G1CollectedHeap::print_on(outputStream* st) const {
- print_on(st, PrintHeapAtGCExtended);
-}
-
-void G1CollectedHeap::print_on(outputStream* st, bool extended) const {
st->print(" %-20s", "garbage-first heap");
st->print(" total " SIZE_FORMAT "K, used " SIZE_FORMAT "K",
capacity()/K, used_unlocked()/K);
@@ -2988,8 +3044,7 @@ void G1CollectedHeap::print_on(outputStream* st, bool extended) const {
_g1_storage.high(),
_g1_storage.high_boundary());
st->cr();
- st->print(" region size " SIZE_FORMAT "K, ",
- HeapRegion::GrainBytes/K);
+ st->print(" region size " SIZE_FORMAT "K, ", HeapRegion::GrainBytes / K);
size_t young_regions = _young_list->length();
st->print(SIZE_FORMAT " young (" SIZE_FORMAT "K), ",
young_regions, young_regions * HeapRegion::GrainBytes / K);
@@ -2998,13 +3053,14 @@ void G1CollectedHeap::print_on(outputStream* st, bool extended) const {
survivor_regions, survivor_regions * HeapRegion::GrainBytes / K);
st->cr();
perm()->as_gen()->print_on(st);
- if (extended) {
- st->cr();
- print_on_extended(st);
- }
}
-void G1CollectedHeap::print_on_extended(outputStream* st) const {
+void G1CollectedHeap::print_extended_on(outputStream* st) const {
+ print_on(st);
+
+ // Print the per-region information.
+ st->cr();
+ st->print_cr("Heap Regions: (Y=young(eden), SU=young(survivor), HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, TS=gc time stamp, PTAMS=previous top-at-mark-start, NTAMS=next top-at-mark-start)");
PrintRegionClosure blk(st);
heap_region_iterate(&blk);
}
@@ -3117,6 +3173,10 @@ void G1CollectedHeap::gc_epilogue(bool full /* Ignored */) {
COMPILER2_PRESENT(assert(DerivedPointerTable::is_empty(),
"derived pointer present"));
// always_do_update_barrier = true;
+
+ // We have just completed a GC. Update the soft reference
+ // policy with the new heap occupancy
+ Universe::update_heap_info_at_gc();
}
HeapWord* G1CollectedHeap::do_collection_pause(size_t word_size,
@@ -3289,6 +3349,7 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
Universe::print_heap_before_gc();
}
+ HRSPhaseSetter x(HRSPhaseEvacuation);
verify_region_sets_optional();
verify_dirty_young_regions();
@@ -3298,6 +3359,14 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
// for the duration of this pause.
g1_policy()->decide_on_conc_mark_initiation();
+ // We do not allow initial-mark to be piggy-backed on a
+ // partially-young GC.
+ assert(!g1_policy()->during_initial_mark_pause() ||
+ g1_policy()->full_young_gcs(), "sanity");
+
+ // We also do not allow partially-young GCs during marking.
+ assert(!mark_in_progress() || g1_policy()->full_young_gcs(), "sanity");
+
char verbose_str[128];
sprintf(verbose_str, "GC pause ");
if (g1_policy()->full_young_gcs()) {
@@ -3354,230 +3423,241 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
COMPILER2_PRESENT(DerivedPointerTable::clear());
- // Please see comment in G1CollectedHeap::ref_processing_init()
- // to see how reference processing currently works in G1.
- //
- // We want to turn off ref discovery, if necessary, and turn it back on
- // on again later if we do. XXX Dubious: why is discovery disabled?
- bool was_enabled = ref_processor()->discovery_enabled();
- if (was_enabled) ref_processor()->disable_discovery();
+ // Please see comment in g1CollectedHeap.hpp and
+ // G1CollectedHeap::ref_processing_init() to see how
+ // reference processing currently works in G1.
- // Forget the current alloc region (we might even choose it to be part
- // of the collection set!).
- release_mutator_alloc_region();
+ // Enable discovery in the STW reference processor
+ ref_processor_stw()->enable_discovery(true /*verify_disabled*/,
+ true /*verify_no_refs*/);
- // We should call this after we retire the mutator alloc
- // region(s) so that all the ALLOC / RETIRE events are generated
- // before the start GC event.
- _hr_printer.start_gc(false /* full */, (size_t) total_collections());
-
- // The elapsed time induced by the start time below deliberately elides
- // the possible verification above.
- double start_time_sec = os::elapsedTime();
- size_t start_used_bytes = used();
+ {
+ // We want to temporarily turn off discovery by the
+ // CM ref processor, if necessary, and turn it back on
+ // on again later if we do. Using a scoped
+ // NoRefDiscovery object will do this.
+ NoRefDiscovery no_cm_discovery(ref_processor_cm());
+
+ // Forget the current alloc region (we might even choose it to be part
+ // of the collection set!).
+ release_mutator_alloc_region();
+
+ // We should call this after we retire the mutator alloc
+ // region(s) so that all the ALLOC / RETIRE events are generated
+ // before the start GC event.
+ _hr_printer.start_gc(false /* full */, (size_t) total_collections());
+
+ // The elapsed time induced by the start time below deliberately elides
+ // the possible verification above.
+ double start_time_sec = os::elapsedTime();
+ size_t start_used_bytes = used();
#if YOUNG_LIST_VERBOSE
- gclog_or_tty->print_cr("\nBefore recording pause start.\nYoung_list:");
- _young_list->print();
- g1_policy()->print_collection_set(g1_policy()->inc_cset_head(), gclog_or_tty);
+ gclog_or_tty->print_cr("\nBefore recording pause start.\nYoung_list:");
+ _young_list->print();
+ g1_policy()->print_collection_set(g1_policy()->inc_cset_head(), gclog_or_tty);
#endif // YOUNG_LIST_VERBOSE
- g1_policy()->record_collection_pause_start(start_time_sec,
- start_used_bytes);
+ g1_policy()->record_collection_pause_start(start_time_sec,
+ start_used_bytes);
#if YOUNG_LIST_VERBOSE
- gclog_or_tty->print_cr("\nAfter recording pause start.\nYoung_list:");
- _young_list->print();
+ gclog_or_tty->print_cr("\nAfter recording pause start.\nYoung_list:");
+ _young_list->print();
#endif // YOUNG_LIST_VERBOSE
- if (g1_policy()->during_initial_mark_pause()) {
- concurrent_mark()->checkpointRootsInitialPre();
- }
- perm_gen()->save_marks();
-
- // We must do this before any possible evacuation that should propagate
- // marks.
- if (mark_in_progress()) {
- double start_time_sec = os::elapsedTime();
+ if (g1_policy()->during_initial_mark_pause()) {
+ concurrent_mark()->checkpointRootsInitialPre();
+ }
+ perm_gen()->save_marks();
- _cm->drainAllSATBBuffers();
- double finish_mark_ms = (os::elapsedTime() - start_time_sec) * 1000.0;
- g1_policy()->record_satb_drain_time(finish_mark_ms);
- }
- // Record the number of elements currently on the mark stack, so we
- // only iterate over these. (Since evacuation may add to the mark
- // stack, doing more exposes race conditions.) If no mark is in
- // progress, this will be zero.
- _cm->set_oops_do_bound();
+ // We must do this before any possible evacuation that should propagate
+ // marks.
+ if (mark_in_progress()) {
+ double start_time_sec = os::elapsedTime();
- if (mark_in_progress()) {
- concurrent_mark()->newCSet();
- }
+ _cm->drainAllSATBBuffers();
+ double finish_mark_ms = (os::elapsedTime() - start_time_sec) * 1000.0;
+ g1_policy()->record_satb_drain_time(finish_mark_ms);
+ }
+ // Record the number of elements currently on the mark stack, so we
+ // only iterate over these. (Since evacuation may add to the mark
+ // stack, doing more exposes race conditions.) If no mark is in
+ // progress, this will be zero.
+ _cm->set_oops_do_bound();
+
+ if (mark_in_progress()) {
+ concurrent_mark()->newCSet();
+ }
#if YOUNG_LIST_VERBOSE
- gclog_or_tty->print_cr("\nBefore choosing collection set.\nYoung_list:");
- _young_list->print();
- g1_policy()->print_collection_set(g1_policy()->inc_cset_head(), gclog_or_tty);
+ gclog_or_tty->print_cr("\nBefore choosing collection set.\nYoung_list:");
+ _young_list->print();
+ g1_policy()->print_collection_set(g1_policy()->inc_cset_head(), gclog_or_tty);
#endif // YOUNG_LIST_VERBOSE
- g1_policy()->choose_collection_set(target_pause_time_ms);
-
- if (_hr_printer.is_active()) {
- HeapRegion* hr = g1_policy()->collection_set();
- while (hr != NULL) {
- G1HRPrinter::RegionType type;
- if (!hr->is_young()) {
- type = G1HRPrinter::Old;
- } else if (hr->is_survivor()) {
- type = G1HRPrinter::Survivor;
- } else {
- type = G1HRPrinter::Eden;
+ g1_policy()->choose_collection_set(target_pause_time_ms);
+
+ if (_hr_printer.is_active()) {
+ HeapRegion* hr = g1_policy()->collection_set();
+ while (hr != NULL) {
+ G1HRPrinter::RegionType type;
+ if (!hr->is_young()) {
+ type = G1HRPrinter::Old;
+ } else if (hr->is_survivor()) {
+ type = G1HRPrinter::Survivor;
+ } else {
+ type = G1HRPrinter::Eden;
+ }
+ _hr_printer.cset(hr);
+ hr = hr->next_in_collection_set();
}
- _hr_printer.cset(hr);
- hr = hr->next_in_collection_set();
}
- }
- // We have chosen the complete collection set. If marking is
- // active then, we clear the region fields of any of the
- // concurrent marking tasks whose region fields point into
- // the collection set as these values will become stale. This
- // will cause the owning marking threads to claim a new region
- // when marking restarts.
- if (mark_in_progress()) {
- concurrent_mark()->reset_active_task_region_fields_in_cset();
- }
+ // We have chosen the complete collection set. If marking is
+ // active then, we clear the region fields of any of the
+ // concurrent marking tasks whose region fields point into
+ // the collection set as these values will become stale. This
+ // will cause the owning marking threads to claim a new region
+ // when marking restarts.
+ if (mark_in_progress()) {
+ concurrent_mark()->reset_active_task_region_fields_in_cset();
+ }
#ifdef ASSERT
- VerifyCSetClosure cl;
- collection_set_iterate(&cl);
+ VerifyCSetClosure cl;
+ collection_set_iterate(&cl);
#endif // ASSERT
- setup_surviving_young_words();
+ setup_surviving_young_words();
- // Initialize the GC alloc regions.
- init_gc_alloc_regions();
+ // Initialize the GC alloc regions.
+ init_gc_alloc_regions();
- // Actually do the work...
- evacuate_collection_set();
+ // Actually do the work...
+ evacuate_collection_set();
- free_collection_set(g1_policy()->collection_set());
- g1_policy()->clear_collection_set();
+ free_collection_set(g1_policy()->collection_set());
+ g1_policy()->clear_collection_set();
- cleanup_surviving_young_words();
+ cleanup_surviving_young_words();
- // Start a new incremental collection set for the next pause.
- g1_policy()->start_incremental_cset_building();
+ // Start a new incremental collection set for the next pause.
+ g1_policy()->start_incremental_cset_building();
- // Clear the _cset_fast_test bitmap in anticipation of adding
- // regions to the incremental collection set for the next
- // evacuation pause.
- clear_cset_fast_test();
+ // Clear the _cset_fast_test bitmap in anticipation of adding
+ // regions to the incremental collection set for the next
+ // evacuation pause.
+ clear_cset_fast_test();
- _young_list->reset_sampled_info();
+ _young_list->reset_sampled_info();
- // Don't check the whole heap at this point as the
- // GC alloc regions from this pause have been tagged
- // as survivors and moved on to the survivor list.
- // Survivor regions will fail the !is_young() check.
- assert(check_young_list_empty(false /* check_heap */),
- "young list should be empty");
+ // Don't check the whole heap at this point as the
+ // GC alloc regions from this pause have been tagged
+ // as survivors and moved on to the survivor list.
+ // Survivor regions will fail the !is_young() check.
+ assert(check_young_list_empty(false /* check_heap */),
+ "young list should be empty");
#if YOUNG_LIST_VERBOSE
- gclog_or_tty->print_cr("Before recording survivors.\nYoung List:");
- _young_list->print();
+ gclog_or_tty->print_cr("Before recording survivors.\nYoung List:");
+ _young_list->print();
#endif // YOUNG_LIST_VERBOSE
- g1_policy()->record_survivor_regions(_young_list->survivor_length(),
- _young_list->first_survivor_region(),
- _young_list->last_survivor_region());
+ g1_policy()->record_survivor_regions(_young_list->survivor_length(),
+ _young_list->first_survivor_region(),
+ _young_list->last_survivor_region());
- _young_list->reset_auxilary_lists();
+ _young_list->reset_auxilary_lists();
- if (evacuation_failed()) {
- _summary_bytes_used = recalculate_used();
- } else {
- // The "used" of the the collection set have already been subtracted
- // when they were freed. Add in the bytes evacuated.
- _summary_bytes_used += g1_policy()->bytes_copied_during_gc();
- }
+ if (evacuation_failed()) {
+ _summary_bytes_used = recalculate_used();
+ } else {
+ // The "used" of the the collection set have already been subtracted
+ // when they were freed. Add in the bytes evacuated.
+ _summary_bytes_used += g1_policy()->bytes_copied_during_gc();
+ }
- if (g1_policy()->during_initial_mark_pause()) {
- concurrent_mark()->checkpointRootsInitialPost();
- set_marking_started();
- // CAUTION: after the doConcurrentMark() call below,
- // the concurrent marking thread(s) could be running
- // concurrently with us. Make sure that anything after
- // this point does not assume that we are the only GC thread
- // running. Note: of course, the actual marking work will
- // not start until the safepoint itself is released in
- // ConcurrentGCThread::safepoint_desynchronize().
- doConcurrentMark();
- }
+ if (g1_policy()->during_initial_mark_pause()) {
+ concurrent_mark()->checkpointRootsInitialPost();
+ set_marking_started();
+ // CAUTION: after the doConcurrentMark() call below,
+ // the concurrent marking thread(s) could be running
+ // concurrently with us. Make sure that anything after
+ // this point does not assume that we are the only GC thread
+ // running. Note: of course, the actual marking work will
+ // not start until the safepoint itself is released in
+ // ConcurrentGCThread::safepoint_desynchronize().
+ doConcurrentMark();
+ }
- allocate_dummy_regions();
+ allocate_dummy_regions();
#if YOUNG_LIST_VERBOSE
- gclog_or_tty->print_cr("\nEnd of the pause.\nYoung_list:");
- _young_list->print();
- g1_policy()->print_collection_set(g1_policy()->inc_cset_head(), gclog_or_tty);
+ gclog_or_tty->print_cr("\nEnd of the pause.\nYoung_list:");
+ _young_list->print();
+ g1_policy()->print_collection_set(g1_policy()->inc_cset_head(), gclog_or_tty);
#endif // YOUNG_LIST_VERBOSE
- init_mutator_alloc_region();
-
- {
- size_t expand_bytes = g1_policy()->expansion_amount();
- if (expand_bytes > 0) {
- size_t bytes_before = capacity();
- if (!expand(expand_bytes)) {
- // We failed to expand the heap so let's verify that
- // committed/uncommitted amount match the backing store
- assert(capacity() == _g1_storage.committed_size(), "committed size mismatch");
- assert(max_capacity() == _g1_storage.reserved_size(), "reserved size mismatch");
+ init_mutator_alloc_region();
+
+ {
+ size_t expand_bytes = g1_policy()->expansion_amount();
+ if (expand_bytes > 0) {
+ size_t bytes_before = capacity();
+ if (!expand(expand_bytes)) {
+ // We failed to expand the heap so let's verify that
+ // committed/uncommitted amount match the backing store
+ assert(capacity() == _g1_storage.committed_size(), "committed size mismatch");
+ assert(max_capacity() == _g1_storage.reserved_size(), "reserved size mismatch");
+ }
}
}
- }
- double end_time_sec = os::elapsedTime();
- double pause_time_ms = (end_time_sec - start_time_sec) * MILLIUNITS;
- g1_policy()->record_pause_time_ms(pause_time_ms);
- g1_policy()->record_collection_pause_end();
-
- MemoryService::track_memory_usage();
-
- // In prepare_for_verify() below we'll need to scan the deferred
- // update buffers to bring the RSets up-to-date if
- // G1HRRSFlushLogBuffersOnVerify has been set. While scanning
- // the update buffers we'll probably need to scan cards on the
- // regions we just allocated to (i.e., the GC alloc
- // regions). However, during the last GC we called
- // set_saved_mark() on all the GC alloc regions, so card
- // scanning might skip the [saved_mark_word()...top()] area of
- // those regions (i.e., the area we allocated objects into
- // during the last GC). But it shouldn't. Given that
- // saved_mark_word() is conditional on whether the GC time stamp
- // on the region is current or not, by incrementing the GC time
- // stamp here we invalidate all the GC time stamps on all the
- // regions and saved_mark_word() will simply return top() for
- // all the regions. This is a nicer way of ensuring this rather
- // than iterating over the regions and fixing them. In fact, the
- // GC time stamp increment here also ensures that
- // saved_mark_word() will return top() between pauses, i.e.,
- // during concurrent refinement. So we don't need the
- // is_gc_active() check to decided which top to use when
- // scanning cards (see CR 7039627).
- increment_gc_time_stamp();
+ double end_time_sec = os::elapsedTime();
+ double pause_time_ms = (end_time_sec - start_time_sec) * MILLIUNITS;
+ g1_policy()->record_pause_time_ms(pause_time_ms);
+ g1_policy()->record_collection_pause_end();
+
+ MemoryService::track_memory_usage();
+
+ // In prepare_for_verify() below we'll need to scan the deferred
+ // update buffers to bring the RSets up-to-date if
+ // G1HRRSFlushLogBuffersOnVerify has been set. While scanning
+ // the update buffers we'll probably need to scan cards on the
+ // regions we just allocated to (i.e., the GC alloc
+ // regions). However, during the last GC we called
+ // set_saved_mark() on all the GC alloc regions, so card
+ // scanning might skip the [saved_mark_word()...top()] area of
+ // those regions (i.e., the area we allocated objects into
+ // during the last GC). But it shouldn't. Given that
+ // saved_mark_word() is conditional on whether the GC time stamp
+ // on the region is current or not, by incrementing the GC time
+ // stamp here we invalidate all the GC time stamps on all the
+ // regions and saved_mark_word() will simply return top() for
+ // all the regions. This is a nicer way of ensuring this rather
+ // than iterating over the regions and fixing them. In fact, the
+ // GC time stamp increment here also ensures that
+ // saved_mark_word() will return top() between pauses, i.e.,
+ // during concurrent refinement. So we don't need the
+ // is_gc_active() check to decided which top to use when
+ // scanning cards (see CR 7039627).
+ increment_gc_time_stamp();
+
+ if (VerifyAfterGC && total_collections() >= VerifyGCStartAt) {
+ HandleMark hm; // Discard invalid handles created during verification
+ gclog_or_tty->print(" VerifyAfterGC:");
+ prepare_for_verify();
+ Universe::verify(/* allow dirty */ true,
+ /* silent */ false,
+ /* option */ VerifyOption_G1UsePrevMarking);
+ }
- if (VerifyAfterGC && total_collections() >= VerifyGCStartAt) {
- HandleMark hm; // Discard invalid handles created during verification
- gclog_or_tty->print(" VerifyAfterGC:");
- prepare_for_verify();
- Universe::verify(/* allow dirty */ true,
- /* silent */ false,
- /* option */ VerifyOption_G1UsePrevMarking);
- }
+ assert(!ref_processor_stw()->discovery_enabled(), "Postcondition");
+ ref_processor_stw()->verify_no_references_recorded();
- if (was_enabled) ref_processor()->enable_discovery();
+ // CM reference discovery will be re-enabled if necessary.
+ }
{
size_t expand_bytes = g1_policy()->expansion_amount();
@@ -3630,7 +3710,7 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
if (PrintHeapAtGC) {
Universe::print_heap_after_gc();
}
- g1mm()->update_counters();
+ g1mm()->update_sizes();
if (G1SummarizeRSetStats &&
(G1SummarizeRSetStatsPeriod > 0) &&
@@ -3692,6 +3772,11 @@ void G1CollectedHeap::init_gc_alloc_regions() {
!retained_region->is_empty() &&
!retained_region->isHumongous()) {
retained_region->set_saved_mark();
+ // The retained region was added to the old region set when it was
+ // retired. We have to remove it now, since we don't allow regions
+ // we allocate to in the region sets. We'll re-add it later, when
+ // it's retired again.
+ _old_set.remove(retained_region);
_old_gc_alloc_region.set(retained_region);
_hr_printer.reuse(retained_region);
}
@@ -3728,34 +3813,6 @@ void G1CollectedHeap::finalize_for_evac_failure() {
_evac_failure_scan_stack = NULL;
}
-// *** Sequential G1 Evacuation
-
-class G1IsAliveClosure: public BoolObjectClosure {
- G1CollectedHeap* _g1;
-public:
- G1IsAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
- void do_object(oop p) { assert(false, "Do not call."); }
- bool do_object_b(oop p) {
- // It is reachable if it is outside the collection set, or is inside
- // and forwarded.
- return !_g1->obj_in_cs(p) || p->is_forwarded();
- }
-};
-
-class G1KeepAliveClosure: public OopClosure {
- G1CollectedHeap* _g1;
-public:
- G1KeepAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
- void do_oop(narrowOop* p) { guarantee(false, "Not needed"); }
- void do_oop( oop* p) {
- oop obj = *p;
- if (_g1->obj_in_cs(obj)) {
- assert( obj->is_forwarded(), "invariant" );
- *p = obj->forwardee();
- }
- }
-};
-
class UpdateRSetDeferred : public OopsInHeapRegionClosure {
private:
G1CollectedHeap* _g1;
@@ -3904,9 +3961,6 @@ void G1CollectedHeap::remove_self_forwarding_pointers() {
// _next_top_at_mark_start == top, _next_marked_bytes == 0
// _next_marked_bytes == next_marked_bytes.
}
-
- // Now make sure the region has the right index in the sorted array.
- g1_policy()->note_change_in_marked_bytes(cur);
}
cur = cur->next_in_collection_set();
}
@@ -3946,7 +4000,8 @@ void G1CollectedHeap::drain_evac_failure_scan_stack() {
oop
G1CollectedHeap::handle_evacuation_failure_par(OopsInHeapRegionClosure* cl,
- oop old) {
+ oop old,
+ bool should_mark_root) {
assert(obj_in_cs(old),
err_msg("obj: "PTR_FORMAT" should still be in the CSet",
(HeapWord*) old));
@@ -3954,6 +4009,16 @@ G1CollectedHeap::handle_evacuation_failure_par(OopsInHeapRegionClosure* cl,
oop forward_ptr = old->forward_to_atomic(old);
if (forward_ptr == NULL) {
// Forward-to-self succeeded.
+
+ // should_mark_root will be true when this routine is called
+ // from a root scanning closure during an initial mark pause.
+ // In this case the thread that succeeds in self-forwarding the
+ // object is also responsible for marking the object.
+ if (should_mark_root) {
+ assert(!oopDesc::is_null(old), "shouldn't be");
+ _cm->grayRoot(old);
+ }
+
if (_evac_failure_closure != cl) {
MutexLockerEx x(EvacFailureStack_lock, Mutex::_no_safepoint_check_flag);
assert(!_drain_in_progress,
@@ -4175,12 +4240,17 @@ bool G1ParScanThreadState::verify_task(StarTask ref) const {
#endif // ASSERT
void G1ParScanThreadState::trim_queue() {
+ assert(_evac_cl != NULL, "not set");
+ assert(_evac_failure_cl != NULL, "not set");
+ assert(_partial_scan_cl != NULL, "not set");
+
StarTask ref;
do {
// Drain the overflow stack first, so other threads can steal.
while (refs()->pop_overflow(ref)) {
deal_with_reference(ref);
}
+
while (refs()->pop_local(ref)) {
deal_with_reference(ref);
}
@@ -4208,7 +4278,8 @@ template <class T> void G1ParCopyHelper::mark_object(T* p) {
}
}
-oop G1ParCopyHelper::copy_to_survivor_space(oop old, bool should_mark_copy) {
+oop G1ParCopyHelper::copy_to_survivor_space(oop old, bool should_mark_root,
+ bool should_mark_copy) {
size_t word_sz = old->size();
HeapRegion* from_region = _g1->heap_region_containing_raw(old);
// +1 to make the -1 indexes valid...
@@ -4228,7 +4299,7 @@ oop G1ParCopyHelper::copy_to_survivor_space(oop old, bool should_mark_copy) {
// This will either forward-to-self, or detect that someone else has
// installed a forwarding pointer.
OopsInHeapRegionClosure* cl = _par_scan_state->evac_failure_closure();
- return _g1->handle_evacuation_failure_par(cl, old);
+ return _g1->handle_evacuation_failure_par(cl, old, should_mark_root);
}
// We're going to allocate linearly, so might as well prefetch ahead.
@@ -4330,11 +4401,26 @@ void G1ParCopyClosure<do_gen_barrier, barrier, do_mark_object>
// we also need to handle marking of roots in the
// event of an evacuation failure. In the event of an
// evacuation failure, the object is forwarded to itself
- // and not copied so let's mark it here.
+ // and not copied. For root-scanning closures, the
+ // object would be marked after a successful self-forward
+ // but an object could be pointed to by both a root and non
+ // root location and be self-forwarded by a non-root-scanning
+ // closure. Therefore we also have to attempt to mark the
+ // self-forwarded root object here.
if (do_mark_object && obj->forwardee() == obj) {
mark_object(p);
}
} else {
+ // During an initial mark pause, objects that are pointed to
+ // by the roots need to be marked - even in the event of an
+ // evacuation failure. We pass the template parameter
+ // do_mark_object (which is true for root scanning closures
+ // during an initial mark pause) to copy_to_survivor_space
+ // which will pass it on to the evacuation failure handling
+ // code. The thread that successfully self-forwards a root
+ // object to itself is responsible for marking the object.
+ bool should_mark_root = do_mark_object;
+
// We need to mark the copied object if we're a root scanning
// closure during an initial mark pause (i.e. do_mark_object
// will be true), or the object is already marked and we need
@@ -4343,7 +4429,8 @@ void G1ParCopyClosure<do_gen_barrier, barrier, do_mark_object>
_during_initial_mark ||
(_mark_in_progress && !_g1->is_obj_ill(obj));
- oop copy_oop = copy_to_survivor_space(obj, should_mark_copy);
+ oop copy_oop = copy_to_survivor_space(obj, should_mark_root,
+ should_mark_copy);
oopDesc::encode_store_heap_oop(p, copy_oop);
}
// When scanning the RS, we only care about objs in CS.
@@ -4501,35 +4588,34 @@ public:
ResourceMark rm;
HandleMark hm;
+ ReferenceProcessor* rp = _g1h->ref_processor_stw();
+
G1ParScanThreadState pss(_g1h, i);
- G1ParScanHeapEvacClosure scan_evac_cl(_g1h, &pss);
- G1ParScanHeapEvacFailureClosure evac_failure_cl(_g1h, &pss);
- G1ParScanPartialArrayClosure partial_scan_cl(_g1h, &pss);
+ G1ParScanHeapEvacClosure scan_evac_cl(_g1h, &pss, rp);
+ G1ParScanHeapEvacFailureClosure evac_failure_cl(_g1h, &pss, rp);
+ G1ParScanPartialArrayClosure partial_scan_cl(_g1h, &pss, rp);
pss.set_evac_closure(&scan_evac_cl);
pss.set_evac_failure_closure(&evac_failure_cl);
pss.set_partial_scan_closure(&partial_scan_cl);
- G1ParScanExtRootClosure only_scan_root_cl(_g1h, &pss);
- G1ParScanPermClosure only_scan_perm_cl(_g1h, &pss);
- G1ParScanHeapRSClosure only_scan_heap_rs_cl(_g1h, &pss);
- G1ParPushHeapRSClosure push_heap_rs_cl(_g1h, &pss);
+ G1ParScanExtRootClosure only_scan_root_cl(_g1h, &pss, rp);
+ G1ParScanPermClosure only_scan_perm_cl(_g1h, &pss, rp);
- G1ParScanAndMarkExtRootClosure scan_mark_root_cl(_g1h, &pss);
- G1ParScanAndMarkPermClosure scan_mark_perm_cl(_g1h, &pss);
- G1ParScanAndMarkHeapRSClosure scan_mark_heap_rs_cl(_g1h, &pss);
+ G1ParScanAndMarkExtRootClosure scan_mark_root_cl(_g1h, &pss, rp);
+ G1ParScanAndMarkPermClosure scan_mark_perm_cl(_g1h, &pss, rp);
- OopsInHeapRegionClosure *scan_root_cl;
- OopsInHeapRegionClosure *scan_perm_cl;
+ OopClosure* scan_root_cl = &only_scan_root_cl;
+ OopsInHeapRegionClosure* scan_perm_cl = &only_scan_perm_cl;
if (_g1h->g1_policy()->during_initial_mark_pause()) {
+ // We also need to mark copied objects.
scan_root_cl = &scan_mark_root_cl;
scan_perm_cl = &scan_mark_perm_cl;
- } else {
- scan_root_cl = &only_scan_root_cl;
- scan_perm_cl = &only_scan_perm_cl;
}
+ G1ParPushHeapRSClosure push_heap_rs_cl(_g1h, &pss);
+
pss.start_strong_roots();
_g1h->g1_process_strong_roots(/* not collecting perm */ false,
SharedHeap::SO_AllClasses,
@@ -4577,6 +4663,7 @@ g1_process_strong_roots(bool collecting_perm_gen,
OopsInHeapRegionClosure* scan_rs,
OopsInGenClosure* scan_perm,
int worker_i) {
+
// First scan the strong roots, including the perm gen.
double ext_roots_start = os::elapsedTime();
double closure_app_time_sec = 0.0;
@@ -4595,12 +4682,13 @@ g1_process_strong_roots(bool collecting_perm_gen,
&eager_scan_code_roots,
&buf_scan_perm);
- // Now the ref_processor roots.
+ // Now the CM ref_processor roots.
if (!_process_strong_tasks->is_task_claimed(G1H_PS_refProcessor_oops_do)) {
- // We need to treat the discovered reference lists as roots and
- // keep entries (which are added by the marking threads) on them
- // live until they can be processed at the end of marking.
- ref_processor()->weak_oops_do(&buf_scan_non_heap_roots);
+ // We need to treat the discovered reference lists of the
+ // concurrent mark ref processor as roots and keep entries
+ // (which are added by the marking threads) on them live
+ // until they can be processed at the end of marking.
+ ref_processor_cm()->weak_oops_do(&buf_scan_non_heap_roots);
}
// Finish up any enqueued closure apps (attributed as object copy time).
@@ -4641,6 +4729,524 @@ G1CollectedHeap::g1_process_weak_roots(OopClosure* root_closure,
SharedHeap::process_weak_roots(root_closure, &roots_in_blobs, non_root_closure);
}
+// Weak Reference Processing support
+
+// An always "is_alive" closure that is used to preserve referents.
+// If the object is non-null then it's alive. Used in the preservation
+// of referent objects that are pointed to by reference objects
+// discovered by the CM ref processor.
+class G1AlwaysAliveClosure: public BoolObjectClosure {
+ G1CollectedHeap* _g1;
+public:
+ G1AlwaysAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
+ void do_object(oop p) { assert(false, "Do not call."); }
+ bool do_object_b(oop p) {
+ if (p != NULL) {
+ return true;
+ }
+ return false;
+ }
+};
+
+bool G1STWIsAliveClosure::do_object_b(oop p) {
+ // An object is reachable if it is outside the collection set,
+ // or is inside and copied.
+ return !_g1->obj_in_cs(p) || p->is_forwarded();
+}
+
+// Non Copying Keep Alive closure
+class G1KeepAliveClosure: public OopClosure {
+ G1CollectedHeap* _g1;
+public:
+ G1KeepAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
+ void do_oop(narrowOop* p) { guarantee(false, "Not needed"); }
+ void do_oop( oop* p) {
+ oop obj = *p;
+
+ if (_g1->obj_in_cs(obj)) {
+ assert( obj->is_forwarded(), "invariant" );
+ *p = obj->forwardee();
+ }
+ }
+};
+
+// Copying Keep Alive closure - can be called from both
+// serial and parallel code as long as different worker
+// threads utilize different G1ParScanThreadState instances
+// and different queues.
+
+class G1CopyingKeepAliveClosure: public OopClosure {
+ G1CollectedHeap* _g1h;
+ OopClosure* _copy_non_heap_obj_cl;
+ OopsInHeapRegionClosure* _copy_perm_obj_cl;
+ G1ParScanThreadState* _par_scan_state;
+
+public:
+ G1CopyingKeepAliveClosure(G1CollectedHeap* g1h,
+ OopClosure* non_heap_obj_cl,
+ OopsInHeapRegionClosure* perm_obj_cl,
+ G1ParScanThreadState* pss):
+ _g1h(g1h),
+ _copy_non_heap_obj_cl(non_heap_obj_cl),
+ _copy_perm_obj_cl(perm_obj_cl),
+ _par_scan_state(pss)
+ {}
+
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+
+ template <class T> void do_oop_work(T* p) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
+
+ if (_g1h->obj_in_cs(obj)) {
+ // If the referent object has been forwarded (either copied
+ // to a new location or to itself in the event of an
+ // evacuation failure) then we need to update the reference
+ // field and, if both reference and referent are in the G1
+ // heap, update the RSet for the referent.
+ //
+ // If the referent has not been forwarded then we have to keep
+ // it alive by policy. Therefore we have copy the referent.
+ //
+ // If the reference field is in the G1 heap then we can push
+ // on the PSS queue. When the queue is drained (after each
+ // phase of reference processing) the object and it's followers
+ // will be copied, the reference field set to point to the
+ // new location, and the RSet updated. Otherwise we need to
+ // use the the non-heap or perm closures directly to copy
+ // the refernt object and update the pointer, while avoiding
+ // updating the RSet.
+
+ if (_g1h->is_in_g1_reserved(p)) {
+ _par_scan_state->push_on_queue(p);
+ } else {
+ // The reference field is not in the G1 heap.
+ if (_g1h->perm_gen()->is_in(p)) {
+ _copy_perm_obj_cl->do_oop(p);
+ } else {
+ _copy_non_heap_obj_cl->do_oop(p);
+ }
+ }
+ }
+ }
+};
+
+// Serial drain queue closure. Called as the 'complete_gc'
+// closure for each discovered list in some of the
+// reference processing phases.
+
+class G1STWDrainQueueClosure: public VoidClosure {
+protected:
+ G1CollectedHeap* _g1h;
+ G1ParScanThreadState* _par_scan_state;
+
+ G1ParScanThreadState* par_scan_state() { return _par_scan_state; }
+
+public:
+ G1STWDrainQueueClosure(G1CollectedHeap* g1h, G1ParScanThreadState* pss) :
+ _g1h(g1h),
+ _par_scan_state(pss)
+ { }
+
+ void do_void() {
+ G1ParScanThreadState* const pss = par_scan_state();
+ pss->trim_queue();
+ }
+};
+
+// Parallel Reference Processing closures
+
+// Implementation of AbstractRefProcTaskExecutor for parallel reference
+// processing during G1 evacuation pauses.
+
+class G1STWRefProcTaskExecutor: public AbstractRefProcTaskExecutor {
+private:
+ G1CollectedHeap* _g1h;
+ RefToScanQueueSet* _queues;
+ WorkGang* _workers;
+ int _active_workers;
+
+public:
+ G1STWRefProcTaskExecutor(G1CollectedHeap* g1h,
+ WorkGang* workers,
+ RefToScanQueueSet *task_queues,
+ int n_workers) :
+ _g1h(g1h),
+ _queues(task_queues),
+ _workers(workers),
+ _active_workers(n_workers)
+ {
+ assert(n_workers > 0, "shouldn't call this otherwise");
+ }
+
+ // Executes the given task using concurrent marking worker threads.
+ virtual void execute(ProcessTask& task);
+ virtual void execute(EnqueueTask& task);
+};
+
+// Gang task for possibly parallel reference processing
+
+class G1STWRefProcTaskProxy: public AbstractGangTask {
+ typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
+ ProcessTask& _proc_task;
+ G1CollectedHeap* _g1h;
+ RefToScanQueueSet *_task_queues;
+ ParallelTaskTerminator* _terminator;
+
+public:
+ G1STWRefProcTaskProxy(ProcessTask& proc_task,
+ G1CollectedHeap* g1h,
+ RefToScanQueueSet *task_queues,
+ ParallelTaskTerminator* terminator) :
+ AbstractGangTask("Process reference objects in parallel"),
+ _proc_task(proc_task),
+ _g1h(g1h),
+ _task_queues(task_queues),
+ _terminator(terminator)
+ {}
+
+ virtual void work(int i) {
+ // The reference processing task executed by a single worker.
+ ResourceMark rm;
+ HandleMark hm;
+
+ G1STWIsAliveClosure is_alive(_g1h);
+
+ G1ParScanThreadState pss(_g1h, i);
+
+ G1ParScanHeapEvacClosure scan_evac_cl(_g1h, &pss, NULL);
+ G1ParScanHeapEvacFailureClosure evac_failure_cl(_g1h, &pss, NULL);
+ G1ParScanPartialArrayClosure partial_scan_cl(_g1h, &pss, NULL);
+
+ pss.set_evac_closure(&scan_evac_cl);
+ pss.set_evac_failure_closure(&evac_failure_cl);
+ pss.set_partial_scan_closure(&partial_scan_cl);
+
+ G1ParScanExtRootClosure only_copy_non_heap_cl(_g1h, &pss, NULL);
+ G1ParScanPermClosure only_copy_perm_cl(_g1h, &pss, NULL);
+
+ G1ParScanAndMarkExtRootClosure copy_mark_non_heap_cl(_g1h, &pss, NULL);
+ G1ParScanAndMarkPermClosure copy_mark_perm_cl(_g1h, &pss, NULL);
+
+ OopClosure* copy_non_heap_cl = &only_copy_non_heap_cl;
+ OopsInHeapRegionClosure* copy_perm_cl = &only_copy_perm_cl;
+
+ if (_g1h->g1_policy()->during_initial_mark_pause()) {
+ // We also need to mark copied objects.
+ copy_non_heap_cl = ©_mark_non_heap_cl;
+ copy_perm_cl = ©_mark_perm_cl;
+ }
+
+ // Keep alive closure.
+ G1CopyingKeepAliveClosure keep_alive(_g1h, copy_non_heap_cl, copy_perm_cl, &pss);
+
+ // Complete GC closure
+ G1ParEvacuateFollowersClosure drain_queue(_g1h, &pss, _task_queues, _terminator);
+
+ // Call the reference processing task's work routine.
+ _proc_task.work(i, is_alive, keep_alive, drain_queue);
+
+ // Note we cannot assert that the refs array is empty here as not all
+ // of the processing tasks (specifically phase2 - pp2_work) execute
+ // the complete_gc closure (which ordinarily would drain the queue) so
+ // the queue may not be empty.
+ }
+};
+
+// Driver routine for parallel reference processing.
+// Creates an instance of the ref processing gang
+// task and has the worker threads execute it.
+void G1STWRefProcTaskExecutor::execute(ProcessTask& proc_task) {
+ assert(_workers != NULL, "Need parallel worker threads.");
+
+ ParallelTaskTerminator terminator(_active_workers, _queues);
+ G1STWRefProcTaskProxy proc_task_proxy(proc_task, _g1h, _queues, &terminator);
+
+ _g1h->set_par_threads(_active_workers);
+ _workers->run_task(&proc_task_proxy);
+ _g1h->set_par_threads(0);
+}
+
+// Gang task for parallel reference enqueueing.
+
+class G1STWRefEnqueueTaskProxy: public AbstractGangTask {
+ typedef AbstractRefProcTaskExecutor::EnqueueTask EnqueueTask;
+ EnqueueTask& _enq_task;
+
+public:
+ G1STWRefEnqueueTaskProxy(EnqueueTask& enq_task) :
+ AbstractGangTask("Enqueue reference objects in parallel"),
+ _enq_task(enq_task)
+ { }
+
+ virtual void work(int i) {
+ _enq_task.work(i);
+ }
+};
+
+// Driver routine for parallel reference enqueing.
+// Creates an instance of the ref enqueueing gang
+// task and has the worker threads execute it.
+
+void G1STWRefProcTaskExecutor::execute(EnqueueTask& enq_task) {
+ assert(_workers != NULL, "Need parallel worker threads.");
+
+ G1STWRefEnqueueTaskProxy enq_task_proxy(enq_task);
+
+ _g1h->set_par_threads(_active_workers);
+ _workers->run_task(&enq_task_proxy);
+ _g1h->set_par_threads(0);
+}
+
+// End of weak reference support closures
+
+// Abstract task used to preserve (i.e. copy) any referent objects
+// that are in the collection set and are pointed to by reference
+// objects discovered by the CM ref processor.
+
+class G1ParPreserveCMReferentsTask: public AbstractGangTask {
+protected:
+ G1CollectedHeap* _g1h;
+ RefToScanQueueSet *_queues;
+ ParallelTaskTerminator _terminator;
+ int _n_workers;
+
+public:
+ G1ParPreserveCMReferentsTask(G1CollectedHeap* g1h,int workers, RefToScanQueueSet *task_queues) :
+ AbstractGangTask("ParPreserveCMReferents"),
+ _g1h(g1h),
+ _queues(task_queues),
+ _terminator(workers, _queues),
+ _n_workers(workers)
+ { }
+
+ void work(int i) {
+ ResourceMark rm;
+ HandleMark hm;
+
+ G1ParScanThreadState pss(_g1h, i);
+ G1ParScanHeapEvacClosure scan_evac_cl(_g1h, &pss, NULL);
+ G1ParScanHeapEvacFailureClosure evac_failure_cl(_g1h, &pss, NULL);
+ G1ParScanPartialArrayClosure partial_scan_cl(_g1h, &pss, NULL);
+
+ pss.set_evac_closure(&scan_evac_cl);
+ pss.set_evac_failure_closure(&evac_failure_cl);
+ pss.set_partial_scan_closure(&partial_scan_cl);
+
+ assert(pss.refs()->is_empty(), "both queue and overflow should be empty");
+
+
+ G1ParScanExtRootClosure only_copy_non_heap_cl(_g1h, &pss, NULL);
+ G1ParScanPermClosure only_copy_perm_cl(_g1h, &pss, NULL);
+
+ G1ParScanAndMarkExtRootClosure copy_mark_non_heap_cl(_g1h, &pss, NULL);
+ G1ParScanAndMarkPermClosure copy_mark_perm_cl(_g1h, &pss, NULL);
+
+ OopClosure* copy_non_heap_cl = &only_copy_non_heap_cl;
+ OopsInHeapRegionClosure* copy_perm_cl = &only_copy_perm_cl;
+
+ if (_g1h->g1_policy()->during_initial_mark_pause()) {
+ // We also need to mark copied objects.
+ copy_non_heap_cl = ©_mark_non_heap_cl;
+ copy_perm_cl = ©_mark_perm_cl;
+ }
+
+ // Is alive closure
+ G1AlwaysAliveClosure always_alive(_g1h);
+
+ // Copying keep alive closure. Applied to referent objects that need
+ // to be copied.
+ G1CopyingKeepAliveClosure keep_alive(_g1h, copy_non_heap_cl, copy_perm_cl, &pss);
+
+ ReferenceProcessor* rp = _g1h->ref_processor_cm();
+
+ int limit = ReferenceProcessor::number_of_subclasses_of_ref() * rp->max_num_q();
+ int stride = MIN2(MAX2(_n_workers, 1), limit);
+
+ // limit is set using max_num_q() - which was set using ParallelGCThreads.
+ // So this must be true - but assert just in case someone decides to
+ // change the worker ids.
+ assert(0 <= i && i < limit, "sanity");
+ assert(!rp->discovery_is_atomic(), "check this code");
+
+ // Select discovered lists [i, i+stride, i+2*stride,...,limit)
+ for (int idx = i; idx < limit; idx += stride) {
+ DiscoveredList& ref_list = rp->discovered_refs()[idx];
+
+ DiscoveredListIterator iter(ref_list, &keep_alive, &always_alive);
+ while (iter.has_next()) {
+ // Since discovery is not atomic for the CM ref processor, we
+ // can see some null referent objects.
+ iter.load_ptrs(DEBUG_ONLY(true));
+ oop ref = iter.obj();
+
+ // This will filter nulls.
+ if (iter.is_referent_alive()) {
+ iter.make_referent_alive();
+ }
+ iter.move_to_next();
+ }
+ }
+
+ // Drain the queue - which may cause stealing
+ G1ParEvacuateFollowersClosure drain_queue(_g1h, &pss, _queues, &_terminator);
+ drain_queue.do_void();
+ // Allocation buffers were retired at the end of G1ParEvacuateFollowersClosure
+ assert(pss.refs()->is_empty(), "should be");
+ }
+};
+
+// Weak Reference processing during an evacuation pause (part 1).
+void G1CollectedHeap::process_discovered_references() {
+ double ref_proc_start = os::elapsedTime();
+
+ ReferenceProcessor* rp = _ref_processor_stw;
+ assert(rp->discovery_enabled(), "should have been enabled");
+
+ // Any reference objects, in the collection set, that were 'discovered'
+ // by the CM ref processor should have already been copied (either by
+ // applying the external root copy closure to the discovered lists, or
+ // by following an RSet entry).
+ //
+ // But some of the referents, that are in the collection set, that these
+ // reference objects point to may not have been copied: the STW ref
+ // processor would have seen that the reference object had already
+ // been 'discovered' and would have skipped discovering the reference,
+ // but would not have treated the reference object as a regular oop.
+ // As a reult the copy closure would not have been applied to the
+ // referent object.
+ //
+ // We need to explicitly copy these referent objects - the references
+ // will be processed at the end of remarking.
+ //
+ // We also need to do this copying before we process the reference
+ // objects discovered by the STW ref processor in case one of these
+ // referents points to another object which is also referenced by an
+ // object discovered by the STW ref processor.
+
+ int n_workers = (G1CollectedHeap::use_parallel_gc_threads() ?
+ workers()->total_workers() : 1);
+
+ set_par_threads(n_workers);
+ G1ParPreserveCMReferentsTask keep_cm_referents(this, n_workers, _task_queues);
+
+ if (G1CollectedHeap::use_parallel_gc_threads()) {
+ workers()->run_task(&keep_cm_referents);
+ } else {
+ keep_cm_referents.work(0);
+ }
+
+ set_par_threads(0);
+
+ // Closure to test whether a referent is alive.
+ G1STWIsAliveClosure is_alive(this);
+
+ // Even when parallel reference processing is enabled, the processing
+ // of JNI refs is serial and performed serially by the current thread
+ // rather than by a worker. The following PSS will be used for processing
+ // JNI refs.
+
+ // Use only a single queue for this PSS.
+ G1ParScanThreadState pss(this, 0);
+
+ // We do not embed a reference processor in the copying/scanning
+ // closures while we're actually processing the discovered
+ // reference objects.
+ G1ParScanHeapEvacClosure scan_evac_cl(this, &pss, NULL);
+ G1ParScanHeapEvacFailureClosure evac_failure_cl(this, &pss, NULL);
+ G1ParScanPartialArrayClosure partial_scan_cl(this, &pss, NULL);
+
+ pss.set_evac_closure(&scan_evac_cl);
+ pss.set_evac_failure_closure(&evac_failure_cl);
+ pss.set_partial_scan_closure(&partial_scan_cl);
+
+ assert(pss.refs()->is_empty(), "pre-condition");
+
+ G1ParScanExtRootClosure only_copy_non_heap_cl(this, &pss, NULL);
+ G1ParScanPermClosure only_copy_perm_cl(this, &pss, NULL);
+
+ G1ParScanAndMarkExtRootClosure copy_mark_non_heap_cl(this, &pss, NULL);
+ G1ParScanAndMarkPermClosure copy_mark_perm_cl(this, &pss, NULL);
+
+ OopClosure* copy_non_heap_cl = &only_copy_non_heap_cl;
+ OopsInHeapRegionClosure* copy_perm_cl = &only_copy_perm_cl;
+
+ if (_g1h->g1_policy()->during_initial_mark_pause()) {
+ // We also need to mark copied objects.
+ copy_non_heap_cl = ©_mark_non_heap_cl;
+ copy_perm_cl = ©_mark_perm_cl;
+ }
+
+ // Keep alive closure.
+ G1CopyingKeepAliveClosure keep_alive(this, copy_non_heap_cl, copy_perm_cl, &pss);
+
+ // Serial Complete GC closure
+ G1STWDrainQueueClosure drain_queue(this, &pss);
+
+ // Setup the soft refs policy...
+ rp->setup_policy(false);
+
+ if (!rp->processing_is_mt()) {
+ // Serial reference processing...
+ rp->process_discovered_references(&is_alive,
+ &keep_alive,
+ &drain_queue,
+ NULL);
+ } else {
+ // Parallel reference processing
+ int active_workers = (ParallelGCThreads > 0 ? workers()->total_workers() : 1);
+ assert(rp->num_q() == active_workers, "sanity");
+ assert(active_workers <= rp->max_num_q(), "sanity");
+
+ G1STWRefProcTaskExecutor par_task_executor(this, workers(), _task_queues, active_workers);
+ rp->process_discovered_references(&is_alive, &keep_alive, &drain_queue, &par_task_executor);
+ }
+
+ // We have completed copying any necessary live referent objects
+ // (that were not copied during the actual pause) so we can
+ // retire any active alloc buffers
+ pss.retire_alloc_buffers();
+ assert(pss.refs()->is_empty(), "both queue and overflow should be empty");
+
+ double ref_proc_time = os::elapsedTime() - ref_proc_start;
+ g1_policy()->record_ref_proc_time(ref_proc_time * 1000.0);
+}
+
+// Weak Reference processing during an evacuation pause (part 2).
+void G1CollectedHeap::enqueue_discovered_references() {
+ double ref_enq_start = os::elapsedTime();
+
+ ReferenceProcessor* rp = _ref_processor_stw;
+ assert(!rp->discovery_enabled(), "should have been disabled as part of processing");
+
+ // Now enqueue any remaining on the discovered lists on to
+ // the pending list.
+ if (!rp->processing_is_mt()) {
+ // Serial reference processing...
+ rp->enqueue_discovered_references();
+ } else {
+ // Parallel reference enqueuing
+
+ int active_workers = (ParallelGCThreads > 0 ? workers()->total_workers() : 1);
+ assert(rp->num_q() == active_workers, "sanity");
+ assert(active_workers <= rp->max_num_q(), "sanity");
+
+ G1STWRefProcTaskExecutor par_task_executor(this, workers(), _task_queues, active_workers);
+ rp->enqueue_discovered_references(&par_task_executor);
+ }
+
+ rp->verify_no_references_recorded();
+ assert(!rp->discovery_enabled(), "should have been disabled");
+
+ // FIXME
+ // CM's reference processing also cleans up the string and symbol tables.
+ // Should we do that here also? We could, but it is a serial operation
+ // and could signicantly increase the pause time.
+
+ double ref_enq_time = os::elapsedTime() - ref_enq_start;
+ g1_policy()->record_ref_enq_time(ref_enq_time * 1000.0);
+}
+
void G1CollectedHeap::evacuate_collection_set() {
set_evacuation_failed(false);
@@ -4658,6 +5264,7 @@ void G1CollectedHeap::evacuate_collection_set() {
assert(dirty_card_queue_set().completed_buffers_num() == 0, "Should be empty");
double start_par = os::elapsedTime();
+
if (G1CollectedHeap::use_parallel_gc_threads()) {
// The individual threads will set their evac-failure closures.
StrongRootsScope srs(this);
@@ -4672,15 +5279,23 @@ void G1CollectedHeap::evacuate_collection_set() {
g1_policy()->record_par_time(par_time);
set_par_threads(0);
+ // Process any discovered reference objects - we have
+ // to do this _before_ we retire the GC alloc regions
+ // as we may have to copy some 'reachable' referent
+ // objects (and their reachable sub-graphs) that were
+ // not copied during the pause.
+ process_discovered_references();
+
// Weak root processing.
// Note: when JSR 292 is enabled and code blobs can contain
// non-perm oops then we will need to process the code blobs
// here too.
{
- G1IsAliveClosure is_alive(this);
+ G1STWIsAliveClosure is_alive(this);
G1KeepAliveClosure keep_alive(this);
JNIHandles::weak_oops_do(&is_alive, &keep_alive);
}
+
release_gc_alloc_regions();
g1_rem_set()->cleanup_after_oops_into_collection_set_do();
@@ -4702,6 +5317,15 @@ void G1CollectedHeap::evacuate_collection_set() {
}
}
+ // Enqueue any remaining references remaining on the STW
+ // reference processor's discovered lists. We need to do
+ // this after the card table is cleaned (and verified) as
+ // the act of enqueuing entries on to the pending list
+ // will log these updates (and dirty their associated
+ // cards). We need these updates logged to update any
+ // RSets.
+ enqueue_discovered_references();
+
if (G1DeferredRSUpdate) {
RedirtyLoggedCardTableEntryFastClosure redirty;
dirty_card_queue_set().set_closure(&redirty);
@@ -4717,6 +5341,7 @@ void G1CollectedHeap::evacuate_collection_set() {
void G1CollectedHeap::free_region_if_empty(HeapRegion* hr,
size_t* pre_used,
FreeRegionList* free_list,
+ OldRegionSet* old_proxy_set,
HumongousRegionSet* humongous_proxy_set,
HRRSCleanupTask* hrrs_cleanup_task,
bool par) {
@@ -4725,6 +5350,7 @@ void G1CollectedHeap::free_region_if_empty(HeapRegion* hr,
assert(hr->startsHumongous(), "we should only see starts humongous");
free_humongous_region(hr, pre_used, free_list, humongous_proxy_set, par);
} else {
+ _old_set.remove_with_proxy(hr, old_proxy_set);
free_region(hr, pre_used, free_list, par);
}
} else {
@@ -4781,6 +5407,7 @@ void G1CollectedHeap::free_humongous_region(HeapRegion* hr,
void G1CollectedHeap::update_sets_after_freeing_regions(size_t pre_used,
FreeRegionList* free_list,
+ OldRegionSet* old_proxy_set,
HumongousRegionSet* humongous_proxy_set,
bool par) {
if (pre_used > 0) {
@@ -4796,6 +5423,10 @@ void G1CollectedHeap::update_sets_after_freeing_regions(size_t pre_used,
MutexLockerEx x(FreeList_lock, Mutex::_no_safepoint_check_flag);
_free_list.add_as_head(free_list);
}
+ if (old_proxy_set != NULL && !old_proxy_set->is_empty()) {
+ MutexLockerEx x(OldSets_lock, Mutex::_no_safepoint_check_flag);
+ _old_set.update_from_proxy(old_proxy_set);
+ }
if (humongous_proxy_set != NULL && !humongous_proxy_set->is_empty()) {
MutexLockerEx x(OldSets_lock, Mutex::_no_safepoint_check_flag);
_humongous_set.update_from_proxy(humongous_proxy_set);
@@ -4881,34 +5512,36 @@ void G1CollectedHeap::cleanUpCardTable() {
CardTableModRefBS* ct_bs = (CardTableModRefBS*) (barrier_set());
double start = os::elapsedTime();
- // Iterate over the dirty cards region list.
- G1ParCleanupCTTask cleanup_task(ct_bs, this);
+ {
+ // Iterate over the dirty cards region list.
+ G1ParCleanupCTTask cleanup_task(ct_bs, this);
- if (ParallelGCThreads > 0) {
- set_par_threads(workers()->total_workers());
- workers()->run_task(&cleanup_task);
- set_par_threads(0);
- } else {
- while (_dirty_cards_region_list) {
- HeapRegion* r = _dirty_cards_region_list;
- cleanup_task.clear_cards(r);
- _dirty_cards_region_list = r->get_next_dirty_cards_region();
- if (_dirty_cards_region_list == r) {
- // The last region.
- _dirty_cards_region_list = NULL;
+ if (ParallelGCThreads > 0) {
+ set_par_threads(workers()->total_workers());
+ workers()->run_task(&cleanup_task);
+ set_par_threads(0);
+ } else {
+ while (_dirty_cards_region_list) {
+ HeapRegion* r = _dirty_cards_region_list;
+ cleanup_task.clear_cards(r);
+ _dirty_cards_region_list = r->get_next_dirty_cards_region();
+ if (_dirty_cards_region_list == r) {
+ // The last region.
+ _dirty_cards_region_list = NULL;
+ }
+ r->set_next_dirty_cards_region(NULL);
}
- r->set_next_dirty_cards_region(NULL);
}
+#ifndef PRODUCT
+ if (G1VerifyCTCleanup || VerifyAfterGC) {
+ G1VerifyCardTableCleanup cleanup_verifier(this, ct_bs);
+ heap_region_iterate(&cleanup_verifier);
+ }
+#endif
}
double elapsed = os::elapsedTime() - start;
- g1_policy()->record_clear_ct_time( elapsed * 1000.0);
-#ifndef PRODUCT
- if (G1VerifyCTCleanup || VerifyAfterGC) {
- G1VerifyCardTableCleanup cleanup_verifier(this, ct_bs);
- heap_region_iterate(&cleanup_verifier);
- }
-#endif
+ g1_policy()->record_clear_ct_time(elapsed * 1000.0);
}
void G1CollectedHeap::free_collection_set(HeapRegion* cs_head) {
@@ -4991,6 +5624,8 @@ void G1CollectedHeap::free_collection_set(HeapRegion* cs_head) {
cur->set_young_index_in_cset(-1);
cur->set_not_young();
cur->set_evacuation_failed(false);
+ // The region is now considered to be old.
+ _old_set.add(cur);
}
cur = next;
}
@@ -5006,6 +5641,7 @@ void G1CollectedHeap::free_collection_set(HeapRegion* cs_head) {
young_time_ms += elapsed_ms;
update_sets_after_freeing_regions(pre_used, &local_free_list,
+ NULL /* old_proxy_set */,
NULL /* humongous_proxy_set */,
false /* par */);
policy->record_young_free_cset_time_ms(young_time_ms);
@@ -5117,52 +5753,106 @@ bool G1CollectedHeap::check_young_list_empty(bool check_heap, bool check_sample)
return ret;
}
-void G1CollectedHeap::empty_young_list() {
- assert(heap_lock_held_for_gc(),
- "the heap lock should already be held by or for this thread");
+class TearDownRegionSetsClosure : public HeapRegionClosure {
+private:
+ OldRegionSet *_old_set;
- _young_list->empty_list();
-}
+public:
+ TearDownRegionSetsClosure(OldRegionSet* old_set) : _old_set(old_set) { }
+
+ bool doHeapRegion(HeapRegion* r) {
+ if (r->is_empty()) {
+ // We ignore empty regions, we'll empty the free list afterwards
+ } else if (r->is_young()) {
+ // We ignore young regions, we'll empty the young list afterwards
+ } else if (r->isHumongous()) {
+ // We ignore humongous regions, we're not tearing down the
+ // humongous region set
+ } else {
+ // The rest should be old
+ _old_set->remove(r);
+ }
+ return false;
+ }
+
+ ~TearDownRegionSetsClosure() {
+ assert(_old_set->is_empty(), "post-condition");
+ }
+};
+
+void G1CollectedHeap::tear_down_region_sets(bool free_list_only) {
+ assert_at_safepoint(true /* should_be_vm_thread */);
-// Done at the start of full GC.
-void G1CollectedHeap::tear_down_region_lists() {
+ if (!free_list_only) {
+ TearDownRegionSetsClosure cl(&_old_set);
+ heap_region_iterate(&cl);
+
+ // Need to do this after the heap iteration to be able to
+ // recognize the young regions and ignore them during the iteration.
+ _young_list->empty_list();
+ }
_free_list.remove_all();
}
-class RegionResetter: public HeapRegionClosure {
- G1CollectedHeap* _g1h;
- FreeRegionList _local_free_list;
+class RebuildRegionSetsClosure : public HeapRegionClosure {
+private:
+ bool _free_list_only;
+ OldRegionSet* _old_set;
+ FreeRegionList* _free_list;
+ size_t _total_used;
public:
- RegionResetter() : _g1h(G1CollectedHeap::heap()),
- _local_free_list("Local Free List for RegionResetter") { }
+ RebuildRegionSetsClosure(bool free_list_only,
+ OldRegionSet* old_set, FreeRegionList* free_list) :
+ _free_list_only(free_list_only),
+ _old_set(old_set), _free_list(free_list), _total_used(0) {
+ assert(_free_list->is_empty(), "pre-condition");
+ if (!free_list_only) {
+ assert(_old_set->is_empty(), "pre-condition");
+ }
+ }
bool doHeapRegion(HeapRegion* r) {
- if (r->continuesHumongous()) return false;
- if (r->top() > r->bottom()) {
- if (r->top() < r->end()) {
- Copy::fill_to_words(r->top(),
- pointer_delta(r->end(), r->top()));
+ if (r->continuesHumongous()) {
+ return false;
+ }
+
+ if (r->is_empty()) {
+ // Add free regions to the free list
+ _free_list->add_as_tail(r);
+ } else if (!_free_list_only) {
+ assert(!r->is_young(), "we should not come across young regions");
+
+ if (r->isHumongous()) {
+ // We ignore humongous regions, we left the humongous set unchanged
+ } else {
+ // The rest should be old, add them to the old set
+ _old_set->add(r);
}
- } else {
- assert(r->is_empty(), "tautology");
- _local_free_list.add_as_tail(r);
+ _total_used += r->used();
}
+
return false;
}
- void update_free_lists() {
- _g1h->update_sets_after_freeing_regions(0, &_local_free_list, NULL,
- false /* par */);
+ size_t total_used() {
+ return _total_used;
}
};
-// Done at the end of full GC.
-void G1CollectedHeap::rebuild_region_lists() {
- // This needs to go at the end of the full GC.
- RegionResetter rs;
- heap_region_iterate(&rs);
- rs.update_free_lists();
+void G1CollectedHeap::rebuild_region_sets(bool free_list_only) {
+ assert_at_safepoint(true /* should_be_vm_thread */);
+
+ RebuildRegionSetsClosure cl(free_list_only, &_old_set, &_free_list);
+ heap_region_iterate(&cl);
+
+ if (!free_list_only) {
+ _summary_bytes_used = cl.total_used();
+ }
+ assert(_summary_bytes_used == recalculate_used(),
+ err_msg("inconsistent _summary_bytes_used, "
+ "value: "SIZE_FORMAT" recalculated: "SIZE_FORMAT,
+ _summary_bytes_used, recalculate_used()));
}
void G1CollectedHeap::set_refine_cte_cl_concurrency(bool concurrent) {
@@ -5193,7 +5883,6 @@ HeapRegion* G1CollectedHeap::new_mutator_alloc_region(size_t word_size,
g1_policy()->update_region_num(true /* next_is_young */);
set_region_short_lived_locked(new_alloc_region);
_hr_printer.alloc(new_alloc_region, G1HRPrinter::Eden, young_list_full);
- g1mm()->update_eden_counters();
return new_alloc_region;
}
}
@@ -5208,6 +5897,10 @@ void G1CollectedHeap::retire_mutator_alloc_region(HeapRegion* alloc_region,
g1_policy()->add_region_to_incremental_cset_lhs(alloc_region);
_summary_bytes_used += allocated_bytes;
_hr_printer.retire(alloc_region);
+ // We update the eden sizes here, when the region is retired,
+ // instead of when it's allocated, since this is the point that its
+ // used space has been recored in _summary_bytes_used.
+ g1mm()->update_eden_size();
}
HeapRegion* MutatorAllocRegion::allocate_new_region(size_t word_size,
@@ -5256,6 +5949,8 @@ void G1CollectedHeap::retire_gc_alloc_region(HeapRegion* alloc_region,
g1_policy()->record_bytes_copied_during_gc(allocated_bytes);
if (ap == GCAllocForSurvived) {
young_list()->add_survivor_region(alloc_region);
+ } else {
+ _old_set.add(alloc_region);
}
_hr_printer.retire(alloc_region);
}
@@ -5287,15 +5982,17 @@ void OldGCAllocRegion::retire_region(HeapRegion* alloc_region,
class VerifyRegionListsClosure : public HeapRegionClosure {
private:
- HumongousRegionSet* _humongous_set;
FreeRegionList* _free_list;
+ OldRegionSet* _old_set;
+ HumongousRegionSet* _humongous_set;
size_t _region_count;
public:
- VerifyRegionListsClosure(HumongousRegionSet* humongous_set,
+ VerifyRegionListsClosure(OldRegionSet* old_set,
+ HumongousRegionSet* humongous_set,
FreeRegionList* free_list) :
- _humongous_set(humongous_set), _free_list(free_list),
- _region_count(0) { }
+ _old_set(old_set), _humongous_set(humongous_set),
+ _free_list(free_list), _region_count(0) { }
size_t region_count() { return _region_count; }
@@ -5312,6 +6009,8 @@ public:
_humongous_set->verify_next_region(hr);
} else if (hr->is_empty()) {
_free_list->verify_next_region(hr);
+ } else {
+ _old_set->verify_next_region(hr);
}
return false;
}
@@ -5338,6 +6037,7 @@ void G1CollectedHeap::verify_region_sets() {
MutexLockerEx x(SecondaryFreeList_lock, Mutex::_no_safepoint_check_flag);
_secondary_free_list.verify();
}
+ _old_set.verify();
_humongous_set.verify();
// If a concurrent region freeing operation is in progress it will
@@ -5361,12 +6061,14 @@ void G1CollectedHeap::verify_region_sets() {
// Finally, make sure that the region accounting in the lists is
// consistent with what we see in the heap.
+ _old_set.verify_start();
_humongous_set.verify_start();
_free_list.verify_start();
- VerifyRegionListsClosure cl(&_humongous_set, &_free_list);
+ VerifyRegionListsClosure cl(&_old_set, &_humongous_set, &_free_list);
heap_region_iterate(&cl);
+ _old_set.verify_end();
_humongous_set.verify_end();
_free_list.verify_end();
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
index 650e438..d0e0941 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
@@ -155,6 +155,19 @@ public:
: G1AllocRegion("Mutator Alloc Region", false /* bot_updates */) { }
};
+// The G1 STW is alive closure.
+// An instance is embedded into the G1CH and used as the
+// (optional) _is_alive_non_header closure in the STW
+// reference processor. It is also extensively used during
+// refence processing during STW evacuation pauses.
+class G1STWIsAliveClosure: public BoolObjectClosure {
+ G1CollectedHeap* _g1;
+public:
+ G1STWIsAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
+ void do_object(oop p) { assert(false, "Do not call."); }
+ bool do_object_b(oop p);
+};
+
class SurvivorGCAllocRegion : public G1AllocRegion {
protected:
virtual HeapRegion* allocate_new_region(size_t word_size, bool force);
@@ -174,6 +187,7 @@ public:
};
class RefineCardTableEntryClosure;
+
class G1CollectedHeap : public SharedHeap {
friend class VM_G1CollectForAllocation;
friend class VM_GenCollectForPermanentAllocation;
@@ -225,6 +239,9 @@ private:
// master free list when appropriate.
SecondaryFreeRegionList _secondary_free_list;
+ // It keeps track of the old regions.
+ MasterOldRegionSet _old_set;
+
// It keeps track of the humongous regions.
MasterHumongousRegionSet _humongous_set;
@@ -234,10 +251,21 @@ private:
// The block offset table for the G1 heap.
G1BlockOffsetSharedArray* _bot_shared;
- // Move all of the regions off the free lists, then rebuild those free
- // lists, before and after full GC.
- void tear_down_region_lists();
- void rebuild_region_lists();
+ // Tears down the region sets / lists so that they are empty and the
+ // regions on the heap do not belong to a region set / list. The
+ // only exception is the humongous set which we leave unaltered. If
+ // free_list_only is true, it will only tear down the master free
+ // list. It is called before a Full GC (free_list_only == false) or
+ // before heap shrinking (free_list_only == true).
+ void tear_down_region_sets(bool free_list_only);
+
+ // Rebuilds the region sets / lists so that they are repopulated to
+ // reflect the contents of the heap. The only exception is the
+ // humongous set which was not torn down in the first place. If
+ // free_list_only is true, it will only rebuild the master free
+ // list. It is called after a Full GC (free_list_only == false) or
+ // after heap shrinking (free_list_only == true).
+ void rebuild_region_sets(bool free_list_only);
// The sequence of all heap regions in the heap.
HeapRegionSeq _hrs;
@@ -573,9 +601,20 @@ protected:
// allocated block, or else "NULL".
HeapWord* expand_and_allocate(size_t word_size);
+ // Process any reference objects discovered during
+ // an incremental evacuation pause.
+ void process_discovered_references();
+
+ // Enqueue any remaining discovered references
+ // after processing.
+ void enqueue_discovered_references();
+
public:
- G1MonitoringSupport* g1mm() { return _g1mm; }
+ G1MonitoringSupport* g1mm() {
+ assert(_g1mm != NULL, "should have been initialized");
+ return _g1mm;
+ }
// Expand the garbage-first heap by at least the given size (in bytes!).
// Returns true if the heap was expanded by the requested amount;
@@ -822,17 +861,87 @@ protected:
void finalize_for_evac_failure();
// An attempt to evacuate "obj" has failed; take necessary steps.
- oop handle_evacuation_failure_par(OopsInHeapRegionClosure* cl, oop obj);
+ oop handle_evacuation_failure_par(OopsInHeapRegionClosure* cl, oop obj,
+ bool should_mark_root);
void handle_evacuation_failure_common(oop obj, markOop m);
- // Instance of the concurrent mark is_alive closure for embedding
- // into the reference processor as the is_alive_non_header. This
- // prevents unnecessary additions to the discovered lists during
- // concurrent discovery.
- G1CMIsAliveClosure _is_alive_closure;
+ // ("Weak") Reference processing support.
+ //
+ // G1 has 2 instances of the referece processor class. One
+ // (_ref_processor_cm) handles reference object discovery
+ // and subsequent processing during concurrent marking cycles.
+ //
+ // The other (_ref_processor_stw) handles reference object
+ // discovery and processing during full GCs and incremental
+ // evacuation pauses.
+ //
+ // During an incremental pause, reference discovery will be
+ // temporarily disabled for _ref_processor_cm and will be
+ // enabled for _ref_processor_stw. At the end of the evacuation
+ // pause references discovered by _ref_processor_stw will be
+ // processed and discovery will be disabled. The previous
+ // setting for reference object discovery for _ref_processor_cm
+ // will be re-instated.
+ //
+ // At the start of marking:
+ // * Discovery by the CM ref processor is verified to be inactive
+ // and it's discovered lists are empty.
+ // * Discovery by the CM ref processor is then enabled.
+ //
+ // At the end of marking:
+ // * Any references on the CM ref processor's discovered
+ // lists are processed (possibly MT).
+ //
+ // At the start of full GC we:
+ // * Disable discovery by the CM ref processor and
+ // empty CM ref processor's discovered lists
+ // (without processing any entries).
+ // * Verify that the STW ref processor is inactive and it's
+ // discovered lists are empty.
+ // * Temporarily set STW ref processor discovery as single threaded.
+ // * Temporarily clear the STW ref processor's _is_alive_non_header
+ // field.
+ // * Finally enable discovery by the STW ref processor.
+ //
+ // The STW ref processor is used to record any discovered
+ // references during the full GC.
+ //
+ // At the end of a full GC we:
+ // * Enqueue any reference objects discovered by the STW ref processor
+ // that have non-live referents. This has the side-effect of
+ // making the STW ref processor inactive by disabling discovery.
+ // * Verify that the CM ref processor is still inactive
+ // and no references have been placed on it's discovered
+ // lists (also checked as a precondition during initial marking).
+
+ // The (stw) reference processor...
+ ReferenceProcessor* _ref_processor_stw;
+
+ // During reference object discovery, the _is_alive_non_header
+ // closure (if non-null) is applied to the referent object to
+ // determine whether the referent is live. If so then the
+ // reference object does not need to be 'discovered' and can
+ // be treated as a regular oop. This has the benefit of reducing
+ // the number of 'discovered' reference objects that need to
+ // be processed.
+ //
+ // Instance of the is_alive closure for embedding into the
+ // STW reference processor as the _is_alive_non_header field.
+ // Supplying a value for the _is_alive_non_header field is
+ // optional but doing so prevents unnecessary additions to
+ // the discovered lists during reference discovery.
+ G1STWIsAliveClosure _is_alive_closure_stw;
+
+ // The (concurrent marking) reference processor...
+ ReferenceProcessor* _ref_processor_cm;
- // ("Weak") Reference processing support
- ReferenceProcessor* _ref_processor;
+ // Instance of the concurrent mark is_alive closure for embedding
+ // into the Concurrent Marking reference processor as the
+ // _is_alive_non_header field. Supplying a value for the
+ // _is_alive_non_header field is optional but doing so prevents
+ // unnecessary additions to the discovered lists during reference
+ // discovery.
+ G1CMIsAliveClosure _is_alive_closure_cm;
enum G1H_process_strong_roots_tasks {
G1H_PS_mark_stack_oops_do,
@@ -873,6 +982,7 @@ public:
// specified by the policy object.
jint initialize();
+ // Initialize weak reference processing.
virtual void ref_processing_init();
void set_par_threads(int t) {
@@ -924,8 +1034,13 @@ public:
// The shared block offset table array.
G1BlockOffsetSharedArray* bot_shared() const { return _bot_shared; }
- // Reference Processing accessor
- ReferenceProcessor* ref_processor() { return _ref_processor; }
+ // Reference Processing accessors
+
+ // The STW reference processor....
+ ReferenceProcessor* ref_processor_stw() const { return _ref_processor_stw; }
+
+ // The Concurent Marking reference processor...
+ ReferenceProcessor* ref_processor_cm() const { return _ref_processor_cm; }
virtual size_t capacity() const;
virtual size_t used() const;
@@ -1023,6 +1138,10 @@ public:
}
}
+ void old_set_remove(HeapRegion* hr) {
+ _old_set.remove(hr);
+ }
+
void set_free_regions_coming();
void reset_free_regions_coming();
bool free_regions_coming() { return _free_regions_coming; }
@@ -1052,6 +1171,7 @@ public:
void free_region_if_empty(HeapRegion* hr,
size_t* pre_used,
FreeRegionList* free_list,
+ OldRegionSet* old_proxy_set,
HumongousRegionSet* humongous_proxy_set,
HRRSCleanupTask* hrrs_cleanup_task,
bool par);
@@ -1062,6 +1182,7 @@ public:
// (if par is true, it will do so by taking the ParGCRareEvent_lock).
void update_sets_after_freeing_regions(size_t pre_used,
FreeRegionList* free_list,
+ OldRegionSet* old_proxy_set,
HumongousRegionSet* humongous_proxy_set,
bool par);
@@ -1236,12 +1357,7 @@ public:
// storage in the heap comes from a young region or not.
// See ReduceInitialCardMarks.
virtual bool can_elide_tlab_store_barriers() const {
- // 6920090: Temporarily disabled, because of lingering
- // instabilities related to RICM with G1. In the
- // interim, the option ReduceInitialCardMarksForG1
- // below is left solely as a debugging device at least
- // until 6920109 fixes the instabilities.
- return ReduceInitialCardMarksForG1;
+ return true;
}
virtual bool card_mark_must_follow_store() const {
@@ -1265,8 +1381,6 @@ public:
// update logging post-barrier, we don't maintain remembered set
// information for young gen objects.
virtual bool can_elide_initializing_store_barrier(oop new_obj) {
- // Re 6920090, 6920109 above.
- assert(ReduceInitialCardMarksForG1, "Else cannot be here");
return is_in_young(new_obj);
}
@@ -1335,14 +1449,8 @@ public:
// Override; it uses the "prev" marking information
virtual void verify(bool allow_dirty, bool silent);
- // Default behavior by calling print(tty);
- virtual void print() const;
- // This calls print_on(st, PrintHeapAtGCExtended).
virtual void print_on(outputStream* st) const;
- // If extended is true, it will print out information for all
- // regions in the heap by calling print_on_extended(st).
- virtual void print_on(outputStream* st, bool extended) const;
- virtual void print_on_extended(outputStream* st) const;
+ virtual void print_extended_on(outputStream* st) const;
virtual void print_gc_threads_on(outputStream* st) const;
virtual void gc_threads_do(ThreadClosure* tc) const;
@@ -1358,8 +1466,6 @@ public:
// asserted to be this type.
static G1CollectedHeap* heap();
- void empty_young_list();
-
void set_region_short_lived_locked(HeapRegion* hr);
// add appropriate methods for any other surv rate groups
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
index d43d080..019f087 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
@@ -152,8 +152,12 @@ G1CollectorPolicy::G1CollectorPolicy() :
_summary(new Summary()),
-#ifndef PRODUCT
_cur_clear_ct_time_ms(0.0),
+
+ _cur_ref_proc_time_ms(0.0),
+ _cur_ref_enq_time_ms(0.0),
+
+#ifndef PRODUCT
_min_clear_cc_time_ms(-1.0),
_max_clear_cc_time_ms(-1.0),
_cur_clear_cc_time_ms(0.0),
@@ -221,16 +225,12 @@ G1CollectorPolicy::G1CollectorPolicy() :
_recent_CS_bytes_surviving(new TruncatedSeq(NumPrevPausesForHeuristics)),
_recent_avg_pause_time_ratio(0.0),
- _num_markings(0),
- _n_marks(0),
- _n_pauses_at_mark_end(0),
_all_full_gc_times_ms(new NumberSeq()),
// G1PausesBtwnConcMark defaults to -1
// so the hack is to do the cast QQQ FIXME
_pauses_btwn_concurrent_mark((size_t)G1PausesBtwnConcMark),
- _n_marks_since_last_pause(0),
_initiate_conc_mark_if_possible(false),
_during_initial_mark_pause(false),
_should_revert_to_full_young_gcs(false),
@@ -294,10 +294,10 @@ G1CollectorPolicy::G1CollectorPolicy() :
}
// Verify PLAB sizes
- const uint region_size = HeapRegion::GrainWords;
+ const size_t region_size = HeapRegion::GrainWords;
if (YoungPLABSize > region_size || OldPLABSize > region_size) {
char buffer[128];
- jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most %u",
+ jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT,
OldPLABSize > region_size ? "Old" : "Young", region_size);
vm_exit_during_initialization(buffer);
}
@@ -320,6 +320,7 @@ G1CollectorPolicy::G1CollectorPolicy() :
_par_last_termination_attempts = new double[_parallel_gc_threads];
_par_last_gc_worker_end_times_ms = new double[_parallel_gc_threads];
_par_last_gc_worker_times_ms = new double[_parallel_gc_threads];
+ _par_last_gc_worker_other_times_ms = new double[_parallel_gc_threads];
// start conservatively
_expensive_region_limit_ms = 0.5 * (double) MaxGCPauseMillis;
@@ -436,6 +437,7 @@ G1CollectorPolicy::G1CollectorPolicy() :
_reserve_regions = 0;
initialize_all();
+ _collectionSetChooser = new CollectionSetChooser();
}
// Increment "i", mod "len"
@@ -459,15 +461,16 @@ void G1CollectorPolicy::initialize_flags() {
// ParallelScavengeHeap::initialize()). We might change this in the
// future, but it's a good start.
class G1YoungGenSizer : public TwoGenerationCollectorPolicy {
+private:
+ size_t size_to_region_num(size_t byte_size) {
+ return MAX2((size_t) 1, byte_size / HeapRegion::GrainBytes);
+ }
public:
G1YoungGenSizer() {
initialize_flags();
initialize_size_info();
}
- size_t size_to_region_num(size_t byte_size) {
- return MAX2((size_t) 1, byte_size / HeapRegion::GrainBytes);
- }
size_t min_young_region_num() {
return size_to_region_num(_min_gen0_size);
}
@@ -495,32 +498,27 @@ void G1CollectorPolicy::init() {
initialize_gc_policy_counters();
G1YoungGenSizer sizer;
- size_t initial_region_num = sizer.initial_young_region_num();
_min_desired_young_length = sizer.min_young_region_num();
_max_desired_young_length = sizer.max_young_region_num();
if (FLAG_IS_CMDLINE(NewRatio)) {
if (FLAG_IS_CMDLINE(NewSize) || FLAG_IS_CMDLINE(MaxNewSize)) {
- gclog_or_tty->print_cr("-XX:NewSize and -XX:MaxNewSize overrides -XX:NewRatio");
+ warning("-XX:NewSize and -XX:MaxNewSize override -XX:NewRatio");
} else {
// Treat NewRatio as a fixed size that is only recalculated when the heap size changes
- size_t heap_regions = sizer.size_to_region_num(_g1->n_regions());
- update_young_list_size_using_newratio(heap_regions);
+ update_young_list_size_using_newratio(_g1->n_regions());
_using_new_ratio_calculations = true;
}
}
- // GenCollectorPolicy guarantees that min <= initial <= max.
- // Asserting here just to state that we rely on this property.
assert(_min_desired_young_length <= _max_desired_young_length, "Invalid min/max young gen size values");
- assert(initial_region_num <= _max_desired_young_length, "Initial young gen size too large");
- assert(_min_desired_young_length <= initial_region_num, "Initial young gen size too small");
set_adaptive_young_list_length(_min_desired_young_length < _max_desired_young_length);
if (adaptive_young_list_length()) {
_young_list_fixed_length = 0;
} else {
- _young_list_fixed_length = initial_region_num;
+ assert(_min_desired_young_length == _max_desired_young_length, "Min and max young size differ");
+ _young_list_fixed_length = _min_desired_young_length;
}
_free_regions_at_end_of_collection = _g1->free_regions();
update_young_list_target_length();
@@ -917,6 +915,7 @@ void G1CollectorPolicy::record_full_collection_end() {
// Reset survivors SurvRateGroup.
_survivor_surv_rate_group->reset();
update_young_list_target_length();
+ _collectionSetChooser->updateAfterFullCollection();
}
void G1CollectorPolicy::record_stop_world_start() {
@@ -974,6 +973,7 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec,
_par_last_termination_attempts[i] = -1234.0;
_par_last_gc_worker_end_times_ms[i] = -1234.0;
_par_last_gc_worker_times_ms[i] = -1234.0;
+ _par_last_gc_worker_other_times_ms[i] = -1234.0;
}
#endif
@@ -982,8 +982,10 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec,
_cur_aux_times_set[i] = false;
}
- _satb_drain_time_set = false;
- _last_satb_drain_processed_buffers = -1;
+ // These are initialized to zero here and they are set during
+ // the evacuation pause if marking is in progress.
+ _cur_satb_drain_time_ms = 0.0;
+ _last_satb_drain_processed_buffers = 0;
_last_young_gc_full = false;
@@ -1025,39 +1027,7 @@ void G1CollectorPolicy::record_concurrent_mark_cleanup_start() {
_mark_cleanup_start_sec = os::elapsedTime();
}
-void
-G1CollectorPolicy::record_concurrent_mark_cleanup_end(size_t freed_bytes,
- size_t max_live_bytes) {
- record_concurrent_mark_cleanup_end_work1(freed_bytes, max_live_bytes);
- record_concurrent_mark_cleanup_end_work2();
-}
-
-void
-G1CollectorPolicy::
-record_concurrent_mark_cleanup_end_work1(size_t freed_bytes,
- size_t max_live_bytes) {
- if (_n_marks < 2) {
- _n_marks++;
- }
-}
-
-// The important thing about this is that it includes "os::elapsedTime".
-void G1CollectorPolicy::record_concurrent_mark_cleanup_end_work2() {
- double end_time_sec = os::elapsedTime();
- double elapsed_time_ms = (end_time_sec - _mark_cleanup_start_sec)*1000.0;
- _concurrent_mark_cleanup_times_ms->add(elapsed_time_ms);
- _cur_mark_stop_world_time_ms += elapsed_time_ms;
- _prev_collection_pause_end_ms += elapsed_time_ms;
-
- _mmu_tracker->add_pause(_mark_cleanup_start_sec, end_time_sec, true);
-
- _num_markings++;
- _n_pauses_at_mark_end = _n_pauses;
- _n_marks_since_last_pause++;
-}
-
-void
-G1CollectorPolicy::record_concurrent_mark_cleanup_completed() {
+void G1CollectorPolicy::record_concurrent_mark_cleanup_completed() {
_should_revert_to_full_young_gcs = false;
_last_full_young_gc = true;
_in_marking_window = false;
@@ -1127,61 +1097,65 @@ void G1CollectorPolicy::print_par_sizes(int level,
(int)total, (int)avg, (int)min, (int)max, (int)max - (int)min);
}
-void G1CollectorPolicy::print_stats (int level,
- const char* str,
- double value) {
+void G1CollectorPolicy::print_stats(int level,
+ const char* str,
+ double value) {
LineBuffer(level).append_and_print_cr("[%s: %5.1lf ms]", str, value);
}
-void G1CollectorPolicy::print_stats (int level,
- const char* str,
- int value) {
+void G1CollectorPolicy::print_stats(int level,
+ const char* str,
+ int value) {
LineBuffer(level).append_and_print_cr("[%s: %d]", str, value);
}
-double G1CollectorPolicy::avg_value (double* data) {
+double G1CollectorPolicy::avg_value(double* data) {
if (G1CollectedHeap::use_parallel_gc_threads()) {
double ret = 0.0;
- for (uint i = 0; i < ParallelGCThreads; ++i)
+ for (uint i = 0; i < ParallelGCThreads; ++i) {
ret += data[i];
+ }
return ret / (double) ParallelGCThreads;
} else {
return data[0];
}
}
-double G1CollectorPolicy::max_value (double* data) {
+double G1CollectorPolicy::max_value(double* data) {
if (G1CollectedHeap::use_parallel_gc_threads()) {
double ret = data[0];
- for (uint i = 1; i < ParallelGCThreads; ++i)
- if (data[i] > ret)
+ for (uint i = 1; i < ParallelGCThreads; ++i) {
+ if (data[i] > ret) {
ret = data[i];
+ }
+ }
return ret;
} else {
return data[0];
}
}
-double G1CollectorPolicy::sum_of_values (double* data) {
+double G1CollectorPolicy::sum_of_values(double* data) {
if (G1CollectedHeap::use_parallel_gc_threads()) {
double sum = 0.0;
- for (uint i = 0; i < ParallelGCThreads; i++)
+ for (uint i = 0; i < ParallelGCThreads; i++) {
sum += data[i];
+ }
return sum;
} else {
return data[0];
}
}
-double G1CollectorPolicy::max_sum (double* data1,
- double* data2) {
+double G1CollectorPolicy::max_sum(double* data1, double* data2) {
double ret = data1[0] + data2[0];
if (G1CollectedHeap::use_parallel_gc_threads()) {
for (uint i = 1; i < ParallelGCThreads; ++i) {
double data = data1[i] + data2[i];
- if (data > ret)
+ if (data > ret) {
ret = data;
+ }
}
}
return ret;
@@ -1281,6 +1255,10 @@ void G1CollectorPolicy::record_collection_pause_end() {
_n_pauses++;
+ // These values are used to update the summary information that is
+ // displayed when TraceGen0Time is enabled, and are output as part
+ // of the PrintGCDetails output, in the non-parallel case.
+
double ext_root_scan_time = avg_value(_par_last_ext_root_scan_times_ms);
double mark_stack_scan_time = avg_value(_par_last_mark_stack_scan_times_ms);
double update_rs_time = avg_value(_par_last_update_rs_times_ms);
@@ -1290,42 +1268,68 @@ void G1CollectorPolicy::record_collection_pause_end() {
double obj_copy_time = avg_value(_par_last_obj_copy_times_ms);
double termination_time = avg_value(_par_last_termination_times_ms);
- double parallel_known_time = update_rs_time +
- ext_root_scan_time +
- mark_stack_scan_time +
- scan_rs_time +
- obj_copy_time +
- termination_time;
+ double known_time = ext_root_scan_time +
+ mark_stack_scan_time +
+ update_rs_time +
+ scan_rs_time +
+ obj_copy_time;
+
+ double other_time_ms = elapsed_ms;
+
+ // Subtract the SATB drain time. It's initialized to zero at the
+ // start of the pause and is updated during the pause if marking
+ // is in progress.
+ other_time_ms -= _cur_satb_drain_time_ms;
+
+ if (parallel) {
+ other_time_ms -= _cur_collection_par_time_ms;
+ } else {
+ other_time_ms -= known_time;
+ }
- double parallel_other_time = _cur_collection_par_time_ms - parallel_known_time;
+ // Subtract the time taken to clean the card table from the
+ // current value of "other time"
+ other_time_ms -= _cur_clear_ct_time_ms;
- PauseSummary* summary = _summary;
+ // TraceGen0Time and TraceGen1Time summary info updating.
+ _all_pause_times_ms->add(elapsed_ms);
if (update_stats) {
_recent_rs_scan_times_ms->add(scan_rs_time);
_recent_pause_times_ms->add(elapsed_ms);
_recent_rs_sizes->add(rs_size);
- MainBodySummary* body_summary = summary->main_body_summary();
- guarantee(body_summary != NULL, "should not be null!");
+ _summary->record_total_time_ms(elapsed_ms);
+ _summary->record_other_time_ms(other_time_ms);
+
+ MainBodySummary* body_summary = _summary->main_body_summary();
+ assert(body_summary != NULL, "should not be null!");
- if (_satb_drain_time_set)
- body_summary->record_satb_drain_time_ms(_cur_satb_drain_time_ms);
- else
- body_summary->record_satb_drain_time_ms(0.0);
+ // This will be non-zero iff marking is currently in progress (i.e.
+ // _g1->mark_in_progress() == true) and the currrent pause was not
+ // an initial mark pause. Since the body_summary items are NumberSeqs,
+ // however, they have to be consistent and updated in lock-step with
+ // each other. Therefore we unconditionally record the SATB drain
+ // time - even if it's zero.
+ body_summary->record_satb_drain_time_ms(_cur_satb_drain_time_ms);
body_summary->record_ext_root_scan_time_ms(ext_root_scan_time);
body_summary->record_mark_stack_scan_time_ms(mark_stack_scan_time);
body_summary->record_update_rs_time_ms(update_rs_time);
body_summary->record_scan_rs_time_ms(scan_rs_time);
body_summary->record_obj_copy_time_ms(obj_copy_time);
+
if (parallel) {
body_summary->record_parallel_time_ms(_cur_collection_par_time_ms);
- body_summary->record_clear_ct_time_ms(_cur_clear_ct_time_ms);
body_summary->record_termination_time_ms(termination_time);
+
+ double parallel_known_time = known_time + termination_time;
+ double parallel_other_time = _cur_collection_par_time_ms - parallel_known_time;
body_summary->record_parallel_other_time_ms(parallel_other_time);
}
+
body_summary->record_mark_closure_time_ms(_mark_closure_time_ms);
+ body_summary->record_clear_ct_time_ms(_cur_clear_ct_time_ms);
// We exempt parallel collection from this check because Alloc Buffer
// fragmentation can produce negative collections. Same with evac
@@ -1337,6 +1341,7 @@ void G1CollectorPolicy::record_collection_pause_end() {
|| _g1->evacuation_failed()
|| surviving_bytes <= _collection_set_bytes_used_before,
"Or else negative collection!");
+
_recent_CS_bytes_used_before->add(_collection_set_bytes_used_before);
_recent_CS_bytes_surviving->add(surviving_bytes);
@@ -1387,6 +1392,13 @@ void G1CollectorPolicy::record_collection_pause_end() {
}
}
+ for (int i = 0; i < _aux_num; ++i) {
+ if (_cur_aux_times_set[i]) {
+ _all_aux_times_ms[i].add(_cur_aux_times_ms[i]);
+ }
+ }
+
+
if (G1PolicyVerbose > 1) {
gclog_or_tty->print_cr(" Recording collection pause(%d)", _n_pauses);
}
@@ -1413,61 +1425,60 @@ void G1CollectorPolicy::record_collection_pause_end() {
recent_avg_pause_time_ratio() * 100.0);
}
- double other_time_ms = elapsed_ms;
-
- if (_satb_drain_time_set) {
- other_time_ms -= _cur_satb_drain_time_ms;
- }
-
- if (parallel) {
- other_time_ms -= _cur_collection_par_time_ms + _cur_clear_ct_time_ms;
- } else {
- other_time_ms -=
- update_rs_time +
- ext_root_scan_time + mark_stack_scan_time +
- scan_rs_time + obj_copy_time;
- }
-
+ // PrintGCDetails output
if (PrintGCDetails) {
+ bool print_marking_info =
+ _g1->mark_in_progress() && !last_pause_included_initial_mark;
+
gclog_or_tty->print_cr("%s, %1.8lf secs]",
(last_pause_included_initial_mark) ? " (initial-mark)" : "",
elapsed_ms / 1000.0);
- if (_satb_drain_time_set) {
+ if (print_marking_info) {
print_stats(1, "SATB Drain Time", _cur_satb_drain_time_ms);
- }
- if (_last_satb_drain_processed_buffers >= 0) {
print_stats(2, "Processed Buffers", _last_satb_drain_processed_buffers);
}
+
if (parallel) {
print_stats(1, "Parallel Time", _cur_collection_par_time_ms);
- print_par_stats(2, "GC Worker Start Time", _par_last_gc_worker_start_times_ms);
+ print_par_stats(2, "GC Worker Start", _par_last_gc_worker_start_times_ms);
+ print_par_stats(2, "Ext Root Scanning", _par_last_ext_root_scan_times_ms);
+ if (print_marking_info) {
+ print_par_stats(2, "Mark Stack Scanning", _par_last_mark_stack_scan_times_ms);
+ }
print_par_stats(2, "Update RS", _par_last_update_rs_times_ms);
print_par_sizes(3, "Processed Buffers", _par_last_update_rs_processed_buffers);
- print_par_stats(2, "Ext Root Scanning", _par_last_ext_root_scan_times_ms);
- print_par_stats(2, "Mark Stack Scanning", _par_last_mark_stack_scan_times_ms);
print_par_stats(2, "Scan RS", _par_last_scan_rs_times_ms);
print_par_stats(2, "Object Copy", _par_last_obj_copy_times_ms);
print_par_stats(2, "Termination", _par_last_termination_times_ms);
print_par_sizes(3, "Termination Attempts", _par_last_termination_attempts);
- print_par_stats(2, "GC Worker End Time", _par_last_gc_worker_end_times_ms);
+ print_par_stats(2, "GC Worker End", _par_last_gc_worker_end_times_ms);
for (int i = 0; i < _parallel_gc_threads; i++) {
_par_last_gc_worker_times_ms[i] = _par_last_gc_worker_end_times_ms[i] - _par_last_gc_worker_start_times_ms[i];
- }
- print_par_stats(2, "GC Worker Times", _par_last_gc_worker_times_ms);
- print_stats(2, "Parallel Other", parallel_other_time);
- print_stats(1, "Clear CT", _cur_clear_ct_time_ms);
+ double worker_known_time = _par_last_ext_root_scan_times_ms[i] +
+ _par_last_mark_stack_scan_times_ms[i] +
+ _par_last_update_rs_times_ms[i] +
+ _par_last_scan_rs_times_ms[i] +
+ _par_last_obj_copy_times_ms[i] +
+ _par_last_termination_times_ms[i];
+
+ _par_last_gc_worker_other_times_ms[i] = _cur_collection_par_time_ms - worker_known_time;
+ }
+ print_par_stats(2, "GC Worker", _par_last_gc_worker_times_ms);
+ print_par_stats(2, "GC Worker Other", _par_last_gc_worker_other_times_ms);
} else {
- print_stats(1, "Update RS", update_rs_time);
- print_stats(2, "Processed Buffers",
- (int)update_rs_processed_buffers);
print_stats(1, "Ext Root Scanning", ext_root_scan_time);
- print_stats(1, "Mark Stack Scanning", mark_stack_scan_time);
+ if (print_marking_info) {
+ print_stats(1, "Mark Stack Scanning", mark_stack_scan_time);
+ }
+ print_stats(1, "Update RS", update_rs_time);
+ print_stats(2, "Processed Buffers", (int)update_rs_processed_buffers);
print_stats(1, "Scan RS", scan_rs_time);
print_stats(1, "Object Copying", obj_copy_time);
}
+ print_stats(1, "Clear CT", _cur_clear_ct_time_ms);
#ifndef PRODUCT
print_stats(1, "Cur Clear CC", _cur_clear_cc_time_ms);
print_stats(1, "Cum Clear CC", _cum_clear_cc_time_ms);
@@ -1479,6 +1490,8 @@ void G1CollectorPolicy::record_collection_pause_end() {
#endif
print_stats(1, "Other", other_time_ms);
print_stats(2, "Choose CSet", _recorded_young_cset_choice_time_ms);
+ print_stats(2, "Ref Proc", _cur_ref_proc_time_ms);
+ print_stats(2, "Ref Enq", _cur_ref_enq_time_ms);
for (int i = 0; i < _aux_num; ++i) {
if (_cur_aux_times_set[i]) {
@@ -1489,18 +1502,6 @@ void G1CollectorPolicy::record_collection_pause_end() {
}
}
- _all_pause_times_ms->add(elapsed_ms);
- if (update_stats) {
- summary->record_total_time_ms(elapsed_ms);
- summary->record_other_time_ms(other_time_ms);
- }
- for (int i = 0; i < _aux_num; ++i)
- if (_cur_aux_times_set[i])
- _all_aux_times_ms[i].add(_cur_aux_times_ms[i]);
-
- // Reset marks-between-pauses counter.
- _n_marks_since_last_pause = 0;
-
// Update the efficiency-since-mark vars.
double proc_ms = elapsed_ms * (double) _parallel_gc_threads;
if (elapsed_ms < MIN_TIMER_GRANULARITY) {
@@ -1519,11 +1520,17 @@ void G1CollectorPolicy::record_collection_pause_end() {
}
if (_last_full_young_gc) {
- ergo_verbose2(ErgoPartiallyYoungGCs,
- "start partially-young GCs",
- ergo_format_byte_perc("known garbage"),
- _known_garbage_bytes, _known_garbage_ratio * 100.0);
- set_full_young_gcs(false);
+ if (!last_pause_included_initial_mark) {
+ ergo_verbose2(ErgoPartiallyYoungGCs,
+ "start partially-young GCs",
+ ergo_format_byte_perc("known garbage"),
+ _known_garbage_bytes, _known_garbage_ratio * 100.0);
+ set_full_young_gcs(false);
+ } else {
+ ergo_verbose0(ErgoPartiallyYoungGCs,
+ "do not start partially-young GCs",
+ ergo_format_reason("concurrent cycle is about to start"));
+ }
_last_full_young_gc = false;
}
@@ -1717,6 +1724,8 @@ void G1CollectorPolicy::record_collection_pause_end() {
double update_rs_time_goal_ms = _mmu_tracker->max_gc_time() * MILLIUNITS * G1RSetUpdatingPauseTimePercent / 100.0;
adjust_concurrent_refinement(update_rs_time, update_rs_processed_buffers, update_rs_time_goal_ms);
// </NEW PREDICTION>
+
+ assert(assertMarkedBytesDataOK(), "Marked regions not OK at pause end.");
}
#define EXT_SIZE_FORMAT "%d%s"
@@ -2144,10 +2153,6 @@ size_t G1CollectorPolicy::expansion_amount() {
}
}
-void G1CollectorPolicy::note_start_of_mark_thread() {
- _mark_thread_startup_sec = os::elapsedTime();
-}
-
class CountCSClosure: public HeapRegionClosure {
G1CollectorPolicy* _g1_policy;
public:
@@ -2164,17 +2169,17 @@ void G1CollectorPolicy::count_CS_bytes_used() {
_g1->collection_set_iterate(&cs_closure);
}
-void G1CollectorPolicy::print_summary (int level,
- const char* str,
- NumberSeq* seq) const {
+void G1CollectorPolicy::print_summary(int level,
+ const char* str,
+ NumberSeq* seq) const {
double sum = seq->sum();
LineBuffer(level + 1).append_and_print_cr("%-24s = %8.2lf s (avg = %8.2lf ms)",
str, sum / 1000.0, seq->avg());
}
-void G1CollectorPolicy::print_summary_sd (int level,
- const char* str,
- NumberSeq* seq) const {
+void G1CollectorPolicy::print_summary_sd(int level,
+ const char* str,
+ NumberSeq* seq) const {
print_summary(level, str, seq);
LineBuffer(level + 6).append_and_print_cr("(num = %5d, std dev = %8.2lf ms, max = %8.2lf ms)",
seq->num(), seq->sd(), seq->maximum());
@@ -2237,20 +2242,18 @@ void G1CollectorPolicy::print_summary(PauseSummary* summary) const {
print_summary(1, "SATB Drain", body_summary->get_satb_drain_seq());
if (parallel) {
print_summary(1, "Parallel Time", body_summary->get_parallel_seq());
+ print_summary(2, "Ext Root Scanning", body_summary->get_ext_root_scan_seq());
+ print_summary(2, "Mark Stack Scanning", body_summary->get_mark_stack_scan_seq());
print_summary(2, "Update RS", body_summary->get_update_rs_seq());
- print_summary(2, "Ext Root Scanning",
- body_summary->get_ext_root_scan_seq());
- print_summary(2, "Mark Stack Scanning",
- body_summary->get_mark_stack_scan_seq());
print_summary(2, "Scan RS", body_summary->get_scan_rs_seq());
print_summary(2, "Object Copy", body_summary->get_obj_copy_seq());
print_summary(2, "Termination", body_summary->get_termination_seq());
- print_summary(2, "Other", body_summary->get_parallel_other_seq());
+ print_summary(2, "Parallel Other", body_summary->get_parallel_other_seq());
{
NumberSeq* other_parts[] = {
- body_summary->get_update_rs_seq(),
body_summary->get_ext_root_scan_seq(),
body_summary->get_mark_stack_scan_seq(),
+ body_summary->get_update_rs_seq(),
body_summary->get_scan_rs_seq(),
body_summary->get_obj_copy_seq(),
body_summary->get_termination_seq()
@@ -2260,18 +2263,16 @@ void G1CollectorPolicy::print_summary(PauseSummary* summary) const {
check_other_times(2, body_summary->get_parallel_other_seq(),
&calc_other_times_ms);
}
- print_summary(1, "Mark Closure", body_summary->get_mark_closure_seq());
- print_summary(1, "Clear CT", body_summary->get_clear_ct_seq());
} else {
+ print_summary(1, "Ext Root Scanning", body_summary->get_ext_root_scan_seq());
+ print_summary(1, "Mark Stack Scanning", body_summary->get_mark_stack_scan_seq());
print_summary(1, "Update RS", body_summary->get_update_rs_seq());
- print_summary(1, "Ext Root Scanning",
- body_summary->get_ext_root_scan_seq());
- print_summary(1, "Mark Stack Scanning",
- body_summary->get_mark_stack_scan_seq());
print_summary(1, "Scan RS", body_summary->get_scan_rs_seq());
print_summary(1, "Object Copy", body_summary->get_obj_copy_seq());
}
}
+ print_summary(1, "Mark Closure", body_summary->get_mark_closure_seq());
+ print_summary(1, "Clear CT", body_summary->get_clear_ct_seq());
print_summary(1, "Other", summary->get_other_seq());
{
if (body_summary != NULL) {
@@ -2434,7 +2435,7 @@ public:
}
};
-bool G1CollectorPolicy_BestRegionsFirst::assertMarkedBytesDataOK() {
+bool G1CollectorPolicy::assertMarkedBytesDataOK() {
HRSortIndexIsOKClosure cl(_collectionSetChooser);
_g1->heap_region_iterate(&cl);
return true;
@@ -2485,6 +2486,13 @@ G1CollectorPolicy::decide_on_conc_mark_initiation() {
// initiate a new cycle.
set_during_initial_mark_pause();
+ // We do not allow non-full young GCs during marking.
+ if (!full_young_gcs()) {
+ set_full_young_gcs(true);
+ ergo_verbose0(ErgoPartiallyYoungGCs,
+ "end partially-young GCs",
+ ergo_format_reason("concurrent cycle is about to start"));
+ }
// And we can now clear initiate_conc_mark_if_possible() as
// we've already acted on it.
@@ -2513,12 +2521,6 @@ G1CollectorPolicy::decide_on_conc_mark_initiation() {
}
}
-void
-G1CollectorPolicy_BestRegionsFirst::
-record_collection_pause_start(double start_time_sec, size_t start_used) {
- G1CollectorPolicy::record_collection_pause_start(start_time_sec, start_used);
-}
-
class KnownGarbageClosure: public HeapRegionClosure {
CollectionSetChooser* _hrSorted;
@@ -2626,20 +2628,20 @@ public:
};
void
-G1CollectorPolicy_BestRegionsFirst::
-record_concurrent_mark_cleanup_end(size_t freed_bytes,
- size_t max_live_bytes) {
- double start;
- if (G1PrintParCleanupStats) start = os::elapsedTime();
- record_concurrent_mark_cleanup_end_work1(freed_bytes, max_live_bytes);
+G1CollectorPolicy::record_concurrent_mark_cleanup_end() {
+ double start_sec;
+ if (G1PrintParCleanupStats) {
+ start_sec = os::elapsedTime();
+ }
_collectionSetChooser->clearMarkedHeapRegions();
- double clear_marked_end;
+ double clear_marked_end_sec;
if (G1PrintParCleanupStats) {
- clear_marked_end = os::elapsedTime();
- gclog_or_tty->print_cr(" clear marked regions + work1: %8.3f ms.",
- (clear_marked_end - start)*1000.0);
+ clear_marked_end_sec = os::elapsedTime();
+ gclog_or_tty->print_cr(" clear marked regions: %8.3f ms.",
+ (clear_marked_end_sec - start_sec) * 1000.0);
}
+
if (G1CollectedHeap::use_parallel_gc_threads()) {
const size_t OverpartitionFactor = 4;
const size_t MinWorkUnit = 8;
@@ -2658,27 +2660,25 @@ record_concurrent_mark_cleanup_end(size_t freed_bytes,
KnownGarbageClosure knownGarbagecl(_collectionSetChooser);
_g1->heap_region_iterate(&knownGarbagecl);
}
- double known_garbage_end;
+ double known_garbage_end_sec;
if (G1PrintParCleanupStats) {
- known_garbage_end = os::elapsedTime();
+ known_garbage_end_sec = os::elapsedTime();
gclog_or_tty->print_cr(" compute known garbage: %8.3f ms.",
- (known_garbage_end - clear_marked_end)*1000.0);
+ (known_garbage_end_sec - clear_marked_end_sec) * 1000.0);
}
+
_collectionSetChooser->sortMarkedHeapRegions();
- double sort_end;
+ double end_sec = os::elapsedTime();
if (G1PrintParCleanupStats) {
- sort_end = os::elapsedTime();
gclog_or_tty->print_cr(" sorting: %8.3f ms.",
- (sort_end - known_garbage_end)*1000.0);
+ (end_sec - known_garbage_end_sec) * 1000.0);
}
- record_concurrent_mark_cleanup_end_work2();
- double work2_end;
- if (G1PrintParCleanupStats) {
- work2_end = os::elapsedTime();
- gclog_or_tty->print_cr(" work2: %8.3f ms.",
- (work2_end - sort_end)*1000.0);
- }
+ double elapsed_time_ms = (end_sec - _mark_cleanup_start_sec) * 1000.0;
+ _concurrent_mark_cleanup_times_ms->add(elapsed_time_ms);
+ _cur_mark_stop_world_time_ms += elapsed_time_ms;
+ _prev_collection_pause_end_ms += elapsed_time_ms;
+ _mmu_tracker->add_pause(_mark_cleanup_start_sec, end_sec, true);
}
// Add the heap region at the head of the non-incremental collection set
@@ -2893,9 +2893,7 @@ void G1CollectorPolicy::print_collection_set(HeapRegion* list_head, outputStream
}
#endif // !PRODUCT
-void
-G1CollectorPolicy_BestRegionsFirst::choose_collection_set(
- double target_pause_time_ms) {
+void G1CollectorPolicy::choose_collection_set(double target_pause_time_ms) {
// Set this here - in case we're not doing young collections.
double non_young_start_time_sec = os::elapsedTime();
@@ -3017,6 +3015,7 @@ G1CollectorPolicy_BestRegionsFirst::choose_collection_set(
hr = _collectionSetChooser->getNextMarkedRegion(time_remaining_ms,
avg_prediction);
if (hr != NULL) {
+ _g1->old_set_remove(hr);
double predicted_time_ms = predict_region_elapsed_time_ms(hr, false);
time_remaining_ms -= predicted_time_ms;
predicted_pause_time_ms += predicted_time_ms;
@@ -3096,14 +3095,3 @@ G1CollectorPolicy_BestRegionsFirst::choose_collection_set(
_recorded_non_young_cset_choice_time_ms =
(non_young_end_time_sec - non_young_start_time_sec) * 1000.0;
}
-
-void G1CollectorPolicy_BestRegionsFirst::record_full_collection_end() {
- G1CollectorPolicy::record_full_collection_end();
- _collectionSetChooser->updateAfterFullCollection();
-}
-
-void G1CollectorPolicy_BestRegionsFirst::
-record_collection_pause_end() {
- G1CollectorPolicy::record_collection_pause_end();
- assert(assertMarkedBytesDataOK(), "Marked regions not OK at pause end.");
-}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
index 9dc7349..cff4870 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
@@ -74,7 +74,7 @@ class MainBodySummary: public CHeapObj {
define_num_seq(termination) // parallel only
define_num_seq(parallel_other) // parallel only
define_num_seq(mark_closure)
- define_num_seq(clear_ct) // parallel only
+ define_num_seq(clear_ct)
};
class Summary: public PauseSummary,
@@ -84,7 +84,7 @@ public:
};
class G1CollectorPolicy: public CollectorPolicy {
-protected:
+private:
// The number of pauses during the execution.
long _n_pauses;
@@ -106,10 +106,7 @@ protected:
initialize_perm_generation(PermGen::MarkSweepCompact);
}
- virtual size_t default_init_heap_size() {
- // Pick some reasonable default.
- return 8*M;
- }
+ CollectionSetChooser* _collectionSetChooser;
double _cur_collection_start_sec;
size_t _cur_collection_pause_used_at_start_bytes;
@@ -118,7 +115,8 @@ protected:
double _cur_collection_par_time_ms;
double _cur_satb_drain_time_ms;
double _cur_clear_ct_time_ms;
- bool _satb_drain_time_set;
+ double _cur_ref_proc_time_ms;
+ double _cur_ref_enq_time_ms;
#ifndef PRODUCT
// Card Table Count Cache stats
@@ -177,6 +175,11 @@ protected:
double* _par_last_gc_worker_end_times_ms;
double* _par_last_gc_worker_times_ms;
+ // Each workers 'other' time i.e. the elapsed time of the parallel
+ // phase of the pause minus the sum of the individual sub-phase
+ // times for a given worker thread.
+ double* _par_last_gc_worker_other_times_ms;
+
// indicates whether we are in full young or partially young GC mode
bool _full_young_gcs;
@@ -314,7 +317,6 @@ private:
double update_rs_processed_buffers,
double goal_ms);
-protected:
double _pause_time_target_ms;
double _recorded_young_cset_choice_time_ms;
double _recorded_non_young_cset_choice_time_ms;
@@ -552,7 +554,7 @@ public:
return _short_lived_surv_rate_group->accum_surv_rate_pred(age);
}
-protected:
+private:
void print_stats(int level, const char* str, double value);
void print_stats(int level, const char* str, int value);
@@ -586,10 +588,6 @@ protected:
// Statistics kept per GC stoppage, pause or full.
TruncatedSeq* _recent_prev_end_times_for_all_gcs_sec;
- // We track markings.
- int _num_markings;
- double _mark_thread_startup_sec; // Time at startup of marking thread
-
// Add a new GC of the given duration and end time to the record.
void update_recent_gc_times(double end_time_sec, double elapsed_ms);
@@ -662,12 +660,6 @@ protected:
// young list/collection set).
size_t _inc_cset_predicted_bytes_to_copy;
- // Info about marking.
- int _n_marks; // Sticky at 2, so we know when we've done at least 2.
-
- // The number of collection pauses at the end of the last mark.
- size_t _n_pauses_at_mark_end;
-
// Stash a pointer to the g1 heap.
G1CollectedHeap* _g1;
@@ -735,8 +727,6 @@ protected:
// Number of pauses between concurrent marking.
size_t _pauses_btwn_concurrent_mark;
- size_t _n_marks_since_last_pause;
-
// At the end of a pause we check the heap occupancy and we decide
// whether we will start a marking cycle during the next pause. If
// we decide that we want to do that, we will set this parameter to
@@ -808,6 +798,11 @@ protected:
bool predict_will_fit(size_t young_length, double base_time_ms,
size_t base_free_regions, double target_pause_time_ms);
+ // Count the number of bytes used in the CS.
+ void count_CS_bytes_used();
+
+ void update_young_list_size_using_newratio(size_t number_of_heap_regions);
+
public:
G1CollectorPolicy();
@@ -834,22 +829,9 @@ public:
// This should be called after the heap is resized.
void record_new_heap_size(size_t new_number_of_regions);
-protected:
-
- // Count the number of bytes used in the CS.
- void count_CS_bytes_used();
-
- // Together these do the base cleanup-recording work. Subclasses might
- // want to put something between them.
- void record_concurrent_mark_cleanup_end_work1(size_t freed_bytes,
- size_t max_live_bytes);
- void record_concurrent_mark_cleanup_end_work2();
-
- void update_young_list_size_using_newratio(size_t number_of_heap_regions);
-
public:
- virtual void init();
+ void init();
// Create jstat counters for the policy.
virtual void initialize_gc_policy_counters();
@@ -874,10 +856,9 @@ public:
// start time, where the given number of bytes were used at the start.
// This may involve changing the desired size of a collection set.
- virtual void record_stop_world_start();
+ void record_stop_world_start();
- virtual void record_collection_pause_start(double start_time_sec,
- size_t start_used);
+ void record_collection_pause_start(double start_time_sec, size_t start_used);
// Must currently be called while the world is stopped.
void record_concurrent_mark_init_end(double
@@ -885,23 +866,22 @@ public:
void record_mark_closure_time(double mark_closure_time_ms);
- virtual void record_concurrent_mark_remark_start();
- virtual void record_concurrent_mark_remark_end();
+ void record_concurrent_mark_remark_start();
+ void record_concurrent_mark_remark_end();
- virtual void record_concurrent_mark_cleanup_start();
- virtual void record_concurrent_mark_cleanup_end(size_t freed_bytes,
- size_t max_live_bytes);
- virtual void record_concurrent_mark_cleanup_completed();
+ void record_concurrent_mark_cleanup_start();
+ void record_concurrent_mark_cleanup_end();
+ void record_concurrent_mark_cleanup_completed();
- virtual void record_concurrent_pause();
- virtual void record_concurrent_pause_end();
+ void record_concurrent_pause();
+ void record_concurrent_pause_end();
- virtual void record_collection_pause_end();
+ void record_collection_pause_end();
void print_heap_transition();
// Record the fact that a full collection occurred.
- virtual void record_full_collection_start();
- virtual void record_full_collection_end();
+ void record_full_collection_start();
+ void record_full_collection_end();
void record_gc_worker_start_time(int worker_i, double ms) {
_par_last_gc_worker_start_times_ms[worker_i] = ms;
@@ -916,11 +896,12 @@ public:
}
void record_satb_drain_time(double ms) {
+ assert(_g1->mark_in_progress(), "shouldn't be here otherwise");
_cur_satb_drain_time_ms = ms;
- _satb_drain_time_set = true;
}
- void record_satb_drain_processed_buffers (int processed_buffers) {
+ void record_satb_drain_processed_buffers(int processed_buffers) {
+ assert(_g1->mark_in_progress(), "shouldn't be here otherwise");
_last_satb_drain_processed_buffers = processed_buffers;
}
@@ -986,6 +967,14 @@ public:
_cur_aux_times_ms[i] += ms;
}
+ void record_ref_proc_time(double ms) {
+ _cur_ref_proc_time_ms = ms;
+ }
+
+ void record_ref_enq_time(double ms) {
+ _cur_ref_enq_time_ms = ms;
+ }
+
#ifndef PRODUCT
void record_cc_clear_time(double ms) {
if (_min_clear_cc_time_ms < 0.0 || ms <= _min_clear_cc_time_ms)
@@ -1012,7 +1001,7 @@ public:
// Choose a new collection set. Marks the chosen regions as being
// "in_collection_set", and links them together. The head and number of
// the collection set are available via access methods.
- virtual void choose_collection_set(double target_pause_time_ms) = 0;
+ void choose_collection_set(double target_pause_time_ms);
// The head of the list (via "next_in_collection_set()") representing the
// current collection set.
@@ -1097,19 +1086,12 @@ public:
// If an expansion would be appropriate, because recent GC overhead had
// exceeded the desired limit, return an amount to expand by.
- virtual size_t expansion_amount();
-
- // note start of mark thread
- void note_start_of_mark_thread();
-
- // The marked bytes of the "r" has changed; reclassify it's desirability
- // for marking. Also asserts that "r" is eligible for a CS.
- virtual void note_change_in_marked_bytes(HeapRegion* r) = 0;
+ size_t expansion_amount();
#ifndef PRODUCT
// Check any appropriate marked bytes info, asserting false if
// something's wrong, else returning "true".
- virtual bool assertMarkedBytesDataOK() = 0;
+ bool assertMarkedBytesDataOK();
#endif
// Print tracing information.
@@ -1139,6 +1121,10 @@ public:
return young_list_length < young_list_max_length;
}
+ size_t young_list_max_length() {
+ return _young_list_max_length;
+ }
+
void update_region_num(bool young);
bool full_young_gcs() {
@@ -1168,10 +1154,10 @@ public:
return ret;
}
+private:
//
// Survivor regions policy.
//
-protected:
// Current tenuring threshold, set to 0 if the collector reaches the
// maximum amount of suvivors regions.
@@ -1251,51 +1237,6 @@ public:
};
-// This encapsulates a particular strategy for a g1 Collector.
-//
-// Start a concurrent mark when our heap size is n bytes
-// greater then our heap size was at the last concurrent
-// mark. Where n is a function of the CMSTriggerRatio
-// and the MinHeapFreeRatio.
-//
-// Start a g1 collection pause when we have allocated the
-// average number of bytes currently being freed in
-// a collection, but only if it is at least one region
-// full
-//
-// Resize Heap based on desired
-// allocation space, where desired allocation space is
-// a function of survival rate and desired future to size.
-//
-// Choose collection set by first picking all older regions
-// which have a survival rate which beats our projected young
-// survival rate. Then fill out the number of needed regions
-// with young regions.
-
-class G1CollectorPolicy_BestRegionsFirst: public G1CollectorPolicy {
- CollectionSetChooser* _collectionSetChooser;
-
- virtual void choose_collection_set(double target_pause_time_ms);
- virtual void record_collection_pause_start(double start_time_sec,
- size_t start_used);
- virtual void record_concurrent_mark_cleanup_end(size_t freed_bytes,
- size_t max_live_bytes);
- virtual void record_full_collection_end();
-
-public:
- G1CollectorPolicy_BestRegionsFirst() {
- _collectionSetChooser = new CollectionSetChooser();
- }
- void record_collection_pause_end();
- // This is not needed any more, after the CSet choosing code was
- // changed to use the pause prediction work. But let's leave the
- // hook in just in case.
- void note_change_in_marked_bytes(HeapRegion* r) { }
-#ifndef PRODUCT
- bool assertMarkedBytesDataOK();
-#endif
-};
-
// This should move to some place more general...
// If we have "n" measurements, and we've kept track of their "sum" and the
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
index 1ed4f99..c12bb56 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
@@ -62,6 +62,8 @@ void G1MarkSweep::invoke_at_safepoint(ReferenceProcessor* rp,
// hook up weak ref data so it can be used during Mark-Sweep
assert(GenMarkSweep::ref_processor() == NULL, "no stomping");
assert(rp != NULL, "should be non-NULL");
+ assert(rp == G1CollectedHeap::heap()->ref_processor_stw(), "Precondition");
+
GenMarkSweep::_ref_processor = rp;
rp->setup_policy(clear_all_softrefs);
@@ -139,6 +141,8 @@ void G1MarkSweep::mark_sweep_phase1(bool& marked_for_unloading,
// Process reference objects found during marking
ReferenceProcessor* rp = GenMarkSweep::ref_processor();
+ assert(rp == G1CollectedHeap::heap()->ref_processor_stw(), "Sanity");
+
rp->setup_policy(clear_all_softrefs);
rp->process_discovered_references(&GenMarkSweep::is_alive,
&GenMarkSweep::keep_alive,
@@ -166,7 +170,6 @@ void G1MarkSweep::mark_sweep_phase1(bool& marked_for_unloading,
GenMarkSweep::follow_mdo_weak_refs();
assert(GenMarkSweep::_marking_stack.is_empty(), "just drained");
-
// Visit interned string tables and delete unmarked oops
StringTable::unlink(&GenMarkSweep::is_alive);
// Clean up unreferenced symbols in symbol table.
@@ -233,6 +236,7 @@ public:
// at the end of the GC, so no point in updating those values here.
_g1h->update_sets_after_freeing_regions(0, /* pre_used */
NULL, /* free_list */
+ NULL, /* old_proxy_set */
&_humongous_proxy_set,
false /* par */);
}
@@ -346,7 +350,8 @@ void G1MarkSweep::mark_sweep_phase3() {
NULL, // do not touch code cache here
&GenMarkSweep::adjust_pointer_closure);
- g1h->ref_processor()->weak_oops_do(&GenMarkSweep::adjust_root_pointer_closure);
+ assert(GenMarkSweep::ref_processor() == g1h->ref_processor_stw(), "Sanity");
+ g1h->ref_processor_stw()->weak_oops_do(&GenMarkSweep::adjust_root_pointer_closure);
// Now adjust pointers in remaining weak roots. (All of which should
// have been cleared if they pointed to non-surviving objects.)
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp
index aab16db..d22dc7a 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp
@@ -27,19 +27,69 @@
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-G1MonitoringSupport::G1MonitoringSupport(G1CollectedHeap* g1h,
- VirtualSpace* g1_storage_addr) :
+G1GenerationCounters::G1GenerationCounters(G1MonitoringSupport* g1mm,
+ const char* name,
+ int ordinal, int spaces,
+ size_t min_capacity,
+ size_t max_capacity,
+ size_t curr_capacity)
+ : GenerationCounters(name, ordinal, spaces, min_capacity,
+ max_capacity, curr_capacity), _g1mm(g1mm) { }
+
+// We pad the capacity three times given that the young generation
+// contains three spaces (eden and two survivors).
+G1YoungGenerationCounters::G1YoungGenerationCounters(G1MonitoringSupport* g1mm,
+ const char* name)
+ : G1GenerationCounters(g1mm, name, 0 /* ordinal */, 3 /* spaces */,
+ G1MonitoringSupport::pad_capacity(0, 3) /* min_capacity */,
+ G1MonitoringSupport::pad_capacity(g1mm->young_gen_max(), 3),
+ G1MonitoringSupport::pad_capacity(0, 3) /* curr_capacity */) {
+ update_all();
+}
+
+G1OldGenerationCounters::G1OldGenerationCounters(G1MonitoringSupport* g1mm,
+ const char* name)
+ : G1GenerationCounters(g1mm, name, 1 /* ordinal */, 1 /* spaces */,
+ G1MonitoringSupport::pad_capacity(0) /* min_capacity */,
+ G1MonitoringSupport::pad_capacity(g1mm->old_gen_max()),
+ G1MonitoringSupport::pad_capacity(0) /* curr_capacity */) {
+ update_all();
+}
+
+void G1YoungGenerationCounters::update_all() {
+ size_t committed =
+ G1MonitoringSupport::pad_capacity(_g1mm->young_gen_committed(), 3);
+ _current_size->set_value(committed);
+}
+
+void G1OldGenerationCounters::update_all() {
+ size_t committed =
+ G1MonitoringSupport::pad_capacity(_g1mm->old_gen_committed());
+ _current_size->set_value(committed);
+}
+
+G1MonitoringSupport::G1MonitoringSupport(G1CollectedHeap* g1h) :
_g1h(g1h),
_incremental_collection_counters(NULL),
_full_collection_counters(NULL),
- _non_young_collection_counters(NULL),
+ _old_collection_counters(NULL),
_old_space_counters(NULL),
_young_collection_counters(NULL),
_eden_counters(NULL),
_from_counters(NULL),
_to_counters(NULL),
- _g1_storage_addr(g1_storage_addr)
-{
+
+ _overall_reserved(0),
+ _overall_committed(0), _overall_used(0),
+ _young_region_num(0),
+ _young_gen_committed(0),
+ _eden_committed(0), _eden_used(0),
+ _survivor_committed(0), _survivor_used(0),
+ _old_committed(0), _old_used(0) {
+
+ _overall_reserved = g1h->max_capacity();
+ recalculate_sizes();
+
// Counters for GC collections
//
// name "collector.0". In a generational collector this would be the
@@ -69,110 +119,147 @@ G1MonitoringSupport::G1MonitoringSupport(G1CollectedHeap* g1h,
// generational GC terms. The "1, 1" parameters are for
// the n-th generation (=1) with 1 space.
// Counters are created from minCapacity, maxCapacity, and capacity
- _non_young_collection_counters =
- new GenerationCounters("whole heap", 1, 1, _g1_storage_addr);
+ _old_collection_counters = new G1OldGenerationCounters(this, "old");
// name "generation.1.space.0"
// Counters are created from maxCapacity, capacity, initCapacity,
// and used.
- _old_space_counters = new HSpaceCounters("space", 0,
- _g1h->max_capacity(), _g1h->capacity(), _non_young_collection_counters);
+ _old_space_counters = new HSpaceCounters("space", 0 /* ordinal */,
+ pad_capacity(overall_reserved()) /* max_capacity */,
+ pad_capacity(old_space_committed()) /* init_capacity */,
+ _old_collection_counters);
// Young collection set
// name "generation.0". This is logically the young generation.
// The "0, 3" are paremeters for the n-th genertaion (=0) with 3 spaces.
- // See _non_young_collection_counters for additional counters
- _young_collection_counters = new GenerationCounters("young", 0, 3, NULL);
+ // See _old_collection_counters for additional counters
+ _young_collection_counters = new G1YoungGenerationCounters(this, "young");
- // Replace "max_heap_byte_size() with maximum young gen size for
- // g1Collectedheap
// name "generation.0.space.0"
// See _old_space_counters for additional counters
- _eden_counters = new HSpaceCounters("eden", 0,
- _g1h->max_capacity(), eden_space_committed(),
+ _eden_counters = new HSpaceCounters("eden", 0 /* ordinal */,
+ pad_capacity(overall_reserved()) /* max_capacity */,
+ pad_capacity(eden_space_committed()) /* init_capacity */,
_young_collection_counters);
// name "generation.0.space.1"
// See _old_space_counters for additional counters
// Set the arguments to indicate that this survivor space is not used.
- _from_counters = new HSpaceCounters("s0", 1, (long) 0, (long) 0,
+ _from_counters = new HSpaceCounters("s0", 1 /* ordinal */,
+ pad_capacity(0) /* max_capacity */,
+ pad_capacity(0) /* init_capacity */,
_young_collection_counters);
+ // Given that this survivor space is not used, we update it here
+ // once to reflect that its used space is 0 so that we don't have to
+ // worry about updating it again later.
+ _from_counters->update_used(0);
// name "generation.0.space.2"
// See _old_space_counters for additional counters
- _to_counters = new HSpaceCounters("s1", 2,
- _g1h->max_capacity(),
- survivor_space_committed(),
+ _to_counters = new HSpaceCounters("s1", 2 /* ordinal */,
+ pad_capacity(overall_reserved()) /* max_capacity */,
+ pad_capacity(survivor_space_committed()) /* init_capacity */,
_young_collection_counters);
}
-size_t G1MonitoringSupport::overall_committed() {
- return g1h()->capacity();
-}
+void G1MonitoringSupport::recalculate_sizes() {
+ G1CollectedHeap* g1 = g1h();
-size_t G1MonitoringSupport::overall_used() {
- return g1h()->used_unlocked();
-}
+ // Recalculate all the sizes from scratch. We assume that this is
+ // called at a point where no concurrent updates to the various
+ // values we read here are possible (i.e., at a STW phase at the end
+ // of a GC).
-size_t G1MonitoringSupport::eden_space_committed() {
- return MAX2(eden_space_used(), (size_t) HeapRegion::GrainBytes);
-}
+ size_t young_list_length = g1->young_list()->length();
+ size_t survivor_list_length = g1->g1_policy()->recorded_survivor_regions();
+ assert(young_list_length >= survivor_list_length, "invariant");
+ size_t eden_list_length = young_list_length - survivor_list_length;
+ // Max length includes any potential extensions to the young gen
+ // we'll do when the GC locker is active.
+ size_t young_list_max_length = g1->g1_policy()->young_list_max_length();
+ assert(young_list_max_length >= survivor_list_length, "invariant");
+ size_t eden_list_max_length = young_list_max_length - survivor_list_length;
-size_t G1MonitoringSupport::eden_space_used() {
- size_t young_list_length = g1h()->young_list()->length();
- size_t eden_used = young_list_length * HeapRegion::GrainBytes;
- size_t survivor_used = survivor_space_used();
- eden_used = subtract_up_to_zero(eden_used, survivor_used);
- return eden_used;
-}
+ _overall_used = g1->used_unlocked();
+ _eden_used = eden_list_length * HeapRegion::GrainBytes;
+ _survivor_used = survivor_list_length * HeapRegion::GrainBytes;
+ _young_region_num = young_list_length;
+ _old_used = subtract_up_to_zero(_overall_used, _eden_used + _survivor_used);
-size_t G1MonitoringSupport::survivor_space_committed() {
- return MAX2(survivor_space_used(),
- (size_t) HeapRegion::GrainBytes);
-}
+ // First calculate the committed sizes that can be calculated independently.
+ _survivor_committed = _survivor_used;
+ _old_committed = HeapRegion::align_up_to_region_byte_size(_old_used);
-size_t G1MonitoringSupport::survivor_space_used() {
- size_t survivor_num = g1h()->g1_policy()->recorded_survivor_regions();
- size_t survivor_used = survivor_num * HeapRegion::GrainBytes;
- return survivor_used;
-}
+ // Next, start with the overall committed size.
+ _overall_committed = g1->capacity();
+ size_t committed = _overall_committed;
-size_t G1MonitoringSupport::old_space_committed() {
- size_t committed = overall_committed();
- size_t eden_committed = eden_space_committed();
- size_t survivor_committed = survivor_space_committed();
- committed = subtract_up_to_zero(committed, eden_committed);
- committed = subtract_up_to_zero(committed, survivor_committed);
- committed = MAX2(committed, (size_t) HeapRegion::GrainBytes);
- return committed;
+ // Remove the committed size we have calculated so far (for the
+ // survivor and old space).
+ assert(committed >= (_survivor_committed + _old_committed), "sanity");
+ committed -= _survivor_committed + _old_committed;
+
+ // Next, calculate and remove the committed size for the eden.
+ _eden_committed = eden_list_max_length * HeapRegion::GrainBytes;
+ // Somewhat defensive: be robust in case there are inaccuracies in
+ // the calculations
+ _eden_committed = MIN2(_eden_committed, committed);
+ committed -= _eden_committed;
+
+ // Finally, give the rest to the old space...
+ _old_committed += committed;
+ // ..and calculate the young gen committed.
+ _young_gen_committed = _eden_committed + _survivor_committed;
+
+ assert(_overall_committed ==
+ (_eden_committed + _survivor_committed + _old_committed),
+ "the committed sizes should add up");
+ // Somewhat defensive: cap the eden used size to make sure it
+ // never exceeds the committed size.
+ _eden_used = MIN2(_eden_used, _eden_committed);
+ // _survivor_committed and _old_committed are calculated in terms of
+ // the corresponding _*_used value, so the next two conditions
+ // should hold.
+ assert(_survivor_used <= _survivor_committed, "post-condition");
+ assert(_old_used <= _old_committed, "post-condition");
}
-// See the comment near the top of g1MonitoringSupport.hpp for
-// an explanation of these calculations for "used" and "capacity".
-size_t G1MonitoringSupport::old_space_used() {
- size_t used = overall_used();
- size_t eden_used = eden_space_used();
- size_t survivor_used = survivor_space_used();
- used = subtract_up_to_zero(used, eden_used);
- used = subtract_up_to_zero(used, survivor_used);
- return used;
+void G1MonitoringSupport::recalculate_eden_size() {
+ G1CollectedHeap* g1 = g1h();
+
+ // When a new eden region is allocated, only the eden_used size is
+ // affected (since we have recalculated everything else at the last GC).
+
+ size_t young_region_num = g1h()->young_list()->length();
+ if (young_region_num > _young_region_num) {
+ size_t diff = young_region_num - _young_region_num;
+ _eden_used += diff * HeapRegion::GrainBytes;
+ // Somewhat defensive: cap the eden used size to make sure it
+ // never exceeds the committed size.
+ _eden_used = MIN2(_eden_used, _eden_committed);
+ _young_region_num = young_region_num;
+ }
}
-void G1MonitoringSupport::update_counters() {
+void G1MonitoringSupport::update_sizes() {
+ recalculate_sizes();
if (UsePerfData) {
- eden_counters()->update_capacity(eden_space_committed());
+ eden_counters()->update_capacity(pad_capacity(eden_space_committed()));
eden_counters()->update_used(eden_space_used());
- to_counters()->update_capacity(survivor_space_committed());
+ // only the to survivor space (s1) is active, so we don't need to
+ // update the counteres for the from survivor space (s0)
+ to_counters()->update_capacity(pad_capacity(survivor_space_committed()));
to_counters()->update_used(survivor_space_used());
- old_space_counters()->update_capacity(old_space_committed());
+ old_space_counters()->update_capacity(pad_capacity(old_space_committed()));
old_space_counters()->update_used(old_space_used());
- non_young_collection_counters()->update_all();
+ old_collection_counters()->update_all();
+ young_collection_counters()->update_all();
}
}
-void G1MonitoringSupport::update_eden_counters() {
+void G1MonitoringSupport::update_eden_size() {
+ recalculate_eden_size();
if (UsePerfData) {
- eden_counters()->update_capacity(eden_space_committed());
eden_counters()->update_used(eden_space_used());
}
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp
index 61de266..3d124ce 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp
@@ -28,101 +28,95 @@
#include "gc_implementation/shared/hSpaceCounters.hpp"
class G1CollectedHeap;
-class G1SpaceMonitoringSupport;
-
-// Class for monitoring logical spaces in G1.
-// G1 defines a set of regions as a young
-// collection (analogous to a young generation).
-// The young collection is a logical generation
-// with no fixed chunk (see space.hpp) reflecting
-// the address space for the generation. In addition
-// to the young collection there is its complement
-// the non-young collection that is simply the regions
-// not in the young collection. The non-young collection
-// is treated here as a logical old generation only
-// because the monitoring tools expect a generational
-// heap. The monitoring tools expect that a Space
-// (see space.hpp) exists that describe the
-// address space of young collection and non-young
-// collection and such a view is provided here.
-//
-// This class provides interfaces to access
-// the value of variables for the young collection
-// that include the "capacity" and "used" of the
-// young collection along with constant values
-// for the minimum and maximum capacities for
-// the logical spaces. Similarly for the non-young
-// collection.
-//
-// Also provided are counters for G1 concurrent collections
-// and stop-the-world full heap collecitons.
-//
-// Below is a description of how "used" and "capactiy"
-// (or committed) is calculated for the logical spaces.
-//
-// 1) The used space calculation for a pool is not necessarily
-// independent of the others. We can easily get from G1 the overall
-// used space in the entire heap, the number of regions in the young
-// generation (includes both eden and survivors), and the number of
-// survivor regions. So, from that we calculate:
-//
-// survivor_used = survivor_num * region_size
-// eden_used = young_region_num * region_size - survivor_used
-// old_gen_used = overall_used - eden_used - survivor_used
-//
-// Note that survivor_used and eden_used are upper bounds. To get the
-// actual value we would have to iterate over the regions and add up
-// ->used(). But that'd be expensive. So, we'll accept some lack of
-// accuracy for those two. But, we have to be careful when calculating
-// old_gen_used, in case we subtract from overall_used more then the
-// actual number and our result goes negative.
-//
-// 2) Calculating the used space is straightforward, as described
-// above. However, how do we calculate the committed space, given that
-// we allocate space for the eden, survivor, and old gen out of the
-// same pool of regions? One way to do this is to use the used value
-// as also the committed value for the eden and survivor spaces and
-// then calculate the old gen committed space as follows:
-//
-// old_gen_committed = overall_committed - eden_committed - survivor_committed
-//
-// Maybe a better way to do that would be to calculate used for eden
-// and survivor as a sum of ->used() over their regions and then
-// calculate committed as region_num * region_size (i.e., what we use
-// to calculate the used space now). This is something to consider
-// in the future.
-//
-// 3) Another decision that is again not straightforward is what is
-// the max size that each memory pool can grow to. One way to do this
-// would be to use the committed size for the max for the eden and
-// survivors and calculate the old gen max as follows (basically, it's
-// a similar pattern to what we use for the committed space, as
-// described above):
-//
-// old_gen_max = overall_max - eden_max - survivor_max
-//
-// Unfortunately, the above makes the max of each pool fluctuate over
-// time and, even though this is allowed according to the spec, it
-// broke several assumptions in the M&M framework (there were cases
-// where used would reach a value greater than max). So, for max we
-// use -1, which means "undefined" according to the spec.
-//
-// 4) Now, there is a very subtle issue with all the above. The
-// framework will call get_memory_usage() on the three pools
-// asynchronously. As a result, each call might get a different value
-// for, say, survivor_num which will yield inconsistent values for
-// eden_used, survivor_used, and old_gen_used (as survivor_num is used
-// in the calculation of all three). This would normally be
-// ok. However, it's possible that this might cause the sum of
-// eden_used, survivor_used, and old_gen_used to go over the max heap
-// size and this seems to sometimes cause JConsole (and maybe other
-// clients) to get confused. There's not a really an easy / clean
-// solution to this problem, due to the asynchrounous nature of the
-// framework.
+
+// Class for monitoring logical spaces in G1. It provides data for
+// both G1's jstat counters as well as G1's memory pools.
+//
+// G1 splits the heap into heap regions and each heap region belongs
+// to one of the following categories:
+//
+// * eden : regions that have been allocated since the last GC
+// * survivors : regions with objects that survived the last few GCs
+// * old : long-lived non-humongous regions
+// * humongous : humongous regions
+// * free : free regions
+//
+// The combination of eden and survivor regions form the equivalent of
+// the young generation in the other GCs. The combination of old and
+// humongous regions form the equivalent of the old generation in the
+// other GCs. Free regions do not have a good equivalent in the other
+// GCs given that they can be allocated as any of the other region types.
+//
+// The monitoring tools expect the heap to contain a number of
+// generations (young, old, perm) and each generation to contain a
+// number of spaces (young: eden, survivors, old). Given that G1 does
+// not maintain those spaces physically (e.g., the set of
+// non-contiguous eden regions can be considered as a "logical"
+// space), we'll provide the illusion that those generations and
+// spaces exist. In reality, each generation and space refers to a set
+// of heap regions that are potentially non-contiguous.
+//
+// This class provides interfaces to access the min, current, and max
+// capacity and current occupancy for each of G1's logical spaces and
+// generations we expose to the monitoring tools. Also provided are
+// counters for G1 concurrent collections and stop-the-world full heap
+// collections.
+//
+// Below is a description of how the various sizes are calculated.
+//
+// * Current Capacity
+//
+// - heap_capacity = current heap capacity (e.g., current committed size)
+// - young_gen_capacity = current max young gen target capacity
+// (i.e., young gen target capacity + max allowed expansion capacity)
+// - survivor_capacity = current survivor region capacity
+// - eden_capacity = young_gen_capacity - survivor_capacity
+// - old_capacity = heap_capacity - young_gen_capacity
+//
+// What we do in the above is to distribute the free regions among
+// eden_capacity and old_capacity.
+//
+// * Occupancy
+//
+// - young_gen_used = current young region capacity
+// - survivor_used = survivor_capacity
+// - eden_used = young_gen_used - survivor_used
+// - old_used = overall_used - young_gen_used
+//
+// Unfortunately, we currently only keep track of the number of
+// currently allocated young and survivor regions + the overall used
+// bytes in the heap, so the above can be a little inaccurate.
+//
+// * Min Capacity
+//
+// We set this to 0 for all spaces. We could consider setting the old
+// min capacity to the min capacity of the heap (see 7078465).
+//
+// * Max Capacity
+//
+// For jstat, we set the max capacity of all spaces to heap_capacity,
+// given that we don't always have a reasonably upper bound on how big
+// each space can grow. For the memory pools, we actually make the max
+// capacity undefined. We could consider setting the old max capacity
+// to the max capacity of the heap (see 7078465).
+//
+// If we had more accurate occupancy / capacity information per
+// region set the above calculations would be greatly simplified and
+// be made more accurate.
+//
+// We update all the above synchronously and we store the results in
+// fields so that we just read said fields when needed. A subtle point
+// is that all the above sizes need to be recalculated when the old
+// gen changes capacity (after a GC or after a humongous allocation)
+// but only the eden occupancy changes when a new eden region is
+// allocated. So, in the latter case we have minimal recalcuation to
+// do which is important as we want to keep the eden region allocation
+// path as low-overhead as possible.
class G1MonitoringSupport : public CHeapObj {
+ friend class VMStructs;
+
G1CollectedHeap* _g1h;
- VirtualSpace* _g1_storage_addr;
// jstat performance counters
// incremental collections both fully and partially young
@@ -133,9 +127,9 @@ class G1MonitoringSupport : public CHeapObj {
// _from_counters, and _to_counters are associated with
// this "generational" counter.
GenerationCounters* _young_collection_counters;
- // non-young collection set counters. The _old_space_counters
+ // old collection set counters. The _old_space_counters
// below are associated with this "generational" counter.
- GenerationCounters* _non_young_collection_counters;
+ GenerationCounters* _old_collection_counters;
// Counters for the capacity and used for
// the whole heap
HSpaceCounters* _old_space_counters;
@@ -145,6 +139,27 @@ class G1MonitoringSupport : public CHeapObj {
HSpaceCounters* _from_counters;
HSpaceCounters* _to_counters;
+ // When it's appropriate to recalculate the various sizes (at the
+ // end of a GC, when a new eden region is allocated, etc.) we store
+ // them here so that we can easily report them when needed and not
+ // have to recalculate them every time.
+
+ size_t _overall_reserved;
+ size_t _overall_committed;
+ size_t _overall_used;
+
+ size_t _young_region_num;
+ size_t _young_gen_committed;
+ size_t _eden_committed;
+ size_t _eden_used;
+ size_t _survivor_committed;
+ size_t _survivor_used;
+
+ size_t _old_committed;
+ size_t _old_used;
+
+ G1CollectedHeap* g1h() { return _g1h; }
+
// It returns x - y if x > y, 0 otherwise.
// As described in the comment above, some of the inputs to the
// calculations we have to do are obtained concurrently and hence
@@ -160,15 +175,35 @@ class G1MonitoringSupport : public CHeapObj {
}
}
+ // Recalculate all the sizes.
+ void recalculate_sizes();
+ // Recalculate only what's necessary when a new eden region is allocated.
+ void recalculate_eden_size();
+
public:
- G1MonitoringSupport(G1CollectedHeap* g1h, VirtualSpace* g1_storage_addr);
+ G1MonitoringSupport(G1CollectedHeap* g1h);
- G1CollectedHeap* g1h() { return _g1h; }
- VirtualSpace* g1_storage_addr() { return _g1_storage_addr; }
+ // Unfortunately, the jstat tool assumes that no space has 0
+ // capacity. In our case, given that each space is logical, it's
+ // possible that no regions will be allocated to it, hence to have 0
+ // capacity (e.g., if there are no survivor regions, the survivor
+ // space has 0 capacity). The way we deal with this is to always pad
+ // each capacity value we report to jstat by a very small amount to
+ // make sure that it's never zero. Given that we sometimes have to
+ // report a capacity of a generation that contains several spaces
+ // (e.g., young gen includes one eden, two survivor spaces), the
+ // mult parameter is provided in order to adding the appropriate
+ // padding multiple times so that the capacities add up correctly.
+ static size_t pad_capacity(size_t size_bytes, size_t mult = 1) {
+ return size_bytes + MinObjAlignmentInBytes * mult;
+ }
- // Performance Counter accessors
- void update_counters();
- void update_eden_counters();
+ // Recalculate all the sizes from scratch and update all the jstat
+ // counters accordingly.
+ void update_sizes();
+ // Recalculate only what's necessary when a new eden region is
+ // allocated and update any jstat counters that need to be updated.
+ void update_eden_size();
CollectorCounters* incremental_collection_counters() {
return _incremental_collection_counters;
@@ -176,8 +211,11 @@ class G1MonitoringSupport : public CHeapObj {
CollectorCounters* full_collection_counters() {
return _full_collection_counters;
}
- GenerationCounters* non_young_collection_counters() {
- return _non_young_collection_counters;
+ GenerationCounters* young_collection_counters() {
+ return _young_collection_counters;
+ }
+ GenerationCounters* old_collection_counters() {
+ return _old_collection_counters;
}
HSpaceCounters* old_space_counters() { return _old_space_counters; }
HSpaceCounters* eden_counters() { return _eden_counters; }
@@ -187,17 +225,45 @@ class G1MonitoringSupport : public CHeapObj {
// Monitoring support used by
// MemoryService
// jstat counters
- size_t overall_committed();
- size_t overall_used();
- size_t eden_space_committed();
- size_t eden_space_used();
+ size_t overall_reserved() { return _overall_reserved; }
+ size_t overall_committed() { return _overall_committed; }
+ size_t overall_used() { return _overall_used; }
+
+ size_t young_gen_committed() { return _young_gen_committed; }
+ size_t young_gen_max() { return overall_reserved(); }
+ size_t eden_space_committed() { return _eden_committed; }
+ size_t eden_space_used() { return _eden_used; }
+ size_t survivor_space_committed() { return _survivor_committed; }
+ size_t survivor_space_used() { return _survivor_used; }
+
+ size_t old_gen_committed() { return old_space_committed(); }
+ size_t old_gen_max() { return overall_reserved(); }
+ size_t old_space_committed() { return _old_committed; }
+ size_t old_space_used() { return _old_used; }
+};
- size_t survivor_space_committed();
- size_t survivor_space_used();
+class G1GenerationCounters: public GenerationCounters {
+protected:
+ G1MonitoringSupport* _g1mm;
+
+public:
+ G1GenerationCounters(G1MonitoringSupport* g1mm,
+ const char* name, int ordinal, int spaces,
+ size_t min_capacity, size_t max_capacity,
+ size_t curr_capacity);
+};
+
+class G1YoungGenerationCounters: public G1GenerationCounters {
+public:
+ G1YoungGenerationCounters(G1MonitoringSupport* g1mm, const char* name);
+ virtual void update_all();
+};
- size_t old_space_committed();
- size_t old_space_used();
+class G1OldGenerationCounters: public G1GenerationCounters {
+public:
+ G1OldGenerationCounters(G1MonitoringSupport* g1mm, const char* name);
+ virtual void update_all();
};
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1MONITORINGSUPPORT_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
index d3f1ce2..ace59ea 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
@@ -34,6 +34,7 @@ class CMBitMap;
class CMMarkStack;
class G1ParScanThreadState;
class CMTask;
+class ReferenceProcessor;
// A class that scans oops in a given heap region (much as OopsInGenClosure
// scans oops in a generation.)
@@ -59,8 +60,10 @@ public:
class G1ParPushHeapRSClosure : public G1ParClosureSuper {
public:
- G1ParPushHeapRSClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
+ G1ParPushHeapRSClosure(G1CollectedHeap* g1,
+ G1ParScanThreadState* par_scan_state):
G1ParClosureSuper(g1, par_scan_state) { }
+
template <class T> void do_oop_nv(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); }
virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
@@ -68,8 +71,13 @@ public:
class G1ParScanClosure : public G1ParClosureSuper {
public:
- G1ParScanClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
- G1ParClosureSuper(g1, par_scan_state) { }
+ G1ParScanClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state, ReferenceProcessor* rp) :
+ G1ParClosureSuper(g1, par_scan_state)
+ {
+ assert(_ref_processor == NULL, "sanity");
+ _ref_processor = rp;
+ }
+
template <class T> void do_oop_nv(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); }
virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
@@ -92,9 +100,18 @@ template <class T> inline oop clear_partial_array_mask(T* ref) {
class G1ParScanPartialArrayClosure : public G1ParClosureSuper {
G1ParScanClosure _scanner;
+
public:
- G1ParScanPartialArrayClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
- G1ParClosureSuper(g1, par_scan_state), _scanner(g1, par_scan_state) { }
+ G1ParScanPartialArrayClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state, ReferenceProcessor* rp) :
+ G1ParClosureSuper(g1, par_scan_state), _scanner(g1, par_scan_state, rp)
+ {
+ assert(_ref_processor == NULL, "sanity");
+ }
+
+ G1ParScanClosure* scanner() {
+ return &_scanner;
+ }
+
template <class T> void do_oop_nv(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); }
virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
@@ -105,7 +122,8 @@ class G1ParCopyHelper : public G1ParClosureSuper {
G1ParScanClosure *_scanner;
protected:
template <class T> void mark_object(T* p);
- oop copy_to_survivor_space(oop obj, bool should_mark_copy);
+ oop copy_to_survivor_space(oop obj, bool should_mark_root,
+ bool should_mark_copy);
public:
G1ParCopyHelper(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state,
G1ParScanClosure *scanner) :
@@ -116,10 +134,20 @@ template<bool do_gen_barrier, G1Barrier barrier,
bool do_mark_object>
class G1ParCopyClosure : public G1ParCopyHelper {
G1ParScanClosure _scanner;
+
template <class T> void do_oop_work(T* p);
+
public:
- G1ParCopyClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
- _scanner(g1, par_scan_state), G1ParCopyHelper(g1, par_scan_state, &_scanner) { }
+ G1ParCopyClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state,
+ ReferenceProcessor* rp) :
+ _scanner(g1, par_scan_state, rp),
+ G1ParCopyHelper(g1, par_scan_state, &_scanner)
+ {
+ assert(_ref_processor == NULL, "sanity");
+ }
+
+ G1ParScanClosure* scanner() { return &_scanner; }
+
template <class T> void do_oop_nv(T* p) {
do_oop_work(p);
}
@@ -129,21 +157,25 @@ public:
typedef G1ParCopyClosure<false, G1BarrierNone, false> G1ParScanExtRootClosure;
typedef G1ParCopyClosure<true, G1BarrierNone, false> G1ParScanPermClosure;
-typedef G1ParCopyClosure<false, G1BarrierRS, false> G1ParScanHeapRSClosure;
+
typedef G1ParCopyClosure<false, G1BarrierNone, true> G1ParScanAndMarkExtRootClosure;
typedef G1ParCopyClosure<true, G1BarrierNone, true> G1ParScanAndMarkPermClosure;
-typedef G1ParCopyClosure<false, G1BarrierRS, true> G1ParScanAndMarkHeapRSClosure;
-
-// This is the only case when we set skip_cset_test. Basically, this
-// closure is (should?) only be called directly while we're draining
-// the overflow and task queues. In that case we know that the
-// reference in question points into the collection set, otherwise we
-// would not have pushed it on the queue. The following is defined in
-// g1_specialized_oop_closures.hpp.
-// typedef G1ParCopyClosure<false, G1BarrierEvac, false, true> G1ParScanHeapEvacClosure;
-// We need a separate closure to handle references during evacuation
-// failure processing, as we cannot asume that the reference already
-// points into the collection set (like G1ParScanHeapEvacClosure does).
+
+// The following closure types are no longer used but are retained
+// for historical reasons:
+// typedef G1ParCopyClosure<false, G1BarrierRS, false> G1ParScanHeapRSClosure;
+// typedef G1ParCopyClosure<false, G1BarrierRS, true> G1ParScanAndMarkHeapRSClosure;
+
+// The following closure type is defined in g1_specialized_oop_closures.hpp:
+//
+// typedef G1ParCopyClosure<false, G1BarrierEvac, false> G1ParScanHeapEvacClosure;
+
+// We use a separate closure to handle references during evacuation
+// failure processing.
+// We could have used another instance of G1ParScanHeapEvacClosure
+// (since that closure no longer assumes that the references it
+// handles point into the collection set).
+
typedef G1ParCopyClosure<false, G1BarrierEvac, false> G1ParScanHeapEvacFailureClosure;
class FilterIntoCSClosure: public OopClosure {
@@ -152,9 +184,10 @@ class FilterIntoCSClosure: public OopClosure {
DirtyCardToOopClosure* _dcto_cl;
public:
FilterIntoCSClosure( DirtyCardToOopClosure* dcto_cl,
- G1CollectedHeap* g1, OopClosure* oc) :
- _dcto_cl(dcto_cl), _g1(g1), _oc(oc)
- {}
+ G1CollectedHeap* g1,
+ OopClosure* oc) :
+ _dcto_cl(dcto_cl), _g1(g1), _oc(oc) { }
+
template <class T> void do_oop_nv(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); }
virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
index 568bb64..9f10ac2 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
@@ -122,10 +122,10 @@ public:
void set_try_claimed() { _try_claimed = true; }
void scanCard(size_t index, HeapRegion *r) {
- DirtyCardToOopClosure* cl =
- r->new_dcto_closure(_oc,
- CardTableModRefBS::Precise,
- HeapRegionDCTOC::IntoCSFilterKind);
+ // Stack allocate the DirtyCardToOopClosure instance
+ HeapRegionDCTOC cl(_g1h, r, _oc,
+ CardTableModRefBS::Precise,
+ HeapRegionDCTOC::IntoCSFilterKind);
// Set the "from" region in the closure.
_oc->set_region(r);
@@ -140,7 +140,7 @@ public:
// scans (the rsets of the regions in the cset can intersect).
_ct_bs->set_card_claimed(index);
_cards_done++;
- cl->do_MemRegion(mr);
+ cl.do_MemRegion(mr);
}
}
@@ -234,6 +234,7 @@ void G1RemSet::scanRS(OopsInHeapRegionClosure* oc, int worker_i) {
HeapRegion *startRegion = calculateStartRegion(worker_i);
ScanRSClosure scanRScl(oc, worker_i);
+
_g1->collection_set_iterate_from(startRegion, &scanRScl);
scanRScl.set_try_claimed();
_g1->collection_set_iterate_from(startRegion, &scanRScl);
@@ -283,6 +284,7 @@ void G1RemSet::updateRS(DirtyCardQueue* into_cset_dcq, int worker_i) {
double start = os::elapsedTime();
// Apply the given closure to all remaining log entries.
RefineRecordRefsIntoCSCardTableEntryClosure into_cset_update_rs_cl(_g1, into_cset_dcq);
+
_g1->iterate_dirty_card_closure(&into_cset_update_rs_cl, into_cset_dcq, false, worker_i);
// Now there should be no dirty cards.
@@ -633,10 +635,18 @@ bool G1RemSet::concurrentRefineOneCard_impl(jbyte* card_ptr, int worker_i,
ct_freq_note_card(_ct_bs->index_for(start));
#endif
- assert(!check_for_refs_into_cset || _cset_rs_update_cl[worker_i] != NULL, "sanity");
+ OopsInHeapRegionClosure* oops_in_heap_closure = NULL;
+ if (check_for_refs_into_cset) {
+ // ConcurrentG1RefineThreads have worker numbers larger than what
+ // _cset_rs_update_cl[] is set up to handle. But those threads should
+ // only be active outside of a collection which means that when they
+ // reach here they should have check_for_refs_into_cset == false.
+ assert((size_t)worker_i < n_workers(), "index of worker larger than _cset_rs_update_cl[].length");
+ oops_in_heap_closure = _cset_rs_update_cl[worker_i];
+ }
UpdateRSOrPushRefOopClosure update_rs_oop_cl(_g1,
_g1->g1_rem_set(),
- _cset_rs_update_cl[worker_i],
+ oops_in_heap_closure,
check_for_refs_into_cset,
worker_i);
update_rs_oop_cl.set_from(r);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
index 1e2ab28..861c947 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
@@ -290,10 +290,6 @@
"each evacuation pause in order to artificially fill up the " \
"heap and stress the marking implementation.") \
\
- develop(bool, ReduceInitialCardMarksForG1, false, \
- "When ReduceInitialCardMarks is true, this flag setting " \
- " controls whether G1 allows the RICM optimization") \
- \
develop(bool, G1ExitOnExpansionFailure, false, \
"Raise a fatal VM exit out of memory failure in the event " \
" that heap expansion fails due to running out of swap.") \
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
index ec42314..98b7ebf 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
@@ -33,11 +33,11 @@
#include "memory/iterator.hpp"
#include "oops/oop.inline.hpp"
-int HeapRegion::LogOfHRGrainBytes = 0;
-int HeapRegion::LogOfHRGrainWords = 0;
-int HeapRegion::GrainBytes = 0;
-int HeapRegion::GrainWords = 0;
-int HeapRegion::CardsPerRegion = 0;
+int HeapRegion::LogOfHRGrainBytes = 0;
+int HeapRegion::LogOfHRGrainWords = 0;
+size_t HeapRegion::GrainBytes = 0;
+size_t HeapRegion::GrainWords = 0;
+size_t HeapRegion::CardsPerRegion = 0;
HeapRegionDCTOC::HeapRegionDCTOC(G1CollectedHeap* g1,
HeapRegion* hr, OopClosure* cl,
@@ -45,7 +45,7 @@ HeapRegionDCTOC::HeapRegionDCTOC(G1CollectedHeap* g1,
FilterKind fk) :
ContiguousSpaceDCTOC(hr, cl, precision, NULL),
_hr(hr), _fk(fk), _g1(g1)
-{}
+{ }
FilterOutOfRegionClosure::FilterOutOfRegionClosure(HeapRegion* r,
OopClosure* oc) :
@@ -210,15 +210,17 @@ void HeapRegionDCTOC::walk_mem_region_with_cl(MemRegion mr,
HeapWord* top,
OopClosure* cl) {
G1CollectedHeap* g1h = _g1;
-
int oop_size;
+ OopClosure* cl2 = NULL;
- OopClosure* cl2 = cl;
FilterIntoCSClosure intoCSFilt(this, g1h, cl);
FilterOutOfRegionClosure outOfRegionFilt(_hr, cl);
+
switch (_fk) {
+ case NoFilterKind: cl2 = cl; break;
case IntoCSFilterKind: cl2 = &intoCSFilt; break;
case OutOfRegionFilterKind: cl2 = &outOfRegionFilt; break;
+ default: ShouldNotReachHere();
}
// Start filtering what we add to the remembered set. If the object is
@@ -239,16 +241,19 @@ void HeapRegionDCTOC::walk_mem_region_with_cl(MemRegion mr,
case NoFilterKind:
bottom = walk_mem_region_loop(cl, g1h, _hr, bottom, top);
break;
+
case IntoCSFilterKind: {
FilterIntoCSClosure filt(this, g1h, cl);
bottom = walk_mem_region_loop(&filt, g1h, _hr, bottom, top);
break;
}
+
case OutOfRegionFilterKind: {
FilterOutOfRegionClosure filt(_hr, cl);
bottom = walk_mem_region_loop(&filt, g1h, _hr, bottom, top);
break;
}
+
default:
ShouldNotReachHere();
}
@@ -317,11 +322,11 @@ void HeapRegion::setup_heap_region_size(uintx min_heap_size) {
guarantee(GrainBytes == 0, "we should only set it once");
// The cast to int is safe, given that we've bounded region_size by
// MIN_REGION_SIZE and MAX_REGION_SIZE.
- GrainBytes = (int) region_size;
+ GrainBytes = (size_t)region_size;
guarantee(GrainWords == 0, "we should only set it once");
GrainWords = GrainBytes >> LogHeapWordSize;
- guarantee(1 << LogOfHRGrainWords == GrainWords, "sanity");
+ guarantee((size_t)(1 << LogOfHRGrainWords) == GrainWords, "sanity");
guarantee(CardsPerRegion == 0, "we should only set it once");
CardsPerRegion = GrainBytes >> CardTableModRefBS::card_shift;
@@ -335,14 +340,6 @@ void HeapRegion::reset_after_compaction() {
init_top_at_mark_start();
}
-DirtyCardToOopClosure*
-HeapRegion::new_dcto_closure(OopClosure* cl,
- CardTableModRefBS::PrecisionStyle precision,
- HeapRegionDCTOC::FilterKind fk) {
- return new HeapRegionDCTOC(G1CollectedHeap::heap(),
- this, cl, precision, fk);
-}
-
void HeapRegion::hr_clear(bool par, bool clear_space) {
assert(_humongous_type == NotHumongous,
"we should have already filtered out humongous regions");
@@ -374,8 +371,7 @@ void HeapRegion::hr_clear(bool par, bool clear_space) {
void HeapRegion::par_clear() {
assert(used() == 0, "the region should have been already cleared");
- assert(capacity() == (size_t) HeapRegion::GrainBytes,
- "should be back to normal");
+ assert(capacity() == HeapRegion::GrainBytes, "should be back to normal");
HeapRegionRemSet* hrrs = rem_set();
hrrs->clear();
CardTableModRefBS* ct_bs =
@@ -431,7 +427,7 @@ void HeapRegion::set_notHumongous() {
assert(end() == _orig_end, "sanity");
}
- assert(capacity() == (size_t) HeapRegion::GrainBytes, "pre-condition");
+ assert(capacity() == HeapRegion::GrainBytes, "pre-condition");
_humongous_type = NotHumongous;
_humongous_start_region = NULL;
}
@@ -483,12 +479,13 @@ HeapRegion::
HeapRegion(size_t hrs_index, G1BlockOffsetSharedArray* sharedOffsetArray,
MemRegion mr, bool is_zeroed)
: G1OffsetTableContigSpace(sharedOffsetArray, mr, is_zeroed),
- _next_fk(HeapRegionDCTOC::NoFilterKind), _hrs_index(hrs_index),
+ _hrs_index(hrs_index),
_humongous_type(NotHumongous), _humongous_start_region(NULL),
_in_collection_set(false),
_next_in_special_set(NULL), _orig_end(NULL),
_claimed(InitialClaimValue), _evacuation_failed(false),
_prev_marked_bytes(0), _next_marked_bytes(0), _sort_index(-1),
+ _gc_efficiency(0.0),
_young_type(NotYoung), _next_young_region(NULL),
_next_dirty_cards_region(NULL), _next(NULL), _pending_removal(false),
#ifdef ASSERT
@@ -725,7 +722,7 @@ void HeapRegion::print_on(outputStream* st) const {
st->print(" F");
else
st->print(" ");
- st->print(" %5d", _gc_time_stamp);
+ st->print(" TS %5d", _gc_time_stamp);
st->print(" PTAMS "PTR_FORMAT" NTAMS "PTR_FORMAT,
prev_top_at_mark_start(), next_top_at_mark_start());
G1OffsetTableContigSpace::print_on(st);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
index 774987d..7071ad4 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
@@ -118,7 +118,6 @@ public:
FilterKind fk);
};
-
// The complicating factor is that BlockOffsetTable diverged
// significantly, and we need functionality that is only in the G1 version.
// So I copied that code, which led to an alternate G1 version of
@@ -223,10 +222,6 @@ class HeapRegion: public G1OffsetTableContigSpace {
ContinuesHumongous
};
- // The next filter kind that should be used for a "new_dcto_cl" call with
- // the "traditional" signature.
- HeapRegionDCTOC::FilterKind _next_fk;
-
// Requires that the region "mr" be dense with objects, and begin and end
// with an object.
void oops_in_mr_iterate(MemRegion mr, OopClosure* cl);
@@ -351,16 +346,17 @@ class HeapRegion: public G1OffsetTableContigSpace {
G1BlockOffsetSharedArray* sharedOffsetArray,
MemRegion mr, bool is_zeroed);
- static int LogOfHRGrainBytes;
- static int LogOfHRGrainWords;
- // The normal type of these should be size_t. However, they used to
- // be members of an enum before and they are assumed by the
- // compilers to be ints. To avoid going and fixing all their uses,
- // I'm declaring them as ints. I'm not anticipating heap region
- // sizes to reach anywhere near 2g, so using an int here is safe.
- static int GrainBytes;
- static int GrainWords;
- static int CardsPerRegion;
+ static int LogOfHRGrainBytes;
+ static int LogOfHRGrainWords;
+
+ static size_t GrainBytes;
+ static size_t GrainWords;
+ static size_t CardsPerRegion;
+
+ static size_t align_up_to_region_byte_size(size_t sz) {
+ return (sz + (size_t) GrainBytes - 1) &
+ ~((1 << (size_t) LogOfHRGrainBytes) - 1);
+ }
// It sets up the heap region size (GrainBytes / GrainWords), as
// well as other related fields that are based on the heap region
@@ -435,6 +431,14 @@ class HeapRegion: public G1OffsetTableContigSpace {
return _humongous_start_region;
}
+ // Same as Space::is_in_reserved, but will use the original size of the region.
+ // The original size is different only for start humongous regions. They get
+ // their _end set up to be the end of the last continues region of the
+ // corresponding humongous object.
+ bool is_in_reserved_raw(const void* p) const {
+ return _bottom <= p && p < _orig_end;
+ }
+
// Makes the current region be a "starts humongous" region, i.e.,
// the first region in a series of one or more contiguous regions
// that will contain a single "humongous" object. The two parameters
@@ -573,40 +577,9 @@ class HeapRegion: public G1OffsetTableContigSpace {
// allocated in the current region before the last call to "save_mark".
void oop_before_save_marks_iterate(OopClosure* cl);
- // This call determines the "filter kind" argument that will be used for
- // the next call to "new_dcto_cl" on this region with the "traditional"
- // signature (i.e., the call below.) The default, in the absence of a
- // preceding call to this method, is "NoFilterKind", and a call to this
- // method is necessary for each such call, or else it reverts to the
- // default.
- // (This is really ugly, but all other methods I could think of changed a
- // lot of main-line code for G1.)
- void set_next_filter_kind(HeapRegionDCTOC::FilterKind nfk) {
- _next_fk = nfk;
- }
-
- DirtyCardToOopClosure*
- new_dcto_closure(OopClosure* cl,
- CardTableModRefBS::PrecisionStyle precision,
- HeapRegionDCTOC::FilterKind fk);
-
-#if WHASSUP
- DirtyCardToOopClosure*
- new_dcto_closure(OopClosure* cl,
- CardTableModRefBS::PrecisionStyle precision,
- HeapWord* boundary) {
- assert(boundary == NULL, "This arg doesn't make sense here.");
- DirtyCardToOopClosure* res = new_dcto_closure(cl, precision, _next_fk);
- _next_fk = HeapRegionDCTOC::NoFilterKind;
- return res;
- }
-#endif
-
- //
// Note the start or end of marking. This tells the heap region
// that the collector is about to start or has finished (concurrently)
// marking the heap.
- //
// Note the start of a marking phase. Record the
// start of the unmarked area of the region here.
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
index 8c5f15e..47c4155 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
@@ -143,12 +143,16 @@ protected:
// If the test below fails, then this table was reused concurrently
// with this operation. This is OK, since the old table was coarsened,
// and adding a bit to the new table is never incorrect.
- if (loc_hr->is_in_reserved(from)) {
+ // If the table used to belong to a continues humongous region and is
+ // now reused for the corresponding start humongous region, we need to
+ // make sure that we detect this. Thus, we call is_in_reserved_raw()
+ // instead of just is_in_reserved() here.
+ if (loc_hr->is_in_reserved_raw(from)) {
size_t hw_offset = pointer_delta((HeapWord*)from, loc_hr->bottom());
CardIdx_t from_card = (CardIdx_t)
hw_offset >> (CardTableModRefBS::card_shift - LogHeapWordSize);
- assert(0 <= from_card && from_card < HeapRegion::CardsPerRegion,
+ assert(0 <= from_card && (size_t)from_card < HeapRegion::CardsPerRegion,
"Must be in range.");
add_card_work(from_card, par);
}
@@ -639,7 +643,7 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, int tid) {
uintptr_t(from_hr->bottom())
>> CardTableModRefBS::card_shift;
CardIdx_t card_index = from_card - from_hr_bot_card_index;
- assert(0 <= card_index && card_index < HeapRegion::CardsPerRegion,
+ assert(0 <= card_index && (size_t)card_index < HeapRegion::CardsPerRegion,
"Must be in range.");
if (G1HRRSUseSparseTable &&
_sparse_table.add_card(from_hrs_ind, card_index)) {
@@ -1066,7 +1070,7 @@ bool OtherRegionsTable::contains_reference_locked(OopOrNarrowOopStar from) const
uintptr_t(hr->bottom()) >> CardTableModRefBS::card_shift;
assert(from_card >= hr_bot_card_index, "Inv");
CardIdx_t card_index = from_card - hr_bot_card_index;
- assert(0 <= card_index && card_index < HeapRegion::CardsPerRegion,
+ assert(0 <= card_index && (size_t)card_index < HeapRegion::CardsPerRegion,
"Must be in range.");
return _sparse_table.contains_card(hr_ind, card_index);
}
@@ -1191,7 +1195,7 @@ void HeapRegionRemSetIterator::initialize(const HeapRegionRemSet* hrrs) {
_is = Sparse;
// Set these values so that we increment to the first region.
_coarse_cur_region_index = -1;
- _coarse_cur_region_cur_card = (HeapRegion::CardsPerRegion-1);;
+ _coarse_cur_region_cur_card = (HeapRegion::CardsPerRegion-1);
_cur_region_cur_card = 0;
@@ -1270,7 +1274,7 @@ bool HeapRegionRemSetIterator::fine_has_next(size_t& card_index) {
bool HeapRegionRemSetIterator::fine_has_next() {
return
_fine_cur_prt != NULL &&
- _cur_region_cur_card < (size_t) HeapRegion::CardsPerRegion;
+ _cur_region_cur_card < HeapRegion::CardsPerRegion;
}
bool HeapRegionRemSetIterator::has_next(size_t& card_index) {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp
index 09adcfa..4534350 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp
@@ -395,8 +395,8 @@ class HeapRegionRemSetIterator : public CHeapObj {
// Coarse table iteration fields:
// Current region index;
- int _coarse_cur_region_index;
- int _coarse_cur_region_cur_card;
+ int _coarse_cur_region_index;
+ size_t _coarse_cur_region_cur_card;
bool coarse_has_next(size_t& card_index);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp
index c47b648..3df8d73 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp
@@ -56,6 +56,7 @@ class FreeRegionList;
// and maintain that: _length <= _allocated_length <= _max_length
class HeapRegionSeq: public CHeapObj {
+ friend class VMStructs;
// The array that holds the HeapRegions.
HeapRegion** _regions;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
index 5f35e2f..e21cdd7 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
@@ -26,6 +26,7 @@
#include "gc_implementation/g1/heapRegionSet.inline.hpp"
size_t HeapRegionSetBase::_unrealistically_long_length = 0;
+HRSPhase HeapRegionSetBase::_phase = HRSPhaseNone;
//////////////////// HeapRegionSetBase ////////////////////
@@ -192,6 +193,17 @@ void HeapRegionSetBase::verify_end() {
_verify_in_progress = false;
}
+void HeapRegionSetBase::clear_phase() {
+ assert(_phase != HRSPhaseNone, "pre-condition");
+ _phase = HRSPhaseNone;
+}
+
+void HeapRegionSetBase::set_phase(HRSPhase phase) {
+ assert(_phase == HRSPhaseNone, "pre-condition");
+ assert(phase != HRSPhaseNone, "pre-condition");
+ _phase = phase;
+}
+
void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
out->cr();
out->print_cr("Set: %s ("PTR_FORMAT")", name(), this);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
index 03fb764..9e862b4 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
@@ -47,8 +47,18 @@ typedef FormatBuffer<HRS_ERR_MSG_BUFSZ> hrs_err_msg;
class hrs_ext_msg;
+typedef enum {
+ HRSPhaseNone,
+ HRSPhaseEvacuation,
+ HRSPhaseCleanup,
+ HRSPhaseFullGC
+} HRSPhase;
+
+class HRSPhaseSetter;
+
class HeapRegionSetBase VALUE_OBJ_CLASS_SPEC {
friend class hrs_ext_msg;
+ friend class HRSPhaseSetter;
protected:
static size_t calculate_region_num(HeapRegion* hr);
@@ -80,6 +90,15 @@ protected:
size_t _calc_total_capacity_bytes;
size_t _calc_total_used_bytes;
+ // This is here so that it can be used in the subclasses to assert
+ // something different depending on which phase the GC is in. This
+ // can be particularly helpful in the check_mt_safety() methods.
+ static HRSPhase _phase;
+
+ // Only used by HRSPhaseSetter.
+ static void clear_phase();
+ static void set_phase(HRSPhase phase);
+
// verify_region() is used to ensure that the contents of a region
// added to / removed from a set are consistent. Different sets
// make different assumptions about the regions added to them. So
@@ -177,6 +196,16 @@ public:
}
};
+class HRSPhaseSetter {
+public:
+ HRSPhaseSetter(HRSPhase phase) {
+ HeapRegionSetBase::set_phase(phase);
+ }
+ ~HRSPhaseSetter() {
+ HeapRegionSetBase::clear_phase();
+ }
+};
+
// These two macros are provided for convenience, to keep the uses of
// these two asserts a bit more concise.
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp
index 19b213a..d2a9665 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp
@@ -26,6 +26,17 @@
#include "gc_implementation/g1/heapRegionRemSet.hpp"
#include "gc_implementation/g1/heapRegionSets.hpp"
+// Note on the check_mt_safety() methods below:
+//
+// Verification of the "master" heap region sets / lists that are
+// maintained by G1CollectedHeap is always done during a STW pause and
+// by the VM thread at the start / end of the pause. The standard
+// verification methods all assert check_mt_safety(). This is
+// important as it ensures that verification is done without
+// concurrent updates taking place at the same time. It follows, that,
+// for the "master" heap region sets / lists, the check_mt_safety()
+// method should include the VM thread / STW case.
+
//////////////////// FreeRegionList ////////////////////
const char* FreeRegionList::verify_region_extra(HeapRegion* hr) {
@@ -33,7 +44,7 @@ const char* FreeRegionList::verify_region_extra(HeapRegion* hr) {
return "the region should not be young";
}
// The superclass will check that the region is empty and
- // not-humongous.
+ // not humongous.
return HeapRegionLinkedList::verify_region_extra(hr);
}
@@ -58,12 +69,16 @@ bool MasterFreeRegionList::check_mt_safety() {
// (b) If we're not at a safepoint, operations on the master free
// list should be invoked while holding the Heap_lock.
- guarantee((SafepointSynchronize::is_at_safepoint() &&
- (Thread::current()->is_VM_thread() ||
- FreeList_lock->owned_by_self())) ||
- (!SafepointSynchronize::is_at_safepoint() &&
- Heap_lock->owned_by_self()),
- hrs_ext_msg(this, "master free list MT safety protocol"));
+ if (SafepointSynchronize::is_at_safepoint()) {
+ guarantee(Thread::current()->is_VM_thread() ||
+ FreeList_lock->owned_by_self(),
+ hrs_ext_msg(this, "master free list MT safety protocol "
+ "at a safepoint"));
+ } else {
+ guarantee(Heap_lock->owned_by_self(),
+ hrs_ext_msg(this, "master free list MT safety protocol "
+ "outside a safepoint"));
+ }
return FreeRegionList::check_mt_safety();
}
@@ -81,6 +96,48 @@ bool SecondaryFreeRegionList::check_mt_safety() {
return FreeRegionList::check_mt_safety();
}
+//////////////////// OldRegionSet ////////////////////
+
+const char* OldRegionSet::verify_region_extra(HeapRegion* hr) {
+ if (hr->is_young()) {
+ return "the region should not be young";
+ }
+ // The superclass will check that the region is not empty and not
+ // humongous.
+ return HeapRegionSet::verify_region_extra(hr);
+}
+
+//////////////////// MasterOldRegionSet ////////////////////
+
+bool MasterOldRegionSet::check_mt_safety() {
+ // Master Old Set MT safety protocol:
+ // (a) If we're at a safepoint, operations on the master old set
+ // should be invoked:
+ // - by the VM thread (which will serialize them), or
+ // - by the GC workers while holding the FreeList_lock, if we're
+ // at a safepoint for an evacuation pause (this lock is taken
+ // anyway when an GC alloc region is retired so that a new one
+ // is allocated from the free list), or
+ // - by the GC workers while holding the OldSets_lock, if we're at a
+ // safepoint for a cleanup pause.
+ // (b) If we're not at a safepoint, operations on the master old set
+ // should be invoked while holding the Heap_lock.
+
+ if (SafepointSynchronize::is_at_safepoint()) {
+ guarantee(Thread::current()->is_VM_thread() ||
+ _phase == HRSPhaseEvacuation && FreeList_lock->owned_by_self() ||
+ _phase == HRSPhaseCleanup && OldSets_lock->owned_by_self(),
+ hrs_ext_msg(this, "master old set MT safety protocol "
+ "at a safepoint"));
+ } else {
+ guarantee(Heap_lock->owned_by_self(),
+ hrs_ext_msg(this, "master old set MT safety protocol "
+ "outside a safepoint"));
+ }
+
+ return OldRegionSet::check_mt_safety();
+}
+
//////////////////// HumongousRegionSet ////////////////////
const char* HumongousRegionSet::verify_region_extra(HeapRegion* hr) {
@@ -103,11 +160,16 @@ bool MasterHumongousRegionSet::check_mt_safety() {
// (b) If we're not at a safepoint, operations on the master
// humongous set should be invoked while holding the Heap_lock.
- guarantee((SafepointSynchronize::is_at_safepoint() &&
- (Thread::current()->is_VM_thread() ||
- OldSets_lock->owned_by_self())) ||
- (!SafepointSynchronize::is_at_safepoint() &&
- Heap_lock->owned_by_self()),
- hrs_ext_msg(this, "master humongous set MT safety protocol"));
+ if (SafepointSynchronize::is_at_safepoint()) {
+ guarantee(Thread::current()->is_VM_thread() ||
+ OldSets_lock->owned_by_self(),
+ hrs_ext_msg(this, "master humongous set MT safety protocol "
+ "at a safepoint"));
+ } else {
+ guarantee(Heap_lock->owned_by_self(),
+ hrs_ext_msg(this, "master humongous set MT safety protocol "
+ "outside a safepoint"));
+ }
+
return HumongousRegionSet::check_mt_safety();
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.hpp
index 82636a5..6642326 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.hpp
@@ -61,6 +61,30 @@ public:
SecondaryFreeRegionList(const char* name) : FreeRegionList(name) { }
};
+//////////////////// OldRegionSet ////////////////////
+
+class OldRegionSet : public HeapRegionSet {
+protected:
+ virtual const char* verify_region_extra(HeapRegion* hr);
+
+ virtual bool regions_humongous() { return false; }
+ virtual bool regions_empty() { return false; }
+
+public:
+ OldRegionSet(const char* name) : HeapRegionSet(name) { }
+};
+
+//////////////////// MasterOldRegionSet ////////////////////
+
+class MasterOldRegionSet : public OldRegionSet {
+private:
+protected:
+ virtual bool check_mt_safety();
+
+public:
+ MasterOldRegionSet(const char* name) : OldRegionSet(name) { }
+};
+
//////////////////// HumongousRegionSet ////////////////////
class HumongousRegionSet : public HeapRegionSet {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp b/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp
index 5a7a7b6..ea0c19a 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp
@@ -29,6 +29,7 @@
#include "memory/sharedHeap.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/thread.hpp"
+#include "runtime/vmThread.hpp"
// This method removes entries from an SATB buffer that will not be
// useful to the concurrent marking threads. An entry is removed if it
@@ -252,9 +253,18 @@ void SATBMarkQueueSet::par_iterate_closure_all_threads(int worker) {
t->satb_mark_queue().apply_closure(_par_closures[worker]);
}
}
- // We'll have worker 0 do this one.
- if (worker == 0) {
- shared_satb_queue()->apply_closure(_par_closures[0]);
+
+ // We also need to claim the VMThread so that its parity is updated
+ // otherwise the next call to Thread::possibly_parallel_oops_do inside
+ // a StrongRootsScope might skip the VMThread because it has a stale
+ // parity that matches the parity set by the StrongRootsScope
+ //
+ // Whichever worker succeeds in claiming the VMThread gets to do
+ // the shared queue.
+
+ VMThread* vmt = VMThread::vm_thread();
+ if (vmt->claim_oops_do(true, parity)) {
+ shared_satb_queue()->apply_closure(_par_closures[worker]);
}
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp b/hotspot/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp
new file mode 100644
index 0000000..63c0e94
--- /dev/null
+++ b/hotspot/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
+#define SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
+
+#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc_implementation/g1/heapRegionSeq.inline.hpp"
+#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
+
+#define VM_STRUCTS_G1(nonstatic_field, static_field) \
+ \
+ static_field(HeapRegion, GrainBytes, size_t) \
+ \
+ nonstatic_field(HeapRegionSeq, _regions, HeapRegion**) \
+ nonstatic_field(HeapRegionSeq, _length, size_t) \
+ \
+ nonstatic_field(G1CollectedHeap, _hrs, HeapRegionSeq) \
+ nonstatic_field(G1CollectedHeap, _g1_committed, MemRegion) \
+ nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t) \
+ nonstatic_field(G1CollectedHeap, _g1mm, G1MonitoringSupport*) \
+ \
+ nonstatic_field(G1MonitoringSupport, _eden_committed, size_t) \
+ nonstatic_field(G1MonitoringSupport, _eden_used, size_t) \
+ nonstatic_field(G1MonitoringSupport, _survivor_committed, size_t) \
+ nonstatic_field(G1MonitoringSupport, _survivor_used, size_t) \
+ nonstatic_field(G1MonitoringSupport, _old_committed, size_t) \
+ nonstatic_field(G1MonitoringSupport, _old_used, size_t) \
+
+
+#define VM_TYPES_G1(declare_type, declare_toplevel_type) \
+ \
+ declare_type(G1CollectedHeap, SharedHeap) \
+ \
+ declare_type(HeapRegion, ContiguousSpace) \
+ declare_toplevel_type(HeapRegionSeq) \
+ declare_toplevel_type(G1MonitoringSupport) \
+ \
+ declare_toplevel_type(G1CollectedHeap*) \
+ declare_toplevel_type(HeapRegion*) \
+ declare_toplevel_type(G1MonitoringSupport*) \
+
+
+#endif // SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
index 04d051b..befacd6 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1CollectorPolicy.hpp"
#include "gc_implementation/g1/vm_operations_g1.hpp"
@@ -165,6 +166,20 @@ void VM_G1IncCollectionPause::doit_epilogue() {
}
}
+void VM_CGC_Operation::acquire_pending_list_lock() {
+ // The caller may block while communicating
+ // with the SLT thread in order to acquire/release the PLL.
+ ConcurrentMarkThread::slt()->
+ manipulatePLL(SurrogateLockerThread::acquirePLL);
+}
+
+void VM_CGC_Operation::release_and_notify_pending_list_lock() {
+ // The caller may block while communicating
+ // with the SLT thread in order to acquire/release the PLL.
+ ConcurrentMarkThread::slt()->
+ manipulatePLL(SurrogateLockerThread::releaseAndNotifyPLL);
+}
+
void VM_CGC_Operation::doit() {
gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps);
TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty);
@@ -180,12 +195,19 @@ void VM_CGC_Operation::doit() {
}
bool VM_CGC_Operation::doit_prologue() {
+ // Note the relative order of the locks must match that in
+ // VM_GC_Operation::doit_prologue() or deadlocks can occur
+ acquire_pending_list_lock();
+
Heap_lock->lock();
SharedHeap::heap()->_thread_holds_heap_lock_for_gc = true;
return true;
}
void VM_CGC_Operation::doit_epilogue() {
+ // Note the relative order of the unlocks must match that in
+ // VM_GC_Operation::doit_epilogue()
SharedHeap::heap()->_thread_holds_heap_lock_for_gc = false;
Heap_lock->unlock();
+ release_and_notify_pending_list_lock();
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp
index 825818d..c8bbe06 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp
@@ -93,11 +93,17 @@ public:
}
};
-// Concurrent GC stop-the-world operations such as initial and final mark;
+// Concurrent GC stop-the-world operations such as remark and cleanup;
// consider sharing these with CMS's counterparts.
class VM_CGC_Operation: public VM_Operation {
VoidClosure* _cl;
const char* _printGCMessage;
+
+protected:
+ // java.lang.ref.Reference support
+ void acquire_pending_list_lock();
+ void release_and_notify_pending_list_lock();
+
public:
VM_CGC_Operation(VoidClosure* cl, const char *printGCMsg)
: _cl(cl), _printGCMessage(printGCMsg) { }
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
index 42e65f1..04d2c72 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
@@ -863,8 +863,6 @@ void ParallelScavengeHeap::prepare_for_verify() {
ensure_parsability(false); // no need to retire TLABs for verification
}
-void ParallelScavengeHeap::print() const { print_on(tty); }
-
void ParallelScavengeHeap::print_on(outputStream* st) const {
young_gen()->print_on(st);
old_gen()->print_on(st);
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
index 3d1065f..f9ff996 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
@@ -246,8 +246,7 @@ CollectorPolicy* collector_policy() const { return (CollectorPolicy*) _collector
jlong millis_since_last_gc();
void prepare_for_verify();
- void print() const;
- void print_on(outputStream* st) const;
+ virtual void print_on(outputStream* st) const;
virtual void print_gc_threads_on(outputStream* st) const;
virtual void gc_threads_do(ThreadClosure* tc) const;
virtual void print_tracing_info() const;
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
index 3d7e0ba..f2965e6 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
@@ -198,10 +198,9 @@ void PSMarkSweep::invoke_no_policy(bool clear_all_softrefs) {
allocate_stacks();
- NOT_PRODUCT(ref_processor()->verify_no_references_recorded());
COMPILER2_PRESENT(DerivedPointerTable::clear());
- ref_processor()->enable_discovery();
+ ref_processor()->enable_discovery(true /*verify_disabled*/, true /*verify_no_refs*/);
ref_processor()->setup_policy(clear_all_softrefs);
mark_sweep_phase1(clear_all_softrefs);
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
index 55cb343..a62059c 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
@@ -2069,10 +2069,9 @@ void PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
CodeCache::gc_prologue();
Threads::gc_prologue();
- NOT_PRODUCT(ref_processor()->verify_no_references_recorded());
COMPILER2_PRESENT(DerivedPointerTable::clear());
- ref_processor()->enable_discovery();
+ ref_processor()->enable_discovery(true /*verify_disabled*/, true /*verify_no_refs*/);
ref_processor()->setup_policy(maximum_heap_compaction);
bool marked_for_unloading = false;
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp
index 3569ed7..fc05b2e 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp
@@ -102,17 +102,15 @@ void PSPromotionLAB::flush() {
_state = flushed;
}
-bool PSPromotionLAB::unallocate_object(oop obj) {
+bool PSPromotionLAB::unallocate_object(HeapWord* obj, size_t obj_size) {
assert(Universe::heap()->is_in(obj), "Object outside heap");
if (contains(obj)) {
- HeapWord* object_end = (HeapWord*)obj + obj->size();
- assert(object_end <= top(), "Object crosses promotion LAB boundary");
+ HeapWord* object_end = obj + obj_size;
+ assert(object_end == top(), "Not matching last allocation");
- if (object_end == top()) {
- set_top((HeapWord*)obj);
- return true;
- }
+ set_top(obj);
+ return true;
}
return false;
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
index bed0c0c..fd6a7bf 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
@@ -73,7 +73,7 @@ class PSPromotionLAB : public CHeapObj {
bool is_flushed() { return _state == flushed; }
- bool unallocate_object(oop obj);
+ bool unallocate_object(HeapWord* obj, size_t obj_size);
// Returns a subregion containing all objects in this space.
MemRegion used_region() { return MemRegion(bottom(), top()); }
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
index ad58a90..255bb8e 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
@@ -380,10 +380,10 @@ oop PSPromotionManager::copy_to_survivor_space(oop o) {
// deallocate it, so we have to test. If the deallocation fails,
// overwrite with a filler object.
if (new_obj_is_tenured) {
- if (!_old_lab.unallocate_object(new_obj)) {
+ if (!_old_lab.unallocate_object((HeapWord*) new_obj, new_obj_size)) {
CollectedHeap::fill_with_object((HeapWord*) new_obj, new_obj_size);
}
- } else if (!_young_lab.unallocate_object(new_obj)) {
+ } else if (!_young_lab.unallocate_object((HeapWord*) new_obj, new_obj_size)) {
CollectedHeap::fill_with_object((HeapWord*) new_obj, new_obj_size);
}
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
index b223467..1094d17 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
@@ -350,10 +350,9 @@ bool PSScavenge::invoke_no_policy() {
}
save_to_space_top_before_gc();
- NOT_PRODUCT(reference_processor()->verify_no_references_recorded());
COMPILER2_PRESENT(DerivedPointerTable::clear());
- reference_processor()->enable_discovery();
+ reference_processor()->enable_discovery(true /*verify_disabled*/, true /*verify_no_refs*/);
reference_processor()->setup_policy(false);
// We track how much was promoted to the next generation for
diff --git a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp b/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp
index a231e5d..0dea420 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp
@@ -224,6 +224,8 @@ void SurrogateLockerThread::manipulatePLL(SLT_msg_type msg) {
MutexLockerEx x(&_monitor, Mutex::_no_safepoint_check_flag);
assert(_buffer == empty, "Should be empty");
assert(msg != empty, "empty message");
+ assert(!Heap_lock->owned_by_self(), "Heap_lock owned by requesting thread");
+
_buffer = msg;
while (_buffer != empty) {
_monitor.notify();
diff --git a/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp b/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp
index f07f486..68ab6ff 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp
@@ -26,14 +26,10 @@
#include "gc_implementation/shared/generationCounters.hpp"
#include "memory/resourceArea.hpp"
-
-GenerationCounters::GenerationCounters(const char* name,
- int ordinal, int spaces,
- VirtualSpace* v):
- _virtual_space(v) {
-
+void GenerationCounters::initialize(const char* name, int ordinal, int spaces,
+ size_t min_capacity, size_t max_capacity,
+ size_t curr_capacity) {
if (UsePerfData) {
-
EXCEPTION_MARK;
ResourceMark rm;
@@ -51,18 +47,37 @@ GenerationCounters::GenerationCounters(const char* name,
cname = PerfDataManager::counter_name(_name_space, "minCapacity");
PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes,
- _virtual_space == NULL ? 0 :
- _virtual_space->committed_size(), CHECK);
+ min_capacity, CHECK);
cname = PerfDataManager::counter_name(_name_space, "maxCapacity");
PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes,
- _virtual_space == NULL ? 0 :
- _virtual_space->reserved_size(), CHECK);
+ max_capacity, CHECK);
cname = PerfDataManager::counter_name(_name_space, "capacity");
- _current_size = PerfDataManager::create_variable(SUN_GC, cname,
- PerfData::U_Bytes,
- _virtual_space == NULL ? 0 :
- _virtual_space->committed_size(), CHECK);
+ _current_size =
+ PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes,
+ curr_capacity, CHECK);
}
}
+
+GenerationCounters::GenerationCounters(const char* name,
+ int ordinal, int spaces,
+ VirtualSpace* v)
+ : _virtual_space(v) {
+ assert(v != NULL, "don't call this constructor if v == NULL");
+ initialize(name, ordinal, spaces,
+ v->committed_size(), v->reserved_size(), v->committed_size());
+}
+
+GenerationCounters::GenerationCounters(const char* name,
+ int ordinal, int spaces,
+ size_t min_capacity, size_t max_capacity,
+ size_t curr_capacity)
+ : _virtual_space(NULL) {
+ initialize(name, ordinal, spaces, min_capacity, max_capacity, curr_capacity);
+}
+
+void GenerationCounters::update_all() {
+ assert(_virtual_space != NULL, "otherwise, override this method");
+ _current_size->set_value(_virtual_space->committed_size());
+}
diff --git a/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp b/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
index 21f7691..f399b95 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
@@ -34,6 +34,11 @@
class GenerationCounters: public CHeapObj {
friend class VMStructs;
+private:
+ void initialize(const char* name, int ordinal, int spaces,
+ size_t min_capacity, size_t max_capacity,
+ size_t curr_capacity);
+
protected:
PerfVariable* _current_size;
VirtualSpace* _virtual_space;
@@ -48,11 +53,18 @@ class GenerationCounters: public CHeapObj {
char* _name_space;
// This constructor is only meant for use with the PSGenerationCounters
- // constructor. The need for such an constructor should be eliminated
+ // constructor. The need for such an constructor should be eliminated
// when VirtualSpace and PSVirtualSpace are unified.
- GenerationCounters() : _name_space(NULL), _current_size(NULL), _virtual_space(NULL) {}
- public:
+ GenerationCounters()
+ : _name_space(NULL), _current_size(NULL), _virtual_space(NULL) {}
+
+ // This constructor is used for subclasses that do not have a space
+ // associated with them (e.g, in G1).
+ GenerationCounters(const char* name, int ordinal, int spaces,
+ size_t min_capacity, size_t max_capacity,
+ size_t curr_capacity);
+ public:
GenerationCounters(const char* name, int ordinal, int spaces,
VirtualSpace* v);
@@ -60,10 +72,7 @@ class GenerationCounters: public CHeapObj {
if (_name_space != NULL) FREE_C_HEAP_ARRAY(char, _name_space);
}
- virtual void update_all() {
- _current_size->set_value(_virtual_space == NULL ? 0 :
- _virtual_space->committed_size());
- }
+ virtual void update_all();
const char* name_space() const { return _name_space; }
diff --git a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
index 0828c9c..19ea6cd 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
@@ -40,20 +40,32 @@
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#endif
+#ifndef USDT2
HS_DTRACE_PROBE_DECL1(hotspot, gc__begin, bool);
HS_DTRACE_PROBE_DECL(hotspot, gc__end);
+#endif /* !USDT2 */
// The same dtrace probe can't be inserted in two different files, so we
// have to call it here, so it's only in one file. Can't create new probes
// for the other file anymore. The dtrace probes have to remain stable.
void VM_GC_Operation::notify_gc_begin(bool full) {
+#ifndef USDT2
HS_DTRACE_PROBE1(hotspot, gc__begin, full);
HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
+#else /* USDT2 */
+ HOTSPOT_GC_BEGIN(
+ full);
+#endif /* USDT2 */
}
void VM_GC_Operation::notify_gc_end() {
+#ifndef USDT2
HS_DTRACE_PROBE(hotspot, gc__end);
HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
+#else /* USDT2 */
+ HOTSPOT_GC_END(
+);
+#endif /* USDT2 */
}
void VM_GC_Operation::acquire_pending_list_lock() {
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp b/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
index 0a4b42c..3623e9b 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
@@ -28,6 +28,7 @@
#include "gc_interface/collectedHeap.hpp"
#include "gc_interface/collectedHeap.inline.hpp"
#include "oops/oop.inline.hpp"
+#include "oops/instanceMirrorKlass.hpp"
#include "runtime/init.hpp"
#include "services/heapDumper.hpp"
#ifdef TARGET_OS_FAMILY_linux
@@ -436,3 +437,37 @@ void CollectedHeap::post_full_gc_dump() {
inspector.doit();
}
}
+
+oop CollectedHeap::Class_obj_allocate(KlassHandle klass, int size, KlassHandle real_klass, TRAPS) {
+ debug_only(check_for_valid_allocation_state());
+ assert(!Universe::heap()->is_gc_active(), "Allocation during gc not allowed");
+ assert(size >= 0, "int won't convert to size_t");
+ HeapWord* obj;
+ if (JavaObjectsInPerm) {
+ obj = common_permanent_mem_allocate_init(size, CHECK_NULL);
+ } else {
+ assert(ScavengeRootsInCode > 0, "must be");
+ obj = common_mem_allocate_init(size, CHECK_NULL);
+ }
+ post_allocation_setup_common(klass, obj, size);
+ assert(Universe::is_bootstrapping() ||
+ !((oop)obj)->blueprint()->oop_is_array(), "must not be an array");
+ NOT_PRODUCT(Universe::heap()->check_for_bad_heap_word_value(obj, size));
+ oop mirror = (oop)obj;
+
+ java_lang_Class::set_oop_size(mirror, size);
+
+ // Setup indirections
+ if (!real_klass.is_null()) {
+ java_lang_Class::set_klass(mirror, real_klass());
+ real_klass->set_java_mirror(mirror);
+ }
+
+ instanceMirrorKlass* mk = instanceMirrorKlass::cast(mirror->klass());
+ assert(size == mk->instance_size(real_klass), "should have been set");
+
+ // notify jvmti and dtrace
+ post_allocation_notify(klass, (oop)obj);
+
+ return mirror;
+}
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
index 5761ea5..726a30e 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
@@ -319,6 +319,9 @@ class CollectedHeap : public CHeapObj {
// VM (then terminate).
virtual void preload_and_dump(TRAPS) { ShouldNotReachHere(); }
+ // Allocate and initialize instances of Class
+ static oop Class_obj_allocate(KlassHandle klass, int size, KlassHandle real_klass, TRAPS);
+
// General obj/array allocation facilities.
inline static oop obj_allocate(KlassHandle klass, int size, TRAPS);
inline static oop array_allocate(KlassHandle klass, int size, int length, TRAPS);
@@ -587,13 +590,27 @@ class CollectedHeap : public CHeapObj {
void pre_full_gc_dump();
void post_full_gc_dump();
- virtual void print() const = 0;
+ // Print heap information on the given outputStream.
virtual void print_on(outputStream* st) const = 0;
+ // The default behavior is to call print_on() on tty.
+ virtual void print() const {
+ print_on(tty);
+ }
+ // Print more detailed heap information on the given
+ // outputStream. The default behaviour is to call print_on(). It is
+ // up to each subclass to override it and add any additional output
+ // it needs.
+ virtual void print_extended_on(outputStream* st) const {
+ print_on(st);
+ }
// Print all GC threads (other than the VM thread)
// used by this heap.
virtual void print_gc_threads_on(outputStream* st) const = 0;
- void print_gc_threads() { print_gc_threads_on(tty); }
+ // The default behavior is to call print_gc_threads_on() on tty.
+ void print_gc_threads() {
+ print_gc_threads_on(tty);
+ }
// Iterator for all GC threads (other than VM thread)
virtual void gc_threads_do(ThreadClosure* tc) const = 0;
diff --git a/hotspot/src/share/vm/gc_interface/gcCause.cpp b/hotspot/src/share/vm/gc_interface/gcCause.cpp
index 358b6b1..c4abd12 100644
--- a/hotspot/src/share/vm/gc_interface/gcCause.cpp
+++ b/hotspot/src/share/vm/gc_interface/gcCause.cpp
@@ -42,12 +42,6 @@ const char* GCCause::to_string(GCCause::Cause cause) {
case _jvmti_force_gc:
return "JvmtiEnv ForceGarbageCollection";
- case _no_gc:
- return "No GC";
-
- case _allocation_failure:
- return "Allocation Failure";
-
case _gc_locker:
return "GCLocker Initiated GC";
@@ -57,6 +51,12 @@ const char* GCCause::to_string(GCCause::Cause cause) {
case _heap_dump:
return "Heap Dump Initiated GC";
+ case _no_gc:
+ return "No GC";
+
+ case _allocation_failure:
+ return "Allocation Failure";
+
case _tenured_generation_full:
return "Tenured Generation Full";
@@ -78,6 +78,9 @@ const char* GCCause::to_string(GCCause::Cause cause) {
case _old_generation_too_full_to_scavenge:
return "Old Generation Too Full To Scavenge";
+ case _adaptive_size_policy:
+ return "Ergonomics";
+
case _g1_inc_collection_pause:
return "G1 Evacuation Pause";
diff --git a/hotspot/src/share/vm/interpreter/bytecode.hpp b/hotspot/src/share/vm/interpreter/bytecode.hpp
index 7fb50df..107161a 100644
--- a/hotspot/src/share/vm/interpreter/bytecode.hpp
+++ b/hotspot/src/share/vm/interpreter/bytecode.hpp
@@ -234,6 +234,13 @@ class Bytecode_invoke: public Bytecode_member_ref {
is_invokespecial() ||
is_invokedynamic(); }
+ bool is_method_handle_invoke() const {
+ return (is_invokedynamic() ||
+ (is_invokevirtual() &&
+ method()->constants()->klass_ref_at_noresolve(index()) == vmSymbols::java_lang_invoke_MethodHandle() &&
+ methodOopDesc::is_method_handle_invoke_name(name())));
+ }
+
// Helper to skip verification. Used is_valid() to check if the result is really an invoke
inline friend Bytecode_invoke Bytecode_invoke_check(methodHandle method, int bci);
};
diff --git a/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp b/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp
index b9f64ed..e510358 100644
--- a/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp
+++ b/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp
@@ -241,7 +241,7 @@ bool BytecodePrinter::check_index(int i, int& cp_index, outputStream* st) {
st->print_cr(" not secondary entry?", i);
return false;
}
- i = cache->entry_at(i)->main_entry_index();
+ i = cache->entry_at(i)->main_entry_index() + constantPoolOopDesc::CPCACHE_INDEX_TAG;
goto check_cache_index;
} else {
st->print_cr(" not in cache[*]?", i);
diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
index 7b7b49d..c3eb879 100644
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -549,8 +549,8 @@ IRT_ENTRY(void, InterpreterRuntime::resolve_get_put(JavaThread* thread, Bytecode
if (is_put && !is_static && klass->is_subclass_of(SystemDictionary::CallSite_klass()) && (info.name() == vmSymbols::target_name())) {
const jint direction = frame::interpreter_frame_expression_stack_direction();
- oop call_site = *((oop*) thread->last_frame().interpreter_frame_tos_at(-1 * direction));
- oop method_handle = *((oop*) thread->last_frame().interpreter_frame_tos_at( 0 * direction));
+ Handle call_site (THREAD, *((oop*) thread->last_frame().interpreter_frame_tos_at(-1 * direction)));
+ Handle method_handle(THREAD, *((oop*) thread->last_frame().interpreter_frame_tos_at( 0 * direction)));
assert(call_site ->is_a(SystemDictionary::CallSite_klass()), "must be");
assert(method_handle->is_a(SystemDictionary::MethodHandle_klass()), "must be");
diff --git a/hotspot/src/share/vm/libadt/vectset.cpp b/hotspot/src/share/vm/libadt/vectset.cpp
index 93cb48d..0042ca7 100644
--- a/hotspot/src/share/vm/libadt/vectset.cpp
+++ b/hotspot/src/share/vm/libadt/vectset.cpp
@@ -350,6 +350,21 @@ int VectorSet::hash() const
return (int)_xor;
}
+//------------------------------iterate----------------------------------------
+// Used by Set::print().
+class VSetI_ : public SetI_ {
+ VectorSetI vsi;
+public:
+ VSetI_( const VectorSet *vset, uint &elem ) : vsi(vset) { elem = vsi.elem; }
+
+ uint next(void) { ++vsi; return vsi.elem; }
+ int test(void) { return vsi.test(); }
+};
+
+SetI_ *VectorSet::iterate(uint &elem) const {
+ return new(ResourceObj::C_HEAP) VSetI_(this, elem);
+}
+
//=============================================================================
//------------------------------next-------------------------------------------
// Find and return the next element of a vector set, or return garbage and
diff --git a/hotspot/src/share/vm/libadt/vectset.hpp b/hotspot/src/share/vm/libadt/vectset.hpp
index c184773..552fdd1 100644
--- a/hotspot/src/share/vm/libadt/vectset.hpp
+++ b/hotspot/src/share/vm/libadt/vectset.hpp
@@ -151,7 +151,7 @@ public:
private:
- SetI_ *iterate(uint&) const { ShouldNotCallThis(); return NULL; } // Removed
+ SetI_ *iterate(uint&) const;
};
//------------------------------Iteration--------------------------------------
diff --git a/hotspot/src/share/vm/memory/genCollectedHeap.cpp b/hotspot/src/share/vm/memory/genCollectedHeap.cpp
index f233cbc..babb006 100644
--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp
@@ -599,8 +599,7 @@ void GenCollectedHeap::do_collection(bool full,
// atomic wrt other collectors in this configuration, we
// are guaranteed to have empty discovered ref lists.
if (rp->discovery_is_atomic()) {
- rp->verify_no_references_recorded();
- rp->enable_discovery();
+ rp->enable_discovery(true /*verify_disabled*/, true /*verify_no_refs*/);
rp->setup_policy(do_clear_all_soft_refs);
} else {
// collect() below will enable discovery as appropriate
@@ -1271,7 +1270,6 @@ void GenCollectedHeap::verify(bool allow_dirty, bool silent, VerifyOption option
rem_set()->verify();
}
-void GenCollectedHeap::print() const { print_on(tty); }
void GenCollectedHeap::print_on(outputStream* st) const {
for (int i = 0; i < _n_gens; i++) {
_gens[i]->print_on(st);
diff --git a/hotspot/src/share/vm/memory/genCollectedHeap.hpp b/hotspot/src/share/vm/memory/genCollectedHeap.hpp
index 9c15377..e7bea64 100644
--- a/hotspot/src/share/vm/memory/genCollectedHeap.hpp
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.hpp
@@ -360,8 +360,7 @@ public:
void verify(bool allow_dirty, bool silent, VerifyOption option);
// Override.
- void print() const;
- void print_on(outputStream* st) const;
+ virtual void print_on(outputStream* st) const;
virtual void print_gc_threads_on(outputStream* st) const;
virtual void gc_threads_do(ThreadClosure* tc) const;
virtual void print_tracing_info() const;
diff --git a/hotspot/src/share/vm/memory/referencePolicy.cpp b/hotspot/src/share/vm/memory/referencePolicy.cpp
index 2af4368..a667332 100644
--- a/hotspot/src/share/vm/memory/referencePolicy.cpp
+++ b/hotspot/src/share/vm/memory/referencePolicy.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -41,8 +41,9 @@ void LRUCurrentHeapPolicy::setup() {
// The oop passed in is the SoftReference object, and not
// the object the SoftReference points to.
-bool LRUCurrentHeapPolicy::should_clear_reference(oop p) {
- jlong interval = java_lang_ref_SoftReference::clock() - java_lang_ref_SoftReference::timestamp(p);
+bool LRUCurrentHeapPolicy::should_clear_reference(oop p,
+ jlong timestamp_clock) {
+ jlong interval = timestamp_clock - java_lang_ref_SoftReference::timestamp(p);
assert(interval >= 0, "Sanity check");
// The interval will be zero if the ref was accessed since the last scavenge/gc.
@@ -71,8 +72,9 @@ void LRUMaxHeapPolicy::setup() {
// The oop passed in is the SoftReference object, and not
// the object the SoftReference points to.
-bool LRUMaxHeapPolicy::should_clear_reference(oop p) {
- jlong interval = java_lang_ref_SoftReference::clock() - java_lang_ref_SoftReference::timestamp(p);
+bool LRUMaxHeapPolicy::should_clear_reference(oop p,
+ jlong timestamp_clock) {
+ jlong interval = timestamp_clock - java_lang_ref_SoftReference::timestamp(p);
assert(interval >= 0, "Sanity check");
// The interval will be zero if the ref was accessed since the last scavenge/gc.
diff --git a/hotspot/src/share/vm/memory/referencePolicy.hpp b/hotspot/src/share/vm/memory/referencePolicy.hpp
index 9672ed9..6616f25 100644
--- a/hotspot/src/share/vm/memory/referencePolicy.hpp
+++ b/hotspot/src/share/vm/memory/referencePolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -31,19 +31,27 @@
class ReferencePolicy : public CHeapObj {
public:
- virtual bool should_clear_reference(oop p) { ShouldNotReachHere(); return true; }
+ virtual bool should_clear_reference(oop p, jlong timestamp_clock) {
+ ShouldNotReachHere();
+ return true;
+ }
+
// Capture state (of-the-VM) information needed to evaluate the policy
virtual void setup() { /* do nothing */ }
};
class NeverClearPolicy : public ReferencePolicy {
public:
- bool should_clear_reference(oop p) { return false; }
+ virtual bool should_clear_reference(oop p, jlong timestamp_clock) {
+ return false;
+ }
};
class AlwaysClearPolicy : public ReferencePolicy {
public:
- bool should_clear_reference(oop p) { return true; }
+ virtual bool should_clear_reference(oop p, jlong timestamp_clock) {
+ return true;
+ }
};
class LRUCurrentHeapPolicy : public ReferencePolicy {
@@ -55,7 +63,7 @@ class LRUCurrentHeapPolicy : public ReferencePolicy {
// Capture state (of-the-VM) information needed to evaluate the policy
void setup();
- bool should_clear_reference(oop p);
+ virtual bool should_clear_reference(oop p, jlong timestamp_clock);
};
class LRUMaxHeapPolicy : public ReferencePolicy {
@@ -67,7 +75,7 @@ class LRUMaxHeapPolicy : public ReferencePolicy {
// Capture state (of-the-VM) information needed to evaluate the policy
void setup();
- bool should_clear_reference(oop p);
+ virtual bool should_clear_reference(oop p, jlong timestamp_clock);
};
#endif // SHARE_VM_MEMORY_REFERENCEPOLICY_HPP
diff --git a/hotspot/src/share/vm/memory/referenceProcessor.cpp b/hotspot/src/share/vm/memory/referenceProcessor.cpp
index 9b593ef..e0dabaf 100644
--- a/hotspot/src/share/vm/memory/referenceProcessor.cpp
+++ b/hotspot/src/share/vm/memory/referenceProcessor.cpp
@@ -35,49 +35,20 @@
ReferencePolicy* ReferenceProcessor::_always_clear_soft_ref_policy = NULL;
ReferencePolicy* ReferenceProcessor::_default_soft_ref_policy = NULL;
-const int subclasses_of_ref = REF_PHANTOM - REF_OTHER;
bool ReferenceProcessor::_pending_list_uses_discovered_field = false;
-
-// List of discovered references.
-class DiscoveredList {
-public:
- DiscoveredList() : _len(0), _compressed_head(0), _oop_head(NULL) { }
- oop head() const {
- return UseCompressedOops ? oopDesc::decode_heap_oop(_compressed_head) :
- _oop_head;
- }
- HeapWord* adr_head() {
- return UseCompressedOops ? (HeapWord*)&_compressed_head :
- (HeapWord*)&_oop_head;
- }
- void set_head(oop o) {
- if (UseCompressedOops) {
- // Must compress the head ptr.
- _compressed_head = oopDesc::encode_heap_oop(o);
- } else {
- _oop_head = o;
- }
- }
- bool empty() const { return head() == NULL; }
- size_t length() { return _len; }
- void set_length(size_t len) { _len = len; }
- void inc_length(size_t inc) { _len += inc; assert(_len > 0, "Error"); }
- void dec_length(size_t dec) { _len -= dec; }
-private:
- // Set value depending on UseCompressedOops. This could be a template class
- // but then we have to fix all the instantiations and declarations that use this class.
- oop _oop_head;
- narrowOop _compressed_head;
- size_t _len;
-};
+jlong ReferenceProcessor::_soft_ref_timestamp_clock = 0;
void referenceProcessor_init() {
ReferenceProcessor::init_statics();
}
void ReferenceProcessor::init_statics() {
- // Initialize the master soft ref clock.
- java_lang_ref_SoftReference::set_clock(os::javaTimeMillis());
+ jlong now = os::javaTimeMillis();
+
+ // Initialize the soft ref timestamp clock.
+ _soft_ref_timestamp_clock = now;
+ // Also update the soft ref clock in j.l.r.SoftReference
+ java_lang_ref_SoftReference::set_clock(_soft_ref_timestamp_clock);
_always_clear_soft_ref_policy = new AlwaysClearPolicy();
_default_soft_ref_policy = new COMPILER2_PRESENT(LRUMaxHeapPolicy())
@@ -91,6 +62,28 @@ void ReferenceProcessor::init_statics() {
_pending_list_uses_discovered_field = JDK_Version::current().pending_list_uses_discovered_field();
}
+void ReferenceProcessor::enable_discovery(bool verify_disabled, bool check_no_refs) {
+#ifdef ASSERT
+ // Verify that we're not currently discovering refs
+ assert(!verify_disabled || !_discovering_refs, "nested call?");
+
+ if (check_no_refs) {
+ // Verify that the discovered lists are empty
+ verify_no_references_recorded();
+ }
+#endif // ASSERT
+
+ // Someone could have modified the value of the static
+ // field in the j.l.r.SoftReference class that holds the
+ // soft reference timestamp clock using reflection or
+ // Unsafe between GCs. Unconditionally update the static
+ // field in ReferenceProcessor here so that we use the new
+ // value during reference discovery.
+
+ _soft_ref_timestamp_clock = java_lang_ref_SoftReference::clock();
+ _discovering_refs = true;
+}
+
ReferenceProcessor::ReferenceProcessor(MemRegion span,
bool mt_processing,
int mt_processing_degree,
@@ -112,18 +105,22 @@ ReferenceProcessor::ReferenceProcessor(MemRegion span,
_discovery_is_mt = mt_discovery;
_num_q = MAX2(1, mt_processing_degree);
_max_num_q = MAX2(_num_q, mt_discovery_degree);
- _discoveredSoftRefs = NEW_C_HEAP_ARRAY(DiscoveredList, _max_num_q * subclasses_of_ref);
- if (_discoveredSoftRefs == NULL) {
+ _discovered_refs = NEW_C_HEAP_ARRAY(DiscoveredList,
+ _max_num_q * number_of_subclasses_of_ref());
+ if (_discovered_refs == NULL) {
vm_exit_during_initialization("Could not allocated RefProc Array");
}
+ _discoveredSoftRefs = &_discovered_refs[0];
_discoveredWeakRefs = &_discoveredSoftRefs[_max_num_q];
_discoveredFinalRefs = &_discoveredWeakRefs[_max_num_q];
_discoveredPhantomRefs = &_discoveredFinalRefs[_max_num_q];
- // Initialized all entries to NULL
- for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
- _discoveredSoftRefs[i].set_head(NULL);
- _discoveredSoftRefs[i].set_length(0);
+
+ // Initialize all entries to NULL
+ for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+ _discovered_refs[i].set_head(NULL);
+ _discovered_refs[i].set_length(0);
}
+
// If we do barriers, cache a copy of the barrier set.
if (discovered_list_needs_barrier) {
_bs = Universe::heap()->barrier_set();
@@ -134,23 +131,19 @@ ReferenceProcessor::ReferenceProcessor(MemRegion span,
#ifndef PRODUCT
void ReferenceProcessor::verify_no_references_recorded() {
guarantee(!_discovering_refs, "Discovering refs?");
- for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
- guarantee(_discoveredSoftRefs[i].empty(),
+ for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+ guarantee(_discovered_refs[i].is_empty(),
"Found non-empty discovered list");
}
}
#endif
void ReferenceProcessor::weak_oops_do(OopClosure* f) {
- // Should this instead be
- // for (int i = 0; i < subclasses_of_ref; i++_ {
- // for (int j = 0; j < _num_q; j++) {
- // int index = i * _max_num_q + j;
- for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
+ for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
if (UseCompressedOops) {
- f->do_oop((narrowOop*)_discoveredSoftRefs[i].adr_head());
+ f->do_oop((narrowOop*)_discovered_refs[i].adr_head());
} else {
- f->do_oop((oop*)_discoveredSoftRefs[i].adr_head());
+ f->do_oop((oop*)_discovered_refs[i].adr_head());
}
}
}
@@ -159,17 +152,21 @@ void ReferenceProcessor::update_soft_ref_master_clock() {
// Update (advance) the soft ref master clock field. This must be done
// after processing the soft ref list.
jlong now = os::javaTimeMillis();
- jlong clock = java_lang_ref_SoftReference::clock();
+ jlong soft_ref_clock = java_lang_ref_SoftReference::clock();
+ assert(soft_ref_clock == _soft_ref_timestamp_clock, "soft ref clocks out of sync");
+
NOT_PRODUCT(
- if (now < clock) {
- warning("time warp: %d to %d", clock, now);
+ if (now < _soft_ref_timestamp_clock) {
+ warning("time warp: "INT64_FORMAT" to "INT64_FORMAT,
+ _soft_ref_timestamp_clock, now);
}
)
// In product mode, protect ourselves from system time being adjusted
// externally and going backward; see note in the implementation of
// GenCollectedHeap::time_since_last_gc() for the right way to fix
// this uniformly throughout the VM; see bug-id 4741166. XXX
- if (now > clock) {
+ if (now > _soft_ref_timestamp_clock) {
+ _soft_ref_timestamp_clock = now;
java_lang_ref_SoftReference::set_clock(now);
}
// Else leave clock stalled at its old value until time progresses
@@ -187,6 +184,16 @@ void ReferenceProcessor::process_discovered_references(
// Stop treating discovered references specially.
disable_discovery();
+ // If discovery was concurrent, someone could have modified
+ // the value of the static field in the j.l.r.SoftReference
+ // class that holds the soft reference timestamp clock using
+ // reflection or Unsafe between when discovery was enabled and
+ // now. Unconditionally update the static field in ReferenceProcessor
+ // here so that we use the new value during processing of the
+ // discovered soft refs.
+
+ _soft_ref_timestamp_clock = java_lang_ref_SoftReference::clock();
+
bool trace_time = PrintGCDetails && PrintReferenceGC;
// Soft references
{
@@ -404,7 +411,7 @@ public:
// allocated and are indexed into.
assert(_n_queues == (int) _ref_processor.max_num_q(), "Different number not expected");
for (int j = 0;
- j < subclasses_of_ref;
+ j < ReferenceProcessor::number_of_subclasses_of_ref();
j++, index += _n_queues) {
_ref_processor.enqueue_discovered_reflist(
_refs_lists[index], _pending_list_addr);
@@ -419,132 +426,20 @@ void ReferenceProcessor::enqueue_discovered_reflists(HeapWord* pending_list_addr
AbstractRefProcTaskExecutor* task_executor) {
if (_processing_is_mt && task_executor != NULL) {
// Parallel code
- RefProcEnqueueTask tsk(*this, _discoveredSoftRefs,
+ RefProcEnqueueTask tsk(*this, _discovered_refs,
pending_list_addr, _max_num_q);
task_executor->execute(tsk);
} else {
// Serial code: call the parent class's implementation
- for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
- enqueue_discovered_reflist(_discoveredSoftRefs[i], pending_list_addr);
- _discoveredSoftRefs[i].set_head(NULL);
- _discoveredSoftRefs[i].set_length(0);
- }
- }
-}
-
-// Iterator for the list of discovered references.
-class DiscoveredListIterator {
-public:
- inline DiscoveredListIterator(DiscoveredList& refs_list,
- OopClosure* keep_alive,
- BoolObjectClosure* is_alive);
-
- // End Of List.
- inline bool has_next() const { return _ref != NULL; }
-
- // Get oop to the Reference object.
- inline oop obj() const { return _ref; }
-
- // Get oop to the referent object.
- inline oop referent() const { return _referent; }
-
- // Returns true if referent is alive.
- inline bool is_referent_alive() const;
-
- // Loads data for the current reference.
- // The "allow_null_referent" argument tells us to allow for the possibility
- // of a NULL referent in the discovered Reference object. This typically
- // happens in the case of concurrent collectors that may have done the
- // discovery concurrently, or interleaved, with mutator execution.
- inline void load_ptrs(DEBUG_ONLY(bool allow_null_referent));
-
- // Move to the next discovered reference.
- inline void next();
-
- // Remove the current reference from the list
- inline void remove();
-
- // Make the Reference object active again.
- inline void make_active() { java_lang_ref_Reference::set_next(_ref, NULL); }
-
- // Make the referent alive.
- inline void make_referent_alive() {
- if (UseCompressedOops) {
- _keep_alive->do_oop((narrowOop*)_referent_addr);
- } else {
- _keep_alive->do_oop((oop*)_referent_addr);
- }
- }
-
- // Update the discovered field.
- inline void update_discovered() {
- // First _prev_next ref actually points into DiscoveredList (gross).
- if (UseCompressedOops) {
- if (!oopDesc::is_null(*(narrowOop*)_prev_next)) {
- _keep_alive->do_oop((narrowOop*)_prev_next);
- }
- } else {
- if (!oopDesc::is_null(*(oop*)_prev_next)) {
- _keep_alive->do_oop((oop*)_prev_next);
- }
+ for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+ enqueue_discovered_reflist(_discovered_refs[i], pending_list_addr);
+ _discovered_refs[i].set_head(NULL);
+ _discovered_refs[i].set_length(0);
}
}
-
- // NULL out referent pointer.
- inline void clear_referent() { oop_store_raw(_referent_addr, NULL); }
-
- // Statistics
- NOT_PRODUCT(
- inline size_t processed() const { return _processed; }
- inline size_t removed() const { return _removed; }
- )
-
- inline void move_to_next();
-
-private:
- DiscoveredList& _refs_list;
- HeapWord* _prev_next;
- oop _prev;
- oop _ref;
- HeapWord* _discovered_addr;
- oop _next;
- HeapWord* _referent_addr;
- oop _referent;
- OopClosure* _keep_alive;
- BoolObjectClosure* _is_alive;
- DEBUG_ONLY(
- oop _first_seen; // cyclic linked list check
- )
- NOT_PRODUCT(
- size_t _processed;
- size_t _removed;
- )
-};
-
-inline DiscoveredListIterator::DiscoveredListIterator(DiscoveredList& refs_list,
- OopClosure* keep_alive,
- BoolObjectClosure* is_alive)
- : _refs_list(refs_list),
- _prev_next(refs_list.adr_head()),
- _prev(NULL),
- _ref(refs_list.head()),
-#ifdef ASSERT
- _first_seen(refs_list.head()),
-#endif
-#ifndef PRODUCT
- _processed(0),
- _removed(0),
-#endif
- _next(NULL),
- _keep_alive(keep_alive),
- _is_alive(is_alive)
-{ }
-
-inline bool DiscoveredListIterator::is_referent_alive() const {
- return _is_alive->do_object_b(_referent);
}
-inline void DiscoveredListIterator::load_ptrs(DEBUG_ONLY(bool allow_null_referent)) {
+void DiscoveredListIterator::load_ptrs(DEBUG_ONLY(bool allow_null_referent)) {
_discovered_addr = java_lang_ref_Reference::discovered_addr(_ref);
oop discovered = java_lang_ref_Reference::discovered(_ref);
assert(_discovered_addr && discovered->is_oop_or_null(),
@@ -560,13 +455,7 @@ inline void DiscoveredListIterator::load_ptrs(DEBUG_ONLY(bool allow_null_referen
"bad referent");
}
-inline void DiscoveredListIterator::next() {
- _prev_next = _discovered_addr;
- _prev = _ref;
- move_to_next();
-}
-
-inline void DiscoveredListIterator::remove() {
+void DiscoveredListIterator::remove() {
assert(_ref->is_oop(), "Dropping a bad reference");
oop_store_raw(_discovered_addr, NULL);
@@ -592,15 +481,29 @@ inline void DiscoveredListIterator::remove() {
_refs_list.dec_length(1);
}
-inline void DiscoveredListIterator::move_to_next() {
- if (_ref == _next) {
- // End of the list.
- _ref = NULL;
+// Make the Reference object active again.
+void DiscoveredListIterator::make_active() {
+ // For G1 we don't want to use set_next - it
+ // will dirty the card for the next field of
+ // the reference object and will fail
+ // CT verification.
+ if (UseG1GC) {
+ BarrierSet* bs = oopDesc::bs();
+ HeapWord* next_addr = java_lang_ref_Reference::next_addr(_ref);
+
+ if (UseCompressedOops) {
+ bs->write_ref_field_pre((narrowOop*)next_addr, NULL);
+ } else {
+ bs->write_ref_field_pre((oop*)next_addr, NULL);
+ }
+ java_lang_ref_Reference::set_next_raw(_ref, NULL);
} else {
- _ref = _next;
+ java_lang_ref_Reference::set_next(_ref, NULL);
}
- assert(_ref != _first_seen, "cyclic ref_list found");
- NOT_PRODUCT(_processed++);
+}
+
+void DiscoveredListIterator::clear_referent() {
+ oop_store_raw(_referent_addr, NULL);
}
// NOTE: process_phase*() are largely similar, and at a high level
@@ -627,7 +530,8 @@ ReferenceProcessor::process_phase1(DiscoveredList& refs_list,
while (iter.has_next()) {
iter.load_ptrs(DEBUG_ONLY(!discovery_is_atomic() /* allow_null_referent */));
bool referent_is_dead = (iter.referent() != NULL) && !iter.is_referent_alive();
- if (referent_is_dead && !policy->should_clear_reference(iter.obj())) {
+ if (referent_is_dead &&
+ !policy->should_clear_reference(iter.obj(), _soft_ref_timestamp_clock)) {
if (TraceReferenceGC) {
gclog_or_tty->print_cr("Dropping reference (" INTPTR_FORMAT ": %s" ") by policy",
iter.obj(), iter.obj()->blueprint()->internal_name());
@@ -786,12 +690,11 @@ ReferenceProcessor::abandon_partial_discovered_list(DiscoveredList& refs_list) {
void ReferenceProcessor::abandon_partial_discovery() {
// loop over the lists
- for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
+ for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
if (TraceReferenceGC && PrintGCDetails && ((i % _max_num_q) == 0)) {
- gclog_or_tty->print_cr("\nAbandoning %s discovered list",
- list_name(i));
+ gclog_or_tty->print_cr("\nAbandoning %s discovered list", list_name(i));
}
- abandon_partial_discovered_list(_discoveredSoftRefs[i]);
+ abandon_partial_discovered_list(_discovered_refs[i]);
}
}
@@ -858,6 +761,14 @@ private:
bool _clear_referent;
};
+void ReferenceProcessor::set_discovered(oop ref, oop value) {
+ if (_discovered_list_needs_barrier) {
+ java_lang_ref_Reference::set_discovered(ref, value);
+ } else {
+ java_lang_ref_Reference::set_discovered_raw(ref, value);
+ }
+}
+
// Balances reference queues.
// Move entries from all queues[0, 1, ..., _max_num_q-1] to
// queues[0, 1, ..., _num_q-1] because only the first _num_q
@@ -915,9 +826,9 @@ void ReferenceProcessor::balance_queues(DiscoveredList ref_lists[])
// Add the chain to the to list.
if (ref_lists[to_idx].head() == NULL) {
// to list is empty. Make a loop at the end.
- java_lang_ref_Reference::set_discovered(move_tail, move_tail);
+ set_discovered(move_tail, move_tail);
} else {
- java_lang_ref_Reference::set_discovered(move_tail, ref_lists[to_idx].head());
+ set_discovered(move_tail, ref_lists[to_idx].head());
}
ref_lists[to_idx].set_head(move_head);
ref_lists[to_idx].inc_length(refs_to_move);
@@ -1038,17 +949,13 @@ ReferenceProcessor::process_discovered_reflist(
void ReferenceProcessor::clean_up_discovered_references() {
// loop over the lists
- // Should this instead be
- // for (int i = 0; i < subclasses_of_ref; i++_ {
- // for (int j = 0; j < _num_q; j++) {
- // int index = i * _max_num_q + j;
- for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
+ for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
if (TraceReferenceGC && PrintGCDetails && ((i % _max_num_q) == 0)) {
gclog_or_tty->print_cr(
"\nScrubbing %s discovered list of Null referents",
list_name(i));
}
- clean_up_discovered_reflist(_discoveredSoftRefs[i]);
+ clean_up_discovered_reflist(_discovered_refs[i]);
}
}
@@ -1255,11 +1162,13 @@ bool ReferenceProcessor::discover_reference(oop obj, ReferenceType rt) {
// time-stamp policies advance the soft-ref clock only
// at a major collection cycle, this is always currently
// accurate.
- if (!_current_soft_ref_policy->should_clear_reference(obj)) {
+ if (!_current_soft_ref_policy->should_clear_reference(obj, _soft_ref_timestamp_clock)) {
return false;
}
}
+ ResourceMark rm; // Needed for tracing.
+
HeapWord* const discovered_addr = java_lang_ref_Reference::discovered_addr(obj);
const oop discovered = java_lang_ref_Reference::discovered(obj);
assert(discovered->is_oop_or_null(), "bad discovered field");
@@ -1472,7 +1381,9 @@ ReferenceProcessor::preclean_discovered_reflist(DiscoveredList& refs_list,
}
const char* ReferenceProcessor::list_name(int i) {
- assert(i >= 0 && i <= _max_num_q * subclasses_of_ref, "Out of bounds index");
+ assert(i >= 0 && i <= _max_num_q * number_of_subclasses_of_ref(),
+ "Out of bounds index");
+
int j = i / _max_num_q;
switch (j) {
case 0: return "SoftRef";
@@ -1493,8 +1404,8 @@ void ReferenceProcessor::verify_ok_to_handle_reflists() {
#ifndef PRODUCT
void ReferenceProcessor::clear_discovered_references() {
guarantee(!_discovering_refs, "Discovering refs?");
- for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
- clear_discovered_references(_discoveredSoftRefs[i]);
+ for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+ clear_discovered_references(_discovered_refs[i]);
}
}
diff --git a/hotspot/src/share/vm/memory/referenceProcessor.hpp b/hotspot/src/share/vm/memory/referenceProcessor.hpp
index 8178f60..cbd8bfc 100644
--- a/hotspot/src/share/vm/memory/referenceProcessor.hpp
+++ b/hotspot/src/share/vm/memory/referenceProcessor.hpp
@@ -48,18 +48,177 @@
// forward references
class ReferencePolicy;
class AbstractRefProcTaskExecutor;
-class DiscoveredList;
+
+// List of discovered references.
+class DiscoveredList {
+public:
+ DiscoveredList() : _len(0), _compressed_head(0), _oop_head(NULL) { }
+ oop head() const {
+ return UseCompressedOops ? oopDesc::decode_heap_oop(_compressed_head) :
+ _oop_head;
+ }
+ HeapWord* adr_head() {
+ return UseCompressedOops ? (HeapWord*)&_compressed_head :
+ (HeapWord*)&_oop_head;
+ }
+ void set_head(oop o) {
+ if (UseCompressedOops) {
+ // Must compress the head ptr.
+ _compressed_head = oopDesc::encode_heap_oop(o);
+ } else {
+ _oop_head = o;
+ }
+ }
+ bool is_empty() const { return head() == NULL; }
+ size_t length() { return _len; }
+ void set_length(size_t len) { _len = len; }
+ void inc_length(size_t inc) { _len += inc; assert(_len > 0, "Error"); }
+ void dec_length(size_t dec) { _len -= dec; }
+private:
+ // Set value depending on UseCompressedOops. This could be a template class
+ // but then we have to fix all the instantiations and declarations that use this class.
+ oop _oop_head;
+ narrowOop _compressed_head;
+ size_t _len;
+};
+
+// Iterator for the list of discovered references.
+class DiscoveredListIterator {
+private:
+ DiscoveredList& _refs_list;
+ HeapWord* _prev_next;
+ oop _prev;
+ oop _ref;
+ HeapWord* _discovered_addr;
+ oop _next;
+ HeapWord* _referent_addr;
+ oop _referent;
+ OopClosure* _keep_alive;
+ BoolObjectClosure* _is_alive;
+
+ DEBUG_ONLY(
+ oop _first_seen; // cyclic linked list check
+ )
+
+ NOT_PRODUCT(
+ size_t _processed;
+ size_t _removed;
+ )
+
+public:
+ inline DiscoveredListIterator(DiscoveredList& refs_list,
+ OopClosure* keep_alive,
+ BoolObjectClosure* is_alive):
+ _refs_list(refs_list),
+ _prev_next(refs_list.adr_head()),
+ _prev(NULL),
+ _ref(refs_list.head()),
+#ifdef ASSERT
+ _first_seen(refs_list.head()),
+#endif
+#ifndef PRODUCT
+ _processed(0),
+ _removed(0),
+#endif
+ _next(NULL),
+ _keep_alive(keep_alive),
+ _is_alive(is_alive)
+{ }
+
+ // End Of List.
+ inline bool has_next() const { return _ref != NULL; }
+
+ // Get oop to the Reference object.
+ inline oop obj() const { return _ref; }
+
+ // Get oop to the referent object.
+ inline oop referent() const { return _referent; }
+
+ // Returns true if referent is alive.
+ inline bool is_referent_alive() const {
+ return _is_alive->do_object_b(_referent);
+ }
+
+ // Loads data for the current reference.
+ // The "allow_null_referent" argument tells us to allow for the possibility
+ // of a NULL referent in the discovered Reference object. This typically
+ // happens in the case of concurrent collectors that may have done the
+ // discovery concurrently, or interleaved, with mutator execution.
+ void load_ptrs(DEBUG_ONLY(bool allow_null_referent));
+
+ // Move to the next discovered reference.
+ inline void next() {
+ _prev_next = _discovered_addr;
+ _prev = _ref;
+ move_to_next();
+ }
+
+ // Remove the current reference from the list
+ void remove();
+
+ // Make the Reference object active again.
+ void make_active();
+
+ // Make the referent alive.
+ inline void make_referent_alive() {
+ if (UseCompressedOops) {
+ _keep_alive->do_oop((narrowOop*)_referent_addr);
+ } else {
+ _keep_alive->do_oop((oop*)_referent_addr);
+ }
+ }
+
+ // Update the discovered field.
+ inline void update_discovered() {
+ // First _prev_next ref actually points into DiscoveredList (gross).
+ if (UseCompressedOops) {
+ if (!oopDesc::is_null(*(narrowOop*)_prev_next)) {
+ _keep_alive->do_oop((narrowOop*)_prev_next);
+ }
+ } else {
+ if (!oopDesc::is_null(*(oop*)_prev_next)) {
+ _keep_alive->do_oop((oop*)_prev_next);
+ }
+ }
+ }
+
+ // NULL out referent pointer.
+ void clear_referent();
+
+ // Statistics
+ NOT_PRODUCT(
+ inline size_t processed() const { return _processed; }
+ inline size_t removed() const { return _removed; }
+ )
+
+ inline void move_to_next() {
+ if (_ref == _next) {
+ // End of the list.
+ _ref = NULL;
+ } else {
+ _ref = _next;
+ }
+ assert(_ref != _first_seen, "cyclic ref_list found");
+ NOT_PRODUCT(_processed++);
+ }
+};
class ReferenceProcessor : public CHeapObj {
protected:
// Compatibility with pre-4965777 JDK's
static bool _pending_list_uses_discovered_field;
- MemRegion _span; // (right-open) interval of heap
- // subject to wkref discovery
- bool _discovering_refs; // true when discovery enabled
- bool _discovery_is_atomic; // if discovery is atomic wrt
- // other collectors in configuration
- bool _discovery_is_mt; // true if reference discovery is MT.
+
+ // The SoftReference master timestamp clock
+ static jlong _soft_ref_timestamp_clock;
+
+ MemRegion _span; // (right-open) interval of heap
+ // subject to wkref discovery
+
+ bool _discovering_refs; // true when discovery enabled
+ bool _discovery_is_atomic; // if discovery is atomic wrt
+ // other collectors in configuration
+ bool _discovery_is_mt; // true if reference discovery is MT.
+
// If true, setting "next" field of a discovered refs list requires
// write barrier(s). (Must be true if used in a collector in which
// elements of a discovered list may be moved during discovery: for
@@ -67,18 +226,19 @@ class ReferenceProcessor : public CHeapObj {
// long-term concurrent marking phase that does weak reference
// discovery.)
bool _discovered_list_needs_barrier;
- BarrierSet* _bs; // Cached copy of BarrierSet.
- bool _enqueuing_is_done; // true if all weak references enqueued
- bool _processing_is_mt; // true during phases when
- // reference processing is MT.
- int _next_id; // round-robin mod _num_q counter in
- // support of work distribution
-
- // For collectors that do not keep GC marking information
+
+ BarrierSet* _bs; // Cached copy of BarrierSet.
+ bool _enqueuing_is_done; // true if all weak references enqueued
+ bool _processing_is_mt; // true during phases when
+ // reference processing is MT.
+ int _next_id; // round-robin mod _num_q counter in
+ // support of work distribution
+
+ // For collectors that do not keep GC liveness information
// in the object header, this field holds a closure that
// helps the reference processor determine the reachability
- // of an oop (the field is currently initialized to NULL for
- // all collectors but the CMS collector).
+ // of an oop. It is currently initialized to NULL for all
+ // collectors except for CMS and G1.
BoolObjectClosure* _is_alive_non_header;
// Soft ref clearing policies
@@ -95,17 +255,25 @@ class ReferenceProcessor : public CHeapObj {
int _num_q;
// The maximum MT'ness degree of the queues below
int _max_num_q;
- // Arrays of lists of oops, one per thread
+
+ // Master array of discovered oops
+ DiscoveredList* _discovered_refs;
+
+ // Arrays of lists of oops, one per thread (pointers into master array above)
DiscoveredList* _discoveredSoftRefs;
DiscoveredList* _discoveredWeakRefs;
DiscoveredList* _discoveredFinalRefs;
DiscoveredList* _discoveredPhantomRefs;
public:
- int num_q() { return _num_q; }
- int max_num_q() { return _max_num_q; }
- void set_active_mt_degree(int v) { _num_q = v; }
- DiscoveredList* discovered_soft_refs() { return _discoveredSoftRefs; }
+ static int number_of_subclasses_of_ref() { return (REF_PHANTOM - REF_OTHER); }
+
+ int num_q() { return _num_q; }
+ int max_num_q() { return _max_num_q; }
+ void set_active_mt_degree(int v) { _num_q = v; }
+
+ DiscoveredList* discovered_refs() { return _discovered_refs; }
+
ReferencePolicy* setup_policy(bool always_clear) {
_current_soft_ref_policy = always_clear ?
_always_clear_soft_ref_policy : _default_soft_ref_policy;
@@ -205,6 +373,11 @@ class ReferenceProcessor : public CHeapObj {
void enqueue_discovered_reflists(HeapWord* pending_list_addr, AbstractRefProcTaskExecutor* task_executor);
protected:
+ // Set the 'discovered' field of the given reference to
+ // the given value - emitting barriers depending upon
+ // the value of _discovered_list_needs_barrier.
+ void set_discovered(oop ref, oop value);
+
// "Preclean" the given discovered reference list
// by removing references with strongly reachable referents.
// Currently used in support of CMS only.
@@ -243,6 +416,7 @@ class ReferenceProcessor : public CHeapObj {
// constructor
ReferenceProcessor():
_span((HeapWord*)NULL, (HeapWord*)NULL),
+ _discovered_refs(NULL),
_discoveredSoftRefs(NULL), _discoveredWeakRefs(NULL),
_discoveredFinalRefs(NULL), _discoveredPhantomRefs(NULL),
_discovering_refs(false),
@@ -290,7 +464,7 @@ class ReferenceProcessor : public CHeapObj {
void set_span(MemRegion span) { _span = span; }
// start and stop weak ref discovery
- void enable_discovery() { _discovering_refs = true; }
+ void enable_discovery(bool verify_disabled, bool check_no_refs);
void disable_discovery() { _discovering_refs = false; }
bool discovery_enabled() { return _discovering_refs; }
@@ -365,7 +539,7 @@ class NoRefDiscovery: StackObj {
~NoRefDiscovery() {
if (_was_discovering_refs) {
- _rp->enable_discovery();
+ _rp->enable_discovery(true /*verify_disabled*/, false /*check_no_refs*/);
}
}
};
diff --git a/hotspot/src/share/vm/memory/universe.cpp b/hotspot/src/share/vm/memory/universe.cpp
index 4652b40..22f5bb9 100644
--- a/hotspot/src/share/vm/memory/universe.cpp
+++ b/hotspot/src/share/vm/memory/universe.cpp
@@ -893,7 +893,7 @@ jint Universe::initialize_heap() {
} else if (UseG1GC) {
#ifndef SERIALGC
- G1CollectorPolicy* g1p = new G1CollectorPolicy_BestRegionsFirst();
+ G1CollectorPolicy* g1p = new G1CollectorPolicy();
G1CollectedHeap* g1h = new G1CollectedHeap(g1p);
Universe::_collectedHeap = g1h;
#else // SERIALGC
@@ -1281,11 +1281,17 @@ void Universe::flush_dependents_on_method(methodHandle m_h) {
}
}
-void Universe::print() { print_on(gclog_or_tty); }
+void Universe::print() {
+ print_on(gclog_or_tty);
+}
-void Universe::print_on(outputStream* st) {
+void Universe::print_on(outputStream* st, bool extended) {
st->print_cr("Heap");
- heap()->print_on(st);
+ if (!extended) {
+ heap()->print_on(st);
+ } else {
+ heap()->print_extended_on(st);
+ }
}
void Universe::print_heap_at_SIGBREAK() {
@@ -1301,14 +1307,22 @@ void Universe::print_heap_before_gc(outputStream* st) {
st->print_cr("{Heap before GC invocations=%u (full %u):",
heap()->total_collections(),
heap()->total_full_collections());
- heap()->print_on(st);
+ if (!PrintHeapAtGCExtended) {
+ heap()->print_on(st);
+ } else {
+ heap()->print_extended_on(st);
+ }
}
void Universe::print_heap_after_gc(outputStream* st) {
st->print_cr("Heap after GC invocations=%u (full %u):",
heap()->total_collections(),
heap()->total_full_collections());
- heap()->print_on(st);
+ if (!PrintHeapAtGCExtended) {
+ heap()->print_on(st);
+ } else {
+ heap()->print_extended_on(st);
+ }
st->print_cr("}");
}
diff --git a/hotspot/src/share/vm/memory/universe.hpp b/hotspot/src/share/vm/memory/universe.hpp
index 0f90ff5..24c793f 100644
--- a/hotspot/src/share/vm/memory/universe.hpp
+++ b/hotspot/src/share/vm/memory/universe.hpp
@@ -414,9 +414,13 @@ class Universe: AllStatic {
static bool verify_in_progress() { return _verify_in_progress; }
static void verify(bool allow_dirty = true, bool silent = false,
VerifyOption option = VerifyOption_Default );
- static int verify_count() { return _verify_count; }
+ static int verify_count() { return _verify_count; }
+ // The default behavior is to call print_on() on gclog_or_tty.
static void print();
- static void print_on(outputStream* st);
+ // The extended parameter determines which method on the heap will
+ // be called: print_on() (extended == false) or print_extended_on()
+ // (extended == true).
+ static void print_on(outputStream* st, bool extended = false);
static void print_heap_at_SIGBREAK();
static void print_heap_before_gc() { print_heap_before_gc(gclog_or_tty); }
static void print_heap_after_gc() { print_heap_after_gc(gclog_or_tty); }
diff --git a/hotspot/src/share/vm/oops/arrayOop.cpp b/hotspot/src/share/vm/oops/arrayOop.cpp
index 62a971a..c159438 100644
--- a/hotspot/src/share/vm/oops/arrayOop.cpp
+++ b/hotspot/src/share/vm/oops/arrayOop.cpp
@@ -23,9 +23,40 @@
*/
#include "precompiled.hpp"
+
+/////////////// Unit tests ///////////////
+
+#ifndef PRODUCT
+
#include "oops/arrayOop.hpp"
-#include "oops/objArrayOop.hpp"
-#include "oops/oop.inline.hpp"
-#include "oops/symbol.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+bool arrayOopDesc::check_max_length_overflow(BasicType type) {
+ julong length = max_array_length(type);
+ julong bytes_per_element = type2aelembytes(type);
+ julong bytes = length * bytes_per_element + header_size_in_bytes();
+ return (julong)(size_t)bytes == bytes;
+}
+
+bool arrayOopDesc::test_max_array_length() {
+ tty->print_cr("test_max_array_length");
+
+ assert(check_max_length_overflow(T_BOOLEAN), "size_t overflow for boolean array");
+ assert(check_max_length_overflow(T_CHAR), "size_t overflow for char array");
+ assert(check_max_length_overflow(T_FLOAT), "size_t overflow for float array");
+ assert(check_max_length_overflow(T_DOUBLE), "size_t overflow for double array");
+ assert(check_max_length_overflow(T_BYTE), "size_t overflow for byte array");
+ assert(check_max_length_overflow(T_SHORT), "size_t overflow for short array");
+ assert(check_max_length_overflow(T_INT), "size_t overflow for int array");
+ assert(check_max_length_overflow(T_LONG), "size_t overflow for long array");
+ assert(check_max_length_overflow(T_OBJECT), "size_t overflow for object array");
+ assert(check_max_length_overflow(T_ARRAY), "size_t overflow for array array");
+ assert(check_max_length_overflow(T_NARROWOOP), "size_t overflow for narrowOop array");
+
+ // T_VOID and T_ADDRESS are not supported by max_array_length()
+
+ return true;
+}
+
-// <<this page is intentionally left blank>>
+#endif //PRODUCT
diff --git a/hotspot/src/share/vm/oops/arrayOop.hpp b/hotspot/src/share/vm/oops/arrayOop.hpp
index 0e76239..e169990 100644
--- a/hotspot/src/share/vm/oops/arrayOop.hpp
+++ b/hotspot/src/share/vm/oops/arrayOop.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, 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
@@ -104,20 +104,32 @@ class arrayOopDesc : public oopDesc {
// Return the maximum length of an array of BasicType. The length can passed
// to typeArrayOop::object_size(scale, length, header_size) without causing an
- // overflow.
+ // overflow. We also need to make sure that this will not overflow a size_t on
+ // 32 bit platforms when we convert it to a byte size.
static int32_t max_array_length(BasicType type) {
assert(type >= 0 && type < T_CONFLICT, "wrong type");
assert(type2aelembytes(type) != 0, "wrong type");
- const int bytes_per_element = type2aelembytes(type);
- if (bytes_per_element < HeapWordSize) {
- return max_jint;
- }
- const int32_t max_words = align_size_down(max_jint, MinObjAlignment);
- const int32_t max_element_words = max_words - header_size(type);
- const int32_t words_per_element = bytes_per_element >> LogHeapWordSize;
- return max_element_words / words_per_element;
+ const size_t max_element_words_per_size_t =
+ align_size_down((SIZE_MAX/HeapWordSize - header_size(type)), MinObjAlignment);
+ const size_t max_elements_per_size_t =
+ HeapWordSize * max_element_words_per_size_t / type2aelembytes(type);
+ if ((size_t)max_jint < max_elements_per_size_t) {
+ // It should be ok to return max_jint here, but parts of the code
+ // (CollectedHeap, Klass::oop_oop_iterate(), and more) uses an int for
+ // passing around the size (in words) of an object. So, we need to avoid
+ // overflowing an int when we add the header. See CRs 4718400 and 7110613.
+ return align_size_down(max_jint - header_size(type), MinObjAlignment);
+ }
+ return (int32_t)max_elements_per_size_t;
}
+
+// for unit testing
+#ifndef PRODUCT
+ static bool check_max_length_overflow(BasicType type);
+ static int32_t old_max_array_length(BasicType type);
+ static bool test_max_array_length();
+#endif
};
#endif // SHARE_VM_OOPS_ARRAYOOP_HPP
diff --git a/hotspot/src/share/vm/oops/constantPoolKlass.cpp b/hotspot/src/share/vm/oops/constantPoolKlass.cpp
index 0b3a67a..6e26731 100644
--- a/hotspot/src/share/vm/oops/constantPoolKlass.cpp
+++ b/hotspot/src/share/vm/oops/constantPoolKlass.cpp
@@ -532,7 +532,7 @@ void constantPoolKlass::preload_and_initialize_all_classes(oop obj, TRAPS) {
if (cp->tag_at(i).is_unresolved_klass()) {
// This will force loading of the class
klassOop klass = cp->klass_at(i, CHECK);
- if (klass->is_instance()) {
+ if (klass->klass_part()->oop_is_instance()) {
// Force initialization of class
instanceKlass::cast(klass)->initialize(CHECK);
}
diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp
index 20b0a96..04b3c2f 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp
@@ -80,6 +80,8 @@
#ifdef DTRACE_ENABLED
+#ifndef USDT2
+
HS_DTRACE_PROBE_DECL4(hotspot, class__initialization__required,
char*, intptr_t, oop, intptr_t);
HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__recursive,
@@ -122,6 +124,42 @@ HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__end,
HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \
data, len, (clss)->class_loader(), thread_type, wait); \
}
+#else /* USDT2 */
+
+#define HOTSPOT_CLASS_INITIALIZATION_required HOTSPOT_CLASS_INITIALIZATION_REQUIRED
+#define HOTSPOT_CLASS_INITIALIZATION_recursive HOTSPOT_CLASS_INITIALIZATION_RECURSIVE
+#define HOTSPOT_CLASS_INITIALIZATION_concurrent HOTSPOT_CLASS_INITIALIZATION_CONCURRENT
+#define HOTSPOT_CLASS_INITIALIZATION_erroneous HOTSPOT_CLASS_INITIALIZATION_ERRONEOUS
+#define HOTSPOT_CLASS_INITIALIZATION_super__failed HOTSPOT_CLASS_INITIALIZATION_SUPER_FAILED
+#define HOTSPOT_CLASS_INITIALIZATION_clinit HOTSPOT_CLASS_INITIALIZATION_CLINIT
+#define HOTSPOT_CLASS_INITIALIZATION_error HOTSPOT_CLASS_INITIALIZATION_ERROR
+#define HOTSPOT_CLASS_INITIALIZATION_end HOTSPOT_CLASS_INITIALIZATION_END
+#define DTRACE_CLASSINIT_PROBE(type, clss, thread_type) \
+ { \
+ char* data = NULL; \
+ int len = 0; \
+ Symbol* name = (clss)->name(); \
+ if (name != NULL) { \
+ data = (char*)name->bytes(); \
+ len = name->utf8_length(); \
+ } \
+ HOTSPOT_CLASS_INITIALIZATION_##type( \
+ data, len, (clss)->class_loader(), thread_type); \
+ }
+
+#define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \
+ { \
+ char* data = NULL; \
+ int len = 0; \
+ Symbol* name = (clss)->name(); \
+ if (name != NULL) { \
+ data = (char*)name->bytes(); \
+ len = name->utf8_length(); \
+ } \
+ HOTSPOT_CLASS_INITIALIZATION_##type( \
+ data, len, (clss)->class_loader(), thread_type, wait); \
+ }
+#endif /* USDT2 */
#else // ndef DTRACE_ENABLED
diff --git a/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp b/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp
index 8f66441..e0dd7d7 100644
--- a/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp
@@ -288,15 +288,7 @@ instanceOop instanceMirrorKlass::allocate_instance(KlassHandle k, TRAPS) {
// Query before forming handle.
int size = instance_size(k);
KlassHandle h_k(THREAD, as_klassOop());
- instanceOop i;
-
- if (JavaObjectsInPerm) {
- i = (instanceOop) CollectedHeap::permanent_obj_allocate(h_k, size, CHECK_NULL);
- } else {
- assert(ScavengeRootsInCode > 0, "must be");
- i = (instanceOop) CollectedHeap::obj_allocate(h_k, size, CHECK_NULL);
- }
-
+ instanceOop i = (instanceOop) CollectedHeap::Class_obj_allocate(h_k, size, k, CHECK_NULL);
return i;
}
diff --git a/hotspot/src/share/vm/opto/addnode.cpp b/hotspot/src/share/vm/opto/addnode.cpp
index 33ecf15..ee6f6bc 100644
--- a/hotspot/src/share/vm/opto/addnode.cpp
+++ b/hotspot/src/share/vm/opto/addnode.cpp
@@ -34,8 +34,6 @@
// Portions of code courtesy of Clifford Click
-#define MAXFLOAT ((float)3.40282346638528860e+38)
-
// Classic Add functionality. This covers all the usual 'add' behaviors for
// an algebraic ring. Add-integer, add-float, add-double, and binary-or are
// all inherited from this class. The various identity values are supplied
diff --git a/hotspot/src/share/vm/opto/c2_globals.hpp b/hotspot/src/share/vm/opto/c2_globals.hpp
index 827e76e..5cb4100 100644
--- a/hotspot/src/share/vm/opto/c2_globals.hpp
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp
@@ -201,7 +201,7 @@
diagnostic(bool, UnrollLimitCheck, true, \
"Additional overflow checks during loop unroll") \
\
- product(bool, OptimizeFill, false, \
+ product(bool, OptimizeFill, true, \
"convert fill/copy loops into intrinsic") \
\
develop(bool, TraceOptimizeFill, false, \
@@ -459,7 +459,7 @@
product(bool, UseOptoBiasInlining, true, \
"Generate biased locking code in C2 ideal graph") \
\
- product(bool, OptimizeStringConcat, false, \
+ product(bool, OptimizeStringConcat, true, \
"Optimize the construction of Strings by StringBuilder") \
\
notproduct(bool, PrintOptimizeStringConcat, false, \
diff --git a/hotspot/src/share/vm/opto/callGenerator.cpp b/hotspot/src/share/vm/opto/callGenerator.cpp
index 150aa92..5ac3383 100644
--- a/hotspot/src/share/vm/opto/callGenerator.cpp
+++ b/hotspot/src/share/vm/opto/callGenerator.cpp
@@ -775,15 +775,15 @@ JVMState* PredictedDynamicCallGenerator::generate(JVMState* jvms) {
Node* bol = NULL;
int bc = jvms->method()->java_code_at_bci(jvms->bci());
- if (bc == Bytecodes::_invokespecial) {
- // This is the selectAlternative idiom for guardWithTest
+ if (bc != Bytecodes::_invokedynamic) {
+ // This is the selectAlternative idiom for guardWithTest or
+ // similar idioms.
Node* receiver = kit.argument(0);
// Check if the MethodHandle is the expected one
Node* cmp = gvn.transform(new(kit.C, 3) CmpPNode(receiver, predicted_mh));
bol = gvn.transform(new(kit.C, 2) BoolNode(cmp, BoolTest::eq) );
} else {
- assert(bc == Bytecodes::_invokedynamic, "must be");
// Get the constant pool cache from the caller class.
ciMethod* caller_method = jvms->method();
ciBytecodeStream str(caller_method);
diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index 2f0f294..358be62 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -346,15 +346,15 @@ void Compile::identify_useful_nodes(Unique_Node_List &useful) {
// Disconnect all useless nodes by disconnecting those at the boundary.
void Compile::remove_useless_nodes(Unique_Node_List &useful) {
uint next = 0;
- while( next < useful.size() ) {
+ while (next < useful.size()) {
Node *n = useful.at(next++);
// Use raw traversal of out edges since this code removes out edges
int max = n->outcnt();
- for (int j = 0; j < max; ++j ) {
+ for (int j = 0; j < max; ++j) {
Node* child = n->raw_out(j);
- if( ! useful.member(child) ) {
- assert( !child->is_top() || child != top(),
- "If top is cached in Compile object it is in useful list");
+ if (! useful.member(child)) {
+ assert(!child->is_top() || child != top(),
+ "If top is cached in Compile object it is in useful list");
// Only need to remove this out-edge to the useless node
n->raw_del_out(j);
--j;
@@ -362,7 +362,14 @@ void Compile::remove_useless_nodes(Unique_Node_List &useful) {
}
}
if (n->outcnt() == 1 && n->has_special_unique_user()) {
- record_for_igvn( n->unique_out() );
+ record_for_igvn(n->unique_out());
+ }
+ }
+ // Remove useless macro and predicate opaq nodes
+ for (int i = C->macro_count()-1; i >= 0; i--) {
+ Node* n = C->macro_node(i);
+ if (!useful.member(n)) {
+ remove_macro_node(n);
}
}
debug_only(verify_graph_edges(true/*check for no_dead_code*/);)
@@ -719,6 +726,7 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr
while (_late_inlines.length() > 0) {
CallGenerator* cg = _late_inlines.pop();
cg->do_late_inline();
+ if (failing()) return;
}
}
assert(_late_inlines.length() == 0, "should have been processed");
@@ -1691,13 +1699,20 @@ void Compile::Optimize() {
// Perform escape analysis
if (_do_escape_analysis && ConnectionGraph::has_candidates(this)) {
+ if (has_loops()) {
+ // Cleanup graph (remove dead nodes).
+ TracePhase t2("idealLoop", &_t_idealLoop, true);
+ PhaseIdealLoop ideal_loop( igvn, false, true );
+ if (major_progress()) print_method("PhaseIdealLoop before EA", 2);
+ if (failing()) return;
+ }
TracePhase t2("escapeAnalysis", &_t_escapeAnalysis, true);
ConnectionGraph::do_analysis(this, &igvn);
if (failing()) return;
igvn.optimize();
- print_method("Iter GVN 3", 2);
+ print_method("Iter GVN after EA", 2);
if (failing()) return;
diff --git a/hotspot/src/share/vm/opto/connode.cpp b/hotspot/src/share/vm/opto/connode.cpp
index db36c6d..9a3b650 100644
--- a/hotspot/src/share/vm/opto/connode.cpp
+++ b/hotspot/src/share/vm/opto/connode.cpp
@@ -721,12 +721,7 @@ const Type *ConvF2DNode::Value( PhaseTransform *phase ) const {
if( t == Type::TOP ) return Type::TOP;
if( t == Type::FLOAT ) return Type::DOUBLE;
const TypeF *tf = t->is_float_constant();
-#ifndef IA64
return TypeD::make( (double)tf->getf() );
-#else
- float x = tf->getf();
- return TypeD::make( (x == 0.0f) ? (double)x : (double)x + ia64_double_zero );
-#endif
}
//=============================================================================
diff --git a/hotspot/src/share/vm/opto/escape.cpp b/hotspot/src/share/vm/opto/escape.cpp
index 84e37bd..8ce7f96 100644
--- a/hotspot/src/share/vm/opto/escape.cpp
+++ b/hotspot/src/share/vm/opto/escape.cpp
@@ -108,14 +108,16 @@ ConnectionGraph::ConnectionGraph(Compile * C, PhaseIterGVN *igvn) :
// Add ConP(#NULL) and ConN(#NULL) nodes.
Node* oop_null = igvn->zerocon(T_OBJECT);
_oop_null = oop_null->_idx;
- assert(_oop_null < C->unique(), "should be created already");
+ assert(_oop_null < nodes_size(), "should be created already");
add_node(oop_null, PointsToNode::JavaObject, PointsToNode::NoEscape, true);
if (UseCompressedOops) {
Node* noop_null = igvn->zerocon(T_NARROWOOP);
_noop_null = noop_null->_idx;
- assert(_noop_null < C->unique(), "should be created already");
+ assert(_noop_null < nodes_size(), "should be created already");
add_node(noop_null, PointsToNode::JavaObject, PointsToNode::NoEscape, true);
+ } else {
+ _noop_null = _oop_null; // Should be initialized
}
}
@@ -174,6 +176,9 @@ void ConnectionGraph::add_field_edge(uint from_i, uint to_i, int offset) {
}
void ConnectionGraph::set_escape_state(uint ni, PointsToNode::EscapeState es) {
+ // Don't change non-escaping state of NULL pointer.
+ if (ni == _noop_null || ni == _oop_null)
+ return;
PointsToNode *npt = ptnode_adr(ni);
PointsToNode::EscapeState old_es = npt->escape_state();
if (es > old_es)
@@ -231,8 +236,8 @@ PointsToNode::EscapeState ConnectionGraph::escape_state(Node *n) {
}
if (orig_es != es) {
// cache the computed escape state
- assert(es != PointsToNode::UnknownEscape, "should have computed an escape state");
- ptnode_adr(idx)->set_escape_state(es);
+ assert(es > orig_es, "should have computed an escape state");
+ set_escape_state(idx, es);
} // orig_es could be PointsToNode::UnknownEscape
return es;
}
@@ -334,7 +339,7 @@ void ConnectionGraph::remove_deferred(uint ni, GrowableArray<uint>* deferred_edg
add_pointsto_edge(ni, etgt);
if(etgt == _phantom_object) {
// Special case - field set outside (globally escaping).
- ptn->set_escape_state(PointsToNode::GlobalEscape);
+ set_escape_state(ni, PointsToNode::GlobalEscape);
}
} else if (et == PointsToNode::DeferredEdge) {
deferred_edges->append(etgt);
@@ -373,16 +378,17 @@ void ConnectionGraph::add_edge_from_fields(uint adr_i, uint to_i, int offs) {
// whose offset matches "offset".
void ConnectionGraph::add_deferred_edge_to_fields(uint from_i, uint adr_i, int offs) {
PointsToNode* an = ptnode_adr(adr_i);
+ bool is_alloc = an->_node->is_Allocate();
for (uint fe = 0; fe < an->edge_count(); fe++) {
assert(an->edge_type(fe) == PointsToNode::FieldEdge, "expecting a field edge");
int fi = an->edge_target(fe);
PointsToNode* pf = ptnode_adr(fi);
- int po = pf->offset();
- if (pf->edge_count() == 0) {
- // we have not seen any stores to this field, assume it was set outside this method
+ int offset = pf->offset();
+ if (!is_alloc) {
+ // Assume the field was set outside this method if it is not Allocation
add_pointsto_edge(fi, _phantom_object);
}
- if (po == offs || po == Type::OffsetBot || offs == Type::OffsetBot) {
+ if (offset == offs || offset == Type::OffsetBot || offs == Type::OffsetBot) {
add_deferred_edge(from_i, fi);
}
}
@@ -1036,7 +1042,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist)
PointsToNode::EscapeState es = escape_state(alloc);
// We have an allocation or call which returns a Java object,
// see if it is unescaped.
- if (es != PointsToNode::NoEscape || !ptn->_scalar_replaceable)
+ if (es != PointsToNode::NoEscape || !ptn->scalar_replaceable())
continue;
// Find CheckCastPP for the allocate or for the return value of a call
@@ -1085,7 +1091,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist)
// so it could be eliminated.
alloc->as_Allocate()->_is_scalar_replaceable = true;
}
- set_escape_state(n->_idx, es);
+ set_escape_state(n->_idx, es); // CheckCastPP escape state
// in order for an object to be scalar-replaceable, it must be:
// - a direct allocation (not a call returning an object)
// - non-escaping
@@ -1097,15 +1103,14 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist)
set_map(n->_idx, alloc);
const TypeOopPtr *t = igvn->type(n)->isa_oopptr();
if (t == NULL)
- continue; // not a TypeInstPtr
+ continue; // not a TypeOopPtr
tinst = t->cast_to_exactness(true)->is_oopptr()->cast_to_instance_id(ni);
igvn->hash_delete(n);
igvn->set_type(n, tinst);
n->raise_bottom_type(tinst);
igvn->hash_insert(n);
record_for_optimizer(n);
- if (alloc->is_Allocate() && ptn->_scalar_replaceable &&
- (t->isa_instptr() || t->isa_aryptr())) {
+ if (alloc->is_Allocate() && (t->isa_instptr() || t->isa_aryptr())) {
// First, put on the worklist all Field edges from Connection Graph
// which is more accurate then putting immediate users from Ideal Graph.
@@ -1533,7 +1538,8 @@ bool ConnectionGraph::compute_escape() {
worklist_init.push(C->root());
}
- GrowableArray<int> cg_worklist;
+ GrowableArray<Node*> alloc_worklist;
+ GrowableArray<Node*> addp_worklist;
PhaseGVN* igvn = _igvn;
bool has_allocations = false;
@@ -1546,11 +1552,13 @@ bool ConnectionGraph::compute_escape() {
if (n->is_Allocate() || n->is_CallStaticJava() &&
ptnode_adr(n->_idx)->node_type() == PointsToNode::JavaObject) {
has_allocations = true;
+ if (n->is_Allocate())
+ alloc_worklist.append(n);
}
if(n->is_AddP()) {
// Collect address nodes. Use them during stage 3 below
// to build initial connection graph field edges.
- cg_worklist.append(n->_idx);
+ addp_worklist.append(n);
} else if (n->is_MergeMem()) {
// Collect all MergeMem nodes to add memory slices for
// scalar replaceable objects in split_unique_types().
@@ -1576,10 +1584,9 @@ bool ConnectionGraph::compute_escape() {
// 3. Pass to create initial fields edges (JavaObject -F-> AddP)
// to reduce number of iterations during stage 4 below.
- uint cg_length = cg_worklist.length();
- for( uint next = 0; next < cg_length; ++next ) {
- int ni = cg_worklist.at(next);
- Node* n = ptnode_adr(ni)->_node;
+ uint addp_length = addp_worklist.length();
+ for( uint next = 0; next < addp_length; ++next ) {
+ Node* n = addp_worklist.at(next);
Node* base = get_addp_base(n);
if (base->is_Proj())
base = base->in(0);
@@ -1589,7 +1596,7 @@ bool ConnectionGraph::compute_escape() {
}
}
- cg_worklist.clear();
+ GrowableArray<int> cg_worklist;
cg_worklist.append(_phantom_object);
GrowableArray<uint> worklist;
@@ -1648,73 +1655,44 @@ bool ConnectionGraph::compute_escape() {
Arena* arena = Thread::current()->resource_area();
VectorSet visited(arena);
+
+ // 5. Find fields initializing values for not escaped allocations
+ uint alloc_length = alloc_worklist.length();
+ for (uint next = 0; next < alloc_length; ++next) {
+ Node* n = alloc_worklist.at(next);
+ if (ptnode_adr(n->_idx)->escape_state() == PointsToNode::NoEscape) {
+ find_init_values(n, &visited, igvn);
+ }
+ }
+
worklist.clear();
- // 5. Remove deferred edges from the graph and adjust
- // escape state of nonescaping objects.
- cg_length = cg_worklist.length();
- for( uint next = 0; next < cg_length; ++next ) {
+ // 6. Remove deferred edges from the graph.
+ uint cg_length = cg_worklist.length();
+ for (uint next = 0; next < cg_length; ++next) {
int ni = cg_worklist.at(next);
PointsToNode* ptn = ptnode_adr(ni);
PointsToNode::NodeType nt = ptn->node_type();
if (nt == PointsToNode::LocalVar || nt == PointsToNode::Field) {
remove_deferred(ni, &worklist, &visited);
Node *n = ptn->_node;
- if (n->is_AddP()) {
- // Search for objects which are not scalar replaceable
- // and adjust their escape state.
- adjust_escape_state(ni, igvn);
- }
}
}
- // 6. Propagate escape states.
+ // 7. Adjust escape state of nonescaping objects.
+ for (uint next = 0; next < addp_length; ++next) {
+ Node* n = addp_worklist.at(next);
+ adjust_escape_state(n);
+ }
+
+ // 8. Propagate escape states.
worklist.clear();
- bool has_non_escaping_obj = false;
- // push all GlobalEscape nodes on the worklist
- for( uint next = 0; next < cg_length; ++next ) {
- int nk = cg_worklist.at(next);
- if (ptnode_adr(nk)->escape_state() == PointsToNode::GlobalEscape)
- worklist.push(nk);
- }
// mark all nodes reachable from GlobalEscape nodes
- while(worklist.length() > 0) {
- PointsToNode* ptn = ptnode_adr(worklist.pop());
- uint e_cnt = ptn->edge_count();
- for (uint ei = 0; ei < e_cnt; ei++) {
- uint npi = ptn->edge_target(ei);
- PointsToNode *np = ptnode_adr(npi);
- if (np->escape_state() < PointsToNode::GlobalEscape) {
- np->set_escape_state(PointsToNode::GlobalEscape);
- worklist.push(npi);
- }
- }
- }
+ (void)propagate_escape_state(&cg_worklist, &worklist, PointsToNode::GlobalEscape);
- // push all ArgEscape nodes on the worklist
- for( uint next = 0; next < cg_length; ++next ) {
- int nk = cg_worklist.at(next);
- if (ptnode_adr(nk)->escape_state() == PointsToNode::ArgEscape)
- worklist.push(nk);
- }
// mark all nodes reachable from ArgEscape nodes
- while(worklist.length() > 0) {
- PointsToNode* ptn = ptnode_adr(worklist.pop());
- if (ptn->node_type() == PointsToNode::JavaObject)
- has_non_escaping_obj = true; // Non GlobalEscape
- uint e_cnt = ptn->edge_count();
- for (uint ei = 0; ei < e_cnt; ei++) {
- uint npi = ptn->edge_target(ei);
- PointsToNode *np = ptnode_adr(npi);
- if (np->escape_state() < PointsToNode::ArgEscape) {
- np->set_escape_state(PointsToNode::ArgEscape);
- worklist.push(npi);
- }
- }
- }
-
- GrowableArray<Node*> alloc_worklist;
+ bool has_non_escaping_obj = propagate_escape_state(&cg_worklist, &worklist, PointsToNode::ArgEscape);
// push all NoEscape nodes on the worklist
for( uint next = 0; next < cg_length; ++next ) {
@@ -1722,15 +1700,20 @@ bool ConnectionGraph::compute_escape() {
if (ptnode_adr(nk)->escape_state() == PointsToNode::NoEscape)
worklist.push(nk);
}
+ alloc_worklist.clear();
// mark all nodes reachable from NoEscape nodes
while(worklist.length() > 0) {
- PointsToNode* ptn = ptnode_adr(worklist.pop());
- if (ptn->node_type() == PointsToNode::JavaObject)
- has_non_escaping_obj = true; // Non GlobalEscape
+ uint nk = worklist.pop();
+ PointsToNode* ptn = ptnode_adr(nk);
+ if (ptn->node_type() == PointsToNode::JavaObject &&
+ !(nk == _noop_null || nk == _oop_null))
+ has_non_escaping_obj = true; // Non Escape
Node* n = ptn->_node;
- if (n->is_Allocate() && ptn->_scalar_replaceable ) {
+ bool scalar_replaceable = ptn->scalar_replaceable();
+ if (n->is_Allocate() && scalar_replaceable) {
// Push scalar replaceable allocations on alloc_worklist
- // for processing in split_unique_types().
+ // for processing in split_unique_types(). Note,
+ // following code may change scalar_replaceable value.
alloc_worklist.append(n);
}
uint e_cnt = ptn->edge_count();
@@ -1738,7 +1721,14 @@ bool ConnectionGraph::compute_escape() {
uint npi = ptn->edge_target(ei);
PointsToNode *np = ptnode_adr(npi);
if (np->escape_state() < PointsToNode::NoEscape) {
- np->set_escape_state(PointsToNode::NoEscape);
+ set_escape_state(npi, PointsToNode::NoEscape);
+ if (!scalar_replaceable) {
+ np->set_scalar_replaceable(false);
+ }
+ worklist.push(npi);
+ } else if (np->scalar_replaceable() && !scalar_replaceable) {
+ // Propagate scalar_replaceable value.
+ np->set_scalar_replaceable(false);
worklist.push(npi);
}
}
@@ -1747,7 +1737,12 @@ bool ConnectionGraph::compute_escape() {
_collecting = false;
assert(C->unique() == nodes_size(), "there should be no new ideal nodes during ConnectionGraph build");
- if (EliminateLocks) {
+ assert(ptnode_adr(_oop_null)->escape_state() == PointsToNode::NoEscape, "sanity");
+ if (UseCompressedOops) {
+ assert(ptnode_adr(_noop_null)->escape_state() == PointsToNode::NoEscape, "sanity");
+ }
+
+ if (EliminateLocks && has_non_escaping_obj) {
// Mark locks before changing ideal graph.
int cnt = C->macro_count();
for( int i=0; i < cnt; i++ ) {
@@ -1772,7 +1767,18 @@ bool ConnectionGraph::compute_escape() {
}
#endif
- bool has_scalar_replaceable_candidates = alloc_worklist.length() > 0;
+ bool has_scalar_replaceable_candidates = false;
+ alloc_length = alloc_worklist.length();
+ for (uint next = 0; next < alloc_length; ++next) {
+ Node* n = alloc_worklist.at(next);
+ PointsToNode* ptn = ptnode_adr(n->_idx);
+ assert(ptn->escape_state() == PointsToNode::NoEscape, "sanity");
+ if (ptn->scalar_replaceable()) {
+ has_scalar_replaceable_candidates = true;
+ break;
+ }
+ }
+
if ( has_scalar_replaceable_candidates &&
C->AliasLevel() >= 3 && EliminateAllocations ) {
@@ -1801,53 +1807,32 @@ bool ConnectionGraph::compute_escape() {
return has_non_escaping_obj;
}
-// Adjust escape state after Connection Graph is built.
-void ConnectionGraph::adjust_escape_state(int nidx, PhaseTransform* phase) {
- PointsToNode* ptn = ptnode_adr(nidx);
- Node* n = ptn->_node;
- assert(n->is_AddP(), "Should be called for AddP nodes only");
- // Search for objects which are not scalar replaceable.
- // Mark their escape state as ArgEscape to propagate the state
- // to referenced objects.
- // Note: currently there are no difference in compiler optimizations
- // for ArgEscape objects and NoEscape objects which are not
- // scalar replaceable.
+// Find fields initializing values for allocations.
+void ConnectionGraph::find_init_values(Node* alloc, VectorSet* visited, PhaseTransform* phase) {
+ assert(alloc->is_Allocate(), "Should be called for Allocate nodes only");
+ PointsToNode* pta = ptnode_adr(alloc->_idx);
+ assert(pta->escape_state() == PointsToNode::NoEscape, "Not escaped Allocate nodes only");
+ InitializeNode* ini = alloc->as_Allocate()->initialization();
Compile* C = _compile;
-
- int offset = ptn->offset();
- Node* base = get_addp_base(n);
- VectorSet* ptset = PointsTo(base);
- int ptset_size = ptset->Size();
-
+ visited->Reset();
// Check if a oop field's initializing value is recorded and add
// a corresponding NULL field's value if it is not recorded.
// Connection Graph does not record a default initialization by NULL
// captured by Initialize node.
//
- // Note: it will disable scalar replacement in some cases:
- //
- // Point p[] = new Point[1];
- // p[0] = new Point(); // Will be not scalar replaced
- //
- // but it will save us from incorrect optimizations in next cases:
- //
- // Point p[] = new Point[1];
- // if ( x ) p[0] = new Point(); // Will be not scalar replaced
- //
- // Do a simple control flow analysis to distinguish above cases.
- //
- if (offset != Type::OffsetBot && ptset_size == 1) {
- uint elem = ptset->getelem(); // Allocation node's index
- // It does not matter if it is not Allocation node since
- // only non-escaping allocations are scalar replaced.
- if (ptnode_adr(elem)->_node->is_Allocate() &&
- ptnode_adr(elem)->escape_state() == PointsToNode::NoEscape) {
- AllocateNode* alloc = ptnode_adr(elem)->_node->as_Allocate();
- InitializeNode* ini = alloc->initialization();
+ uint ae_cnt = pta->edge_count();
+ for (uint ei = 0; ei < ae_cnt; ei++) {
+ uint nidx = pta->edge_target(ei); // Field (AddP)
+ PointsToNode* ptn = ptnode_adr(nidx);
+ assert(ptn->_node->is_AddP(), "Should be AddP nodes only");
+ int offset = ptn->offset();
+ if (offset != Type::OffsetBot &&
+ offset != oopDesc::klass_offset_in_bytes() &&
+ !visited->test_set(offset)) {
// Check only oop fields.
- const Type* adr_type = n->as_AddP()->bottom_type();
+ const Type* adr_type = ptn->_node->as_AddP()->bottom_type();
BasicType basic_field_type = T_INT;
if (adr_type->isa_instptr()) {
ciField* field = C->alias_type(adr_type->isa_instptr())->field();
@@ -1857,12 +1842,20 @@ void ConnectionGraph::adjust_escape_state(int nidx, PhaseTransform* phase) {
// Ignore non field load (for example, klass load)
}
} else if (adr_type->isa_aryptr()) {
- const Type* elemtype = adr_type->isa_aryptr()->elem();
- basic_field_type = elemtype->array_element_basic_type();
+ if (offset != arrayOopDesc::length_offset_in_bytes()) {
+ const Type* elemtype = adr_type->isa_aryptr()->elem();
+ basic_field_type = elemtype->array_element_basic_type();
+ } else {
+ // Ignore array length load
+ }
+#ifdef ASSERT
} else {
- // Raw pointers are used for initializing stores so skip it.
+ // Raw pointers are used for initializing stores so skip it
+ // since it should be recorded already
+ Node* base = get_addp_base(ptn->_node);
assert(adr_type->isa_rawptr() && base->is_Proj() &&
(base->in(0) == alloc),"unexpected pointer type");
+#endif
}
if (basic_field_type == T_OBJECT ||
basic_field_type == T_NARROWOOP ||
@@ -1877,18 +1870,33 @@ void ConnectionGraph::adjust_escape_state(int nidx, PhaseTransform* phase) {
// Check for a store which follows allocation without branches.
// For example, a volatile field store is not collected
// by Initialize node. TODO: it would be nice to use idom() here.
- for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
- store = n->fast_out(i);
- if (store->is_Store() && store->in(0) != NULL) {
- Node* ctrl = store->in(0);
- while(!(ctrl == ini || ctrl == alloc || ctrl == NULL ||
- ctrl == C->root() || ctrl == C->top() || ctrl->is_Region() ||
- ctrl->is_IfTrue() || ctrl->is_IfFalse())) {
- ctrl = ctrl->in(0);
- }
- if (ctrl == ini || ctrl == alloc) {
- value = store->in(MemNode::ValueIn);
- break;
+ //
+ // Search all references to the same field which use different
+ // AddP nodes, for example, in the next case:
+ //
+ // Point p[] = new Point[1];
+ // if ( x ) { p[0] = new Point(); p[0].x = x; }
+ // if ( p[0] != null ) { y = p[0].x; } // has CastPP
+ //
+ for (uint next = ei; (next < ae_cnt) && (value == NULL); next++) {
+ uint fpi = pta->edge_target(next); // Field (AddP)
+ PointsToNode *ptf = ptnode_adr(fpi);
+ if (ptf->offset() == offset) {
+ Node* nf = ptf->_node;
+ for (DUIterator_Fast imax, i = nf->fast_outs(imax); i < imax; i++) {
+ store = nf->fast_out(i);
+ if (store->is_Store() && store->in(0) != NULL) {
+ Node* ctrl = store->in(0);
+ while(!(ctrl == ini || ctrl == alloc || ctrl == NULL ||
+ ctrl == C->root() || ctrl == C->top() || ctrl->is_Region() ||
+ ctrl->is_IfTrue() || ctrl->is_IfFalse())) {
+ ctrl = ctrl->in(0);
+ }
+ if (ctrl == ini || ctrl == alloc) {
+ value = store->in(MemNode::ValueIn);
+ break;
+ }
+ }
}
}
}
@@ -1897,21 +1905,35 @@ void ConnectionGraph::adjust_escape_state(int nidx, PhaseTransform* phase) {
if (value == NULL || value != ptnode_adr(value->_idx)->_node) {
// A field's initializing value was not recorded. Add NULL.
uint null_idx = UseCompressedOops ? _noop_null : _oop_null;
- add_pointsto_edge(nidx, null_idx);
+ add_edge_from_fields(alloc->_idx, null_idx, offset);
}
}
}
}
+}
+
+// Adjust escape state after Connection Graph is built.
+void ConnectionGraph::adjust_escape_state(Node* n) {
+ PointsToNode* ptn = ptnode_adr(n->_idx);
+ assert(n->is_AddP(), "Should be called for AddP nodes only");
+ // Search for objects which are not scalar replaceable
+ // and mark them to propagate the state to referenced objects.
+ //
+
+ int offset = ptn->offset();
+ Node* base = get_addp_base(n);
+ VectorSet* ptset = PointsTo(base);
+ int ptset_size = ptset->Size();
// An object is not scalar replaceable if the field which may point
// to it has unknown offset (unknown element of an array of objects).
//
+
if (offset == Type::OffsetBot) {
uint e_cnt = ptn->edge_count();
for (uint ei = 0; ei < e_cnt; ei++) {
uint npi = ptn->edge_target(ei);
- set_escape_state(npi, PointsToNode::ArgEscape);
- ptnode_adr(npi)->_scalar_replaceable = false;
+ ptnode_adr(npi)->set_scalar_replaceable(false);
}
}
@@ -1930,20 +1952,62 @@ void ConnectionGraph::adjust_escape_state(int nidx, PhaseTransform* phase) {
// to unknown field (unknown element for arrays, offset is OffsetBot).
//
// Or the address may point to more then one object. This may produce
- // the false positive result (set scalar_replaceable to false)
+ // the false positive result (set not scalar replaceable)
// since the flow-insensitive escape analysis can't separate
// the case when stores overwrite the field's value from the case
// when stores happened on different control branches.
//
+ // Note: it will disable scalar replacement in some cases:
+ //
+ // Point p[] = new Point[1];
+ // p[0] = new Point(); // Will be not scalar replaced
+ //
+ // but it will save us from incorrect optimizations in next cases:
+ //
+ // Point p[] = new Point[1];
+ // if ( x ) p[0] = new Point(); // Will be not scalar replaced
+ //
if (ptset_size > 1 || ptset_size != 0 &&
(has_LoadStore || offset == Type::OffsetBot)) {
for( VectorSetI j(ptset); j.test(); ++j ) {
- set_escape_state(j.elem, PointsToNode::ArgEscape);
- ptnode_adr(j.elem)->_scalar_replaceable = false;
+ ptnode_adr(j.elem)->set_scalar_replaceable(false);
}
}
}
+// Propagate escape states to referenced nodes.
+bool ConnectionGraph::propagate_escape_state(GrowableArray<int>* cg_worklist,
+ GrowableArray<uint>* worklist,
+ PointsToNode::EscapeState esc_state) {
+ bool has_java_obj = false;
+
+ // push all nodes with the same escape state on the worklist
+ uint cg_length = cg_worklist->length();
+ for (uint next = 0; next < cg_length; ++next) {
+ int nk = cg_worklist->at(next);
+ if (ptnode_adr(nk)->escape_state() == esc_state)
+ worklist->push(nk);
+ }
+ // mark all reachable nodes
+ while (worklist->length() > 0) {
+ PointsToNode* ptn = ptnode_adr(worklist->pop());
+ if (ptn->node_type() == PointsToNode::JavaObject) {
+ has_java_obj = true;
+ }
+ uint e_cnt = ptn->edge_count();
+ for (uint ei = 0; ei < e_cnt; ei++) {
+ uint npi = ptn->edge_target(ei);
+ PointsToNode *np = ptnode_adr(npi);
+ if (np->escape_state() < esc_state) {
+ set_escape_state(npi, esc_state);
+ worklist->push(npi);
+ }
+ }
+ }
+ // Has not escaping java objects
+ return has_java_obj && (esc_state < PointsToNode::GlobalEscape);
+}
+
void ConnectionGraph::process_call_arguments(CallNode *call, PhaseTransform *phase) {
switch (call->Opcode()) {
@@ -2100,6 +2164,7 @@ void ConnectionGraph::process_call_result(ProjNode *resproj, PhaseTransform *pha
} else {
es = PointsToNode::NoEscape;
edge_to = call_idx;
+ assert(ptnode_adr(call_idx)->scalar_replaceable(), "sanity");
}
set_escape_state(call_idx, es);
add_pointsto_edge(resproj_idx, edge_to);
@@ -2123,10 +2188,11 @@ void ConnectionGraph::process_call_result(ProjNode *resproj, PhaseTransform *pha
} else {
es = PointsToNode::NoEscape;
edge_to = call_idx;
+ assert(ptnode_adr(call_idx)->scalar_replaceable(), "sanity");
int length = call->in(AllocateNode::ALength)->find_int_con(-1);
if (length < 0 || length > EliminateAllocationArraySizeLimit) {
// Not scalar replaceable if the length is not constant or too big.
- ptnode_adr(call_idx)->_scalar_replaceable = false;
+ ptnode_adr(call_idx)->set_scalar_replaceable(false);
}
}
set_escape_state(call_idx, es);
@@ -2168,11 +2234,12 @@ void ConnectionGraph::process_call_result(ProjNode *resproj, PhaseTransform *pha
// Mark it as NoEscape so that objects referenced by
// it's fields will be marked as NoEscape at least.
set_escape_state(call_idx, PointsToNode::NoEscape);
+ ptnode_adr(call_idx)->set_scalar_replaceable(false);
add_pointsto_edge(resproj_idx, call_idx);
copy_dependencies = true;
} else if (call_analyzer->is_return_local()) {
// determine whether any arguments are returned
- set_escape_state(call_idx, PointsToNode::NoEscape);
+ set_escape_state(call_idx, PointsToNode::ArgEscape);
bool ret_arg = false;
for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
const Type* at = d->field_at(i);
@@ -2189,7 +2256,6 @@ void ConnectionGraph::process_call_result(ProjNode *resproj, PhaseTransform *pha
add_pointsto_edge(resproj_idx, arg->_idx);
else
add_deferred_edge(resproj_idx, arg->_idx);
- arg_esp->_hidden_alias = true;
}
}
}
@@ -2198,18 +2264,12 @@ void ConnectionGraph::process_call_result(ProjNode *resproj, PhaseTransform *pha
set_escape_state(call_idx, PointsToNode::GlobalEscape);
add_pointsto_edge(resproj_idx, _phantom_object);
}
- copy_dependencies = true;
+ if (done) {
+ copy_dependencies = true;
+ }
} else {
set_escape_state(call_idx, PointsToNode::GlobalEscape);
add_pointsto_edge(resproj_idx, _phantom_object);
- for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
- const Type* at = d->field_at(i);
- if (at->isa_oopptr() != NULL) {
- Node *arg = call->in(i)->uncast();
- PointsToNode *arg_esp = ptnode_adr(arg->_idx);
- arg_esp->_hidden_alias = true;
- }
- }
}
if (copy_dependencies)
call_analyzer->copy_dependencies(_compile->dependencies());
diff --git a/hotspot/src/share/vm/opto/escape.hpp b/hotspot/src/share/vm/opto/escape.hpp
index 0cd00f4..9ac2ca1 100644
--- a/hotspot/src/share/vm/opto/escape.hpp
+++ b/hotspot/src/share/vm/opto/escape.hpp
@@ -74,7 +74,7 @@
// C2 does not have local variables. However for the purposes of constructing
// the connection graph, the following IR nodes are treated as local variables:
// Phi (pointer values)
-// LoadP
+// LoadP, LoadN
// Proj#5 (value returned from callnodes including allocations)
// CheckCastPP, CastPP
//
@@ -84,7 +84,7 @@
//
// The following node types are JavaObject:
//
-// top()
+// phantom_object (general globally escaped object)
// Allocate
// AllocateArray
// Parm (for incoming arguments)
@@ -93,6 +93,7 @@
// ConP
// LoadKlass
// ThreadLocal
+// CallStaticJava (which returns Object)
//
// AddP nodes are fields.
//
@@ -130,10 +131,12 @@ public:
typedef enum {
UnknownEscape = 0,
- NoEscape = 1, // A scalar replaceable object with unique type.
- ArgEscape = 2, // An object passed as argument or referenced by
- // argument (and not globally escape during call).
- GlobalEscape = 3 // An object escapes the method and thread.
+ NoEscape = 1, // An object does not escape method or thread and it is
+ // not passed to call. It could be replaced with scalar.
+ ArgEscape = 2, // An object does not escape method or thread but it is
+ // passed as argument to call or referenced by argument
+ // and it does not escape during call.
+ GlobalEscape = 3 // An object escapes the method or thread.
} EscapeState;
typedef enum {
@@ -153,28 +156,25 @@ private:
NodeType _type;
EscapeState _escape;
- GrowableArray<uint>* _edges; // outgoing edges
+ GrowableArray<uint>* _edges; // outgoing edges
+ Node* _node; // Ideal node corresponding to this PointsTo node.
+ int _offset; // Object fields offsets.
+ bool _scalar_replaceable; // Not escaped object could be replaced with scalar
public:
- Node* _node; // Ideal node corresponding to this PointsTo node.
- int _offset; // Object fields offsets.
- bool _scalar_replaceable;// Not escaped object could be replaced with scalar
- bool _hidden_alias; // This node is an argument to a function.
- // which may return it creating a hidden alias.
-
PointsToNode():
_type(UnknownType),
_escape(UnknownEscape),
_edges(NULL),
_node(NULL),
_offset(-1),
- _scalar_replaceable(true),
- _hidden_alias(false) {}
+ _scalar_replaceable(true) {}
EscapeState escape_state() const { return _escape; }
NodeType node_type() const { return _type;}
int offset() { return _offset;}
+ bool scalar_replaceable() { return _scalar_replaceable;}
void set_offset(int offs) { _offset = offs;}
void set_escape_state(EscapeState state) { _escape = state; }
@@ -182,6 +182,7 @@ public:
assert(_type == UnknownType || _type == ntype, "Can't change node type");
_type = ntype;
}
+ void set_scalar_replaceable(bool v) { _scalar_replaceable = v; }
// count of outgoing edges
uint edge_count() const { return (_edges == NULL) ? 0 : _edges->length(); }
@@ -233,8 +234,8 @@ private:
// that pointer values loaded from
// a field which has not been set
// are assumed to point to.
- uint _oop_null; // ConP(#NULL)
- uint _noop_null; // ConN(#NULL)
+ uint _oop_null; // ConP(#NULL)->_idx
+ uint _noop_null; // ConN(#NULL)->_idx
Compile * _compile; // Compile object for current compilation
PhaseIterGVN * _igvn; // Value numbering
@@ -339,8 +340,16 @@ private:
// Set the escape state of a node
void set_escape_state(uint ni, PointsToNode::EscapeState es);
+ // Find fields initializing values for allocations.
+ void find_init_values(Node* n, VectorSet* visited, PhaseTransform* phase);
+
// Adjust escape state after Connection Graph is built.
- void adjust_escape_state(int nidx, PhaseTransform* phase);
+ void adjust_escape_state(Node* n);
+
+ // Propagate escape states to referenced nodes.
+ bool propagate_escape_state(GrowableArray<int>* cg_worklist,
+ GrowableArray<uint>* worklist,
+ PointsToNode::EscapeState esc_state);
// Compute the escape information
bool compute_escape();
@@ -357,21 +366,6 @@ public:
// escape state of a node
PointsToNode::EscapeState escape_state(Node *n);
- // other information we have collected
- bool is_scalar_replaceable(Node *n) {
- if (_collecting || (n->_idx >= nodes_size()))
- return false;
- PointsToNode* ptn = ptnode_adr(n->_idx);
- return ptn->escape_state() == PointsToNode::NoEscape && ptn->_scalar_replaceable;
- }
-
- bool hidden_alias(Node *n) {
- if (_collecting || (n->_idx >= nodes_size()))
- return true;
- PointsToNode* ptn = ptnode_adr(n->_idx);
- return (ptn->escape_state() != PointsToNode::NoEscape) || ptn->_hidden_alias;
- }
-
#ifndef PRODUCT
void dump();
#endif
diff --git a/hotspot/src/share/vm/opto/loopnode.cpp b/hotspot/src/share/vm/opto/loopnode.cpp
index 2243c39..3bd04ad 100644
--- a/hotspot/src/share/vm/opto/loopnode.cpp
+++ b/hotspot/src/share/vm/opto/loopnode.cpp
@@ -1883,7 +1883,7 @@ void PhaseIdealLoop::eliminate_useless_predicates() {
//----------------------------build_and_optimize-------------------------------
// Create a PhaseLoop. Build the ideal Loop tree. Map each Ideal Node to
// its corresponding LoopNode. If 'optimize' is true, do some loop cleanups.
-void PhaseIdealLoop::build_and_optimize(bool do_split_ifs) {
+void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool skip_loop_opts) {
ResourceMark rm;
int old_progress = C->major_progress();
@@ -2072,6 +2072,16 @@ void PhaseIdealLoop::build_and_optimize(bool do_split_ifs) {
}
#endif
+ if (skip_loop_opts) {
+ // Cleanup any modified bits
+ _igvn.optimize();
+
+ if (C->log() != NULL) {
+ log_loop_tree(_ltree_root, _ltree_root, C->log());
+ }
+ return;
+ }
+
if (ReassociateInvariants) {
// Reassociate invariants and prep for split_thru_phi
for (LoopTreeIterator iter(_ltree_root); !iter.done(); iter.next()) {
diff --git a/hotspot/src/share/vm/opto/loopnode.hpp b/hotspot/src/share/vm/opto/loopnode.hpp
index 817124b..9b4c38a 100644
--- a/hotspot/src/share/vm/opto/loopnode.hpp
+++ b/hotspot/src/share/vm/opto/loopnode.hpp
@@ -747,11 +747,11 @@ private:
_dom_lca_tags(arena()), // Thread::resource_area
_verify_me(NULL),
_verify_only(true) {
- build_and_optimize(false);
+ build_and_optimize(false, false);
}
// build the loop tree and perform any requested optimizations
- void build_and_optimize(bool do_split_if);
+ void build_and_optimize(bool do_split_if, bool skip_loop_opts);
public:
// Dominators for the sea of nodes
@@ -762,13 +762,13 @@ public:
Node *dom_lca_internal( Node *n1, Node *n2 ) const;
// Compute the Ideal Node to Loop mapping
- PhaseIdealLoop( PhaseIterGVN &igvn, bool do_split_ifs) :
+ PhaseIdealLoop( PhaseIterGVN &igvn, bool do_split_ifs, bool skip_loop_opts = false) :
PhaseTransform(Ideal_Loop),
_igvn(igvn),
_dom_lca_tags(arena()), // Thread::resource_area
_verify_me(NULL),
_verify_only(false) {
- build_and_optimize(do_split_ifs);
+ build_and_optimize(do_split_ifs, skip_loop_opts);
}
// Verify that verify_me made the same decisions as a fresh run.
@@ -778,7 +778,7 @@ public:
_dom_lca_tags(arena()), // Thread::resource_area
_verify_me(verify_me),
_verify_only(false) {
- build_and_optimize(false);
+ build_and_optimize(false, false);
}
// Build and verify the loop tree without modifying the graph. This
diff --git a/hotspot/src/share/vm/opto/loopopts.cpp b/hotspot/src/share/vm/opto/loopopts.cpp
index c693deb..93c1819 100644
--- a/hotspot/src/share/vm/opto/loopopts.cpp
+++ b/hotspot/src/share/vm/opto/loopopts.cpp
@@ -28,6 +28,7 @@
#include "opto/connode.hpp"
#include "opto/divnode.hpp"
#include "opto/loopnode.hpp"
+#include "opto/matcher.hpp"
#include "opto/mulnode.hpp"
#include "opto/rootnode.hpp"
#include "opto/subnode.hpp"
@@ -472,46 +473,50 @@ Node *PhaseIdealLoop::remix_address_expressions( Node *n ) {
// 1 or 2 items with a total of 1 or 2 ops executed speculatively.
Node *PhaseIdealLoop::conditional_move( Node *region ) {
- assert( region->is_Region(), "sanity check" );
- if( region->req() != 3 ) return NULL;
+ assert(region->is_Region(), "sanity check");
+ if (region->req() != 3) return NULL;
// Check for CFG diamond
Node *lp = region->in(1);
Node *rp = region->in(2);
- if( !lp || !rp ) return NULL;
+ if (!lp || !rp) return NULL;
Node *lp_c = lp->in(0);
- if( lp_c == NULL || lp_c != rp->in(0) || !lp_c->is_If() ) return NULL;
+ if (lp_c == NULL || lp_c != rp->in(0) || !lp_c->is_If()) return NULL;
IfNode *iff = lp_c->as_If();
- // Check for highly predictable branch. No point in CMOV'ing if
- // we are going to predict accurately all the time.
- // %%% This hides patterns produced by utility methods like Math.min.
- if( iff->_prob < PROB_UNLIKELY_MAG(3) ||
- iff->_prob > PROB_LIKELY_MAG(3) )
- return NULL;
-
// Check for ops pinned in an arm of the diamond.
// Can't remove the control flow in this case
- if( lp->outcnt() > 1 ) return NULL;
- if( rp->outcnt() > 1 ) return NULL;
+ if (lp->outcnt() > 1) return NULL;
+ if (rp->outcnt() > 1) return NULL;
+
+ IdealLoopTree* r_loop = get_loop(region);
+ assert(r_loop == get_loop(iff), "sanity");
+ // Always convert to CMOVE if all results are used only outside this loop.
+ bool used_inside_loop = (r_loop == _ltree_root);
// Check profitability
int cost = 0;
int phis = 0;
for (DUIterator_Fast imax, i = region->fast_outs(imax); i < imax; i++) {
Node *out = region->fast_out(i);
- if( !out->is_Phi() ) continue; // Ignore other control edges, etc
+ if (!out->is_Phi()) continue; // Ignore other control edges, etc
phis++;
PhiNode* phi = out->as_Phi();
- switch (phi->type()->basic_type()) {
- case T_LONG:
- cost++; // Probably encodes as 2 CMOV's
- case T_INT: // These all CMOV fine
+ BasicType bt = phi->type()->basic_type();
+ switch (bt) {
case T_FLOAT:
- case T_DOUBLE:
- case T_ADDRESS: // (RawPtr)
+ case T_DOUBLE: {
+ cost += Matcher::float_cmove_cost(); // Could be very expensive
+ break;
+ }
+ case T_LONG: {
+ cost += Matcher::long_cmove_cost(); // May encodes as 2 CMOV's
+ }
+ case T_INT: // These all CMOV fine
+ case T_ADDRESS: { // (RawPtr)
cost++;
break;
+ }
case T_NARROWOOP: // Fall through
case T_OBJECT: { // Base oops are OK, but not derived oops
const TypeOopPtr *tp = phi->type()->make_ptr()->isa_oopptr();
@@ -524,7 +529,7 @@ Node *PhaseIdealLoop::conditional_move( Node *region ) {
// relevant bases. This puts the allocator in the business of
// manufacturing expensive instructions, generally a bad plan.
// Just Say No to Conditionally-Moved Derived Pointers.
- if( tp && tp->offset() != 0 )
+ if (tp && tp->offset() != 0)
return NULL;
cost++;
break;
@@ -533,39 +538,64 @@ Node *PhaseIdealLoop::conditional_move( Node *region ) {
return NULL; // In particular, can't do memory or I/O
}
// Add in cost any speculative ops
- for( uint j = 1; j < region->req(); j++ ) {
+ for (uint j = 1; j < region->req(); j++) {
Node *proj = region->in(j);
Node *inp = phi->in(j);
if (get_ctrl(inp) == proj) { // Found local op
cost++;
// Check for a chain of dependent ops; these will all become
// speculative in a CMOV.
- for( uint k = 1; k < inp->req(); k++ )
+ for (uint k = 1; k < inp->req(); k++)
if (get_ctrl(inp->in(k)) == proj)
- return NULL; // Too much speculative goo
+ cost += ConditionalMoveLimit; // Too much speculative goo
}
}
// See if the Phi is used by a Cmp or Narrow oop Decode/Encode.
// This will likely Split-If, a higher-payoff operation.
for (DUIterator_Fast kmax, k = phi->fast_outs(kmax); k < kmax; k++) {
Node* use = phi->fast_out(k);
- if( use->is_Cmp() || use->is_DecodeN() || use->is_EncodeP() )
- return NULL;
+ if (use->is_Cmp() || use->is_DecodeN() || use->is_EncodeP())
+ cost += ConditionalMoveLimit;
+ // Is there a use inside the loop?
+ // Note: check only basic types since CMoveP is pinned.
+ if (!used_inside_loop && is_java_primitive(bt)) {
+ IdealLoopTree* u_loop = get_loop(has_ctrl(use) ? get_ctrl(use) : use);
+ if (r_loop == u_loop || r_loop->is_member(u_loop)) {
+ used_inside_loop = true;
+ }
+ }
}
}
- if( cost >= ConditionalMoveLimit ) return NULL; // Too much goo
Node* bol = iff->in(1);
- assert( bol->Opcode() == Op_Bool, "" );
+ assert(bol->Opcode() == Op_Bool, "");
int cmp_op = bol->in(1)->Opcode();
// It is expensive to generate flags from a float compare.
// Avoid duplicated float compare.
- if( phis > 1 && (cmp_op == Op_CmpF || cmp_op == Op_CmpD)) return NULL;
+ if (phis > 1 && (cmp_op == Op_CmpF || cmp_op == Op_CmpD)) return NULL;
+
+ float infrequent_prob = PROB_UNLIKELY_MAG(3);
+ // Ignore cost and blocks frequency if CMOVE can be moved outside the loop.
+ if (used_inside_loop) {
+ if (cost >= ConditionalMoveLimit) return NULL; // Too much goo
+
+ // BlockLayoutByFrequency optimization moves infrequent branch
+ // from hot path. No point in CMOV'ing in such case (110 is used
+ // instead of 100 to take into account not exactness of float value).
+ if (BlockLayoutByFrequency) {
+ infrequent_prob = MAX2(infrequent_prob, (float)BlockLayoutMinDiamondPercentage/110.0f);
+ }
+ }
+ // Check for highly predictable branch. No point in CMOV'ing if
+ // we are going to predict accurately all the time.
+ if (iff->_prob < infrequent_prob ||
+ iff->_prob > (1.0f - infrequent_prob))
+ return NULL;
// --------------
// Now replace all Phis with CMOV's
Node *cmov_ctrl = iff->in(0);
uint flip = (lp->Opcode() == Op_IfTrue);
- while( 1 ) {
+ while (1) {
PhiNode* phi = NULL;
for (DUIterator_Fast imax, i = region->fast_outs(imax); i < imax; i++) {
Node *out = region->fast_out(i);
@@ -576,15 +606,15 @@ Node *PhaseIdealLoop::conditional_move( Node *region ) {
}
if (phi == NULL) break;
#ifndef PRODUCT
- if( PrintOpto && VerifyLoopOptimizations ) tty->print_cr("CMOV");
+ if (PrintOpto && VerifyLoopOptimizations) tty->print_cr("CMOV");
#endif
// Move speculative ops
- for( uint j = 1; j < region->req(); j++ ) {
+ for (uint j = 1; j < region->req(); j++) {
Node *proj = region->in(j);
Node *inp = phi->in(j);
if (get_ctrl(inp) == proj) { // Found local op
#ifndef PRODUCT
- if( PrintOpto && VerifyLoopOptimizations ) {
+ if (PrintOpto && VerifyLoopOptimizations) {
tty->print(" speculate: ");
inp->dump();
}
@@ -596,7 +626,15 @@ Node *PhaseIdealLoop::conditional_move( Node *region ) {
register_new_node( cmov, cmov_ctrl );
_igvn.replace_node( phi, cmov );
#ifndef PRODUCT
- if( VerifyLoopOptimizations ) verify();
+ if (TraceLoopOpts) {
+ tty->print("CMOV ");
+ r_loop->dump_head();
+ if (Verbose) {
+ bol->in(1)->dump(1);
+ cmov->dump(1);
+ }
+ }
+ if (VerifyLoopOptimizations) verify();
#endif
}
@@ -676,14 +714,14 @@ Node *PhaseIdealLoop::split_if_with_blocks_pre( Node *n ) {
// Split 'n' through the merge point if it is profitable
Node *phi = split_thru_phi( n, n_blk, policy );
- if( !phi ) return n;
+ if (!phi) return n;
// Found a Phi to split thru!
// Replace 'n' with the new phi
_igvn.replace_node( n, phi );
// Moved a load around the loop, 'en-registering' something.
- if( n_blk->Opcode() == Op_Loop && n->is_Load() &&
- !phi->in(LoopNode::LoopBackControl)->is_Load() )
+ if (n_blk->is_Loop() && n->is_Load() &&
+ !phi->in(LoopNode::LoopBackControl)->is_Load())
C->set_major_progress();
return phi;
diff --git a/hotspot/src/share/vm/opto/machnode.cpp b/hotspot/src/share/vm/opto/machnode.cpp
index dd6c3c0..95ee4bf 100644
--- a/hotspot/src/share/vm/opto/machnode.cpp
+++ b/hotspot/src/share/vm/opto/machnode.cpp
@@ -484,6 +484,13 @@ int MachConstantNode::constant_offset() {
// Bind the offset lazily.
if (offset == -1) {
Compile::ConstantTable& constant_table = Compile::current()->constant_table();
+ // If called from Compile::scratch_emit_size assume the worst-case
+ // for load offsets: half the constant table size.
+ // NOTE: Don't return or calculate the actual offset (which might
+ // be zero) because that leads to problems with e.g. jumpXtnd on
+ // some architectures (cf. add-optimization in SPARC jumpXtnd).
+ if (Compile::current()->in_scratch_emit_size())
+ return constant_table.size() / 2;
offset = constant_table.table_base_offset() + constant_table.find_offset(_constant);
_constant.set_offset(offset);
}
diff --git a/hotspot/src/share/vm/opto/matcher.cpp b/hotspot/src/share/vm/opto/matcher.cpp
index 3244a94..1200d25 100644
--- a/hotspot/src/share/vm/opto/matcher.cpp
+++ b/hotspot/src/share/vm/opto/matcher.cpp
@@ -1915,7 +1915,7 @@ void Matcher::find_shared( Node *n ) {
set_dontcare(n);
break;
case Op_Jump:
- mstack.push(n->in(1), Visit); // Switch Value
+ mstack.push(n->in(1), Pre_Visit); // Switch Value (could be shared)
mstack.push(n->in(0), Pre_Visit); // Visit Control input
continue; // while (mstack.is_nonempty())
case Op_StrComp:
diff --git a/hotspot/src/share/vm/opto/matcher.hpp b/hotspot/src/share/vm/opto/matcher.hpp
index 39b00b0..3d1a2dc 100644
--- a/hotspot/src/share/vm/opto/matcher.hpp
+++ b/hotspot/src/share/vm/opto/matcher.hpp
@@ -360,6 +360,12 @@ public:
// Anything this size or smaller may get converted to discrete scalar stores.
static const int init_array_short_size;
+ // Some hardware needs 2 CMOV's for longs.
+ static const int long_cmove_cost();
+
+ // Some hardware have expensive CMOV for float and double.
+ static const int float_cmove_cost();
+
// Should the Matcher clone shifts on addressing modes, expecting them to
// be subsumed into complex addressing expressions or compute them into
// registers? True for Intel but false for most RISCs
diff --git a/hotspot/src/share/vm/opto/memnode.cpp b/hotspot/src/share/vm/opto/memnode.cpp
index 4f6dc08..5d4afb0 100644
--- a/hotspot/src/share/vm/opto/memnode.cpp
+++ b/hotspot/src/share/vm/opto/memnode.cpp
@@ -1421,6 +1421,12 @@ Node *LoadNode::Ideal(PhaseGVN *phase, bool can_reshape) {
const TypeOopPtr *t_oop = addr_t->isa_oopptr();
if (can_reshape && opt_mem->is_Phi() &&
(t_oop != NULL) && t_oop->is_known_instance_field()) {
+ PhaseIterGVN *igvn = phase->is_IterGVN();
+ if (igvn != NULL && igvn->_worklist.member(opt_mem)) {
+ // Delay this transformation until memory Phi is processed.
+ phase->is_IterGVN()->_worklist.push(this);
+ return NULL;
+ }
// Split instance field load through Phi.
Node* result = split_through_phi(phase);
if (result != NULL) return result;
diff --git a/hotspot/src/share/vm/opto/phaseX.cpp b/hotspot/src/share/vm/opto/phaseX.cpp
index 541744a..99b7393 100644
--- a/hotspot/src/share/vm/opto/phaseX.cpp
+++ b/hotspot/src/share/vm/opto/phaseX.cpp
@@ -322,11 +322,12 @@ void NodeHash::remove_useless_nodes(VectorSet &useful) {
void NodeHash::dump() {
_total_inserts += _inserts;
_total_insert_probes += _insert_probes;
- if( PrintCompilation && PrintOptoStatistics && Verbose && (_inserts > 0) ) { // PrintOptoGVN
- if( PrintCompilation2 ) {
- for( uint i=0; i<_max; i++ )
- if( _table[i] )
- tty->print("%d/%d/%d ",i,_table[i]->hash()&(_max-1),_table[i]->_idx);
+ if (PrintCompilation && PrintOptoStatistics && Verbose && (_inserts > 0)) {
+ if (WizardMode) {
+ for (uint i=0; i<_max; i++) {
+ if (_table[i])
+ tty->print("%d/%d/%d ",i,_table[i]->hash()&(_max-1),_table[i]->_idx);
+ }
}
tty->print("\nGVN Hash stats: %d grows to %d max_size\n", _grows, _max);
tty->print(" %d/%d (%8.1f%% full)\n", _inserts, _max, (double)_inserts/_max*100.0);
diff --git a/hotspot/src/share/vm/opto/runtime.cpp b/hotspot/src/share/vm/opto/runtime.cpp
index a4495ea..b97f06a 100644
--- a/hotspot/src/share/vm/opto/runtime.cpp
+++ b/hotspot/src/share/vm/opto/runtime.cpp
@@ -338,6 +338,24 @@ JRT_BLOCK_ENTRY(void, OptoRuntime::new_array_nozero_C(klassOopDesc* array_type,
// inform GC that we won't do card marks for initializing writes.
new_store_pre_barrier(thread);
}
+
+ oop result = thread->vm_result();
+ if ((len > 0) && (result != NULL) &&
+ is_deoptimized_caller_frame(thread)) {
+ // Zero array here if the caller is deoptimized.
+ int size = ((typeArrayOop)result)->object_size();
+ BasicType elem_type = typeArrayKlass::cast(array_type)->element_type();
+ const size_t hs = arrayOopDesc::header_size(elem_type);
+ // Align to next 8 bytes to avoid trashing arrays's length.
+ const size_t aligned_hs = align_object_offset(hs);
+ HeapWord* obj = (HeapWord*)result;
+ if (aligned_hs > hs) {
+ Copy::zero_to_words(obj+hs, aligned_hs-hs);
+ }
+ // Optimized zeroing.
+ Copy::fill_to_aligned_words(obj+aligned_hs, size-aligned_hs);
+ }
+
JRT_END
// Note: multianewarray for one dimension is handled inline by GraphKit::new_array.
@@ -997,10 +1015,13 @@ JRT_ENTRY_NO_ASYNC(address, OptoRuntime::handle_exception_C_helper(JavaThread* t
force_unwind ? NULL : nm->handler_for_exception_and_pc(exception, pc);
if (handler_address == NULL) {
+ Handle original_exception(thread, exception());
handler_address = SharedRuntime::compute_compiled_exc_handler(nm, pc, exception, force_unwind, true);
assert (handler_address != NULL, "must have compiled handler");
- // Update the exception cache only when the unwind was not forced.
- if (!force_unwind) {
+ // Update the exception cache only when the unwind was not forced
+ // and there didn't happen another exception during the computation of the
+ // compiled exception handler.
+ if (!force_unwind && original_exception() == exception()) {
nm->add_handler_for_exception_and_pc(exception,pc,handler_address);
}
} else {
@@ -1127,12 +1148,22 @@ void OptoRuntime::deoptimize_caller_frame(JavaThread *thread, bool doit) {
assert(stub_frame.is_runtime_frame() || exception_blob()->contains(stub_frame.pc()), "sanity check");
frame caller_frame = stub_frame.sender(®_map);
- // bypass VM_DeoptimizeFrame and deoptimize the frame directly
+ // Deoptimize the caller frame.
Deoptimization::deoptimize_frame(thread, caller_frame.id());
}
}
+bool OptoRuntime::is_deoptimized_caller_frame(JavaThread *thread) {
+ // Called from within the owner thread, so no need for safepoint
+ RegisterMap reg_map(thread);
+ frame stub_frame = thread->last_frame();
+ assert(stub_frame.is_runtime_frame() || exception_blob()->contains(stub_frame.pc()), "sanity check");
+ frame caller_frame = stub_frame.sender(®_map);
+ return caller_frame.is_deoptimized_frame();
+}
+
+
const TypeFunc *OptoRuntime::register_finalizer_Type() {
// create input type (domain)
const Type **fields = TypeTuple::fields(1);
diff --git a/hotspot/src/share/vm/opto/runtime.hpp b/hotspot/src/share/vm/opto/runtime.hpp
index f2c538b..3970298 100644
--- a/hotspot/src/share/vm/opto/runtime.hpp
+++ b/hotspot/src/share/vm/opto/runtime.hpp
@@ -175,6 +175,7 @@ private:
static address handle_exception_C_helper(JavaThread* thread, nmethod*& nm);
static address rethrow_C (oopDesc* exception, JavaThread *thread, address return_pc );
static void deoptimize_caller_frame (JavaThread *thread, bool doit);
+ static bool is_deoptimized_caller_frame (JavaThread *thread);
// CodeBlob support
// ===================================================================
diff --git a/hotspot/src/share/vm/precompiled.hpp b/hotspot/src/share/vm/precompiled/precompiled.hpp
similarity index 100%
copy from hotspot/src/share/vm/precompiled.hpp
copy to hotspot/src/share/vm/precompiled/precompiled.hpp
diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp
index 4e46f6a..aef42cb 100644
--- a/hotspot/src/share/vm/prims/jni.cpp
+++ b/hotspot/src/share/vm/prims/jni.cpp
@@ -110,6 +110,7 @@ static jint CurrentVersion = JNI_VERSION_1_6;
// return_value = 5;
// return return_value;
// JNI_END
+#ifndef USDT2
#define DT_RETURN_MARK_DECL(name, type) \
HS_DTRACE_PROBE_DECL1(hotspot_jni, name##__return, type); \
DTRACE_ONLY( \
@@ -134,6 +135,30 @@ static jint CurrentVersion = JNI_VERSION_1_6;
} \
)
+#else /* USDT2 */
+
+#define DT_RETURN_MARK_DECL(name, type, probe) \
+ DTRACE_ONLY( \
+ class DTraceReturnProbeMark_##name { \
+ public: \
+ const type& _ret_ref; \
+ DTraceReturnProbeMark_##name(const type& v) : _ret_ref(v) {} \
+ ~DTraceReturnProbeMark_##name() { \
+ probe; \
+ } \
+ } \
+ )
+// Void functions are simpler since there's no return value
+#define DT_VOID_RETURN_MARK_DECL(name, probe) \
+ DTRACE_ONLY( \
+ class DTraceReturnProbeMark_##name { \
+ public: \
+ ~DTraceReturnProbeMark_##name() { \
+ probe; \
+ } \
+ } \
+ )
+#endif /* USDT2 */
// Place these macros in the function to mark the return. Non-void
// functions need the type and address of the return value.
@@ -162,9 +187,15 @@ static jint CurrentVersion = JNI_VERSION_1_6;
// Choose DT_RETURN_MARK macros based on the type: float/double -> void
// (dtrace doesn't do FP yet)
+#ifndef USDT2
#define DT_RETURN_MARK_DECL_FOR(TypeName, name, type) \
FP_SELECT(TypeName, \
DT_RETURN_MARK_DECL(name, type), DT_VOID_RETURN_MARK_DECL(name) )
+#else /* USDT2 */
+#define DT_RETURN_MARK_DECL_FOR(TypeName, name, type, probe) \
+ FP_SELECT(TypeName, \
+ DT_RETURN_MARK_DECL(name, type, probe), DT_VOID_RETURN_MARK_DECL(name, probe) )
+#endif /* USDT2 */
#define DT_RETURN_MARK_FOR(TypeName, name, type, ref) \
FP_SELECT(TypeName, \
DT_RETURN_MARK(name, type, ref), DT_VOID_RETURN_MARK(name) )
@@ -323,14 +354,24 @@ const int MAX_REASONABLE_LOCAL_CAPACITY = 4*K;
// Implementation of JNI entries
+#ifndef USDT2
DT_RETURN_MARK_DECL(DefineClass, jclass);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(DefineClass, jclass
+ , HOTSPOT_JNI_DEFINECLASS_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jclass, jni_DefineClass(JNIEnv *env, const char *name, jobject loaderRef,
const jbyte *buf, jsize bufLen))
JNIWrapper("DefineClass");
+#ifndef USDT2
DTRACE_PROBE5(hotspot_jni, DefineClass__entry,
env, name, loaderRef, buf, bufLen);
+#else /* USDT2 */
+ HOTSPOT_JNI_DEFINECLASS_ENTRY(
+ env, (char*) name, loaderRef, (char*) buf, bufLen);
+#endif /* USDT2 */
jclass cls = NULL;
DT_RETURN_MARK(DefineClass, jclass, (const jclass&)cls);
@@ -376,11 +417,21 @@ JNI_END
static bool first_time_FindClass = true;
+#ifndef USDT2
DT_RETURN_MARK_DECL(FindClass, jclass);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(FindClass, jclass
+ , HOTSPOT_JNI_FINDCLASS_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jclass, jni_FindClass(JNIEnv *env, const char *name))
JNIWrapper("FindClass");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, FindClass__entry, env, name);
+#else /* USDT2 */
+ HOTSPOT_JNI_FINDCLASS_ENTRY(
+ env, (char *)name);
+#endif /* USDT2 */
jclass result = NULL;
DT_RETURN_MARK(FindClass, jclass, (const jclass&)result);
@@ -444,11 +495,21 @@ JNI_ENTRY(jclass, jni_FindClass(JNIEnv *env, const char *name))
return result;
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(FromReflectedMethod, jmethodID);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(FromReflectedMethod, jmethodID
+ , HOTSPOT_JNI_FROMREFLECTEDMETHOD_RETURN((uintptr_t)_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jmethodID, jni_FromReflectedMethod(JNIEnv *env, jobject method))
JNIWrapper("FromReflectedMethod");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, FromReflectedMethod__entry, env, method);
+#else /* USDT2 */
+ HOTSPOT_JNI_FROMREFLECTEDMETHOD_ENTRY(
+ env, method);
+#endif /* USDT2 */
jmethodID ret = NULL;
DT_RETURN_MARK(FromReflectedMethod, jmethodID, (const jmethodID&)ret);
@@ -475,11 +536,21 @@ JNI_ENTRY(jmethodID, jni_FromReflectedMethod(JNIEnv *env, jobject method))
return ret;
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(FromReflectedField, jfieldID);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(FromReflectedField, jfieldID
+ , HOTSPOT_JNI_FROMREFLECTEDFIELD_RETURN((uintptr_t)_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jfieldID, jni_FromReflectedField(JNIEnv *env, jobject field))
JNIWrapper("FromReflectedField");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, FromReflectedField__entry, env, field);
+#else /* USDT2 */
+ HOTSPOT_JNI_FROMREFLECTEDFIELD_ENTRY(
+ env, field);
+#endif /* USDT2 */
jfieldID ret = NULL;
DT_RETURN_MARK(FromReflectedField, jfieldID, (const jfieldID&)ret);
@@ -514,11 +585,21 @@ JNI_ENTRY(jfieldID, jni_FromReflectedField(JNIEnv *env, jobject field))
return ret;
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(ToReflectedMethod, jobject);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(ToReflectedMethod, jobject
+ , HOTSPOT_JNI_TOREFLECTEDMETHOD_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jobject, jni_ToReflectedMethod(JNIEnv *env, jclass cls, jmethodID method_id, jboolean isStatic))
JNIWrapper("ToReflectedMethod");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, ToReflectedMethod__entry, env, cls, method_id, isStatic);
+#else /* USDT2 */
+ HOTSPOT_JNI_TOREFLECTEDMETHOD_ENTRY(
+ env, cls, (uintptr_t) method_id, isStatic);
+#endif /* USDT2 */
jobject ret = NULL;
DT_RETURN_MARK(ToReflectedMethod, jobject, (const jobject&)ret);
@@ -534,11 +615,21 @@ JNI_ENTRY(jobject, jni_ToReflectedMethod(JNIEnv *env, jclass cls, jmethodID meth
return ret;
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(GetSuperclass, jclass);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(GetSuperclass, jclass
+ , HOTSPOT_JNI_GETSUPERCLASS_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jclass, jni_GetSuperclass(JNIEnv *env, jclass sub))
JNIWrapper("GetSuperclass");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetSuperclass__entry, env, sub);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSUPERCLASS_ENTRY(
+ env, sub);
+#endif /* USDT2 */
jclass obj = NULL;
DT_RETURN_MARK(GetSuperclass, jclass, (const jclass&)obj);
@@ -567,13 +658,23 @@ JNI_END
JNI_QUICK_ENTRY(jboolean, jni_IsAssignableFrom(JNIEnv *env, jclass sub, jclass super))
JNIWrapper("IsSubclassOf");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, IsAssignableFrom__entry, env, sub, super);
+#else /* USDT2 */
+ HOTSPOT_JNI_ISASSIGNABLEFROM_ENTRY(
+ env, sub, super);
+#endif /* USDT2 */
oop sub_mirror = JNIHandles::resolve_non_null(sub);
oop super_mirror = JNIHandles::resolve_non_null(super);
if (java_lang_Class::is_primitive(sub_mirror) ||
java_lang_Class::is_primitive(super_mirror)) {
jboolean ret = (sub_mirror == super_mirror);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, IsAssignableFrom__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_ISASSIGNABLEFROM_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
}
klassOop sub_klass = java_lang_Class::as_klassOop(sub_mirror);
@@ -581,15 +682,30 @@ JNI_QUICK_ENTRY(jboolean, jni_IsAssignableFrom(JNIEnv *env, jclass sub, jclass s
assert(sub_klass != NULL && super_klass != NULL, "invalid arguments to jni_IsAssignableFrom");
jboolean ret = Klass::cast(sub_klass)->is_subtype_of(super_klass) ?
JNI_TRUE : JNI_FALSE;
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, IsAssignableFrom__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_ISASSIGNABLEFROM_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(Throw, jint);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(Throw, jint
+ , HOTSPOT_JNI_THROW_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jint, jni_Throw(JNIEnv *env, jthrowable obj))
JNIWrapper("Throw");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, Throw__entry, env, obj);
+#else /* USDT2 */
+ HOTSPOT_JNI_THROW_ENTRY(
+ env, obj);
+#endif /* USDT2 */
jint ret = JNI_OK;
DT_RETURN_MARK(Throw, jint, (const jint&)ret);
@@ -597,11 +713,21 @@ JNI_ENTRY(jint, jni_Throw(JNIEnv *env, jthrowable obj))
ShouldNotReachHere();
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(ThrowNew, jint);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(ThrowNew, jint
+ , HOTSPOT_JNI_THROWNEW_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jint, jni_ThrowNew(JNIEnv *env, jclass clazz, const char *message))
JNIWrapper("ThrowNew");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, ThrowNew__entry, env, clazz, message);
+#else /* USDT2 */
+ HOTSPOT_JNI_THROWNEW_ENTRY(
+ env, clazz, (char *) message);
+#endif /* USDT2 */
jint ret = JNI_OK;
DT_RETURN_MARK(ThrowNew, jint, (const jint&)ret);
@@ -630,18 +756,33 @@ static void jni_check_async_exceptions(JavaThread *thread) {
JNI_ENTRY_NO_PRESERVE(jthrowable, jni_ExceptionOccurred(JNIEnv *env))
JNIWrapper("ExceptionOccurred");
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionOccurred__entry, env);
+#else /* USDT2 */
+ HOTSPOT_JNI_EXCEPTIONOCCURRED_ENTRY(
+ env);
+#endif /* USDT2 */
jni_check_async_exceptions(thread);
oop exception = thread->pending_exception();
jthrowable ret = (jthrowable) JNIHandles::make_local(env, exception);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionOccurred__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_EXCEPTIONOCCURRED_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
JNI_ENTRY_NO_PRESERVE(void, jni_ExceptionDescribe(JNIEnv *env))
JNIWrapper("ExceptionDescribe");
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionDescribe__entry, env);
+#else /* USDT2 */
+ HOTSPOT_JNI_EXCEPTIONDESCRIBE_ENTRY(
+ env);
+#endif /* USDT2 */
if (thread->has_pending_exception()) {
Handle ex(thread, thread->pending_exception());
thread->clear_pending_exception();
@@ -677,13 +818,23 @@ JNI_ENTRY_NO_PRESERVE(void, jni_ExceptionDescribe(JNIEnv *env))
}
}
}
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, ExceptionDescribe__return);
+#else /* USDT2 */
+ HOTSPOT_JNI_EXCEPTIONDESCRIBE_RETURN(
+ );
+#endif /* USDT2 */
JNI_END
JNI_QUICK_ENTRY(void, jni_ExceptionClear(JNIEnv *env))
JNIWrapper("ExceptionClear");
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionClear__entry, env);
+#else /* USDT2 */
+ HOTSPOT_JNI_EXCEPTIONCLEAR_ENTRY(
+ env);
+#endif /* USDT2 */
// The jni code might be using this API to clear java thrown exception.
// So just mark jvmti thread exception state as exception caught.
@@ -692,13 +843,23 @@ JNI_QUICK_ENTRY(void, jni_ExceptionClear(JNIEnv *env))
state->set_exception_caught();
}
thread->clear_pending_exception();
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, ExceptionClear__return);
+#else /* USDT2 */
+ HOTSPOT_JNI_EXCEPTIONCLEAR_RETURN(
+ );
+#endif /* USDT2 */
JNI_END
JNI_ENTRY(void, jni_FatalError(JNIEnv *env, const char *msg))
JNIWrapper("FatalError");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, FatalError__entry, env, msg);
+#else /* USDT2 */
+ HOTSPOT_JNI_FATALERROR_ENTRY(
+ env, (char *) msg);
+#endif /* USDT2 */
tty->print_cr("FATAL ERROR in native method: %s", msg);
thread->print_stack();
os::abort(); // Dump core and abort
@@ -707,10 +868,20 @@ JNI_END
JNI_ENTRY(jint, jni_PushLocalFrame(JNIEnv *env, jint capacity))
JNIWrapper("PushLocalFrame");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, PushLocalFrame__entry, env, capacity);
+#else /* USDT2 */
+ HOTSPOT_JNI_PUSHLOCALFRAME_ENTRY(
+ env, capacity);
+#endif /* USDT2 */
//%note jni_11
if (capacity < 0 && capacity > MAX_REASONABLE_LOCAL_CAPACITY) {
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, PushLocalFrame__return, JNI_ERR);
+#else /* USDT2 */
+ HOTSPOT_JNI_PUSHLOCALFRAME_RETURN(
+ (uint32_t)JNI_ERR);
+#endif /* USDT2 */
return JNI_ERR;
}
JNIHandleBlock* old_handles = thread->active_handles();
@@ -719,14 +890,24 @@ JNI_ENTRY(jint, jni_PushLocalFrame(JNIEnv *env, jint capacity))
new_handles->set_pop_frame_link(old_handles);
thread->set_active_handles(new_handles);
jint ret = JNI_OK;
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, PushLocalFrame__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_PUSHLOCALFRAME_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
JNI_ENTRY(jobject, jni_PopLocalFrame(JNIEnv *env, jobject result))
JNIWrapper("PopLocalFrame");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, PopLocalFrame__entry, env, result);
+#else /* USDT2 */
+ HOTSPOT_JNI_POPLOCALFRAME_ENTRY(
+ env, result);
+#endif /* USDT2 */
//%note jni_11
Handle result_handle(thread, JNIHandles::resolve(result));
JNIHandleBlock* old_handles = thread->active_handles();
@@ -741,71 +922,141 @@ JNI_ENTRY(jobject, jni_PopLocalFrame(JNIEnv *env, jobject result))
JNIHandleBlock::release_block(old_handles, thread); // may block
result = JNIHandles::make_local(thread, result_handle());
}
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, PopLocalFrame__return, result);
+#else /* USDT2 */
+ HOTSPOT_JNI_POPLOCALFRAME_RETURN(
+ result);
+#endif /* USDT2 */
return result;
JNI_END
JNI_ENTRY(jobject, jni_NewGlobalRef(JNIEnv *env, jobject ref))
JNIWrapper("NewGlobalRef");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, NewGlobalRef__entry, env, ref);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWGLOBALREF_ENTRY(
+ env, ref);
+#endif /* USDT2 */
Handle ref_handle(thread, JNIHandles::resolve(ref));
jobject ret = JNIHandles::make_global(ref_handle);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, NewGlobalRef__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWGLOBALREF_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
// Must be JNI_ENTRY (with HandleMark)
JNI_ENTRY_NO_PRESERVE(void, jni_DeleteGlobalRef(JNIEnv *env, jobject ref))
JNIWrapper("DeleteGlobalRef");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, DeleteGlobalRef__entry, env, ref);
+#else /* USDT2 */
+ HOTSPOT_JNI_DELETEGLOBALREF_ENTRY(
+ env, ref);
+#endif /* USDT2 */
JNIHandles::destroy_global(ref);
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, DeleteGlobalRef__return);
+#else /* USDT2 */
+ HOTSPOT_JNI_DELETEGLOBALREF_RETURN(
+ );
+#endif /* USDT2 */
JNI_END
JNI_QUICK_ENTRY(void, jni_DeleteLocalRef(JNIEnv *env, jobject obj))
JNIWrapper("DeleteLocalRef");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, DeleteLocalRef__entry, env, obj);
+#else /* USDT2 */
+ HOTSPOT_JNI_DELETELOCALREF_ENTRY(
+ env, obj);
+#endif /* USDT2 */
JNIHandles::destroy_local(obj);
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, DeleteLocalRef__return);
+#else /* USDT2 */
+ HOTSPOT_JNI_DELETELOCALREF_RETURN(
+ );
+#endif /* USDT2 */
JNI_END
JNI_QUICK_ENTRY(jboolean, jni_IsSameObject(JNIEnv *env, jobject r1, jobject r2))
JNIWrapper("IsSameObject");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, IsSameObject__entry, env, r1, r2);
+#else /* USDT2 */
+ HOTSPOT_JNI_ISSAMEOBJECT_ENTRY(
+ env, r1, r2);
+#endif /* USDT2 */
oop a = JNIHandles::resolve(r1);
oop b = JNIHandles::resolve(r2);
jboolean ret = (a == b) ? JNI_TRUE : JNI_FALSE;
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, IsSameObject__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_ISSAMEOBJECT_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
JNI_ENTRY(jobject, jni_NewLocalRef(JNIEnv *env, jobject ref))
JNIWrapper("NewLocalRef");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, NewLocalRef__entry, env, ref);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWLOCALREF_ENTRY(
+ env, ref);
+#endif /* USDT2 */
jobject ret = JNIHandles::make_local(env, JNIHandles::resolve(ref));
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, NewLocalRef__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWLOCALREF_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
JNI_LEAF(jint, jni_EnsureLocalCapacity(JNIEnv *env, jint capacity))
JNIWrapper("EnsureLocalCapacity");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, EnsureLocalCapacity__entry, env, capacity);
+#else /* USDT2 */
+ HOTSPOT_JNI_ENSURELOCALCAPACITY_ENTRY(
+ env, capacity);
+#endif /* USDT2 */
jint ret;
if (capacity >= 0 && capacity <= MAX_REASONABLE_LOCAL_CAPACITY) {
ret = JNI_OK;
} else {
ret = JNI_ERR;
}
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, EnsureLocalCapacity__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_ENSURELOCALCAPACITY_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
// Return the Handle Type
JNI_LEAF(jobjectRefType, jni_GetObjectRefType(JNIEnv *env, jobject obj))
JNIWrapper("GetObjectRefType");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetObjectRefType__entry, env, obj);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETOBJECTREFTYPE_ENTRY(
+ env, obj);
+#endif /* USDT2 */
jobjectRefType ret;
if (JNIHandles::is_local_handle(thread, obj) ||
JNIHandles::is_frame_handle(thread, obj))
@@ -816,7 +1067,12 @@ JNI_LEAF(jobjectRefType, jni_GetObjectRefType(JNIEnv *env, jobject obj))
ret = JNIWeakGlobalRefType;
else
ret = JNIInvalidRefType;
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetObjectRefType__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETOBJECTREFTYPE_RETURN(
+ (void *) ret);
+#endif /* USDT2 */
return ret;
JNI_END
@@ -1167,12 +1423,22 @@ static instanceOop alloc_object(jclass clazz, TRAPS) {
return ih;
}
+#ifndef USDT2
DT_RETURN_MARK_DECL(AllocObject, jobject);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(AllocObject, jobject
+ , HOTSPOT_JNI_ALLOCOBJECT_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jobject, jni_AllocObject(JNIEnv *env, jclass clazz))
JNIWrapper("AllocObject");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, AllocObject__entry, env, clazz);
+#else /* USDT2 */
+ HOTSPOT_JNI_ALLOCOBJECT_ENTRY(
+ env, clazz);
+#endif /* USDT2 */
jobject ret = NULL;
DT_RETURN_MARK(AllocObject, jobject, (const jobject&)ret);
@@ -1181,11 +1447,21 @@ JNI_ENTRY(jobject, jni_AllocObject(JNIEnv *env, jclass clazz))
return ret;
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(NewObjectA, jobject);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(NewObjectA, jobject
+ , HOTSPOT_JNI_NEWOBJECTA_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jobject, jni_NewObjectA(JNIEnv *env, jclass clazz, jmethodID methodID, const jvalue *args))
JNIWrapper("NewObjectA");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, NewObjectA__entry, env, clazz, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWOBJECTA_ENTRY(
+ env, clazz, (uintptr_t) methodID);
+#endif /* USDT2 */
jobject obj = NULL;
DT_RETURN_MARK(NewObjectA, jobject, (const jobject)obj);
@@ -1197,11 +1473,21 @@ JNI_ENTRY(jobject, jni_NewObjectA(JNIEnv *env, jclass clazz, jmethodID methodID,
return obj;
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(NewObjectV, jobject);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(NewObjectV, jobject
+ , HOTSPOT_JNI_NEWOBJECTV_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jobject, jni_NewObjectV(JNIEnv *env, jclass clazz, jmethodID methodID, va_list args))
JNIWrapper("NewObjectV");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, NewObjectV__entry, env, clazz, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWOBJECTV_ENTRY(
+ env, clazz, (uintptr_t) methodID);
+#endif /* USDT2 */
jobject obj = NULL;
DT_RETURN_MARK(NewObjectV, jobject, (const jobject&)obj);
@@ -1213,11 +1499,21 @@ JNI_ENTRY(jobject, jni_NewObjectV(JNIEnv *env, jclass clazz, jmethodID methodID,
return obj;
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(NewObject, jobject);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(NewObject, jobject
+ , HOTSPOT_JNI_NEWOBJECT_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jobject, jni_NewObject(JNIEnv *env, jclass clazz, jmethodID methodID, ...))
JNIWrapper("NewObject");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, NewObject__entry, env, clazz, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWOBJECT_ENTRY(
+ env, clazz, (uintptr_t) methodID);
+#endif /* USDT2 */
jobject obj = NULL;
DT_RETURN_MARK(NewObject, jobject, (const jobject&)obj);
@@ -1235,17 +1531,32 @@ JNI_END
JNI_ENTRY(jclass, jni_GetObjectClass(JNIEnv *env, jobject obj))
JNIWrapper("GetObjectClass");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetObjectClass__entry, env, obj);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETOBJECTCLASS_ENTRY(
+ env, obj);
+#endif /* USDT2 */
klassOop k = JNIHandles::resolve_non_null(obj)->klass();
jclass ret =
(jclass) JNIHandles::make_local(env, Klass::cast(k)->java_mirror());
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetObjectClass__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETOBJECTCLASS_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
JNI_QUICK_ENTRY(jboolean, jni_IsInstanceOf(JNIEnv *env, jobject obj, jclass clazz))
JNIWrapper("IsInstanceOf");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, IsInstanceOf__entry, env, obj, clazz);
+#else /* USDT2 */
+ HOTSPOT_JNI_ISINSTANCEOF_ENTRY(
+ env, obj, clazz);
+#endif /* USDT2 */
jboolean ret = JNI_TRUE;
if (obj != NULL) {
ret = JNI_FALSE;
@@ -1255,7 +1566,12 @@ JNI_QUICK_ENTRY(jboolean, jni_IsInstanceOf(JNIEnv *env, jobject obj, jclass claz
ret = JNIHandles::resolve_non_null(obj)->is_a(k) ? JNI_TRUE : JNI_FALSE;
}
}
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, IsInstanceOf__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_ISINSTANCEOF_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
@@ -1317,9 +1633,19 @@ static jmethodID get_method_id(JNIEnv *env, jclass clazz, const char *name_str,
JNI_ENTRY(jmethodID, jni_GetMethodID(JNIEnv *env, jclass clazz,
const char *name, const char *sig))
JNIWrapper("GetMethodID");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, GetMethodID__entry, env, clazz, name, sig);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETMETHODID_ENTRY(
+ env, clazz, (char *) name, (char *) sig);
+#endif /* USDT2 */
jmethodID ret = get_method_id(env, clazz, name, sig, false, thread);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetMethodID__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETMETHODID_RETURN(
+ (uintptr_t) ret);
+#endif /* USDT2 */
return ret;
JNI_END
@@ -1327,9 +1653,19 @@ JNI_END
JNI_ENTRY(jmethodID, jni_GetStaticMethodID(JNIEnv *env, jclass clazz,
const char *name, const char *sig))
JNIWrapper("GetStaticMethodID");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, GetStaticMethodID__entry, env, clazz, name, sig);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTATICMETHODID_ENTRY(
+ env, (char *) clazz, (char *) name, (char *)sig);
+#endif /* USDT2 */
jmethodID ret = get_method_id(env, clazz, name, sig, true, thread);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStaticMethodID__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTATICMETHODID_RETURN(
+ (uintptr_t) ret);
+#endif /* USDT2 */
return ret;
JNI_END
@@ -1339,7 +1675,7 @@ JNI_END
// Calling Methods
//
-
+#ifndef USDT2
#define DEFINE_CALLMETHOD(ResultType, Result, Tag) \
\
DT_RETURN_MARK_DECL_FOR(Result, Call##Result##Method, ResultType);\
@@ -1350,7 +1686,7 @@ JNI_ENTRY(ResultType, \
jni_Call##Result##Method(JNIEnv *env, jobject obj, jmethodID methodID, ...)) \
JNIWrapper("Call" XSTR(Result) "Method"); \
\
- DTRACE_PROBE3(hotspot_jni, Call##Result##Method__entry, env, obj, methodID);\
+ DTRACE_PROBE3(hotspot_jni, Call##Result##Method__entry, env, obj, methodID); \
ResultType ret = 0;\
DT_RETURN_MARK_FOR(Result, Call##Result##Method, ResultType, \
(const ResultType&)ret);\
@@ -1370,7 +1706,7 @@ JNI_ENTRY(ResultType, \
jni_Call##Result##MethodV(JNIEnv *env, jobject obj, jmethodID methodID, va_list args)) \
JNIWrapper("Call" XSTR(Result) "MethodV"); \
\
- DTRACE_PROBE3(hotspot_jni, Call##Result##MethodV__entry, env, obj, methodID);\
+ DTRACE_PROBE3(hotspot_jni, Call##Result##MethodV__entry, env, obj, methodID); \
ResultType ret = 0;\
DT_RETURN_MARK_FOR(Result, Call##Result##MethodV, ResultType, \
(const ResultType&)ret);\
@@ -1386,7 +1722,7 @@ JNI_END \
JNI_ENTRY(ResultType, \
jni_Call##Result##MethodA(JNIEnv *env, jobject obj, jmethodID methodID, const jvalue *args)) \
JNIWrapper("Call" XSTR(Result) "MethodA"); \
- DTRACE_PROBE3(hotspot_jni, Call##Result##MethodA__entry, env, obj, methodID);\
+ DTRACE_PROBE3(hotspot_jni, Call##Result##MethodA__entry, env, obj, methodID); \
ResultType ret = 0;\
DT_RETURN_MARK_FOR(Result, Call##Result##MethodA, ResultType, \
(const ResultType&)ret);\
@@ -1414,9 +1750,183 @@ DT_VOID_RETURN_MARK_DECL(CallVoidMethod);
DT_VOID_RETURN_MARK_DECL(CallVoidMethodV);
DT_VOID_RETURN_MARK_DECL(CallVoidMethodA);
+#else /* USDT2 */
+
+#define DEFINE_CALLMETHOD(ResultType, Result, Tag \
+ , EntryProbe, ReturnProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, Call##Result##Method, ResultType \
+ , ReturnProbe); \
+\
+JNI_ENTRY(ResultType, \
+ jni_Call##Result##Method(JNIEnv *env, jobject obj, jmethodID methodID, ...)) \
+ JNIWrapper("Call" XSTR(Result) "Method"); \
+\
+ EntryProbe; \
+ ResultType ret = 0;\
+ DT_RETURN_MARK_FOR(Result, Call##Result##Method, ResultType, \
+ (const ResultType&)ret);\
+\
+ va_list args; \
+ va_start(args, methodID); \
+ JavaValue jvalue(Tag); \
+ JNI_ArgumentPusherVaArg ap(methodID, args); \
+ jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \
+ va_end(args); \
+ ret = jvalue.get_##ResultType(); \
+ return ret;\
+JNI_END
+
+// the runtime type of subword integral basic types is integer
+DEFINE_CALLMETHOD(jboolean, Boolean, T_BOOLEAN
+ , HOTSPOT_JNI_CALLBOOLEANMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLBOOLEANMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHOD(jbyte, Byte, T_BYTE
+ , HOTSPOT_JNI_CALLBYTEMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLBYTEMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHOD(jchar, Char, T_CHAR
+ , HOTSPOT_JNI_CALLCHARMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLCHARMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHOD(jshort, Short, T_SHORT
+ , HOTSPOT_JNI_CALLSHORTMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSHORTMETHOD_RETURN(_ret_ref))
+
+DEFINE_CALLMETHOD(jobject, Object, T_OBJECT
+ , HOTSPOT_JNI_CALLOBJECTMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLOBJECTMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHOD(jint, Int, T_INT,
+ HOTSPOT_JNI_CALLINTMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLINTMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHOD(jlong, Long, T_LONG
+ , HOTSPOT_JNI_CALLLONGMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLLONGMETHOD_RETURN(_ret_ref))
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_CALLMETHOD(jfloat, Float, T_FLOAT
+ , HOTSPOT_JNI_CALLFLOATMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLFLOATMETHOD_RETURN())
+DEFINE_CALLMETHOD(jdouble, Double, T_DOUBLE
+ , HOTSPOT_JNI_CALLDOUBLEMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLDOUBLEMETHOD_RETURN())
+
+#define DEFINE_CALLMETHODV(ResultType, Result, Tag \
+ , EntryProbe, ReturnProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, Call##Result##MethodV, ResultType \
+ , ReturnProbe); \
+\
+JNI_ENTRY(ResultType, \
+ jni_Call##Result##MethodV(JNIEnv *env, jobject obj, jmethodID methodID, va_list args)) \
+ JNIWrapper("Call" XSTR(Result) "MethodV"); \
+\
+ EntryProbe;\
+ ResultType ret = 0;\
+ DT_RETURN_MARK_FOR(Result, Call##Result##MethodV, ResultType, \
+ (const ResultType&)ret);\
+\
+ JavaValue jvalue(Tag); \
+ JNI_ArgumentPusherVaArg ap(methodID, args); \
+ jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \
+ ret = jvalue.get_##ResultType(); \
+ return ret;\
+JNI_END
+
+// the runtime type of subword integral basic types is integer
+DEFINE_CALLMETHODV(jboolean, Boolean, T_BOOLEAN
+ , HOTSPOT_JNI_CALLBOOLEANMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLBOOLEANMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHODV(jbyte, Byte, T_BYTE
+ , HOTSPOT_JNI_CALLBYTEMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLBYTEMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHODV(jchar, Char, T_CHAR
+ , HOTSPOT_JNI_CALLCHARMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLCHARMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHODV(jshort, Short, T_SHORT
+ , HOTSPOT_JNI_CALLSHORTMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSHORTMETHOD_RETURN(_ret_ref))
+
+DEFINE_CALLMETHODV(jobject, Object, T_OBJECT
+ , HOTSPOT_JNI_CALLOBJECTMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLOBJECTMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHODV(jint, Int, T_INT,
+ HOTSPOT_JNI_CALLINTMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLINTMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHODV(jlong, Long, T_LONG
+ , HOTSPOT_JNI_CALLLONGMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLLONGMETHOD_RETURN(_ret_ref))
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_CALLMETHODV(jfloat, Float, T_FLOAT
+ , HOTSPOT_JNI_CALLFLOATMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLFLOATMETHOD_RETURN())
+DEFINE_CALLMETHODV(jdouble, Double, T_DOUBLE
+ , HOTSPOT_JNI_CALLDOUBLEMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLDOUBLEMETHOD_RETURN())
+
+#define DEFINE_CALLMETHODA(ResultType, Result, Tag \
+ , EntryProbe, ReturnProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, Call##Result##MethodA, ResultType \
+ , ReturnProbe); \
+\
+JNI_ENTRY(ResultType, \
+ jni_Call##Result##MethodA(JNIEnv *env, jobject obj, jmethodID methodID, const jvalue *args)) \
+ JNIWrapper("Call" XSTR(Result) "MethodA"); \
+ EntryProbe; \
+ ResultType ret = 0;\
+ DT_RETURN_MARK_FOR(Result, Call##Result##MethodA, ResultType, \
+ (const ResultType&)ret);\
+\
+ JavaValue jvalue(Tag); \
+ JNI_ArgumentPusherArray ap(methodID, args); \
+ jni_invoke_nonstatic(env, &jvalue, obj, JNI_VIRTUAL, methodID, &ap, CHECK_0); \
+ ret = jvalue.get_##ResultType(); \
+ return ret;\
+JNI_END
+
+// the runtime type of subword integral basic types is integer
+DEFINE_CALLMETHODA(jboolean, Boolean, T_BOOLEAN
+ , HOTSPOT_JNI_CALLBOOLEANMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLBOOLEANMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHODA(jbyte, Byte, T_BYTE
+ , HOTSPOT_JNI_CALLBYTEMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLBYTEMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHODA(jchar, Char, T_CHAR
+ , HOTSPOT_JNI_CALLCHARMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLCHARMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHODA(jshort, Short, T_SHORT
+ , HOTSPOT_JNI_CALLSHORTMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSHORTMETHOD_RETURN(_ret_ref))
+
+DEFINE_CALLMETHODA(jobject, Object, T_OBJECT
+ , HOTSPOT_JNI_CALLOBJECTMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLOBJECTMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHODA(jint, Int, T_INT,
+ HOTSPOT_JNI_CALLINTMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLINTMETHOD_RETURN(_ret_ref))
+DEFINE_CALLMETHODA(jlong, Long, T_LONG
+ , HOTSPOT_JNI_CALLLONGMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLLONGMETHOD_RETURN(_ret_ref))
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_CALLMETHODA(jfloat, Float, T_FLOAT
+ , HOTSPOT_JNI_CALLFLOATMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLFLOATMETHOD_RETURN())
+DEFINE_CALLMETHODA(jdouble, Double, T_DOUBLE
+ , HOTSPOT_JNI_CALLDOUBLEMETHOD_ENTRY(env, obj, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLDOUBLEMETHOD_RETURN())
+
+DT_VOID_RETURN_MARK_DECL(CallVoidMethod, HOTSPOT_JNI_CALLVOIDMETHOD_RETURN());
+DT_VOID_RETURN_MARK_DECL(CallVoidMethodV, HOTSPOT_JNI_CALLVOIDMETHODV_RETURN());
+DT_VOID_RETURN_MARK_DECL(CallVoidMethodA, HOTSPOT_JNI_CALLVOIDMETHODA_RETURN());
+
+#endif /* USDT2 */
+
JNI_ENTRY(void, jni_CallVoidMethod(JNIEnv *env, jobject obj, jmethodID methodID, ...))
JNIWrapper("CallVoidMethod");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallVoidMethod__entry, env, obj, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_CALLVOIDMETHOD_ENTRY(
+ env, obj, (uintptr_t) methodID);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(CallVoidMethod);
va_list args;
@@ -1430,7 +1940,12 @@ JNI_END
JNI_ENTRY(void, jni_CallVoidMethodV(JNIEnv *env, jobject obj, jmethodID methodID, va_list args))
JNIWrapper("CallVoidMethodV");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallVoidMethodV__entry, env, obj, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_CALLVOIDMETHODV_ENTRY(
+ env, obj, (uintptr_t) methodID);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(CallVoidMethodV);
JavaValue jvalue(T_VOID);
@@ -1441,7 +1956,12 @@ JNI_END
JNI_ENTRY(void, jni_CallVoidMethodA(JNIEnv *env, jobject obj, jmethodID methodID, const jvalue *args))
JNIWrapper("CallVoidMethodA");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallVoidMethodA__entry, env, obj, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_CALLVOIDMETHODA_ENTRY(
+ env, obj, (uintptr_t) methodID);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(CallVoidMethodA);
JavaValue jvalue(T_VOID);
@@ -1450,6 +1970,7 @@ JNI_ENTRY(void, jni_CallVoidMethodA(JNIEnv *env, jobject obj, jmethodID methodID
JNI_END
+#ifndef USDT2
#define DEFINE_CALLNONVIRTUALMETHOD(ResultType, Result, Tag) \
\
DT_RETURN_MARK_DECL_FOR(Result, CallNonvirtual##Result##Method, ResultType);\
@@ -1522,11 +2043,188 @@ DT_VOID_RETURN_MARK_DECL(CallNonvirtualVoidMethod);
DT_VOID_RETURN_MARK_DECL(CallNonvirtualVoidMethodV);
DT_VOID_RETURN_MARK_DECL(CallNonvirtualVoidMethodA);
+#else /* USDT2 */
+
+#define DEFINE_CALLNONVIRTUALMETHOD(ResultType, Result, Tag \
+ , EntryProbe, ReturnProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, CallNonvirtual##Result##Method, ResultType \
+ , ReturnProbe);\
+\
+JNI_ENTRY(ResultType, \
+ jni_CallNonvirtual##Result##Method(JNIEnv *env, jobject obj, jclass cls, jmethodID methodID, ...)) \
+ JNIWrapper("CallNonvitual" XSTR(Result) "Method"); \
+\
+ EntryProbe;\
+ ResultType ret;\
+ DT_RETURN_MARK_FOR(Result, CallNonvirtual##Result##Method, ResultType, \
+ (const ResultType&)ret);\
+\
+ va_list args; \
+ va_start(args, methodID); \
+ JavaValue jvalue(Tag); \
+ JNI_ArgumentPusherVaArg ap(methodID, args); \
+ jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \
+ va_end(args); \
+ ret = jvalue.get_##ResultType(); \
+ return ret;\
+JNI_END
+
+// the runtime type of subword integral basic types is integer
+DEFINE_CALLNONVIRTUALMETHOD(jboolean, Boolean, T_BOOLEAN
+ , HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHOD_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHOD_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHOD(jbyte, Byte, T_BYTE
+ , HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHOD_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHOD_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHOD(jchar, Char, T_CHAR
+ , HOTSPOT_JNI_CALLNONVIRTUALCHARMETHOD_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALCHARMETHOD_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHOD(jshort, Short, T_SHORT
+ , HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHOD_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHOD_RETURN(_ret_ref))
+
+DEFINE_CALLNONVIRTUALMETHOD(jobject, Object, T_OBJECT
+ , HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHOD_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHOD_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHOD(jint, Int, T_INT
+ , HOTSPOT_JNI_CALLNONVIRTUALINTMETHOD_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALINTMETHOD_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHOD(jlong, Long, T_LONG
+ , HOTSPOT_JNI_CALLNONVIRTUALLONGMETHOD_ENTRY(env, obj, cls, (uintptr_t)methodID),
+// Float and double probes don't return value because dtrace doesn't currently support it
+ HOTSPOT_JNI_CALLNONVIRTUALLONGMETHOD_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHOD(jfloat, Float, T_FLOAT
+ , HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHOD_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHOD_RETURN())
+DEFINE_CALLNONVIRTUALMETHOD(jdouble, Double, T_DOUBLE
+ , HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHOD_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHOD_RETURN())
+
+#define DEFINE_CALLNONVIRTUALMETHODV(ResultType, Result, Tag \
+ , EntryProbe, ReturnProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, CallNonvirtual##Result##MethodV, ResultType \
+ , ReturnProbe);\
+\
+JNI_ENTRY(ResultType, \
+ jni_CallNonvirtual##Result##MethodV(JNIEnv *env, jobject obj, jclass cls, jmethodID methodID, va_list args)) \
+ JNIWrapper("CallNonvitual" XSTR(Result) "MethodV"); \
+\
+ EntryProbe;\
+ ResultType ret;\
+ DT_RETURN_MARK_FOR(Result, CallNonvirtual##Result##MethodV, ResultType, \
+ (const ResultType&)ret);\
+\
+ JavaValue jvalue(Tag); \
+ JNI_ArgumentPusherVaArg ap(methodID, args); \
+ jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \
+ ret = jvalue.get_##ResultType(); \
+ return ret;\
+JNI_END
+
+// the runtime type of subword integral basic types is integer
+DEFINE_CALLNONVIRTUALMETHODV(jboolean, Boolean, T_BOOLEAN
+ , HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODV_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODV_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODV(jbyte, Byte, T_BYTE
+ , HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODV_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODV_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODV(jchar, Char, T_CHAR
+ , HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODV_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODV_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODV(jshort, Short, T_SHORT
+ , HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODV_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODV_RETURN(_ret_ref))
+
+DEFINE_CALLNONVIRTUALMETHODV(jobject, Object, T_OBJECT
+ , HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODV_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODV_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODV(jint, Int, T_INT
+ , HOTSPOT_JNI_CALLNONVIRTUALINTMETHODV_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALINTMETHODV_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODV(jlong, Long, T_LONG
+ , HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODV_ENTRY(env, obj, cls, (uintptr_t)methodID),
+// Float and double probes don't return value because dtrace doesn't currently support it
+ HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODV_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODV(jfloat, Float, T_FLOAT
+ , HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODV_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODV_RETURN())
+DEFINE_CALLNONVIRTUALMETHODV(jdouble, Double, T_DOUBLE
+ , HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODV_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODV_RETURN())
+
+#define DEFINE_CALLNONVIRTUALMETHODA(ResultType, Result, Tag \
+ , EntryProbe, ReturnProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, CallNonvirtual##Result##MethodA, ResultType \
+ , ReturnProbe);\
+\
+JNI_ENTRY(ResultType, \
+ jni_CallNonvirtual##Result##MethodA(JNIEnv *env, jobject obj, jclass cls, jmethodID methodID, const jvalue *args)) \
+ JNIWrapper("CallNonvitual" XSTR(Result) "MethodA"); \
+\
+ EntryProbe;\
+ ResultType ret;\
+ DT_RETURN_MARK_FOR(Result, CallNonvirtual##Result##MethodA, ResultType, \
+ (const ResultType&)ret);\
+\
+ JavaValue jvalue(Tag); \
+ JNI_ArgumentPusherArray ap(methodID, args); \
+ jni_invoke_nonstatic(env, &jvalue, obj, JNI_NONVIRTUAL, methodID, &ap, CHECK_0); \
+ ret = jvalue.get_##ResultType(); \
+ return ret;\
+JNI_END
+
+// the runtime type of subword integral basic types is integer
+DEFINE_CALLNONVIRTUALMETHODA(jboolean, Boolean, T_BOOLEAN
+ , HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODA_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODA_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODA(jbyte, Byte, T_BYTE
+ , HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODA_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODA_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODA(jchar, Char, T_CHAR
+ , HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODA_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODA_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODA(jshort, Short, T_SHORT
+ , HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODA_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODA_RETURN(_ret_ref))
+
+DEFINE_CALLNONVIRTUALMETHODA(jobject, Object, T_OBJECT
+ , HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODA_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODA_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODA(jint, Int, T_INT
+ , HOTSPOT_JNI_CALLNONVIRTUALINTMETHODA_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALINTMETHODA_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODA(jlong, Long, T_LONG
+ , HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODA_ENTRY(env, obj, cls, (uintptr_t)methodID),
+// Float and double probes don't return value because dtrace doesn't currently support it
+ HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODA_RETURN(_ret_ref))
+DEFINE_CALLNONVIRTUALMETHODA(jfloat, Float, T_FLOAT
+ , HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODA_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODA_RETURN())
+DEFINE_CALLNONVIRTUALMETHODA(jdouble, Double, T_DOUBLE
+ , HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODA_ENTRY(env, obj, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODA_RETURN())
+
+DT_VOID_RETURN_MARK_DECL(CallNonvirtualVoidMethod
+ , HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHOD_RETURN());
+DT_VOID_RETURN_MARK_DECL(CallNonvirtualVoidMethodV
+ , HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODV_RETURN());
+DT_VOID_RETURN_MARK_DECL(CallNonvirtualVoidMethodA
+ , HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODA_RETURN());
+#endif /* USDT2 */
+
JNI_ENTRY(void, jni_CallNonvirtualVoidMethod(JNIEnv *env, jobject obj, jclass cls, jmethodID methodID, ...))
JNIWrapper("CallNonvirtualVoidMethod");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, CallNonvirtualVoidMethod__entry,
env, obj, cls, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHOD_ENTRY(
+ env, obj, cls, (uintptr_t) methodID);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(CallNonvirtualVoidMethod);
va_list args;
@@ -1541,8 +2239,13 @@ JNI_END
JNI_ENTRY(void, jni_CallNonvirtualVoidMethodV(JNIEnv *env, jobject obj, jclass cls, jmethodID methodID, va_list args))
JNIWrapper("CallNonvirtualVoidMethodV");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, CallNonvirtualVoidMethodV__entry,
env, obj, cls, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODV_ENTRY(
+ env, obj, cls, (uintptr_t) methodID);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(CallNonvirtualVoidMethodV);
JavaValue jvalue(T_VOID);
@@ -1553,8 +2256,13 @@ JNI_END
JNI_ENTRY(void, jni_CallNonvirtualVoidMethodA(JNIEnv *env, jobject obj, jclass cls, jmethodID methodID, const jvalue *args))
JNIWrapper("CallNonvirtualVoidMethodA");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, CallNonvirtualVoidMethodA__entry,
env, obj, cls, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODA_ENTRY(
+ env, obj, cls, (uintptr_t) methodID);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(CallNonvirtualVoidMethodA);
JavaValue jvalue(T_VOID);
JNI_ArgumentPusherArray ap(methodID, args);
@@ -1562,6 +2270,7 @@ JNI_ENTRY(void, jni_CallNonvirtualVoidMethodA(JNIEnv *env, jobject obj, jclass c
JNI_END
+#ifndef USDT2
#define DEFINE_CALLSTATICMETHOD(ResultType, Result, Tag) \
\
DT_RETURN_MARK_DECL_FOR(Result, CallStatic##Result##Method, ResultType);\
@@ -1634,9 +2343,190 @@ DT_VOID_RETURN_MARK_DECL(CallStaticVoidMethod);
DT_VOID_RETURN_MARK_DECL(CallStaticVoidMethodV);
DT_VOID_RETURN_MARK_DECL(CallStaticVoidMethodA);
+#else /* USDT2 */
+
+#define DEFINE_CALLSTATICMETHOD(ResultType, Result, Tag \
+ , EntryProbe, ResultProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, CallStatic##Result##Method, ResultType \
+ , ResultProbe); \
+\
+JNI_ENTRY(ResultType, \
+ jni_CallStatic##Result##Method(JNIEnv *env, jclass cls, jmethodID methodID, ...)) \
+ JNIWrapper("CallStatic" XSTR(Result) "Method"); \
+\
+ EntryProbe; \
+ ResultType ret = 0;\
+ DT_RETURN_MARK_FOR(Result, CallStatic##Result##Method, ResultType, \
+ (const ResultType&)ret);\
+\
+ va_list args; \
+ va_start(args, methodID); \
+ JavaValue jvalue(Tag); \
+ JNI_ArgumentPusherVaArg ap(methodID, args); \
+ jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \
+ va_end(args); \
+ ret = jvalue.get_##ResultType(); \
+ return ret;\
+JNI_END
+
+// the runtime type of subword integral basic types is integer
+DEFINE_CALLSTATICMETHOD(jboolean, Boolean, T_BOOLEAN
+ , HOTSPOT_JNI_CALLSTATICBOOLEANMETHOD_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICBOOLEANMETHOD_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHOD(jbyte, Byte, T_BYTE
+ , HOTSPOT_JNI_CALLSTATICBYTEMETHOD_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICBYTEMETHOD_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHOD(jchar, Char, T_CHAR
+ , HOTSPOT_JNI_CALLSTATICCHARMETHOD_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICCHARMETHOD_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHOD(jshort, Short, T_SHORT
+ , HOTSPOT_JNI_CALLSTATICSHORTMETHOD_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICSHORTMETHOD_RETURN(_ret_ref));
+
+DEFINE_CALLSTATICMETHOD(jobject, Object, T_OBJECT
+ , HOTSPOT_JNI_CALLSTATICOBJECTMETHOD_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICOBJECTMETHOD_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHOD(jint, Int, T_INT
+ , HOTSPOT_JNI_CALLSTATICINTMETHOD_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICINTMETHOD_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHOD(jlong, Long, T_LONG
+ , HOTSPOT_JNI_CALLSTATICLONGMETHOD_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICLONGMETHOD_RETURN(_ret_ref));
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_CALLSTATICMETHOD(jfloat, Float, T_FLOAT
+ , HOTSPOT_JNI_CALLSTATICFLOATMETHOD_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICFLOATMETHOD_RETURN());
+DEFINE_CALLSTATICMETHOD(jdouble, Double, T_DOUBLE
+ , HOTSPOT_JNI_CALLSTATICDOUBLEMETHOD_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICDOUBLEMETHOD_RETURN());
+
+#define DEFINE_CALLSTATICMETHODV(ResultType, Result, Tag \
+ , EntryProbe, ResultProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, CallStatic##Result##MethodV, ResultType \
+ , ResultProbe); \
+\
+JNI_ENTRY(ResultType, \
+ jni_CallStatic##Result##MethodV(JNIEnv *env, jclass cls, jmethodID methodID, va_list args)) \
+ JNIWrapper("CallStatic" XSTR(Result) "MethodV"); \
+\
+ EntryProbe; \
+ ResultType ret = 0;\
+ DT_RETURN_MARK_FOR(Result, CallStatic##Result##MethodV, ResultType, \
+ (const ResultType&)ret);\
+\
+ JavaValue jvalue(Tag); \
+ JNI_ArgumentPusherVaArg ap(methodID, args); \
+ /* Make sure class is initialized before trying to invoke its method */ \
+ KlassHandle k(THREAD, java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls))); \
+ Klass::cast(k())->initialize(CHECK_0); \
+ jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \
+ va_end(args); \
+ ret = jvalue.get_##ResultType(); \
+ return ret;\
+JNI_END
+
+// the runtime type of subword integral basic types is integer
+DEFINE_CALLSTATICMETHODV(jboolean, Boolean, T_BOOLEAN
+ , HOTSPOT_JNI_CALLSTATICBOOLEANMETHODV_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICBOOLEANMETHODV_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHODV(jbyte, Byte, T_BYTE
+ , HOTSPOT_JNI_CALLSTATICBYTEMETHODV_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICBYTEMETHODV_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHODV(jchar, Char, T_CHAR
+ , HOTSPOT_JNI_CALLSTATICCHARMETHODV_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICCHARMETHODV_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHODV(jshort, Short, T_SHORT
+ , HOTSPOT_JNI_CALLSTATICSHORTMETHODV_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICSHORTMETHODV_RETURN(_ret_ref));
+
+DEFINE_CALLSTATICMETHODV(jobject, Object, T_OBJECT
+ , HOTSPOT_JNI_CALLSTATICOBJECTMETHODV_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICOBJECTMETHODV_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHODV(jint, Int, T_INT
+ , HOTSPOT_JNI_CALLSTATICINTMETHODV_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICINTMETHODV_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHODV(jlong, Long, T_LONG
+ , HOTSPOT_JNI_CALLSTATICLONGMETHODV_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICLONGMETHODV_RETURN(_ret_ref));
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_CALLSTATICMETHODV(jfloat, Float, T_FLOAT
+ , HOTSPOT_JNI_CALLSTATICFLOATMETHODV_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICFLOATMETHODV_RETURN());
+DEFINE_CALLSTATICMETHODV(jdouble, Double, T_DOUBLE
+ , HOTSPOT_JNI_CALLSTATICDOUBLEMETHODV_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICDOUBLEMETHODV_RETURN());
+
+#define DEFINE_CALLSTATICMETHODA(ResultType, Result, Tag \
+ , EntryProbe, ResultProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, CallStatic##Result##MethodA, ResultType \
+ , ResultProbe); \
+\
+JNI_ENTRY(ResultType, \
+ jni_CallStatic##Result##MethodA(JNIEnv *env, jclass cls, jmethodID methodID, const jvalue *args)) \
+ JNIWrapper("CallStatic" XSTR(Result) "MethodA"); \
+\
+ EntryProbe; \
+ ResultType ret = 0;\
+ DT_RETURN_MARK_FOR(Result, CallStatic##Result##MethodA, ResultType, \
+ (const ResultType&)ret);\
+\
+ JavaValue jvalue(Tag); \
+ JNI_ArgumentPusherArray ap(methodID, args); \
+ jni_invoke_static(env, &jvalue, NULL, JNI_STATIC, methodID, &ap, CHECK_0); \
+ ret = jvalue.get_##ResultType(); \
+ return ret;\
+JNI_END
+
+// the runtime type of subword integral basic types is integer
+DEFINE_CALLSTATICMETHODA(jboolean, Boolean, T_BOOLEAN
+ , HOTSPOT_JNI_CALLSTATICBOOLEANMETHODA_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICBOOLEANMETHODA_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHODA(jbyte, Byte, T_BYTE
+ , HOTSPOT_JNI_CALLSTATICBYTEMETHODA_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICBYTEMETHODA_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHODA(jchar, Char, T_CHAR
+ , HOTSPOT_JNI_CALLSTATICCHARMETHODA_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICCHARMETHODA_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHODA(jshort, Short, T_SHORT
+ , HOTSPOT_JNI_CALLSTATICSHORTMETHODA_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICSHORTMETHODA_RETURN(_ret_ref));
+
+DEFINE_CALLSTATICMETHODA(jobject, Object, T_OBJECT
+ , HOTSPOT_JNI_CALLSTATICOBJECTMETHODA_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICOBJECTMETHODA_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHODA(jint, Int, T_INT
+ , HOTSPOT_JNI_CALLSTATICINTMETHODA_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICINTMETHODA_RETURN(_ret_ref));
+DEFINE_CALLSTATICMETHODA(jlong, Long, T_LONG
+ , HOTSPOT_JNI_CALLSTATICLONGMETHODA_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICLONGMETHODA_RETURN(_ret_ref));
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_CALLSTATICMETHODA(jfloat, Float, T_FLOAT
+ , HOTSPOT_JNI_CALLSTATICFLOATMETHODA_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICFLOATMETHODA_RETURN());
+DEFINE_CALLSTATICMETHODA(jdouble, Double, T_DOUBLE
+ , HOTSPOT_JNI_CALLSTATICDOUBLEMETHODA_ENTRY(env, cls, (uintptr_t)methodID),
+ HOTSPOT_JNI_CALLSTATICDOUBLEMETHODA_RETURN());
+
+DT_VOID_RETURN_MARK_DECL(CallStaticVoidMethod
+ , HOTSPOT_JNI_CALLSTATICVOIDMETHOD_RETURN());
+DT_VOID_RETURN_MARK_DECL(CallStaticVoidMethodV
+ , HOTSPOT_JNI_CALLSTATICVOIDMETHODV_RETURN());
+DT_VOID_RETURN_MARK_DECL(CallStaticVoidMethodA
+ , HOTSPOT_JNI_CALLSTATICVOIDMETHODA_RETURN());
+#endif /* USDT2 */
+
JNI_ENTRY(void, jni_CallStaticVoidMethod(JNIEnv *env, jclass cls, jmethodID methodID, ...))
JNIWrapper("CallStaticVoidMethod");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallStaticVoidMethod__entry, env, cls, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_CALLSTATICVOIDMETHOD_ENTRY(
+ env, cls, (uintptr_t) methodID);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(CallStaticVoidMethod);
va_list args;
@@ -1650,7 +2540,12 @@ JNI_END
JNI_ENTRY(void, jni_CallStaticVoidMethodV(JNIEnv *env, jclass cls, jmethodID methodID, va_list args))
JNIWrapper("CallStaticVoidMethodV");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallStaticVoidMethodV__entry, env, cls, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_CALLSTATICVOIDMETHODV_ENTRY(
+ env, cls, (uintptr_t) methodID);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(CallStaticVoidMethodV);
JavaValue jvalue(T_VOID);
@@ -1661,7 +2556,12 @@ JNI_END
JNI_ENTRY(void, jni_CallStaticVoidMethodA(JNIEnv *env, jclass cls, jmethodID methodID, const jvalue *args))
JNIWrapper("CallStaticVoidMethodA");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallStaticVoidMethodA__entry, env, cls, methodID);
+#else /* USDT2 */
+ HOTSPOT_JNI_CALLSTATICVOIDMETHODA_ENTRY(
+ env, cls, (uintptr_t) methodID);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(CallStaticVoidMethodA);
JavaValue jvalue(T_VOID);
@@ -1675,12 +2575,22 @@ JNI_END
//
+#ifndef USDT2
DT_RETURN_MARK_DECL(GetFieldID, jfieldID);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(GetFieldID, jfieldID
+ , HOTSPOT_JNI_GETFIELDID_RETURN((uintptr_t)_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jfieldID, jni_GetFieldID(JNIEnv *env, jclass clazz,
const char *name, const char *sig))
JNIWrapper("GetFieldID");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, GetFieldID__entry, env, clazz, name, sig);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETFIELDID_ENTRY(
+ env, clazz, (char *) name, (char *) sig);
+#endif /* USDT2 */
jfieldID ret = 0;
DT_RETURN_MARK(GetFieldID, jfieldID, (const jfieldID&)ret);
@@ -1712,7 +2622,12 @@ JNI_END
JNI_ENTRY(jobject, jni_GetObjectField(JNIEnv *env, jobject obj, jfieldID fieldID))
JNIWrapper("GetObjectField");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetObjectField__entry, env, obj, fieldID);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETOBJECTFIELD_ENTRY(
+ env, obj, (uintptr_t) fieldID);
+#endif /* USDT2 */
oop o = JNIHandles::resolve_non_null(obj);
klassOop k = o->klass();
int offset = jfieldIDWorkaround::from_instance_jfieldID(k, fieldID);
@@ -1742,11 +2657,17 @@ JNI_ENTRY(jobject, jni_GetObjectField(JNIEnv *env, jobject obj, jfieldID fieldID
}
}
#endif // SERIALGC
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetObjectField__return, ret);
+#else /* USDT2 */
+HOTSPOT_JNI_GETOBJECTFIELD_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
+#ifndef USDT2
#define DEFINE_GETFIELD(Return,Fieldname,Result) \
\
DT_RETURN_MARK_DECL_FOR(Result, Get##Result##Field, Return);\
@@ -1780,6 +2701,61 @@ DEFINE_GETFIELD(jlong, long, Long)
DEFINE_GETFIELD(jfloat, float, Float)
DEFINE_GETFIELD(jdouble, double, Double)
+#else /* USDT2 */
+
+#define DEFINE_GETFIELD(Return,Fieldname,Result \
+ , EntryProbe, ReturnProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, Get##Result##Field, Return \
+ , ReturnProbe); \
+\
+JNI_QUICK_ENTRY(Return, jni_Get##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID)) \
+ JNIWrapper("Get" XSTR(Result) "Field"); \
+\
+ EntryProbe; \
+ Return ret = 0;\
+ DT_RETURN_MARK_FOR(Result, Get##Result##Field, Return, (const Return&)ret);\
+\
+ oop o = JNIHandles::resolve_non_null(obj); \
+ klassOop k = o->klass(); \
+ int offset = jfieldIDWorkaround::from_instance_jfieldID(k, fieldID); \
+ /* Keep JVMTI addition small and only check enabled flag here. */ \
+ /* jni_GetField_probe_nh() assumes that is not okay to create handles */ \
+ /* and creates a ResetNoHandleMark. */ \
+ if (JvmtiExport::should_post_field_access()) { \
+ o = JvmtiExport::jni_GetField_probe_nh(thread, obj, o, k, fieldID, false); \
+ } \
+ ret = o->Fieldname##_field(offset); \
+ return ret; \
+JNI_END
+
+DEFINE_GETFIELD(jboolean, bool, Boolean
+ , HOTSPOT_JNI_GETBOOLEANFIELD_ENTRY(env, obj, (uintptr_t)fieldID),
+ HOTSPOT_JNI_GETBOOLEANFIELD_RETURN(_ret_ref))
+DEFINE_GETFIELD(jbyte, byte, Byte
+ , HOTSPOT_JNI_GETBYTEFIELD_ENTRY(env, obj, (uintptr_t)fieldID),
+ HOTSPOT_JNI_GETBYTEFIELD_RETURN(_ret_ref))
+DEFINE_GETFIELD(jchar, char, Char
+ , HOTSPOT_JNI_GETCHARFIELD_ENTRY(env, obj, (uintptr_t)fieldID),
+ HOTSPOT_JNI_GETCHARFIELD_RETURN(_ret_ref))
+DEFINE_GETFIELD(jshort, short, Short
+ , HOTSPOT_JNI_GETSHORTFIELD_ENTRY(env, obj, (uintptr_t)fieldID),
+ HOTSPOT_JNI_GETSHORTFIELD_RETURN(_ret_ref))
+DEFINE_GETFIELD(jint, int, Int
+ , HOTSPOT_JNI_GETINTFIELD_ENTRY(env, obj, (uintptr_t)fieldID),
+ HOTSPOT_JNI_GETINTFIELD_RETURN(_ret_ref))
+DEFINE_GETFIELD(jlong, long, Long
+ , HOTSPOT_JNI_GETLONGFIELD_ENTRY(env, obj, (uintptr_t)fieldID),
+ HOTSPOT_JNI_GETLONGFIELD_RETURN(_ret_ref))
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_GETFIELD(jfloat, float, Float
+ , HOTSPOT_JNI_GETFLOATFIELD_ENTRY(env, obj, (uintptr_t)fieldID),
+ HOTSPOT_JNI_GETFLOATFIELD_RETURN())
+DEFINE_GETFIELD(jdouble, double, Double
+ , HOTSPOT_JNI_GETDOUBLEFIELD_ENTRY(env, obj, (uintptr_t)fieldID),
+ HOTSPOT_JNI_GETDOUBLEFIELD_RETURN())
+#endif /* USDT2 */
+
address jni_GetBooleanField_addr() {
return (address)jni_GetBooleanField;
}
@@ -1807,7 +2783,12 @@ address jni_GetDoubleField_addr() {
JNI_QUICK_ENTRY(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldID fieldID, jobject value))
JNIWrapper("SetObjectField");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, SetObjectField__entry, env, obj, fieldID, value);
+#else /* USDT2 */
+ HOTSPOT_JNI_SETOBJECTFIELD_ENTRY(
+ env, obj, (uintptr_t) fieldID, value);
+#endif /* USDT2 */
oop o = JNIHandles::resolve_non_null(obj);
klassOop k = o->klass();
int offset = jfieldIDWorkaround::from_instance_jfieldID(k, fieldID);
@@ -1820,9 +2801,15 @@ JNI_QUICK_ENTRY(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldID fiel
o = JvmtiExport::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, 'L', (jvalue *)&field_value);
}
o->obj_field_put(offset, JNIHandles::resolve(value));
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, SetObjectField__return);
+#else /* USDT2 */
+ HOTSPOT_JNI_SETOBJECTFIELD_RETURN(
+);
+#endif /* USDT2 */
JNI_END
+#ifndef USDT2
#define DEFINE_SETFIELD(Argument,Fieldname,Result,SigType,unionType) \
\
JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \
@@ -1857,12 +2844,74 @@ DEFINE_SETFIELD(jlong, long, Long, 'J', j)
DEFINE_SETFIELD(jfloat, float, Float, 'F', f)
DEFINE_SETFIELD(jdouble, double, Double, 'D', d)
+#else /* USDT2 */
+
+#define DEFINE_SETFIELD(Argument,Fieldname,Result,SigType,unionType \
+ , EntryProbe, ReturnProbe) \
+\
+JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \
+ JNIWrapper("Set" XSTR(Result) "Field"); \
+\
+ EntryProbe; \
+\
+ oop o = JNIHandles::resolve_non_null(obj); \
+ klassOop k = o->klass(); \
+ int offset = jfieldIDWorkaround::from_instance_jfieldID(k, fieldID); \
+ /* Keep JVMTI addition small and only check enabled flag here. */ \
+ /* jni_SetField_probe_nh() assumes that is not okay to create handles */ \
+ /* and creates a ResetNoHandleMark. */ \
+ if (JvmtiExport::should_post_field_modification()) { \
+ jvalue field_value; \
+ field_value.unionType = value; \
+ o = JvmtiExport::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, SigType, (jvalue *)&field_value); \
+ } \
+ o->Fieldname##_field_put(offset, value); \
+ ReturnProbe; \
+JNI_END
+
+DEFINE_SETFIELD(jboolean, bool, Boolean, 'Z', z
+ , HOTSPOT_JNI_SETBOOLEANFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value),
+ HOTSPOT_JNI_SETBOOLEANFIELD_RETURN())
+DEFINE_SETFIELD(jbyte, byte, Byte, 'B', b
+ , HOTSPOT_JNI_SETBYTEFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value),
+ HOTSPOT_JNI_SETBYTEFIELD_RETURN())
+DEFINE_SETFIELD(jchar, char, Char, 'C', c
+ , HOTSPOT_JNI_SETCHARFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value),
+ HOTSPOT_JNI_SETCHARFIELD_RETURN())
+DEFINE_SETFIELD(jshort, short, Short, 'S', s
+ , HOTSPOT_JNI_SETSHORTFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value),
+ HOTSPOT_JNI_SETSHORTFIELD_RETURN())
+DEFINE_SETFIELD(jint, int, Int, 'I', i
+ , HOTSPOT_JNI_SETINTFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value),
+ HOTSPOT_JNI_SETINTFIELD_RETURN())
+DEFINE_SETFIELD(jlong, long, Long, 'J', j
+ , HOTSPOT_JNI_SETLONGFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value),
+ HOTSPOT_JNI_SETLONGFIELD_RETURN())
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_SETFIELD(jfloat, float, Float, 'F', f
+ , HOTSPOT_JNI_SETFLOATFIELD_ENTRY(env, obj, (uintptr_t)fieldID),
+ HOTSPOT_JNI_SETFLOATFIELD_RETURN())
+DEFINE_SETFIELD(jdouble, double, Double, 'D', d
+ , HOTSPOT_JNI_SETDOUBLEFIELD_ENTRY(env, obj, (uintptr_t)fieldID),
+ HOTSPOT_JNI_SETDOUBLEFIELD_RETURN())
+#endif /* USDT2 */
+
+#ifndef USDT2
DT_RETURN_MARK_DECL(ToReflectedField, jobject);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(ToReflectedField, jobject
+ , HOTSPOT_JNI_TOREFLECTEDFIELD_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jobject, jni_ToReflectedField(JNIEnv *env, jclass cls, jfieldID fieldID, jboolean isStatic))
JNIWrapper("ToReflectedField");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, ToReflectedField__entry,
env, cls, fieldID, isStatic);
+#else /* USDT2 */
+ HOTSPOT_JNI_TOREFLECTEDFIELD_ENTRY(
+ env, cls, (uintptr_t) fieldID, isStatic);
+#endif /* USDT2 */
jobject ret = NULL;
DT_RETURN_MARK(ToReflectedField, jobject, (const jobject&)ret);
@@ -1892,12 +2941,22 @@ JNI_END
//
// Accessing Static Fields
//
+#ifndef USDT2
DT_RETURN_MARK_DECL(GetStaticFieldID, jfieldID);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(GetStaticFieldID, jfieldID
+ , HOTSPOT_JNI_GETSTATICFIELDID_RETURN((uintptr_t)_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jfieldID, jni_GetStaticFieldID(JNIEnv *env, jclass clazz,
const char *name, const char *sig))
JNIWrapper("GetStaticFieldID");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, GetStaticFieldID__entry, env, clazz, name, sig);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTATICFIELDID_ENTRY(
+ env, clazz, (char *) name, (char *) sig);
+#endif /* USDT2 */
jfieldID ret = NULL;
DT_RETURN_MARK(GetStaticFieldID, jfieldID, (const jfieldID&)ret);
@@ -1933,7 +2992,12 @@ JNI_END
JNI_ENTRY(jobject, jni_GetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID fieldID))
JNIWrapper("GetStaticObjectField");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetStaticObjectField__entry, env, clazz, fieldID);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTATICOBJECTFIELD_ENTRY(
+ env, clazz, (uintptr_t) fieldID);
+#endif /* USDT2 */
#ifndef JNICHECK_KERNEL
DEBUG_ONLY(klassOop param_k = jniCheck::validate_class(thread, clazz);)
#endif // JNICHECK_KERNEL
@@ -1945,10 +3009,16 @@ JNI_ENTRY(jobject, jni_GetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID
JvmtiExport::jni_GetField_probe(thread, NULL, NULL, id->holder(), fieldID, true);
}
jobject ret = JNIHandles::make_local(id->holder()->java_mirror()->obj_field(id->offset()));
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStaticObjectField__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTATICOBJECTFIELD_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
+#ifndef USDT2
#define DEFINE_GETSTATICFIELD(Return,Fieldname,Result) \
\
DT_RETURN_MARK_DECL_FOR(Result, GetStatic##Result##Field, Return);\
@@ -1979,10 +3049,58 @@ DEFINE_GETSTATICFIELD(jlong, long, Long)
DEFINE_GETSTATICFIELD(jfloat, float, Float)
DEFINE_GETSTATICFIELD(jdouble, double, Double)
+#else /* USDT2 */
+
+#define DEFINE_GETSTATICFIELD(Return,Fieldname,Result \
+ , EntryProbe, ReturnProbe) \
+\
+ DT_RETURN_MARK_DECL_FOR(Result, GetStatic##Result##Field, Return \
+ , ReturnProbe); \
+\
+JNI_ENTRY(Return, jni_GetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID)) \
+ JNIWrapper("GetStatic" XSTR(Result) "Field"); \
+ EntryProbe; \
+ Return ret = 0;\
+ DT_RETURN_MARK_FOR(Result, GetStatic##Result##Field, Return, \
+ (const Return&)ret);\
+ JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \
+ assert(id->is_static_field_id(), "invalid static field id"); \
+ /* Keep JVMTI addition small and only check enabled flag here. */ \
+ /* jni_GetField_probe() assumes that is okay to create handles. */ \
+ if (JvmtiExport::should_post_field_access()) { \
+ JvmtiExport::jni_GetField_probe(thread, NULL, NULL, id->holder(), fieldID, true); \
+ } \
+ ret = id->holder()->java_mirror()-> Fieldname##_field (id->offset()); \
+ return ret;\
+JNI_END
+
+DEFINE_GETSTATICFIELD(jboolean, bool, Boolean
+ , HOTSPOT_JNI_GETSTATICBOOLEANFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_GETSTATICBOOLEANFIELD_RETURN(_ret_ref))
+DEFINE_GETSTATICFIELD(jbyte, byte, Byte
+ , HOTSPOT_JNI_GETSTATICBYTEFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_GETSTATICBYTEFIELD_RETURN(_ret_ref) )
+DEFINE_GETSTATICFIELD(jchar, char, Char
+ , HOTSPOT_JNI_GETSTATICCHARFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_GETSTATICCHARFIELD_RETURN(_ret_ref) )
+DEFINE_GETSTATICFIELD(jshort, short, Short
+ , HOTSPOT_JNI_GETSTATICSHORTFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_GETSTATICSHORTFIELD_RETURN(_ret_ref) )
+DEFINE_GETSTATICFIELD(jint, int, Int
+ , HOTSPOT_JNI_GETSTATICINTFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_GETSTATICINTFIELD_RETURN(_ret_ref) )
+DEFINE_GETSTATICFIELD(jlong, long, Long
+ , HOTSPOT_JNI_GETSTATICLONGFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_GETSTATICLONGFIELD_RETURN(_ret_ref) )
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_GETSTATICFIELD(jfloat, float, Float
+ , HOTSPOT_JNI_GETSTATICFLOATFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_GETSTATICFLOATFIELD_RETURN() )
+DEFINE_GETSTATICFIELD(jdouble, double, Double
+ , HOTSPOT_JNI_GETSTATICDOUBLEFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_GETSTATICDOUBLEFIELD_RETURN() )
+#endif /* USDT2 */
JNI_ENTRY(void, jni_SetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID fieldID, jobject value))
JNIWrapper("SetStaticObjectField");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, SetStaticObjectField__entry, env, clazz, fieldID, value);
+#else /* USDT2 */
+ HOTSPOT_JNI_SETSTATICOBJECTFIELD_ENTRY(
+ env, clazz, (uintptr_t) fieldID, value);
+#endif /* USDT2 */
JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID);
assert(id->is_static_field_id(), "invalid static field id");
// Keep JVMTI addition small and only check enabled flag here.
@@ -1993,10 +3111,16 @@ JNI_ENTRY(void, jni_SetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID fie
JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, 'L', (jvalue *)&field_value);
}
id->holder()->java_mirror()->obj_field_put(id->offset(), JNIHandles::resolve(value));
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, SetStaticObjectField__return);
+#else /* USDT2 */
+ HOTSPOT_JNI_SETSTATICOBJECTFIELD_RETURN(
+ );
+#endif /* USDT2 */
JNI_END
+#ifndef USDT2
#define DEFINE_SETSTATICFIELD(Argument,Fieldname,Result,SigType,unionType) \
\
JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \
@@ -2028,6 +3152,54 @@ DEFINE_SETSTATICFIELD(jlong, long, Long, 'J', j)
DEFINE_SETSTATICFIELD(jfloat, float, Float, 'F', f)
DEFINE_SETSTATICFIELD(jdouble, double, Double, 'D', d)
+#else /* USDT2 */
+
+#define DEFINE_SETSTATICFIELD(Argument,Fieldname,Result,SigType,unionType \
+ , EntryProbe, ReturnProbe) \
+\
+JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \
+ JNIWrapper("SetStatic" XSTR(Result) "Field"); \
+ EntryProbe; \
+\
+ JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \
+ assert(id->is_static_field_id(), "invalid static field id"); \
+ /* Keep JVMTI addition small and only check enabled flag here. */ \
+ /* jni_SetField_probe() assumes that is okay to create handles. */ \
+ if (JvmtiExport::should_post_field_modification()) { \
+ jvalue field_value; \
+ field_value.unionType = value; \
+ JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, SigType, (jvalue *)&field_value); \
+ } \
+ id->holder()->java_mirror()-> Fieldname##_field_put (id->offset(), value); \
+ ReturnProbe;\
+JNI_END
+
+DEFINE_SETSTATICFIELD(jboolean, bool, Boolean, 'Z', z
+ , HOTSPOT_JNI_SETBOOLEANFIELD_ENTRY(env, clazz, (uintptr_t)fieldID, value),
+ HOTSPOT_JNI_SETBOOLEANFIELD_RETURN())
+DEFINE_SETSTATICFIELD(jbyte, byte, Byte, 'B', b
+ , HOTSPOT_JNI_SETSTATICBYTEFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value),
+ HOTSPOT_JNI_SETSTATICBYTEFIELD_RETURN())
+DEFINE_SETSTATICFIELD(jchar, char, Char, 'C', c
+ , HOTSPOT_JNI_SETSTATICCHARFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value),
+ HOTSPOT_JNI_SETSTATICCHARFIELD_RETURN())
+DEFINE_SETSTATICFIELD(jshort, short, Short, 'S', s
+ , HOTSPOT_JNI_SETSTATICSHORTFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value),
+ HOTSPOT_JNI_SETSTATICSHORTFIELD_RETURN())
+DEFINE_SETSTATICFIELD(jint, int, Int, 'I', i
+ , HOTSPOT_JNI_SETSTATICINTFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value),
+ HOTSPOT_JNI_SETSTATICINTFIELD_RETURN())
+DEFINE_SETSTATICFIELD(jlong, long, Long, 'J', j
+ , HOTSPOT_JNI_SETSTATICLONGFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value),
+ HOTSPOT_JNI_SETSTATICLONGFIELD_RETURN())
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_SETSTATICFIELD(jfloat, float, Float, 'F', f
+ , HOTSPOT_JNI_SETSTATICFLOATFIELD_ENTRY(env, clazz, (uintptr_t) fieldID),
+ HOTSPOT_JNI_SETSTATICFLOATFIELD_RETURN())
+DEFINE_SETSTATICFIELD(jdouble, double, Double, 'D', d
+ , HOTSPOT_JNI_SETSTATICDOUBLEFIELD_ENTRY(env, clazz, (uintptr_t) fieldID),
+ HOTSPOT_JNI_SETSTATICDOUBLEFIELD_RETURN())
+#endif /* USDT2 */
//
// String Operations
@@ -2035,11 +3207,21 @@ DEFINE_SETSTATICFIELD(jdouble, double, Double, 'D', d)
// Unicode Interface
+#ifndef USDT2
DT_RETURN_MARK_DECL(NewString, jstring);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(NewString, jstring
+ , HOTSPOT_JNI_NEWSTRING_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jstring, jni_NewString(JNIEnv *env, const jchar *unicodeChars, jsize len))
JNIWrapper("NewString");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, NewString__entry, env, unicodeChars, len);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWSTRING_ENTRY(
+ env, (uint16_t *) unicodeChars, len);
+#endif /* USDT2 */
jstring ret = NULL;
DT_RETURN_MARK(NewString, jstring, (const jstring&)ret);
oop string=java_lang_String::create_oop_from_unicode((jchar*) unicodeChars, len, CHECK_NULL);
@@ -2050,9 +3232,19 @@ JNI_END
JNI_QUICK_ENTRY(jsize, jni_GetStringLength(JNIEnv *env, jstring string))
JNIWrapper("GetStringLength");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetStringLength__entry, env, string);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGLENGTH_ENTRY(
+ env, string);
+#endif /* USDT2 */
jsize ret = java_lang_String::length(JNIHandles::resolve_non_null(string));
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringLength__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGLENGTH_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
@@ -2060,7 +3252,12 @@ JNI_END
JNI_QUICK_ENTRY(const jchar*, jni_GetStringChars(
JNIEnv *env, jstring string, jboolean *isCopy))
JNIWrapper("GetStringChars");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetStringChars__entry, env, string, isCopy);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGCHARS_ENTRY(
+ env, string, (uintptr_t *) isCopy);
+#endif /* USDT2 */
//%note jni_5
if (isCopy != NULL) {
*isCopy = JNI_TRUE;
@@ -2074,31 +3271,56 @@ JNI_QUICK_ENTRY(const jchar*, jni_GetStringChars(
memcpy(buf, s_value->char_at_addr(s_offset), sizeof(jchar)*s_len);
}
buf[s_len] = 0;
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringChars__return, buf);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGCHARS_RETURN(
+ buf);
+#endif /* USDT2 */
return buf;
JNI_END
JNI_QUICK_ENTRY(void, jni_ReleaseStringChars(JNIEnv *env, jstring str, const jchar *chars))
JNIWrapper("ReleaseStringChars");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, ReleaseStringChars__entry, env, str, chars);
+#else /* USDT2 */
+ HOTSPOT_JNI_RELEASESTRINGCHARS_ENTRY(
+ env, str, (uint16_t *) chars);
+#endif /* USDT2 */
//%note jni_6
if (chars != NULL) {
// Since String objects are supposed to be immutable, don't copy any
// new data back. A bad user will have to go after the char array.
FreeHeap((void*) chars);
}
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, ReleaseStringChars__return);
+#else /* USDT2 */
+ HOTSPOT_JNI_RELEASESTRINGCHARS_RETURN(
+);
+#endif /* USDT2 */
JNI_END
// UTF Interface
+#ifndef USDT2
DT_RETURN_MARK_DECL(NewStringUTF, jstring);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(NewStringUTF, jstring
+ , HOTSPOT_JNI_NEWSTRINGUTF_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jstring, jni_NewStringUTF(JNIEnv *env, const char *bytes))
JNIWrapper("NewStringUTF");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, NewStringUTF__entry, env, bytes);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWSTRINGUTF_ENTRY(
+ env, (char *) bytes);
+#endif /* USDT2 */
jstring ret;
DT_RETURN_MARK(NewStringUTF, jstring, (const jstring&)ret);
@@ -2110,43 +3332,83 @@ JNI_END
JNI_ENTRY(jsize, jni_GetStringUTFLength(JNIEnv *env, jstring string))
JNIWrapper("GetStringUTFLength");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetStringUTFLength__entry, env, string);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGUTFLENGTH_ENTRY(
+ env, string);
+#endif /* USDT2 */
jsize ret = java_lang_String::utf8_length(JNIHandles::resolve_non_null(string));
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringUTFLength__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGUTFLENGTH_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
JNI_ENTRY(const char*, jni_GetStringUTFChars(JNIEnv *env, jstring string, jboolean *isCopy))
JNIWrapper("GetStringUTFChars");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetStringUTFChars__entry, env, string, isCopy);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGUTFCHARS_ENTRY(
+ env, string, (uintptr_t *) isCopy);
+#endif /* USDT2 */
oop java_string = JNIHandles::resolve_non_null(string);
size_t length = java_lang_String::utf8_length(java_string);
char* result = AllocateHeap(length + 1, "GetStringUTFChars");
java_lang_String::as_utf8_string(java_string, result, (int) length + 1);
if (isCopy != NULL) *isCopy = JNI_TRUE;
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringUTFChars__return, result);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGUTFCHARS_RETURN(
+ result);
+#endif /* USDT2 */
return result;
JNI_END
JNI_LEAF(void, jni_ReleaseStringUTFChars(JNIEnv *env, jstring str, const char *chars))
JNIWrapper("ReleaseStringUTFChars");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, ReleaseStringUTFChars__entry, env, str, chars);
+#else /* USDT2 */
+ HOTSPOT_JNI_RELEASESTRINGUTFCHARS_ENTRY(
+ env, str, (char *) chars);
+#endif /* USDT2 */
if (chars != NULL) {
FreeHeap((char*) chars);
}
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, ReleaseStringUTFChars__return);
+#else /* USDT2 */
+HOTSPOT_JNI_RELEASESTRINGUTFCHARS_RETURN(
+);
+#endif /* USDT2 */
JNI_END
JNI_QUICK_ENTRY(jsize, jni_GetArrayLength(JNIEnv *env, jarray array))
JNIWrapper("GetArrayLength");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetArrayLength__entry, env, array);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETARRAYLENGTH_ENTRY(
+ env, array);
+#endif /* USDT2 */
arrayOop a = arrayOop(JNIHandles::resolve_non_null(array));
assert(a->is_array(), "must be array");
jsize ret = a->length();
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetArrayLength__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETARRAYLENGTH_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
@@ -2155,11 +3417,21 @@ JNI_END
// Object Array Operations
//
+#ifndef USDT2
DT_RETURN_MARK_DECL(NewObjectArray, jobjectArray);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(NewObjectArray, jobjectArray
+ , HOTSPOT_JNI_NEWOBJECTARRAY_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jobjectArray, jni_NewObjectArray(JNIEnv *env, jsize length, jclass elementClass, jobject initialElement))
JNIWrapper("NewObjectArray");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, NewObjectArray__entry, env, length, elementClass, initialElement);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWOBJECTARRAY_ENTRY(
+ env, length, elementClass, initialElement);
+#endif /* USDT2 */
jobjectArray ret = NULL;
DT_RETURN_MARK(NewObjectArray, jobjectArray, (const jobjectArray&)ret);
KlassHandle ek(THREAD, java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(elementClass)));
@@ -2177,11 +3449,21 @@ JNI_ENTRY(jobjectArray, jni_NewObjectArray(JNIEnv *env, jsize length, jclass ele
return ret;
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(GetObjectArrayElement, jobject);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(GetObjectArrayElement, jobject
+ , HOTSPOT_JNI_GETOBJECTARRAYELEMENT_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jobject, jni_GetObjectArrayElement(JNIEnv *env, jobjectArray array, jsize index))
JNIWrapper("GetObjectArrayElement");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetObjectArrayElement__entry, env, array, index);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETOBJECTARRAYELEMENT_ENTRY(
+ env, array, index);
+#endif /* USDT2 */
jobject ret = NULL;
DT_RETURN_MARK(GetObjectArrayElement, jobject, (const jobject&)ret);
objArrayOop a = objArrayOop(JNIHandles::resolve_non_null(array));
@@ -2195,11 +3477,21 @@ JNI_ENTRY(jobject, jni_GetObjectArrayElement(JNIEnv *env, jobjectArray array, js
}
JNI_END
+#ifndef USDT2
DT_VOID_RETURN_MARK_DECL(SetObjectArrayElement);
+#else /* USDT2 */
+DT_VOID_RETURN_MARK_DECL(SetObjectArrayElement
+ , HOTSPOT_JNI_SETOBJECTARRAYELEMENT_RETURN());
+#endif /* USDT2 */
JNI_ENTRY(void, jni_SetObjectArrayElement(JNIEnv *env, jobjectArray array, jsize index, jobject value))
JNIWrapper("SetObjectArrayElement");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, SetObjectArrayElement__entry, env, array, index, value);
+#else /* USDT2 */
+ HOTSPOT_JNI_SETOBJECTARRAYELEMENT_ENTRY(
+ env, array, index, value);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(SetObjectArrayElement);
objArrayOop a = objArrayOop(JNIHandles::resolve_non_null(array));
@@ -2218,9 +3510,10 @@ JNI_ENTRY(void, jni_SetObjectArrayElement(JNIEnv *env, jobjectArray array, jsize
JNI_END
+#ifndef USDT2
#define DEFINE_NEWSCALARARRAY(Return,Allocator,Result) \
\
- DT_RETURN_MARK_DECL(New##Result##Array, Return);\
+ DT_RETURN_MARK_DECL(New##Result##Array, Return); \
\
JNI_ENTRY(Return, \
jni_New##Result##Array(JNIEnv *env, jsize len)) \
@@ -2243,6 +3536,51 @@ DEFINE_NEWSCALARARRAY(jlongArray, new_longArray, Long)
DEFINE_NEWSCALARARRAY(jfloatArray, new_singleArray, Float)
DEFINE_NEWSCALARARRAY(jdoubleArray, new_doubleArray, Double)
+#else /* USDT2 */
+
+#define DEFINE_NEWSCALARARRAY(Return,Allocator,Result \
+ ,EntryProbe,ReturnProbe) \
+\
+ DT_RETURN_MARK_DECL(New##Result##Array, Return \
+ , ReturnProbe); \
+\
+JNI_ENTRY(Return, \
+ jni_New##Result##Array(JNIEnv *env, jsize len)) \
+ JNIWrapper("New" XSTR(Result) "Array"); \
+ EntryProbe; \
+ Return ret = NULL;\
+ DT_RETURN_MARK(New##Result##Array, Return, (const Return&)ret);\
+\
+ oop obj= oopFactory::Allocator(len, CHECK_0); \
+ ret = (Return) JNIHandles::make_local(env, obj); \
+ return ret;\
+JNI_END
+
+DEFINE_NEWSCALARARRAY(jbooleanArray, new_boolArray, Boolean,
+ HOTSPOT_JNI_NEWBOOLEANARRAY_ENTRY(env, len),
+ HOTSPOT_JNI_NEWBOOLEANARRAY_RETURN(_ret_ref))
+DEFINE_NEWSCALARARRAY(jbyteArray, new_byteArray, Byte,
+ HOTSPOT_JNI_NEWBYTEARRAY_ENTRY(env, len),
+ HOTSPOT_JNI_NEWBYTEARRAY_RETURN(_ret_ref))
+DEFINE_NEWSCALARARRAY(jshortArray, new_shortArray, Short,
+ HOTSPOT_JNI_NEWSHORTARRAY_ENTRY(env, len),
+ HOTSPOT_JNI_NEWSHORTARRAY_RETURN(_ret_ref))
+DEFINE_NEWSCALARARRAY(jcharArray, new_charArray, Char,
+ HOTSPOT_JNI_NEWCHARARRAY_ENTRY(env, len),
+ HOTSPOT_JNI_NEWCHARARRAY_RETURN(_ret_ref))
+DEFINE_NEWSCALARARRAY(jintArray, new_intArray, Int,
+ HOTSPOT_JNI_NEWINTARRAY_ENTRY(env, len),
+ HOTSPOT_JNI_NEWINTARRAY_RETURN(_ret_ref))
+DEFINE_NEWSCALARARRAY(jlongArray, new_longArray, Long,
+ HOTSPOT_JNI_NEWLONGARRAY_ENTRY(env, len),
+ HOTSPOT_JNI_NEWLONGARRAY_RETURN(_ret_ref))
+DEFINE_NEWSCALARARRAY(jfloatArray, new_singleArray, Float,
+ HOTSPOT_JNI_NEWFLOATARRAY_ENTRY(env, len),
+ HOTSPOT_JNI_NEWFLOATARRAY_RETURN(_ret_ref))
+DEFINE_NEWSCALARARRAY(jdoubleArray, new_doubleArray, Double,
+ HOTSPOT_JNI_NEWDOUBLEARRAY_ENTRY(env, len),
+ HOTSPOT_JNI_NEWDOUBLEARRAY_RETURN(_ret_ref))
+#endif /* USDT2 */
// Return an address which will fault if the caller writes to it.
@@ -2260,6 +3598,7 @@ static char* get_bad_address() {
}
+#ifndef USDT2
#define DEFINE_GETSCALARARRAYELEMENTS(ElementTag,ElementType,Result, Tag) \
\
JNI_QUICK_ENTRY(ElementType*, \
@@ -2294,7 +3633,62 @@ DEFINE_GETSCALARARRAYELEMENTS(T_LONG, jlong, Long, long)
DEFINE_GETSCALARARRAYELEMENTS(T_FLOAT, jfloat, Float, float)
DEFINE_GETSCALARARRAYELEMENTS(T_DOUBLE, jdouble, Double, double)
+#else /* USDT2 */
+
+#define DEFINE_GETSCALARARRAYELEMENTS(ElementTag,ElementType,Result, Tag \
+ , EntryProbe, ReturnProbe) \
+\
+JNI_QUICK_ENTRY(ElementType*, \
+ jni_Get##Result##ArrayElements(JNIEnv *env, ElementType##Array array, jboolean *isCopy)) \
+ JNIWrapper("Get" XSTR(Result) "ArrayElements"); \
+ EntryProbe; \
+ /* allocate an chunk of memory in c land */ \
+ typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \
+ ElementType* result; \
+ int len = a->length(); \
+ if (len == 0) { \
+ /* Empty array: legal but useless, can't return NULL. \
+ * Return a pointer to something useless. \
+ * Avoid asserts in typeArrayOop. */ \
+ result = (ElementType*)get_bad_address(); \
+ } else { \
+ result = NEW_C_HEAP_ARRAY(ElementType, len); \
+ /* copy the array to the c chunk */ \
+ memcpy(result, a->Tag##_at_addr(0), sizeof(ElementType)*len); \
+ } \
+ if (isCopy) *isCopy = JNI_TRUE; \
+ ReturnProbe; \
+ return result; \
+JNI_END
+DEFINE_GETSCALARARRAYELEMENTS(T_BOOLEAN, jboolean, Boolean, bool
+ , HOTSPOT_JNI_GETBOOLEANARRAYELEMENTS_ENTRY(env, array, (uintptr_t *) isCopy),
+ HOTSPOT_JNI_GETBOOLEANARRAYELEMENTS_RETURN((uintptr_t*)result))
+DEFINE_GETSCALARARRAYELEMENTS(T_BYTE, jbyte, Byte, byte
+ , HOTSPOT_JNI_GETBYTEARRAYELEMENTS_ENTRY(env, array, (uintptr_t *) isCopy),
+ HOTSPOT_JNI_GETBYTEARRAYELEMENTS_RETURN((char*)result))
+DEFINE_GETSCALARARRAYELEMENTS(T_SHORT, jshort, Short, short
+ , HOTSPOT_JNI_GETSHORTARRAYELEMENTS_ENTRY(env, (uint16_t*) array, (uintptr_t *) isCopy),
+ HOTSPOT_JNI_GETSHORTARRAYELEMENTS_RETURN((uint16_t*)result))
+DEFINE_GETSCALARARRAYELEMENTS(T_CHAR, jchar, Char, char
+ , HOTSPOT_JNI_GETCHARARRAYELEMENTS_ENTRY(env, (uint16_t*) array, (uintptr_t *) isCopy),
+ HOTSPOT_JNI_GETCHARARRAYELEMENTS_RETURN(result))
+DEFINE_GETSCALARARRAYELEMENTS(T_INT, jint, Int, int
+ , HOTSPOT_JNI_GETINTARRAYELEMENTS_ENTRY(env, array, (uintptr_t *) isCopy),
+ HOTSPOT_JNI_GETINTARRAYELEMENTS_RETURN((uint32_t*)result))
+DEFINE_GETSCALARARRAYELEMENTS(T_LONG, jlong, Long, long
+ , HOTSPOT_JNI_GETLONGARRAYELEMENTS_ENTRY(env, array, (uintptr_t *) isCopy),
+ HOTSPOT_JNI_GETLONGARRAYELEMENTS_RETURN(((uintptr_t*)result)))
+// Float and double probes don't return value because dtrace doesn't currently support it
+DEFINE_GETSCALARARRAYELEMENTS(T_FLOAT, jfloat, Float, float
+ , HOTSPOT_JNI_GETFLOATARRAYELEMENTS_ENTRY(env, array, (uintptr_t *) isCopy),
+ HOTSPOT_JNI_GETFLOATARRAYELEMENTS_RETURN(result))
+DEFINE_GETSCALARARRAYELEMENTS(T_DOUBLE, jdouble, Double, double
+ , HOTSPOT_JNI_GETDOUBLEARRAYELEMENTS_ENTRY(env, array, (uintptr_t *) isCopy),
+ HOTSPOT_JNI_GETDOUBLEARRAYELEMENTS_RETURN(result))
+#endif /* USDT2 */
+
+#ifndef USDT2
#define DEFINE_RELEASESCALARARRAYELEMENTS(ElementTag,ElementType,Result,Tag) \
\
JNI_QUICK_ENTRY(void, \
@@ -2324,6 +3718,56 @@ DEFINE_RELEASESCALARARRAYELEMENTS(T_LONG, jlong, Long, long)
DEFINE_RELEASESCALARARRAYELEMENTS(T_FLOAT, jfloat, Float, float)
DEFINE_RELEASESCALARARRAYELEMENTS(T_DOUBLE, jdouble, Double, double)
+#else /* USDT2 */
+
+#define DEFINE_RELEASESCALARARRAYELEMENTS(ElementTag,ElementType,Result,Tag \
+ , EntryProbe, ReturnProbe);\
+\
+JNI_QUICK_ENTRY(void, \
+ jni_Release##Result##ArrayElements(JNIEnv *env, ElementType##Array array, \
+ ElementType *buf, jint mode)) \
+ JNIWrapper("Release" XSTR(Result) "ArrayElements"); \
+ EntryProbe; \
+ typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \
+ int len = a->length(); \
+ if (len != 0) { /* Empty array: nothing to free or copy. */ \
+ if ((mode == 0) || (mode == JNI_COMMIT)) { \
+ memcpy(a->Tag##_at_addr(0), buf, sizeof(ElementType)*len); \
+ } \
+ if ((mode == 0) || (mode == JNI_ABORT)) { \
+ FreeHeap(buf); \
+ } \
+ } \
+ ReturnProbe; \
+JNI_END
+
+DEFINE_RELEASESCALARARRAYELEMENTS(T_BOOLEAN, jboolean, Boolean, bool
+ , HOTSPOT_JNI_RELEASEBOOLEANARRAYELEMENTS_ENTRY(env, array, (uintptr_t *) buf, mode),
+ HOTSPOT_JNI_RELEASEBOOLEANARRAYELEMENTS_RETURN())
+DEFINE_RELEASESCALARARRAYELEMENTS(T_BYTE, jbyte, Byte, byte
+ , HOTSPOT_JNI_RELEASEBYTEARRAYELEMENTS_ENTRY(env, array, (char *) buf, mode),
+ HOTSPOT_JNI_RELEASEBYTEARRAYELEMENTS_RETURN())
+DEFINE_RELEASESCALARARRAYELEMENTS(T_SHORT, jshort, Short, short
+ , HOTSPOT_JNI_RELEASESHORTARRAYELEMENTS_ENTRY(env, array, (uint16_t *) buf, mode),
+ HOTSPOT_JNI_RELEASESHORTARRAYELEMENTS_RETURN())
+DEFINE_RELEASESCALARARRAYELEMENTS(T_CHAR, jchar, Char, char
+ , HOTSPOT_JNI_RELEASECHARARRAYELEMENTS_ENTRY(env, array, (uint16_t *) buf, mode),
+ HOTSPOT_JNI_RELEASECHARARRAYELEMENTS_RETURN())
+DEFINE_RELEASESCALARARRAYELEMENTS(T_INT, jint, Int, int
+ , HOTSPOT_JNI_RELEASEINTARRAYELEMENTS_ENTRY(env, array, (uint32_t *) buf, mode),
+ HOTSPOT_JNI_RELEASEINTARRAYELEMENTS_RETURN())
+DEFINE_RELEASESCALARARRAYELEMENTS(T_LONG, jlong, Long, long
+ , HOTSPOT_JNI_RELEASELONGARRAYELEMENTS_ENTRY(env, array, (uintptr_t *) buf, mode),
+ HOTSPOT_JNI_RELEASELONGARRAYELEMENTS_RETURN())
+DEFINE_RELEASESCALARARRAYELEMENTS(T_FLOAT, jfloat, Float, float
+ , HOTSPOT_JNI_RELEASEFLOATARRAYELEMENTS_ENTRY(env, array, (float *) buf, mode),
+ HOTSPOT_JNI_RELEASEFLOATARRAYELEMENTS_RETURN())
+DEFINE_RELEASESCALARARRAYELEMENTS(T_DOUBLE, jdouble, Double, double
+ , HOTSPOT_JNI_RELEASEDOUBLEARRAYELEMENTS_ENTRY(env, array, (double *) buf, mode),
+ HOTSPOT_JNI_RELEASEDOUBLEARRAYELEMENTS_RETURN())
+#endif /* USDT2 */
+
+#ifndef USDT2
#define DEFINE_GETSCALARARRAYREGION(ElementTag,ElementType,Result, Tag) \
DT_VOID_RETURN_MARK_DECL(Get##Result##ArrayRegion);\
\
@@ -2355,6 +3799,59 @@ DEFINE_GETSCALARARRAYREGION(T_LONG, jlong, Long, long)
DEFINE_GETSCALARARRAYREGION(T_FLOAT, jfloat, Float, float)
DEFINE_GETSCALARARRAYREGION(T_DOUBLE, jdouble, Double, double)
+#else /* USDT2 */
+
+#define DEFINE_GETSCALARARRAYREGION(ElementTag,ElementType,Result, Tag \
+ , EntryProbe, ReturnProbe); \
+ DT_VOID_RETURN_MARK_DECL(Get##Result##ArrayRegion \
+ , ReturnProbe); \
+\
+JNI_ENTRY(void, \
+jni_Get##Result##ArrayRegion(JNIEnv *env, ElementType##Array array, jsize start, \
+ jsize len, ElementType *buf)) \
+ JNIWrapper("Get" XSTR(Result) "ArrayRegion"); \
+ EntryProbe; \
+ DT_VOID_RETURN_MARK(Get##Result##ArrayRegion); \
+ typeArrayOop src = typeArrayOop(JNIHandles::resolve_non_null(array)); \
+ if (start < 0 || len < 0 || ((unsigned int)start + (unsigned int)len > (unsigned int)src->length())) { \
+ THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); \
+ } else { \
+ if (len > 0) { \
+ int sc = typeArrayKlass::cast(src->klass())->log2_element_size(); \
+ memcpy((u_char*) buf, \
+ (u_char*) src->Tag##_at_addr(start), \
+ len << sc); \
+ } \
+ } \
+JNI_END
+
+DEFINE_GETSCALARARRAYREGION(T_BOOLEAN, jboolean,Boolean, bool
+ , HOTSPOT_JNI_GETBOOLEANARRAYREGION_ENTRY(env, array, start, len, (uintptr_t *) buf),
+ HOTSPOT_JNI_GETBOOLEANARRAYREGION_RETURN());
+DEFINE_GETSCALARARRAYREGION(T_BYTE, jbyte, Byte, byte
+ , HOTSPOT_JNI_GETBYTEARRAYREGION_ENTRY(env, array, start, len, (char *) buf),
+ HOTSPOT_JNI_GETBYTEARRAYREGION_RETURN());
+DEFINE_GETSCALARARRAYREGION(T_SHORT, jshort, Short, short
+ , HOTSPOT_JNI_GETSHORTARRAYREGION_ENTRY(env, array, start, len, (uint16_t *) buf),
+ HOTSPOT_JNI_GETSHORTARRAYREGION_RETURN());
+DEFINE_GETSCALARARRAYREGION(T_CHAR, jchar, Char, char
+ , HOTSPOT_JNI_GETCHARARRAYREGION_ENTRY(env, array, start, len, (uint16_t*) buf),
+ HOTSPOT_JNI_GETCHARARRAYREGION_RETURN());
+DEFINE_GETSCALARARRAYREGION(T_INT, jint, Int, int
+ , HOTSPOT_JNI_GETINTARRAYREGION_ENTRY(env, array, start, len, (uint32_t*) buf),
+ HOTSPOT_JNI_GETINTARRAYREGION_RETURN());
+DEFINE_GETSCALARARRAYREGION(T_LONG, jlong, Long, long
+ , HOTSPOT_JNI_GETLONGARRAYREGION_ENTRY(env, array, start, len, (uintptr_t *) buf),
+ HOTSPOT_JNI_GETLONGARRAYREGION_RETURN());
+DEFINE_GETSCALARARRAYREGION(T_FLOAT, jfloat, Float, float
+ , HOTSPOT_JNI_GETFLOATARRAYREGION_ENTRY(env, array, start, len, (float *) buf),
+ HOTSPOT_JNI_GETFLOATARRAYREGION_RETURN());
+DEFINE_GETSCALARARRAYREGION(T_DOUBLE, jdouble, Double, double
+ , HOTSPOT_JNI_GETDOUBLEARRAYREGION_ENTRY(env, array, start, len, (double *) buf),
+ HOTSPOT_JNI_GETDOUBLEARRAYREGION_RETURN());
+#endif /* USDT2 */
+
+#ifndef USDT2
#define DEFINE_SETSCALARARRAYREGION(ElementTag,ElementType,Result, Tag) \
DT_VOID_RETURN_MARK_DECL(Set##Result##ArrayRegion);\
\
@@ -2386,6 +3883,58 @@ DEFINE_SETSCALARARRAYREGION(T_LONG, jlong, Long, long)
DEFINE_SETSCALARARRAYREGION(T_FLOAT, jfloat, Float, float)
DEFINE_SETSCALARARRAYREGION(T_DOUBLE, jdouble, Double, double)
+#else /* USDT2 */
+
+#define DEFINE_SETSCALARARRAYREGION(ElementTag,ElementType,Result, Tag \
+ , EntryProbe, ReturnProbe); \
+ DT_VOID_RETURN_MARK_DECL(Set##Result##ArrayRegion \
+ ,ReturnProbe); \
+\
+JNI_ENTRY(void, \
+jni_Set##Result##ArrayRegion(JNIEnv *env, ElementType##Array array, jsize start, \
+ jsize len, const ElementType *buf)) \
+ JNIWrapper("Set" XSTR(Result) "ArrayRegion"); \
+ EntryProbe; \
+ DT_VOID_RETURN_MARK(Set##Result##ArrayRegion); \
+ typeArrayOop dst = typeArrayOop(JNIHandles::resolve_non_null(array)); \
+ if (start < 0 || len < 0 || ((unsigned int)start + (unsigned int)len > (unsigned int)dst->length())) { \
+ THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); \
+ } else { \
+ if (len > 0) { \
+ int sc = typeArrayKlass::cast(dst->klass())->log2_element_size(); \
+ memcpy((u_char*) dst->Tag##_at_addr(start), \
+ (u_char*) buf, \
+ len << sc); \
+ } \
+ } \
+JNI_END
+
+DEFINE_SETSCALARARRAYREGION(T_BOOLEAN, jboolean, Boolean, bool
+ , HOTSPOT_JNI_SETBOOLEANARRAYREGION_ENTRY(env, array, start, len, (uintptr_t *)buf),
+ HOTSPOT_JNI_SETBOOLEANARRAYREGION_RETURN())
+DEFINE_SETSCALARARRAYREGION(T_BYTE, jbyte, Byte, byte
+ , HOTSPOT_JNI_SETBYTEARRAYREGION_ENTRY(env, array, start, len, (char *) buf),
+ HOTSPOT_JNI_SETBYTEARRAYREGION_RETURN())
+DEFINE_SETSCALARARRAYREGION(T_SHORT, jshort, Short, short
+ , HOTSPOT_JNI_SETSHORTARRAYREGION_ENTRY(env, array, start, len, (uint16_t *) buf),
+ HOTSPOT_JNI_SETSHORTARRAYREGION_RETURN())
+DEFINE_SETSCALARARRAYREGION(T_CHAR, jchar, Char, char
+ , HOTSPOT_JNI_SETCHARARRAYREGION_ENTRY(env, array, start, len, (uint16_t *) buf),
+ HOTSPOT_JNI_SETCHARARRAYREGION_RETURN())
+DEFINE_SETSCALARARRAYREGION(T_INT, jint, Int, int
+ , HOTSPOT_JNI_SETINTARRAYREGION_ENTRY(env, array, start, len, (uint32_t *) buf),
+ HOTSPOT_JNI_SETINTARRAYREGION_RETURN())
+DEFINE_SETSCALARARRAYREGION(T_LONG, jlong, Long, long
+ , HOTSPOT_JNI_SETLONGARRAYREGION_ENTRY(env, array, start, len, (uintptr_t *) buf),
+ HOTSPOT_JNI_SETLONGARRAYREGION_RETURN())
+DEFINE_SETSCALARARRAYREGION(T_FLOAT, jfloat, Float, float
+ , HOTSPOT_JNI_SETFLOATARRAYREGION_ENTRY(env, array, start, len, (float *) buf),
+ HOTSPOT_JNI_SETFLOATARRAYREGION_RETURN())
+DEFINE_SETSCALARARRAYREGION(T_DOUBLE, jdouble, Double, double
+ , HOTSPOT_JNI_SETDOUBLEARRAYREGION_ENTRY(env, array, start, len, (double *) buf),
+ HOTSPOT_JNI_SETDOUBLEARRAYREGION_RETURN())
+#endif /* USDT2 */
+
//
// Interception of natives
@@ -2467,13 +4016,23 @@ static bool register_native(KlassHandle k, Symbol* name, Symbol* signature, addr
return true;
}
+#ifndef USDT2
DT_RETURN_MARK_DECL(RegisterNatives, jint);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(RegisterNatives, jint
+ , HOTSPOT_JNI_REGISTERNATIVES_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jint, jni_RegisterNatives(JNIEnv *env, jclass clazz,
const JNINativeMethod *methods,
jint nMethods))
JNIWrapper("RegisterNatives");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, RegisterNatives__entry, env, clazz, methods, nMethods);
+#else /* USDT2 */
+ HOTSPOT_JNI_REGISTERNATIVES_ENTRY(
+ env, clazz, (void *) methods, nMethods);
+#endif /* USDT2 */
jint ret = 0;
DT_RETURN_MARK(RegisterNatives, jint, (const jint&)ret);
@@ -2511,7 +4070,12 @@ JNI_END
JNI_ENTRY(jint, jni_UnregisterNatives(JNIEnv *env, jclass clazz))
JNIWrapper("UnregisterNatives");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, UnregisterNatives__entry, env, clazz);
+#else /* USDT2 */
+ HOTSPOT_JNI_UNREGISTERNATIVES_ENTRY(
+ env, clazz);
+#endif /* USDT2 */
klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(clazz));
//%note jni_2
if (Klass::cast(k)->oop_is_instance()) {
@@ -2523,7 +4087,12 @@ JNI_ENTRY(jint, jni_UnregisterNatives(JNIEnv *env, jclass clazz))
}
}
}
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, UnregisterNatives__return, 0);
+#else /* USDT2 */
+ HOTSPOT_JNI_UNREGISTERNATIVES_RETURN(
+ 0);
+#endif /* USDT2 */
return 0;
JNI_END
@@ -2531,10 +4100,20 @@ JNI_END
// Monitor functions
//
+#ifndef USDT2
DT_RETURN_MARK_DECL(MonitorEnter, jint);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(MonitorEnter, jint
+ , HOTSPOT_JNI_MONITORENTER_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jint, jni_MonitorEnter(JNIEnv *env, jobject jobj))
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, MonitorEnter__entry, env, jobj);
+#else /* USDT2 */
+ HOTSPOT_JNI_MONITORENTER_ENTRY(
+ env, jobj);
+#endif /* USDT2 */
jint ret = JNI_ERR;
DT_RETURN_MARK(MonitorEnter, jint, (const jint&)ret);
@@ -2549,10 +4128,20 @@ JNI_ENTRY(jint, jni_MonitorEnter(JNIEnv *env, jobject jobj))
return ret;
JNI_END
+#ifndef USDT2
DT_RETURN_MARK_DECL(MonitorExit, jint);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(MonitorExit, jint
+ , HOTSPOT_JNI_MONITOREXIT_RETURN(_ret_ref));
+#endif /* USDT2 */
JNI_ENTRY(jint, jni_MonitorExit(JNIEnv *env, jobject jobj))
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, MonitorExit__entry, env, jobj);
+#else /* USDT2 */
+ HOTSPOT_JNI_MONITOREXIT_ENTRY(
+ env, jobj);
+#endif /* USDT2 */
jint ret = JNI_ERR;
DT_RETURN_MARK(MonitorExit, jint, (const jint&)ret);
@@ -2572,11 +4161,21 @@ JNI_END
// Extensions
//
+#ifndef USDT2
DT_VOID_RETURN_MARK_DECL(GetStringRegion);
+#else /* USDT2 */
+DT_VOID_RETURN_MARK_DECL(GetStringRegion
+ , HOTSPOT_JNI_GETSTRINGREGION_RETURN());
+#endif /* USDT2 */
JNI_ENTRY(void, jni_GetStringRegion(JNIEnv *env, jstring string, jsize start, jsize len, jchar *buf))
JNIWrapper("GetStringRegion");
+#ifndef USDT2
DTRACE_PROBE5(hotspot_jni, GetStringRegion__entry, env, string, start, len, buf);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGREGION_ENTRY(
+ env, string, start, len, buf);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(GetStringRegion);
oop s = JNIHandles::resolve_non_null(string);
int s_len = java_lang_String::length(s);
@@ -2591,11 +4190,21 @@ JNI_ENTRY(void, jni_GetStringRegion(JNIEnv *env, jstring string, jsize start, js
}
JNI_END
+#ifndef USDT2
DT_VOID_RETURN_MARK_DECL(GetStringUTFRegion);
+#else /* USDT2 */
+DT_VOID_RETURN_MARK_DECL(GetStringUTFRegion
+ , HOTSPOT_JNI_GETSTRINGUTFREGION_RETURN());
+#endif /* USDT2 */
JNI_ENTRY(void, jni_GetStringUTFRegion(JNIEnv *env, jstring string, jsize start, jsize len, char *buf))
JNIWrapper("GetStringUTFRegion");
+#ifndef USDT2
DTRACE_PROBE5(hotspot_jni, GetStringUTFRegion__entry, env, string, start, len, buf);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGUTFREGION_ENTRY(
+ env, string, start, len, buf);
+#endif /* USDT2 */
DT_VOID_RETURN_MARK(GetStringUTFRegion);
oop s = JNIHandles::resolve_non_null(string);
int s_len = java_lang_String::length(s);
@@ -2621,7 +4230,12 @@ JNI_END
JNI_ENTRY(void*, jni_GetPrimitiveArrayCritical(JNIEnv *env, jarray array, jboolean *isCopy))
JNIWrapper("GetPrimitiveArrayCritical");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetPrimitiveArrayCritical__entry, env, array, isCopy);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETPRIMITIVEARRAYCRITICAL_ENTRY(
+ env, array, (uintptr_t *) isCopy);
+#endif /* USDT2 */
GC_locker::lock_critical(thread);
if (isCopy != NULL) {
*isCopy = JNI_FALSE;
@@ -2635,23 +4249,43 @@ JNI_ENTRY(void*, jni_GetPrimitiveArrayCritical(JNIEnv *env, jarray array, jboole
type = typeArrayKlass::cast(a->klass())->element_type();
}
void* ret = arrayOop(a)->base(type);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetPrimitiveArrayCritical__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETPRIMITIVEARRAYCRITICAL_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
JNI_ENTRY(void, jni_ReleasePrimitiveArrayCritical(JNIEnv *env, jarray array, void *carray, jint mode))
JNIWrapper("ReleasePrimitiveArrayCritical");
+#ifndef USDT2
DTRACE_PROBE4(hotspot_jni, ReleasePrimitiveArrayCritical__entry, env, array, carray, mode);
+#else /* USDT2 */
+ HOTSPOT_JNI_RELEASEPRIMITIVEARRAYCRITICAL_ENTRY(
+ env, array, carray, mode);
+#endif /* USDT2 */
// The array, carray and mode arguments are ignored
GC_locker::unlock_critical(thread);
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, ReleasePrimitiveArrayCritical__return);
+#else /* USDT2 */
+HOTSPOT_JNI_RELEASEPRIMITIVEARRAYCRITICAL_RETURN(
+);
+#endif /* USDT2 */
JNI_END
JNI_ENTRY(const jchar*, jni_GetStringCritical(JNIEnv *env, jstring string, jboolean *isCopy))
JNIWrapper("GetStringCritical");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetStringCritical__entry, env, string, isCopy);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGCRITICAL_ENTRY(
+ env, string, (uintptr_t *) isCopy);
+#endif /* USDT2 */
GC_locker::lock_critical(thread);
if (isCopy != NULL) {
*isCopy = JNI_FALSE;
@@ -2666,44 +4300,89 @@ JNI_ENTRY(const jchar*, jni_GetStringCritical(JNIEnv *env, jstring string, jbool
} else {
ret = (jchar*) s_value->base(T_CHAR);
}
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringCritical__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETSTRINGCRITICAL_RETURN(
+ (uint16_t *) ret);
+#endif /* USDT2 */
return ret;
JNI_END
JNI_ENTRY(void, jni_ReleaseStringCritical(JNIEnv *env, jstring str, const jchar *chars))
JNIWrapper("ReleaseStringCritical");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, ReleaseStringCritical__entry, env, str, chars);
+#else /* USDT2 */
+ HOTSPOT_JNI_RELEASESTRINGCRITICAL_ENTRY(
+ env, str, (uint16_t *) chars);
+#endif /* USDT2 */
// The str and chars arguments are ignored
GC_locker::unlock_critical(thread);
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, ReleaseStringCritical__return);
+#else /* USDT2 */
+HOTSPOT_JNI_RELEASESTRINGCRITICAL_RETURN(
+);
+#endif /* USDT2 */
JNI_END
JNI_ENTRY(jweak, jni_NewWeakGlobalRef(JNIEnv *env, jobject ref))
JNIWrapper("jni_NewWeakGlobalRef");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, NewWeakGlobalRef__entry, env, ref);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWWEAKGLOBALREF_ENTRY(
+ env, ref);
+#endif /* USDT2 */
Handle ref_handle(thread, JNIHandles::resolve(ref));
jweak ret = JNIHandles::make_weak_global(ref_handle);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, NewWeakGlobalRef__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWWEAKGLOBALREF_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
// Must be JNI_ENTRY (with HandleMark)
JNI_ENTRY(void, jni_DeleteWeakGlobalRef(JNIEnv *env, jweak ref))
JNIWrapper("jni_DeleteWeakGlobalRef");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, DeleteWeakGlobalRef__entry, env, ref);
+#else /* USDT2 */
+ HOTSPOT_JNI_DELETEWEAKGLOBALREF_ENTRY(
+ env, ref);
+#endif /* USDT2 */
JNIHandles::destroy_weak_global(ref);
+#ifndef USDT2
DTRACE_PROBE(hotspot_jni, DeleteWeakGlobalRef__return);
+#else /* USDT2 */
+ HOTSPOT_JNI_DELETEWEAKGLOBALREF_RETURN(
+ );
+#endif /* USDT2 */
JNI_END
JNI_QUICK_ENTRY(jboolean, jni_ExceptionCheck(JNIEnv *env))
JNIWrapper("jni_ExceptionCheck");
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionCheck__entry, env);
+#else /* USDT2 */
+ HOTSPOT_JNI_EXCEPTIONCHECK_ENTRY(
+ env);
+#endif /* USDT2 */
jni_check_async_exceptions(thread);
jboolean ret = (thread->has_pending_exception()) ? JNI_TRUE : JNI_FALSE;
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionCheck__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_EXCEPTIONCHECK_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
JNI_END
@@ -2795,11 +4474,21 @@ extern "C" jobject JNICALL jni_NewDirectByteBuffer(JNIEnv *env, void* address, j
JavaThread* thread = JavaThread::thread_from_jni_environment(env);
JNIWrapper("jni_NewDirectByteBuffer");
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, NewDirectByteBuffer__entry, env, address, capacity);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWDIRECTBYTEBUFFER_ENTRY(
+ env, address, capacity);
+#endif /* USDT2 */
if (!directBufferSupportInitializeEnded) {
if (!initializeDirectBufferSupport(env, thread)) {
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWDIRECTBYTEBUFFER_RETURN(
+ NULL);
+#endif /* USDT2 */
return NULL;
}
}
@@ -2810,11 +4499,21 @@ extern "C" jobject JNICALL jni_NewDirectByteBuffer(JNIEnv *env, void* address, j
// takes int capacity
jint cap = (jint) capacity;
jobject ret = env->NewObject(directByteBufferClass, directByteBufferConstructor, addr, cap);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_NEWDIRECTBYTEBUFFER_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
}
+#ifndef USDT2
DT_RETURN_MARK_DECL(GetDirectBufferAddress, void*);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(GetDirectBufferAddress, void*
+ , HOTSPOT_JNI_GETDIRECTBUFFERADDRESS_RETURN((void*) _ret_ref));
+#endif /* USDT2 */
extern "C" void* JNICALL jni_GetDirectBufferAddress(JNIEnv *env, jobject buf)
{
@@ -2822,7 +4521,12 @@ extern "C" void* JNICALL jni_GetDirectBufferAddress(JNIEnv *env, jobject buf)
JavaThread* thread = JavaThread::thread_from_jni_environment(env);
JNIWrapper("jni_GetDirectBufferAddress");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetDirectBufferAddress__entry, env, buf);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETDIRECTBUFFERADDRESS_ENTRY(
+ env, buf);
+#endif /* USDT2 */
void* ret = NULL;
DT_RETURN_MARK(GetDirectBufferAddress, void*, (const void*&)ret);
@@ -2840,7 +4544,12 @@ extern "C" void* JNICALL jni_GetDirectBufferAddress(JNIEnv *env, jobject buf)
return ret;
}
+#ifndef USDT2
DT_RETURN_MARK_DECL(GetDirectBufferCapacity, jlong);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(GetDirectBufferCapacity, jlong
+ , HOTSPOT_JNI_GETDIRECTBUFFERCAPACITY_RETURN(_ret_ref));
+#endif /* USDT2 */
extern "C" jlong JNICALL jni_GetDirectBufferCapacity(JNIEnv *env, jobject buf)
{
@@ -2848,7 +4557,12 @@ extern "C" jlong JNICALL jni_GetDirectBufferCapacity(JNIEnv *env, jobject buf)
JavaThread* thread = JavaThread::thread_from_jni_environment(env);
JNIWrapper("jni_GetDirectBufferCapacity");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetDirectBufferCapacity__entry, env, buf);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETDIRECTBUFFERCAPACITY_ENTRY(
+ env, buf);
+#endif /* USDT2 */
jlong ret = -1;
DT_RETURN_MARK(GetDirectBufferCapacity, jlong, (const jlong&)ret);
@@ -2875,8 +4589,18 @@ extern "C" jlong JNICALL jni_GetDirectBufferCapacity(JNIEnv *env, jobject buf)
JNI_LEAF(jint, jni_GetVersion(JNIEnv *env))
JNIWrapper("GetVersion");
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetVersion__entry, env);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETVERSION_ENTRY(
+ env);
+#endif /* USDT2 */
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetVersion__return, CurrentVersion);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETVERSION_RETURN(
+ CurrentVersion);
+#endif /* USDT2 */
return CurrentVersion;
JNI_END
@@ -2884,9 +4608,19 @@ extern struct JavaVM_ main_vm;
JNI_LEAF(jint, jni_GetJavaVM(JNIEnv *env, JavaVM **vm))
JNIWrapper("jni_GetJavaVM");
+#ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetJavaVM__entry, env, vm);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETJAVAVM_ENTRY(
+ env, (void **) vm);
+#endif /* USDT2 */
*vm = (JavaVM *)(&main_vm);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetJavaVM__return, JNI_OK);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETJAVAVM_RETURN(
+ JNI_OK);
+#endif /* USDT2 */
return JNI_OK;
JNI_END
@@ -3266,11 +5000,21 @@ struct JavaVM_ main_vm = {&jni_InvokeInterface};
#define JAVASTACKSIZE (400 * 1024) /* Default size of a thread java stack */
enum { VERIFY_NONE, VERIFY_REMOTE, VERIFY_ALL };
+#ifndef USDT2
HS_DTRACE_PROBE_DECL1(hotspot_jni, GetDefaultJavaVMInitArgs__entry, void*);
DT_RETURN_MARK_DECL(GetDefaultJavaVMInitArgs, jint);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(GetDefaultJavaVMInitArgs, jint
+ , HOTSPOT_JNI_GETDEFAULTJAVAVMINITARGS_RETURN(_ret_ref));
+#endif /* USDT2 */
_JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_GetDefaultJavaVMInitArgs(void *args_) {
+#ifndef USDT2
HS_DTRACE_PROBE1(hotspot_jni, GetDefaultJavaVMInitArgs__entry, args_);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETDEFAULTJAVAVMINITARGS_ENTRY(
+ args_);
+#endif /* USDT2 */
JDK1_1InitArgs *args = (JDK1_1InitArgs *)args_;
jint ret = JNI_ERR;
DT_RETURN_MARK(GetDefaultJavaVMInitArgs, jint, (const jint&)ret);
@@ -3298,17 +5042,28 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_GetDefaultJavaVMInitArgs(void *args_) {
void execute_internal_vm_tests() {
if (ExecuteInternalVMTests) {
assert(QuickSort::test_quick_sort(), "test_quick_sort failed");
- tty->print_cr("All tests passed");
+ assert(arrayOopDesc::test_max_array_length(), "test_max_array_length failed");
+ tty->print_cr("All internal VM tests passed");
}
}
#endif
+#ifndef USDT2
HS_DTRACE_PROBE_DECL3(hotspot_jni, CreateJavaVM__entry, vm, penv, args);
DT_RETURN_MARK_DECL(CreateJavaVM, jint);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(CreateJavaVM, jint
+ , HOTSPOT_JNI_CREATEJAVAVM_RETURN(_ret_ref));
+#endif /* USDT2 */
_JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_CreateJavaVM(JavaVM **vm, void **penv, void *args) {
+#ifndef USDT2
HS_DTRACE_PROBE3(hotspot_jni, CreateJavaVM__entry, vm, penv, args);
+#else /* USDT2 */
+ HOTSPOT_JNI_CREATEJAVAVM_ENTRY(
+ (void **) vm, penv, args);
+#endif /* USDT2 */
jint result = JNI_ERR;
DT_RETURN_MARK(CreateJavaVM, jint, (const jint&)result);
@@ -3398,31 +5153,53 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_CreateJavaVM(JavaVM **vm, void **penv, v
return result;
}
+#ifndef USDT2
HS_DTRACE_PROBE_DECL3(hotspot_jni, GetCreatedJavaVMs__entry, \
JavaVM**, jsize, jsize*);
HS_DTRACE_PROBE_DECL1(hotspot_jni, GetCreatedJavaVMs__return, jint);
+#endif /* !USDT2 */
_JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_GetCreatedJavaVMs(JavaVM **vm_buf, jsize bufLen, jsize *numVMs) {
// See bug 4367188, the wrapper can sometimes cause VM crashes
// JNIWrapper("GetCreatedJavaVMs");
+#ifndef USDT2
HS_DTRACE_PROBE3(hotspot_jni, GetCreatedJavaVMs__entry, \
vm_buf, bufLen, numVMs);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETCREATEDJAVAVMS_ENTRY(
+ (void **) vm_buf, bufLen, (uintptr_t *) numVMs);
+#endif /* USDT2 */
if (vm_created) {
if (numVMs != NULL) *numVMs = 1;
if (bufLen > 0) *vm_buf = (JavaVM *)(&main_vm);
} else {
if (numVMs != NULL) *numVMs = 0;
}
+#ifndef USDT2
HS_DTRACE_PROBE1(hotspot_jni, GetCreatedJavaVMs__return, JNI_OK);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETCREATEDJAVAVMS_RETURN(
+ JNI_OK);
+#endif /* USDT2 */
return JNI_OK;
}
extern "C" {
+#ifndef USDT2
DT_RETURN_MARK_DECL(DestroyJavaVM, jint);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(DestroyJavaVM, jint
+ , HOTSPOT_JNI_DESTROYJAVAVM_RETURN(_ret_ref));
+#endif /* USDT2 */
jint JNICALL jni_DestroyJavaVM(JavaVM *vm) {
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, DestroyJavaVM__entry, vm);
+#else /* USDT2 */
+ HOTSPOT_JNI_DESTROYJAVAVM_ENTRY(
+ vm);
+#endif /* USDT2 */
jint res = JNI_ERR;
DT_RETURN_MARK(DestroyJavaVM, jint, (const jint&)res);
@@ -3540,7 +5317,7 @@ static jint attach_current_thread(JavaVM *vm, void **penv, void *_args, bool dae
// mark the thread as no longer attaching
// this uses a fence to push the change through so we don't have
// to regrab the threads_lock
- thread->set_attached();
+ thread->set_done_attaching_via_jni();
// Set java thread status.
java_lang_Thread::set_thread_status(thread->threadObj(),
@@ -3568,34 +5345,64 @@ static jint attach_current_thread(JavaVM *vm, void **penv, void *_args, bool dae
jint JNICALL jni_AttachCurrentThread(JavaVM *vm, void **penv, void *_args) {
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, AttachCurrentThread__entry, vm, penv, _args);
+#else /* USDT2 */
+ HOTSPOT_JNI_ATTACHCURRENTTHREAD_ENTRY(
+ vm, penv, _args);
+#endif /* USDT2 */
if (!vm_created) {
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, AttachCurrentThread__return, JNI_ERR);
+#else /* USDT2 */
+ HOTSPOT_JNI_ATTACHCURRENTTHREAD_RETURN(
+ (uint32_t) JNI_ERR);
+#endif /* USDT2 */
return JNI_ERR;
}
JNIWrapper("AttachCurrentThread");
jint ret = attach_current_thread(vm, penv, _args, false);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, AttachCurrentThread__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_ATTACHCURRENTTHREAD_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
}
jint JNICALL jni_DetachCurrentThread(JavaVM *vm) {
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, DetachCurrentThread__entry, vm);
+#else /* USDT2 */
+ HOTSPOT_JNI_DETACHCURRENTTHREAD_ENTRY(
+ vm);
+#endif /* USDT2 */
VM_Exit::block_if_vm_exited();
JNIWrapper("DetachCurrentThread");
// If the thread has been deattacted the operations is a no-op
if (ThreadLocalStorage::thread() == NULL) {
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, DetachCurrentThread__return, JNI_OK);
+#else /* USDT2 */
+ HOTSPOT_JNI_DETACHCURRENTTHREAD_RETURN(
+ JNI_OK);
+#endif /* USDT2 */
return JNI_OK;
}
JavaThread* thread = JavaThread::current();
if (thread->has_last_Java_frame()) {
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, DetachCurrentThread__return, JNI_ERR);
+#else /* USDT2 */
+ HOTSPOT_JNI_DETACHCURRENTTHREAD_RETURN(
+ (uint32_t) JNI_ERR);
+#endif /* USDT2 */
// Can't detach a thread that's running java, that can't work.
return JNI_ERR;
}
@@ -3616,14 +5423,29 @@ jint JNICALL jni_DetachCurrentThread(JavaVM *vm) {
thread->exit(false, JavaThread::jni_detach);
delete thread;
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, DetachCurrentThread__return, JNI_OK);
+#else /* USDT2 */
+ HOTSPOT_JNI_DETACHCURRENTTHREAD_RETURN(
+ JNI_OK);
+#endif /* USDT2 */
return JNI_OK;
}
+#ifndef USDT2
DT_RETURN_MARK_DECL(GetEnv, jint);
+#else /* USDT2 */
+DT_RETURN_MARK_DECL(GetEnv, jint
+ , HOTSPOT_JNI_GETENV_RETURN(_ret_ref));
+#endif /* USDT2 */
jint JNICALL jni_GetEnv(JavaVM *vm, void **penv, jint version) {
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetEnv__entry, vm, penv, version);
+#else /* USDT2 */
+ HOTSPOT_JNI_GETENV_ENTRY(
+ vm, penv, version);
+#endif /* USDT2 */
jint ret = JNI_ERR;
DT_RETURN_MARK(GetEnv, jint, (const jint&)ret);
@@ -3678,15 +5500,30 @@ jint JNICALL jni_GetEnv(JavaVM *vm, void **penv, jint version) {
jint JNICALL jni_AttachCurrentThreadAsDaemon(JavaVM *vm, void **penv, void *_args) {
+#ifndef USDT2
DTRACE_PROBE3(hotspot_jni, AttachCurrentThreadAsDaemon__entry, vm, penv, _args);
+#else /* USDT2 */
+ HOTSPOT_JNI_ATTACHCURRENTTHREADASDAEMON_ENTRY(
+ vm, penv, _args);
+#endif /* USDT2 */
if (!vm_created) {
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, AttachCurrentThreadAsDaemon__return, JNI_ERR);
+#else /* USDT2 */
+ HOTSPOT_JNI_ATTACHCURRENTTHREADASDAEMON_RETURN(
+ (uint32_t) JNI_ERR);
+#endif /* USDT2 */
return JNI_ERR;
}
JNIWrapper("AttachCurrentThreadAsDaemon");
jint ret = attach_current_thread(vm, penv, _args, true);
+#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, AttachCurrentThreadAsDaemon__return, ret);
+#else /* USDT2 */
+ HOTSPOT_JNI_ATTACHCURRENTTHREADASDAEMON_RETURN(
+ ret);
+#endif /* USDT2 */
return ret;
}
diff --git a/hotspot/src/share/vm/prims/jniCheck.cpp b/hotspot/src/share/vm/prims/jniCheck.cpp
index 63281dc..3bf4ecd 100644
--- a/hotspot/src/share/vm/prims/jniCheck.cpp
+++ b/hotspot/src/share/vm/prims/jniCheck.cpp
@@ -107,7 +107,7 @@ extern "C" { \
if (env != xenv) { \
NativeReportJNIFatalError(thr, warn_wrong_jnienv); \
} \
- __ENTRY(result_type, header, thr)
+ VM_ENTRY_BASE(result_type, header, thr)
#define UNCHECKED() (unchecked_jni_NativeInterface)
diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp
index f98d1b7..67588ac 100644
--- a/hotspot/src/share/vm/prims/jvm.cpp
+++ b/hotspot/src/share/vm/prims/jvm.cpp
@@ -79,9 +79,11 @@
#include <errno.h>
+#ifndef USDT2
HS_DTRACE_PROBE_DECL1(hotspot, thread__sleep__begin, long long);
HS_DTRACE_PROBE_DECL1(hotspot, thread__sleep__end, int);
HS_DTRACE_PROBE_DECL0(hotspot, thread__yield);
+#endif /* !USDT2 */
/*
NOTE about use of any ctor or function call that can trigger a safepoint/GC:
@@ -2827,7 +2829,11 @@ JVM_END
JVM_ENTRY(void, JVM_Yield(JNIEnv *env, jclass threadClass))
JVMWrapper("JVM_Yield");
if (os::dont_yield()) return;
+#ifndef USDT2
HS_DTRACE_PROBE0(hotspot, thread__yield);
+#else /* USDT2 */
+ HOTSPOT_THREAD_YIELD();
+#endif /* USDT2 */
// When ConvertYieldToSleep is off (default), this matches the classic VM use of yield.
// Critical for similar threading behaviour
if (ConvertYieldToSleep) {
@@ -2853,7 +2859,12 @@ JVM_ENTRY(void, JVM_Sleep(JNIEnv* env, jclass threadClass, jlong millis))
// And set new thread state to SLEEPING.
JavaThreadSleepState jtss(thread);
+#ifndef USDT2
HS_DTRACE_PROBE1(hotspot, thread__sleep__begin, millis);
+#else /* USDT2 */
+ HOTSPOT_THREAD_SLEEP_BEGIN(
+ millis);
+#endif /* USDT2 */
if (millis == 0) {
// When ConvertSleepToYield is on, this matches the classic VM implementation of
@@ -2875,7 +2886,12 @@ JVM_ENTRY(void, JVM_Sleep(JNIEnv* env, jclass threadClass, jlong millis))
// An asynchronous exception (e.g., ThreadDeathException) could have been thrown on
// us while we were sleeping. We do not overwrite those.
if (!HAS_PENDING_EXCEPTION) {
+#ifndef USDT2
HS_DTRACE_PROBE1(hotspot, thread__sleep__end,1);
+#else /* USDT2 */
+ HOTSPOT_THREAD_SLEEP_END(
+ 1);
+#endif /* USDT2 */
// TODO-FIXME: THROW_MSG returns which means we will not call set_state()
// to properly restore the thread state. That's likely wrong.
THROW_MSG(vmSymbols::java_lang_InterruptedException(), "sleep interrupted");
@@ -2883,7 +2899,12 @@ JVM_ENTRY(void, JVM_Sleep(JNIEnv* env, jclass threadClass, jlong millis))
}
thread->osthread()->set_state(old_state);
}
+#ifndef USDT2
HS_DTRACE_PROBE1(hotspot, thread__sleep__end,0);
+#else /* USDT2 */
+ HOTSPOT_THREAD_SLEEP_END(
+ 0);
+#endif /* USDT2 */
JVM_END
JVM_ENTRY(jobject, JVM_CurrentThread(JNIEnv* env, jclass threadClass))
@@ -3001,6 +3022,20 @@ JVM_ENTRY(void, JVM_DumpAllStacks(JNIEnv* env, jclass))
}
JVM_END
+JVM_ENTRY(void, JVM_SetNativeThreadName(JNIEnv* env, jobject jthread, jstring name))
+ JVMWrapper("JVM_SetNativeThreadName");
+ ResourceMark rm(THREAD);
+ oop java_thread = JNIHandles::resolve_non_null(jthread);
+ JavaThread* thr = java_lang_Thread::thread(java_thread);
+ // Thread naming only supported for the current thread, doesn't work for
+ // target threads.
+ if (Thread::current() == thr && !thr->has_attached_via_jni()) {
+ // we don't set the name of an attached thread to avoid stepping
+ // on other programs
+ const char *thread_name = java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(name));
+ os::set_native_thread_name(thread_name);
+ }
+JVM_END
// java.lang.SecurityManager ///////////////////////////////////////////////////////////////////////
diff --git a/hotspot/src/share/vm/prims/jvm.h b/hotspot/src/share/vm/prims/jvm.h
index 70d1649..13414dd 100644
--- a/hotspot/src/share/vm/prims/jvm.h
+++ b/hotspot/src/share/vm/prims/jvm.h
@@ -291,6 +291,9 @@ JVM_DumpAllStacks(JNIEnv *env, jclass unused);
JNIEXPORT jobjectArray JNICALL
JVM_GetAllThreads(JNIEnv *env, jclass dummy);
+JNIEXPORT void JNICALL
+JVM_SetNativeThreadName(JNIEnv *env, jobject jthread, jstring name);
+
/* getStackTrace() and getAllStackTraces() method */
JNIEXPORT jobjectArray JNICALL
JVM_DumpThreads(JNIEnv *env, jclass threadClass, jobjectArray threads);
diff --git a/hotspot/src/share/vm/prims/jvmtiEnter.xsl b/hotspot/src/share/vm/prims/jvmtiEnter.xsl
index 1dc3de8..318d76b 100644
--- a/hotspot/src/share/vm/prims/jvmtiEnter.xsl
+++ b/hotspot/src/share/vm/prims/jvmtiEnter.xsl
@@ -426,7 +426,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text>
<xsl:value-of select="$space"/>
<xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
<xsl:value-of select="$space"/>
- <xsl:text>__ENTRY(jvmtiError, </xsl:text>
+ <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
<xsl:apply-templates select="." mode="functionid"/>
<xsl:text> , current_thread)</xsl:text>
<xsl:value-of select="$space"/>
diff --git a/hotspot/src/share/vm/prims/jvmtiEnv.cpp b/hotspot/src/share/vm/prims/jvmtiEnv.cpp
index 652be9a..6084915 100644
--- a/hotspot/src/share/vm/prims/jvmtiEnv.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiEnv.cpp
@@ -173,7 +173,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread thread, void** data_ptr) {
// from native so as to resolve the jthread.
ThreadInVMfromNative __tiv(current_thread);
- __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
+ VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
debug_only(VMNativeEntryWrapper __vew;)
oop thread_oop = JNIHandles::resolve_external_guard(thread);
diff --git a/hotspot/src/share/vm/prims/jvmtiExport.cpp b/hotspot/src/share/vm/prims/jvmtiExport.cpp
index 48401ca..181716d 100644
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp
@@ -373,7 +373,7 @@ JvmtiExport::get_jvmti_interface(JavaVM *jvm, void **penv, jint version) {
JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
// transition code: native to VM
ThreadInVMfromNative __tiv(current_thread);
- __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
+ VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
debug_only(VMNativeEntryWrapper __vew;)
JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
diff --git a/hotspot/src/share/vm/prims/methodHandleWalk.cpp b/hotspot/src/share/vm/prims/methodHandleWalk.cpp
index 3f31307..d4d9a71 100644
--- a/hotspot/src/share/vm/prims/methodHandleWalk.cpp
+++ b/hotspot/src/share/vm/prims/methodHandleWalk.cpp
@@ -1387,10 +1387,8 @@ bool MethodHandleCompiler::fetch_counts(ArgToken arg1, ArgToken arg2) {
int total = count1 + count2;
if (count1 != -1 && count2 != -1 && total != 0) {
// Normalize the collect counts to the invoke_count
- tty->print("counts %d %d scaled by %d = ", count2, count1, _invoke_count);
if (count1 != 0) _not_taken_count = (int)(_invoke_count * count1 / (double)total);
if (count2 != 0) _taken_count = (int)(_invoke_count * count2 / (double)total);
- tty->print_cr("%d %d", _taken_count, _not_taken_count);
return true;
}
return false;
diff --git a/hotspot/src/share/vm/prims/methodHandles.cpp b/hotspot/src/share/vm/prims/methodHandles.cpp
index c5d5c88..d43cb97 100644
--- a/hotspot/src/share/vm/prims/methodHandles.cpp
+++ b/hotspot/src/share/vm/prims/methodHandles.cpp
@@ -206,9 +206,12 @@ void MethodHandles::generate_adapters() {
_adapter_code = MethodHandlesAdapterBlob::create(adapter_code_size);
if (_adapter_code == NULL)
vm_exit_out_of_memory(adapter_code_size, "CodeCache: no room for MethodHandles adapters");
- CodeBuffer code(_adapter_code);
- MethodHandlesAdapterGenerator g(&code);
- g.generate();
+ {
+ CodeBuffer code(_adapter_code);
+ MethodHandlesAdapterGenerator g(&code);
+ g.generate();
+ code.log_section_sizes("MethodHandlesAdapterBlob");
+ }
}
//------------------------------------------------------------------------------
@@ -3079,26 +3082,26 @@ JVM_ENTRY(jint, MHN_getMembers(JNIEnv *env, jobject igcls,
JVM_END
JVM_ENTRY(void, MHN_setCallSiteTargetNormal(JNIEnv* env, jobject igcls, jobject call_site_jh, jobject target_jh)) {
- oop call_site = JNIHandles::resolve_non_null(call_site_jh);
- oop target = JNIHandles::resolve(target_jh);
+ Handle call_site(THREAD, JNIHandles::resolve_non_null(call_site_jh));
+ Handle target (THREAD, JNIHandles::resolve(target_jh));
{
// Walk all nmethods depending on this call site.
MutexLocker mu(Compile_lock, thread);
Universe::flush_dependents_on(call_site, target);
}
- java_lang_invoke_CallSite::set_target(call_site, target);
+ java_lang_invoke_CallSite::set_target(call_site(), target());
}
JVM_END
JVM_ENTRY(void, MHN_setCallSiteTargetVolatile(JNIEnv* env, jobject igcls, jobject call_site_jh, jobject target_jh)) {
- oop call_site = JNIHandles::resolve_non_null(call_site_jh);
- oop target = JNIHandles::resolve(target_jh);
+ Handle call_site(THREAD, JNIHandles::resolve_non_null(call_site_jh));
+ Handle target (THREAD, JNIHandles::resolve(target_jh));
{
// Walk all nmethods depending on this call site.
MutexLocker mu(Compile_lock, thread);
Universe::flush_dependents_on(call_site, target);
}
- java_lang_invoke_CallSite::set_target_volatile(call_site, target);
+ java_lang_invoke_CallSite::set_target_volatile(call_site(), target());
}
JVM_END
diff --git a/hotspot/src/share/vm/prims/unsafe.cpp b/hotspot/src/share/vm/prims/unsafe.cpp
index 48d13db..19f77a5 100644
--- a/hotspot/src/share/vm/prims/unsafe.cpp
+++ b/hotspot/src/share/vm/prims/unsafe.cpp
@@ -42,9 +42,11 @@
* Implementation of class sun.misc.Unsafe
*/
+#ifndef USDT2
HS_DTRACE_PROBE_DECL3(hotspot, thread__park__begin, uintptr_t, int, long long);
HS_DTRACE_PROBE_DECL1(hotspot, thread__park__end, uintptr_t);
HS_DTRACE_PROBE_DECL1(hotspot, thread__unpark, uintptr_t);
+#endif /* !USDT2 */
#define MAX_OBJECT_SIZE \
( arrayOopDesc::header_size(T_DOUBLE) * HeapWordSize \
@@ -300,21 +302,24 @@ UNSAFE_END
UNSAFE_ENTRY(void, Unsafe_SetObjectVolatile(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject x_h))
UnsafeWrapper("Unsafe_SetObjectVolatile");
- oop x = JNIHandles::resolve(x_h);
- oop p = JNIHandles::resolve(obj);
- // Catch VolatileCallSite.target stores (via
- // CallSite.setTargetVolatile) and check call site dependencies.
- if ((offset == java_lang_invoke_CallSite::target_offset_in_bytes()) && p->is_a(SystemDictionary::CallSite_klass())) {
- oop call_site = p;
- oop method_handle = x;
- assert(call_site ->is_a(SystemDictionary::CallSite_klass()), "must be");
- assert(method_handle->is_a(SystemDictionary::MethodHandle_klass()), "must be");
- {
- // Walk all nmethods depending on this call site.
- MutexLocker mu(Compile_lock, thread);
- Universe::flush_dependents_on(call_site, method_handle);
+ {
+ // Catch VolatileCallSite.target stores (via
+ // CallSite.setTargetVolatile) and check call site dependencies.
+ oop p = JNIHandles::resolve(obj);
+ if ((offset == java_lang_invoke_CallSite::target_offset_in_bytes()) && p->is_a(SystemDictionary::CallSite_klass())) {
+ Handle call_site (THREAD, p);
+ Handle method_handle(THREAD, JNIHandles::resolve(x_h));
+ assert(call_site ->is_a(SystemDictionary::CallSite_klass()), "must be");
+ assert(method_handle->is_a(SystemDictionary::MethodHandle_klass()), "must be");
+ {
+ // Walk all nmethods depending on this call site.
+ MutexLocker mu(Compile_lock, thread);
+ Universe::flush_dependents_on(call_site(), method_handle());
+ }
}
}
+ oop x = JNIHandles::resolve(x_h);
+ oop p = JNIHandles::resolve(obj);
void* addr = index_oop_from_field_offset_long(p, offset);
OrderAccess::release();
if (UseCompressedOops) {
@@ -1187,10 +1192,20 @@ UNSAFE_END
UNSAFE_ENTRY(void, Unsafe_Park(JNIEnv *env, jobject unsafe, jboolean isAbsolute, jlong time))
UnsafeWrapper("Unsafe_Park");
+#ifndef USDT2
HS_DTRACE_PROBE3(hotspot, thread__park__begin, thread->parker(), (int) isAbsolute, time);
+#else /* USDT2 */
+ HOTSPOT_THREAD_PARK_BEGIN(
+ (uintptr_t) thread->parker(), (int) isAbsolute, time);
+#endif /* USDT2 */
JavaThreadParkedState jtps(thread, time != 0);
thread->parker()->park(isAbsolute != 0, time);
+#ifndef USDT2
HS_DTRACE_PROBE1(hotspot, thread__park__end, thread->parker());
+#else /* USDT2 */
+ HOTSPOT_THREAD_PARK_END(
+ (uintptr_t) thread->parker());
+#endif /* USDT2 */
UNSAFE_END
UNSAFE_ENTRY(void, Unsafe_Unpark(JNIEnv *env, jobject unsafe, jobject jthread))
@@ -1222,7 +1237,12 @@ UNSAFE_ENTRY(void, Unsafe_Unpark(JNIEnv *env, jobject unsafe, jobject jthread))
}
}
if (p != NULL) {
+#ifndef USDT2
HS_DTRACE_PROBE1(hotspot, thread__unpark, p);
+#else /* USDT2 */
+ HOTSPOT_THREAD_UNPARK(
+ (uintptr_t) p);
+#endif /* USDT2 */
p->unpark();
}
UNSAFE_END
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index c78805a..f0e1be3 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -1601,18 +1601,9 @@ void Arguments::set_aggressive_opts_flags() {
sprintf(buffer, "java.lang.Integer.IntegerCache.high=" INTX_FORMAT, AutoBoxCacheMax);
add_property(buffer);
}
- if (AggressiveOpts && FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
- FLAG_SET_DEFAULT(DoEscapeAnalysis, true);
- }
if (AggressiveOpts && FLAG_IS_DEFAULT(BiasedLockingStartupDelay)) {
FLAG_SET_DEFAULT(BiasedLockingStartupDelay, 500);
}
- if (AggressiveOpts && FLAG_IS_DEFAULT(OptimizeStringConcat)) {
- FLAG_SET_DEFAULT(OptimizeStringConcat, true);
- }
- if (AggressiveOpts && FLAG_IS_DEFAULT(OptimizeFill)) {
- FLAG_SET_DEFAULT(OptimizeFill, true);
- }
#endif
if (AggressiveOpts) {
@@ -2645,16 +2636,16 @@ SOLARIS_ONLY(
FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true);
} else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) {
-#ifdef SOLARIS
+#if defined(DTRACE_ENABLED)
FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true);
FLAG_SET_CMDLINE(bool, DTraceMethodProbes, true);
FLAG_SET_CMDLINE(bool, DTraceAllocProbes, true);
FLAG_SET_CMDLINE(bool, DTraceMonitorProbes, true);
-#else // ndef SOLARIS
+#else // defined(DTRACE_ENABLED)
jio_fprintf(defaultStream::error_stream(),
- "ExtendedDTraceProbes flag is only applicable on Solaris\n");
+ "ExtendedDTraceProbes flag is not applicable for this configuration\n");
return JNI_EINVAL;
-#endif // ndef SOLARIS
+#endif // defined(DTRACE_ENABLED)
#ifdef ASSERT
} else if (match_option(option, "-XX:+FullGCALot", &tail)) {
FLAG_SET_CMDLINE(bool, FullGCALot, true);
diff --git a/hotspot/src/share/vm/runtime/deoptimization.cpp b/hotspot/src/share/vm/runtime/deoptimization.cpp
index db95bad..05771c3 100644
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp
@@ -362,8 +362,6 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
intptr_t* frame_sizes = NEW_C_HEAP_ARRAY(intptr_t, number_of_frames);
// +1 because we always have an interpreter return address for the final slot.
address* frame_pcs = NEW_C_HEAP_ARRAY(address, number_of_frames + 1);
- int callee_parameters = 0;
- int callee_locals = 0;
int popframe_extra_args = 0;
// Create an interpreter return address for the stub to use as its return
// address so the skeletal frames are perfectly walkable
@@ -387,14 +385,16 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
// handles are used. If the caller is interpreted get the real
// value so that the proper amount of space can be added to it's
// frame.
- int caller_actual_parameters = callee_parameters;
+ bool caller_was_method_handle = false;
if (deopt_sender.is_interpreted_frame()) {
methodHandle method = deopt_sender.interpreter_frame_method();
- Bytecode_invoke cur = Bytecode_invoke_check(method,
- deopt_sender.interpreter_frame_bci());
- Symbol* signature = method->constants()->signature_ref_at(cur.index());
- ArgumentSizeComputer asc(signature);
- caller_actual_parameters = asc.size() + (cur.has_receiver() ? 1 : 0);
+ Bytecode_invoke cur = Bytecode_invoke_check(method, deopt_sender.interpreter_frame_bci());
+ if (cur.is_method_handle_invoke()) {
+ // Method handle invokes may involve fairly arbitrary chains of
+ // calls so it's impossible to know how much actual space the
+ // caller has for locals.
+ caller_was_method_handle = true;
+ }
}
//
@@ -411,14 +411,15 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
// in the frame_sizes/frame_pcs so the assembly code can do a trivial walk.
// so things look a little strange in this loop.
//
+ int callee_parameters = 0;
+ int callee_locals = 0;
for (int index = 0; index < array->frames(); index++ ) {
// frame[number_of_frames - 1 ] = on_stack_size(youngest)
// frame[number_of_frames - 2 ] = on_stack_size(sender(youngest))
// frame[number_of_frames - 3 ] = on_stack_size(sender(sender(youngest)))
int caller_parms = callee_parameters;
- if (index == array->frames() - 1) {
- // Use the value from the interpreted caller
- caller_parms = caller_actual_parameters;
+ if ((index == array->frames() - 1) && caller_was_method_handle) {
+ caller_parms = 0;
}
frame_sizes[number_of_frames - 1 - index] = BytesPerWord * array->element(index)->on_stack_size(caller_parms,
callee_parameters,
@@ -460,13 +461,13 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
// QQQ I'd rather see this pushed down into last_frame_adjust
// and have it take the sender (aka caller).
- if (deopt_sender.is_compiled_frame()) {
+ if (deopt_sender.is_compiled_frame() || caller_was_method_handle) {
caller_adjustment = last_frame_adjust(0, callee_locals);
- } else if (callee_locals > caller_actual_parameters) {
+ } else if (callee_locals > callee_parameters) {
// The caller frame may need extending to accommodate
// non-parameter locals of the first unpacked interpreted frame.
// Compute that adjustment.
- caller_adjustment = last_frame_adjust(caller_actual_parameters, callee_locals);
+ caller_adjustment = last_frame_adjust(callee_parameters, callee_locals);
}
// If the sender is deoptimized the we must retrieve the address of the handler
@@ -481,7 +482,7 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
UnrollBlock* info = new UnrollBlock(array->frame_size() * BytesPerWord,
caller_adjustment * BytesPerWord,
- caller_actual_parameters,
+ caller_was_method_handle ? 0 : callee_parameters,
number_of_frames,
frame_sizes,
frame_pcs,
diff --git a/hotspot/src/share/vm/runtime/frame.cpp b/hotspot/src/share/vm/runtime/frame.cpp
index e555433..c3a0852 100644
--- a/hotspot/src/share/vm/runtime/frame.cpp
+++ b/hotspot/src/share/vm/runtime/frame.cpp
@@ -1338,7 +1338,11 @@ void frame::describe(FrameValues& values, int frame_no) {
// Label values common to most frames
values.describe(-1, unextended_sp(), err_msg("unextended_sp for #%d", frame_no));
values.describe(-1, sp(), err_msg("sp for #%d", frame_no));
- values.describe(-1, fp(), err_msg("fp for #%d", frame_no));
+ if (is_compiled_frame()) {
+ values.describe(-1, sp() + _cb->frame_size(), err_msg("computed fp for #%d", frame_no));
+ } else {
+ values.describe(-1, fp(), err_msg("fp for #%d", frame_no));
+ }
}
if (is_interpreted_frame()) {
methodOop m = interpreter_frame_method();
@@ -1450,9 +1454,8 @@ void FrameValues::validate() {
}
-void FrameValues::print() {
+void FrameValues::print(JavaThread* thread) {
_values.sort(compare);
- JavaThread* thread = JavaThread::current();
// Sometimes values like the fp can be invalid values if the
// register map wasn't updated during the walk. Trim out values
@@ -1460,12 +1463,22 @@ void FrameValues::print() {
int min_index = 0;
int max_index = _values.length() - 1;
intptr_t* v0 = _values.at(min_index).location;
- while (!thread->is_in_stack((address)v0)) {
- v0 = _values.at(++min_index).location;
- }
intptr_t* v1 = _values.at(max_index).location;
- while (!thread->is_in_stack((address)v1)) {
- v1 = _values.at(--max_index).location;
+
+ if (thread == Thread::current()) {
+ while (!thread->is_in_stack((address)v0)) {
+ v0 = _values.at(++min_index).location;
+ }
+ while (!thread->is_in_stack((address)v1)) {
+ v1 = _values.at(--max_index).location;
+ }
+ } else {
+ while (!thread->on_local_stack((address)v0)) {
+ v0 = _values.at(++min_index).location;
+ }
+ while (!thread->on_local_stack((address)v1)) {
+ v1 = _values.at(--max_index).location;
+ }
}
intptr_t* min = MIN2(v0, v1);
intptr_t* max = MAX2(v0, v1);
diff --git a/hotspot/src/share/vm/runtime/frame.hpp b/hotspot/src/share/vm/runtime/frame.hpp
index ec3e3e6..ec00e3a 100644
--- a/hotspot/src/share/vm/runtime/frame.hpp
+++ b/hotspot/src/share/vm/runtime/frame.hpp
@@ -516,7 +516,7 @@ class FrameValues {
void describe(int owner, intptr_t* location, const char* description, int priority = 0);
void validate();
- void print();
+ void print(JavaThread* thread);
};
#endif
diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index e4ba36a..f330d44 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -577,8 +577,8 @@ class CommandLineFlags {
develop(bool, VerifyStack, false, \
"Verify stack of each thread when it is entering a runtime call") \
\
- develop(bool, ForceUnreachable, false, \
- "(amd64) Make all non code cache addresses to be unreachable with rip-rel forcing use of 64bit literal fixups") \
+ diagnostic(bool, ForceUnreachable, false, \
+ "Make all non code cache addresses to be unreachable with forcing use of 64bit literal fixups") \
\
notproduct(bool, StressDerivedPointers, false, \
"Force scavenge when a derived pointers is detected on stack " \
@@ -677,7 +677,7 @@ class CommandLineFlags {
notproduct(bool, WalkStackALot, false, \
"trace stack (no print) at every exit from the runtime system") \
\
- develop(bool, Debugging, false, \
+ product(bool, Debugging, false, \
"set when executing debug methods in debug.ccp " \
"(to prevent triggering assertions)") \
\
@@ -904,7 +904,7 @@ class CommandLineFlags {
product(bool, AlwaysRestoreFPU, false, \
"Restore the FPU control word after every JNI call (expensive)") \
\
- notproduct(bool, PrintCompilation2, false, \
+ diagnostic(bool, PrintCompilation2, false, \
"Print additional statistics per compilation") \
\
diagnostic(bool, PrintAdapterHandlers, false, \
@@ -2580,7 +2580,7 @@ class CommandLineFlags {
diagnostic(bool, DebugInlinedCalls, true, \
"If false, restricts profiled locations to the root method only") \
\
- product(bool, PrintVMOptions, trueInDebug, \
+ product(bool, PrintVMOptions, false, \
"Print flags that appeared on the command line") \
\
product(bool, IgnoreUnrecognizedVMOptions, false, \
@@ -3364,7 +3364,7 @@ class CommandLineFlags {
notproduct(bool, ExitOnFullCodeCache, false, \
"Exit the VM if we fill the code cache.") \
\
- product(bool, UseCodeCacheFlushing, false, \
+ product(bool, UseCodeCacheFlushing, true, \
"Attempt to clean the code cache before shutting off compiler") \
\
product(intx, MinCodeCacheFlushingInterval, 30, \
diff --git a/hotspot/src/share/vm/runtime/interfaceSupport.hpp b/hotspot/src/share/vm/runtime/interfaceSupport.hpp
index 90c0db3..e1001ee 100644
--- a/hotspot/src/share/vm/runtime/interfaceSupport.hpp
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.hpp
@@ -72,9 +72,9 @@ class HandleMarkCleaner: public StackObj {
}
};
-// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
-// macros. These macros are used to guard entry points into the VM and
-// perform checks upon leave of the VM.
+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
+// VM_ENTRY_BASE macros. These macros are used to guard entry points into
+// the VM and perform checks upon leave of the VM.
class InterfaceSupport: AllStatic {
@@ -433,7 +433,7 @@ class RuntimeHistogramElement : public HistogramElement {
// LEAF routines do not lock, GC or throw exceptions
-#define __LEAF(result_type, header) \
+#define VM_LEAF_BASE(result_type, header) \
TRACE_CALL(result_type, header) \
debug_only(NoHandleMark __hm;) \
/* begin of body */
@@ -441,7 +441,7 @@ class RuntimeHistogramElement : public HistogramElement {
// ENTRY routines may lock, GC and throw exceptions
-#define __ENTRY(result_type, header, thread) \
+#define VM_ENTRY_BASE(result_type, header, thread) \
TRACE_CALL(result_type, header) \
HandleMarkCleaner __hm(thread); \
Thread* THREAD = thread; \
@@ -450,7 +450,7 @@ class RuntimeHistogramElement : public HistogramElement {
// QUICK_ENTRY routines behave like ENTRY but without a handle mark
-#define __QUICK_ENTRY(result_type, header, thread) \
+#define VM_QUICK_ENTRY_BASE(result_type, header, thread) \
TRACE_CALL(result_type, header) \
debug_only(NoHandleMark __hm;) \
Thread* THREAD = thread; \
@@ -463,20 +463,20 @@ class RuntimeHistogramElement : public HistogramElement {
#define IRT_ENTRY(result_type, header) \
result_type header { \
ThreadInVMfromJava __tiv(thread); \
- __ENTRY(result_type, header, thread) \
+ VM_ENTRY_BASE(result_type, header, thread) \
debug_only(VMEntryWrapper __vew;)
#define IRT_LEAF(result_type, header) \
result_type header { \
- __LEAF(result_type, header) \
+ VM_LEAF_BASE(result_type, header) \
debug_only(No_Safepoint_Verifier __nspv(true);)
#define IRT_ENTRY_NO_ASYNC(result_type, header) \
result_type header { \
ThreadInVMfromJavaNoAsyncException __tiv(thread); \
- __ENTRY(result_type, header, thread) \
+ VM_ENTRY_BASE(result_type, header, thread) \
debug_only(VMEntryWrapper __vew;)
// Another special case for nmethod_entry_point so the nmethod that the
@@ -487,7 +487,7 @@ class RuntimeHistogramElement : public HistogramElement {
result_type header { \
nmethodLocker _nmlock(nm); \
ThreadInVMfromJavaNoAsyncException __tiv(thread); \
- __ENTRY(result_type, header, thread)
+ VM_ENTRY_BASE(result_type, header, thread)
#define IRT_END }
@@ -497,20 +497,20 @@ class RuntimeHistogramElement : public HistogramElement {
#define JRT_ENTRY(result_type, header) \
result_type header { \
ThreadInVMfromJava __tiv(thread); \
- __ENTRY(result_type, header, thread) \
+ VM_ENTRY_BASE(result_type, header, thread) \
debug_only(VMEntryWrapper __vew;)
#define JRT_LEAF(result_type, header) \
result_type header { \
- __LEAF(result_type, header) \
+ VM_LEAF_BASE(result_type, header) \
debug_only(JRT_Leaf_Verifier __jlv;)
#define JRT_ENTRY_NO_ASYNC(result_type, header) \
result_type header { \
ThreadInVMfromJavaNoAsyncException __tiv(thread); \
- __ENTRY(result_type, header, thread) \
+ VM_ENTRY_BASE(result_type, header, thread) \
debug_only(VMEntryWrapper __vew;)
// Same as JRT Entry but allows for return value after the safepoint
@@ -543,11 +543,11 @@ extern "C" { \
assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
ThreadInVMfromNative __tiv(thread); \
debug_only(VMNativeEntryWrapper __vew;) \
- __ENTRY(result_type, header, thread)
+ VM_ENTRY_BASE(result_type, header, thread)
// Ensure that the VMNativeEntryWrapper constructor, which can cause
-// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
#define JNI_QUICK_ENTRY(result_type, header) \
extern "C" { \
result_type JNICALL header { \
@@ -555,7 +555,7 @@ extern "C" { \
assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
ThreadInVMfromNative __tiv(thread); \
debug_only(VMNativeEntryWrapper __vew;) \
- __QUICK_ENTRY(result_type, header, thread)
+ VM_QUICK_ENTRY_BASE(result_type, header, thread)
#define JNI_LEAF(result_type, header) \
@@ -563,7 +563,7 @@ extern "C" { \
result_type JNICALL header { \
JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
- __LEAF(result_type, header)
+ VM_LEAF_BASE(result_type, header)
// Close the routine and the extern "C"
@@ -579,7 +579,7 @@ extern "C" { \
JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
ThreadInVMfromNative __tiv(thread); \
debug_only(VMNativeEntryWrapper __vew;) \
- __ENTRY(result_type, header, thread)
+ VM_ENTRY_BASE(result_type, header, thread)
#define JVM_ENTRY_NO_ENV(result_type, header) \
@@ -588,7 +588,7 @@ extern "C" { \
JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \
ThreadInVMfromNative __tiv(thread); \
debug_only(VMNativeEntryWrapper __vew;) \
- __ENTRY(result_type, header, thread)
+ VM_ENTRY_BASE(result_type, header, thread)
#define JVM_QUICK_ENTRY(result_type, header) \
@@ -597,14 +597,14 @@ extern "C" { \
JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
ThreadInVMfromNative __tiv(thread); \
debug_only(VMNativeEntryWrapper __vew;) \
- __QUICK_ENTRY(result_type, header, thread)
+ VM_QUICK_ENTRY_BASE(result_type, header, thread)
#define JVM_LEAF(result_type, header) \
extern "C" { \
result_type JNICALL header { \
VM_Exit::block_if_vm_exited(); \
- __LEAF(result_type, header)
+ VM_LEAF_BASE(result_type, header)
#define JVM_END } }
diff --git a/hotspot/src/share/vm/runtime/java.cpp b/hotspot/src/share/vm/runtime/java.cpp
index 7636304..c04bd23 100644
--- a/hotspot/src/share/vm/runtime/java.cpp
+++ b/hotspot/src/share/vm/runtime/java.cpp
@@ -105,7 +105,9 @@
#include "opto/runtime.hpp"
#endif
+#ifndef USDT2
HS_DTRACE_PROBE_DECL(hotspot, vm__shutdown);
+#endif /* !USDT2 */
#ifndef PRODUCT
@@ -547,8 +549,12 @@ void vm_exit(int code) {
void notify_vm_shutdown() {
// For now, just a dtrace probe.
+#ifndef USDT2
HS_DTRACE_PROBE(hotspot, vm__shutdown);
HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
+#else /* USDT2 */
+ HOTSPOT_VM_SHUTDOWN();
+#endif /* USDT2 */
}
void vm_direct_exit(int code) {
diff --git a/hotspot/src/share/vm/runtime/objectMonitor.cpp b/hotspot/src/share/vm/runtime/objectMonitor.cpp
index 3fa0e32..cee8403 100644
--- a/hotspot/src/share/vm/runtime/objectMonitor.cpp
+++ b/hotspot/src/share/vm/runtime/objectMonitor.cpp
@@ -68,16 +68,6 @@
// Only bother with this argument setup if dtrace is available
// TODO-FIXME: probes should not fire when caller is _blocked. assert() accordingly.
-HS_DTRACE_PROBE_DECL4(hotspot, monitor__notify,
- jlong, uintptr_t, char*, int);
-HS_DTRACE_PROBE_DECL4(hotspot, monitor__notifyAll,
- jlong, uintptr_t, char*, int);
-HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__enter,
- jlong, uintptr_t, char*, int);
-HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__entered,
- jlong, uintptr_t, char*, int);
-HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__exit,
- jlong, uintptr_t, char*, int);
#define DTRACE_MONITOR_PROBE_COMMON(klassOop, thread) \
char* bytes = NULL; \
@@ -89,6 +79,19 @@ HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__exit,
len = klassname->utf8_length(); \
}
+#ifndef USDT2
+
+HS_DTRACE_PROBE_DECL4(hotspot, monitor__notify,
+ jlong, uintptr_t, char*, int);
+HS_DTRACE_PROBE_DECL4(hotspot, monitor__notifyAll,
+ jlong, uintptr_t, char*, int);
+HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__enter,
+ jlong, uintptr_t, char*, int);
+HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__entered,
+ jlong, uintptr_t, char*, int);
+HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__exit,
+ jlong, uintptr_t, char*, int);
+
#define DTRACE_MONITOR_WAIT_PROBE(monitor, klassOop, thread, millis) \
{ \
if (DTraceMonitorProbes) { \
@@ -107,6 +110,33 @@ HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__exit,
} \
}
+#else /* USDT2 */
+
+#define DTRACE_MONITOR_WAIT_PROBE(monitor, klassOop, thread, millis) \
+ { \
+ if (DTraceMonitorProbes) { \
+ DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \
+ HOTSPOT_MONITOR_WAIT(jtid, \
+ (monitor), bytes, len, (millis)); \
+ } \
+ }
+
+#define HOTSPOT_MONITOR_contended__enter HOTSPOT_MONITOR_CONTENDED_ENTER
+#define HOTSPOT_MONITOR_contended__entered HOTSPOT_MONITOR_CONTENDED_ENTERED
+#define HOTSPOT_MONITOR_contended__exit HOTSPOT_MONITOR_CONTENDED_EXIT
+#define HOTSPOT_MONITOR_notify HOTSPOT_MONITOR_NOTIFY
+#define HOTSPOT_MONITOR_notifyAll HOTSPOT_MONITOR_NOTIFYALL
+
+#define DTRACE_MONITOR_PROBE(probe, monitor, klassOop, thread) \
+ { \
+ if (DTraceMonitorProbes) { \
+ DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \
+ HOTSPOT_MONITOR_##probe(jtid, \
+ (uintptr_t)(monitor), bytes, len); \
+ } \
+ }
+
+#endif /* USDT2 */
#else // ndef DTRACE_ENABLED
#define DTRACE_MONITOR_WAIT_PROBE(klassOop, thread, millis, mon) {;}
diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp
index 0563d8a..f966d9a 100644
--- a/hotspot/src/share/vm/runtime/os.cpp
+++ b/hotspot/src/share/vm/runtime/os.cpp
@@ -1135,6 +1135,9 @@ bool os::set_boot_path(char fileSep, char pathSep) {
"%/lib/jsse.jar:"
"%/lib/jce.jar:"
"%/lib/charsets.jar:"
+#ifdef __APPLE__
+ "%/lib/JObjC.jar:"
+#endif
// ## TEMPORARY hack to keep the legacy launcher working when
// ## only the boot module is installed (cf. j.l.ClassLoader)
diff --git a/hotspot/src/share/vm/runtime/os.hpp b/hotspot/src/share/vm/runtime/os.hpp
index f92d92d..80d29f7 100644
--- a/hotspot/src/share/vm/runtime/os.hpp
+++ b/hotspot/src/share/vm/runtime/os.hpp
@@ -184,6 +184,9 @@ class os: AllStatic {
// Returns true if it worked, false if it didn't.
static bool bind_to_processor(uint processor_id);
+ // Give a name to the current thread.
+ static void set_native_thread_name(const char *name);
+
// Interface for stack banging (predetect possible stack overflow for
// exception processing) There are guard pages, and above that shadow
// pages for stack overflow checking.
diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
index 34369e8..486c21d 100644
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
@@ -148,11 +148,13 @@ void SharedRuntime::generate_ricochet_blob() {
#include <math.h>
+#ifndef USDT2
HS_DTRACE_PROBE_DECL4(hotspot, object__alloc, Thread*, char*, int, size_t);
HS_DTRACE_PROBE_DECL7(hotspot, method__entry, int,
char*, int, char*, int, char*, int);
HS_DTRACE_PROBE_DECL7(hotspot, method__return, int,
char*, int, char*, int, char*, int);
+#endif /* !USDT2 */
// Implementation of SharedRuntime
@@ -659,12 +661,14 @@ address SharedRuntime::compute_compiled_exc_handler(nmethod* nm, address ret_pc,
int scope_depth = 0;
if (!force_unwind) {
int bci = sd->bci();
+ bool recursive_exception = false;
do {
bool skip_scope_increment = false;
// exception handler lookup
KlassHandle ek (THREAD, exception->klass());
handler_bci = sd->method()->fast_exception_handler_bci_for(ek, bci, THREAD);
if (HAS_PENDING_EXCEPTION) {
+ recursive_exception = true;
// We threw an exception while trying to find the exception handler.
// Transfer the new exception to the exception handle which will
// be set into thread local storage, and do another lookup for an
@@ -680,6 +684,9 @@ address SharedRuntime::compute_compiled_exc_handler(nmethod* nm, address ret_pc,
skip_scope_increment = true;
}
}
+ else {
+ recursive_exception = false;
+ }
if (!top_frame_only && handler_bci < 0 && !skip_scope_increment) {
sd = sd->sender();
if (sd != NULL) {
@@ -687,7 +694,7 @@ address SharedRuntime::compute_compiled_exc_handler(nmethod* nm, address ret_pc,
}
++scope_depth;
}
- } while (!top_frame_only && handler_bci < 0 && sd != NULL);
+ } while (recursive_exception || (!top_frame_only && handler_bci < 0 && sd != NULL));
}
// found handling method => lookup exception handler
@@ -954,8 +961,14 @@ int SharedRuntime::dtrace_object_alloc_base(Thread* thread, oopDesc* o) {
Klass* klass = o->blueprint();
int size = o->size();
Symbol* name = klass->name();
+#ifndef USDT2
HS_DTRACE_PROBE4(hotspot, object__alloc, get_java_tid(thread),
name->bytes(), name->utf8_length(), size * HeapWordSize);
+#else /* USDT2 */
+ HOTSPOT_OBJECT_ALLOC(
+ get_java_tid(thread),
+ (char *) name->bytes(), name->utf8_length(), size * HeapWordSize);
+#endif /* USDT2 */
return 0;
}
@@ -965,10 +978,18 @@ JRT_LEAF(int, SharedRuntime::dtrace_method_entry(
Symbol* kname = method->klass_name();
Symbol* name = method->name();
Symbol* sig = method->signature();
+#ifndef USDT2
HS_DTRACE_PROBE7(hotspot, method__entry, get_java_tid(thread),
kname->bytes(), kname->utf8_length(),
name->bytes(), name->utf8_length(),
sig->bytes(), sig->utf8_length());
+#else /* USDT2 */
+ HOTSPOT_METHOD_ENTRY(
+ get_java_tid(thread),
+ (char *) kname->bytes(), kname->utf8_length(),
+ (char *) name->bytes(), name->utf8_length(),
+ (char *) sig->bytes(), sig->utf8_length());
+#endif /* USDT2 */
return 0;
JRT_END
@@ -978,10 +999,18 @@ JRT_LEAF(int, SharedRuntime::dtrace_method_exit(
Symbol* kname = method->klass_name();
Symbol* name = method->name();
Symbol* sig = method->signature();
+#ifndef USDT2
HS_DTRACE_PROBE7(hotspot, method__return, get_java_tid(thread),
kname->bytes(), kname->utf8_length(),
name->bytes(), name->utf8_length(),
sig->bytes(), sig->utf8_length());
+#else /* USDT2 */
+ HOTSPOT_METHOD_RETURN(
+ get_java_tid(thread),
+ (char *) kname->bytes(), kname->utf8_length(),
+ (char *) name->bytes(), name->utf8_length(),
+ (char *) sig->bytes(), sig->utf8_length());
+#endif /* USDT2 */
return 0;
JRT_END
@@ -1643,9 +1672,12 @@ IRT_LEAF(void, SharedRuntime::fixup_callers_callsite(methodOopDesc* method, addr
nmethod* nm = cb->as_nmethod_or_null();
assert(nm, "must be");
- // Don't fixup MethodHandle call sites as c2i/i2c adapters are used
- // to implement MethodHandle actions.
- if (nm->is_method_handle_return(caller_pc)) {
+ // Get the return PC for the passed caller PC.
+ address return_pc = caller_pc + frame::pc_return_offset;
+
+ // Don't fixup method handle call sites as the executed method
+ // handle adapters are doing the required MethodHandle chain work.
+ if (nm->is_method_handle_return(return_pc)) {
return;
}
@@ -1664,8 +1696,8 @@ IRT_LEAF(void, SharedRuntime::fixup_callers_callsite(methodOopDesc* method, addr
// Expect to find a native call there (unless it was no-inline cache vtable dispatch)
MutexLockerEx ml_patch(Patching_lock, Mutex::_no_safepoint_check_flag);
- if (NativeCall::is_call_before(caller_pc + frame::pc_return_offset)) {
- NativeCall *call = nativeCall_before(caller_pc + frame::pc_return_offset);
+ if (NativeCall::is_call_before(return_pc)) {
+ NativeCall *call = nativeCall_before(return_pc);
//
// bug 6281185. We might get here after resolving a call site to a vanilla
// virtual call. Because the resolvee uses the verified entry it may then
@@ -1715,7 +1747,6 @@ IRT_LEAF(void, SharedRuntime::fixup_callers_callsite(methodOopDesc* method, addr
}
}
}
-
IRT_END
diff --git a/hotspot/src/share/vm/runtime/synchronizer.cpp b/hotspot/src/share/vm/runtime/synchronizer.cpp
index 09bbc1d..f2c3da0 100644
--- a/hotspot/src/share/vm/runtime/synchronizer.cpp
+++ b/hotspot/src/share/vm/runtime/synchronizer.cpp
@@ -77,11 +77,6 @@
// Only bother with this argument setup if dtrace is available
// TODO-FIXME: probes should not fire when caller is _blocked. assert() accordingly.
-HS_DTRACE_PROBE_DECL5(hotspot, monitor__wait,
- jlong, uintptr_t, char*, int, long);
-HS_DTRACE_PROBE_DECL4(hotspot, monitor__waited,
- jlong, uintptr_t, char*, int);
-
#define DTRACE_MONITOR_PROBE_COMMON(klassOop, thread) \
char* bytes = NULL; \
int len = 0; \
@@ -92,6 +87,12 @@ HS_DTRACE_PROBE_DECL4(hotspot, monitor__waited,
len = klassname->utf8_length(); \
}
+#ifndef USDT2
+HS_DTRACE_PROBE_DECL5(hotspot, monitor__wait,
+ jlong, uintptr_t, char*, int, long);
+HS_DTRACE_PROBE_DECL4(hotspot, monitor__waited,
+ jlong, uintptr_t, char*, int);
+
#define DTRACE_MONITOR_WAIT_PROBE(monitor, klassOop, thread, millis) \
{ \
if (DTraceMonitorProbes) { \
@@ -110,6 +111,29 @@ HS_DTRACE_PROBE_DECL4(hotspot, monitor__waited,
} \
}
+#else /* USDT2 */
+
+#define DTRACE_MONITOR_WAIT_PROBE(monitor, klassOop, thread, millis) \
+ { \
+ if (DTraceMonitorProbes) { \
+ DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \
+ HOTSPOT_MONITOR_WAIT(jtid, \
+ (uintptr_t)(monitor), bytes, len, (millis)); \
+ } \
+ }
+
+#define HOTSPOT_MONITOR_PROBE_waited HOTSPOT_MONITOR_PROBE_WAITED
+
+#define DTRACE_MONITOR_PROBE(probe, monitor, klassOop, thread) \
+ { \
+ if (DTraceMonitorProbes) { \
+ DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \
+ HOTSPOT_MONITOR_PROBE_##probe(jtid, /* probe = waited */ \
+ (uintptr_t)(monitor), bytes, len); \
+ } \
+ }
+
+#endif /* USDT2 */
#else // ndef DTRACE_ENABLED
#define DTRACE_MONITOR_WAIT_PROBE(klassOop, thread, millis, mon) {;}
diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp
index bc70cd3..a8cbf85 100644
--- a/hotspot/src/share/vm/runtime/thread.cpp
+++ b/hotspot/src/share/vm/runtime/thread.cpp
@@ -110,6 +110,7 @@
// Only bother with this argument setup if dtrace is available
+#ifndef USDT2
HS_DTRACE_PROBE_DECL(hotspot, vm__init__begin);
HS_DTRACE_PROBE_DECL(hotspot, vm__init__end);
HS_DTRACE_PROBE_DECL5(hotspot, thread__start, char*, intptr_t,
@@ -130,6 +131,26 @@ HS_DTRACE_PROBE_DECL5(hotspot, thread__stop, char*, intptr_t,
java_lang_Thread::is_daemon((javathread)->threadObj())); \
}
+#else /* USDT2 */
+
+#define HOTSPOT_THREAD_PROBE_start HOTSPOT_THREAD_PROBE_START
+#define HOTSPOT_THREAD_PROBE_stop HOTSPOT_THREAD_PROBE_STOP
+
+#define DTRACE_THREAD_PROBE(probe, javathread) \
+ { \
+ ResourceMark rm(this); \
+ int len = 0; \
+ const char* name = (javathread)->get_thread_name(); \
+ len = strlen(name); \
+ HOTSPOT_THREAD_PROBE_##probe( /* probe = start, stop */ \
+ (char *) name, len, \
+ java_lang_Thread::thread_id((javathread)->threadObj()), \
+ (uintptr_t) (javathread)->osthread()->thread_id(), \
+ java_lang_Thread::is_daemon((javathread)->threadObj())); \
+ }
+
+#endif /* USDT2 */
+
#else // ndef DTRACE_ENABLED
#define DTRACE_THREAD_PROBE(probe, javathread)
@@ -753,8 +774,9 @@ bool Thread::claim_oops_do_par_case(int strong_roots_parity) {
jint thread_parity = _oops_do_parity;
if (thread_parity != strong_roots_parity) {
jint res = Atomic::cmpxchg(strong_roots_parity, &_oops_do_parity, thread_parity);
- if (res == thread_parity) return true;
- else {
+ if (res == thread_parity) {
+ return true;
+ } else {
guarantee(res == strong_roots_parity, "Or else what?");
assert(SharedHeap::heap()->n_par_threads() > 0,
"Should only fail when parallel.");
@@ -1327,7 +1349,7 @@ SATBMarkQueueSet JavaThread::_satb_mark_queue_set;
DirtyCardQueueSet JavaThread::_dirty_card_queue_set;
#endif // !SERIALGC
-JavaThread::JavaThread(bool is_attaching) :
+JavaThread::JavaThread(bool is_attaching_via_jni) :
Thread()
#ifndef SERIALGC
, _satb_mark_queue(&_satb_mark_queue_set),
@@ -1335,7 +1357,11 @@ JavaThread::JavaThread(bool is_attaching) :
#endif // !SERIALGC
{
initialize();
- _is_attaching = is_attaching;
+ if (is_attaching_via_jni) {
+ _jni_attach_state = _attaching_via_jni;
+ } else {
+ _jni_attach_state = _not_attaching_via_jni;
+ }
assert(_deferred_card_mark.is_empty(), "Default MemRegion ctor");
}
@@ -1391,7 +1417,7 @@ JavaThread::JavaThread(ThreadFunction entry_point, size_t stack_sz) :
tty->print_cr("creating thread %p", this);
}
initialize();
- _is_attaching = false;
+ _jni_attach_state = _not_attaching_via_jni;
set_entry_point(entry_point);
// Create the native thread itself.
// %note runtime_23
@@ -1503,6 +1529,10 @@ void JavaThread::thread_main_inner() {
// Note: Due to JVM_StopThread we can have pending exceptions already!
if (!this->has_pending_exception() &&
!java_lang_Thread::is_stillborn(this->threadObj())) {
+ {
+ ResourceMark rm(this);
+ this->set_native_thread_name(this->get_thread_name());
+ }
HandleMark hm(this);
this->entry_point()(this, this);
}
@@ -2682,7 +2712,7 @@ const char* JavaThread::get_thread_name_string(char* buf, int buflen) const {
name_str = UNICODE::as_utf8((jchar*) name->base(T_CHAR), name->length(), buf, buflen);
}
}
- else if (is_attaching()) { // workaround for 6412693 - see 6404306
+ else if (is_attaching_via_jni()) { // workaround for 6412693 - see 6404306
name_str = "<no-name - thread is attaching>";
}
else {
@@ -2917,7 +2947,7 @@ void JavaThread::print_frame_layout(int depth, bool validate_only) {
values.validate();
} else {
tty->print_cr("[Describe stack layout]");
- values.print();
+ values.print(this);
}
}
#endif
@@ -3078,7 +3108,11 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
os::pause();
}
+#ifndef USDT2
HS_DTRACE_PROBE(hotspot, vm__init__begin);
+#else /* USDT2 */
+ HOTSPOT_VM_INIT_BEGIN();
+#endif /* USDT2 */
// Record VM creation timing statistics
TraceVmCreationTime create_vm_timer;
@@ -3333,7 +3367,11 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
// debug stuff, that does not work until all basic classes have been initialized.
set_init_completed();
+#ifndef USDT2
HS_DTRACE_PROBE(hotspot, vm__init__end);
+#else /* USDT2 */
+ HOTSPOT_VM_INIT_END();
+#endif /* USDT2 */
// record VM initialization completion time
Management::record_vm_init_completed();
@@ -3909,8 +3947,9 @@ void Threads::possibly_parallel_oops_do(OopClosure* f, CodeBlobClosure* cf) {
}
}
VMThread* vmt = VMThread::vm_thread();
- if (vmt->claim_oops_do(is_par, cp))
+ if (vmt->claim_oops_do(is_par, cp)) {
vmt->oops_do(f, cf);
+ }
}
#ifndef SERIALGC
diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp
index d507ebd..da13f12 100644
--- a/hotspot/src/share/vm/runtime/thread.hpp
+++ b/hotspot/src/share/vm/runtime/thread.hpp
@@ -309,6 +309,11 @@ class Thread: public ThreadShadow {
static void interrupt(Thread* thr);
static bool is_interrupted(Thread* thr, bool clear_interrupted);
+ void set_native_thread_name(const char *name) {
+ assert(Thread::current() == this, "set_native_thread_name can only be called on the current thread");
+ os::set_native_thread_name(name);
+ }
+
ObjectMonitor** omInUseList_addr() { return (ObjectMonitor **)&omInUseList; }
Monitor* SR_lock() const { return _SR_lock; }
@@ -818,10 +823,17 @@ class JavaThread: public Thread {
bool _do_not_unlock_if_synchronized; // Do not unlock the receiver of a synchronized method (since it was
// never locked) when throwing an exception. Used by interpreter only.
- // Flag to mark a JNI thread in the process of attaching - See CR 6404306
- // This flag is never set true other than at construction, and in that case
- // is shortly thereafter set false
- volatile bool _is_attaching;
+ // JNI attach states:
+ enum JNIAttachStates {
+ _not_attaching_via_jni = 1, // thread is not attaching via JNI
+ _attaching_via_jni, // thread is attaching via JNI
+ _attached_via_jni // thread has attached via JNI
+ };
+
+ // A regular JavaThread's _jni_attach_state is _not_attaching_via_jni.
+ // A native thread that is attaching via JNI starts with a value
+ // of _attaching_via_jni and transitions to _attached_via_jni.
+ volatile JNIAttachStates _jni_attach_state;
public:
// State of the stack guard pages for this thread.
@@ -889,7 +901,7 @@ class JavaThread: public Thread {
public:
// Constructor
- JavaThread(bool is_attaching = false); // for main thread and JNI attached threads
+ JavaThread(bool is_attaching_via_jni = false); // for main thread and JNI attached threads
JavaThread(ThreadFunction entry_point, size_t stack_size = 0);
~JavaThread();
@@ -1641,8 +1653,9 @@ public:
void set_cached_monitor_info(GrowableArray<MonitorInfo*>* info) { _cached_monitor_info = info; }
// clearing/querying jni attach status
- bool is_attaching() const { return _is_attaching; }
- void set_attached() { _is_attaching = false; OrderAccess::fence(); }
+ bool is_attaching_via_jni() const { return _jni_attach_state == _attaching_via_jni; }
+ bool has_attached_via_jni() const { return is_attaching_via_jni() || _jni_attach_state == _attached_via_jni; }
+ void set_done_attaching_via_jni() { _jni_attach_state = _attached_via_jni; OrderAccess::fence(); }
private:
// This field is used to determine if a thread has claimed
// a par_id: it is -1 if the thread has not claimed a par_id;
diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp
index 0ce636f..00fe358 100644
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp
@@ -182,6 +182,7 @@
#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
#include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp"
+#include "gc_implementation/g1/vmStructs_g1.hpp"
#endif
#ifdef COMPILER2
#include "opto/addnode.hpp"
@@ -2878,6 +2879,9 @@ VMStructEntry VMStructs::localHotSpotVMStructs[] = {
VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
GENERATE_STATIC_VM_STRUCT_ENTRY)
+
+ VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
+ GENERATE_STATIC_VM_STRUCT_ENTRY)
#endif // SERIALGC
VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
@@ -2921,6 +2925,9 @@ VMTypeEntry VMStructs::localHotSpotVMTypes[] = {
GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
VM_TYPES_PARNEW(GENERATE_VM_TYPE_ENTRY)
+
+ VM_TYPES_G1(GENERATE_VM_TYPE_ENTRY,
+ GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
#endif // SERIALGC
VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY,
@@ -3020,6 +3027,9 @@ VMStructs::init() {
VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_STATIC_VM_STRUCT_ENTRY);
+
+ VM_STRUCTS_G1(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
+ CHECK_STATIC_VM_STRUCT_ENTRY);
#endif // SERIALGC
VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
@@ -3060,6 +3070,9 @@ VMStructs::init() {
CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
VM_TYPES_PARNEW(CHECK_VM_TYPE_ENTRY)
+
+ VM_TYPES_G1(CHECK_VM_TYPE_ENTRY,
+ CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
#endif // SERIALGC
VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY,
@@ -3125,6 +3138,8 @@ VMStructs::init() {
debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \
ENSURE_FIELD_TYPE_PRESENT, \
ENSURE_FIELD_TYPE_PRESENT));
+ debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT, \
+ ENSURE_FIELD_TYPE_PRESENT));
#endif // SERIALGC
debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \
ENSURE_FIELD_TYPE_PRESENT, \
diff --git a/hotspot/src/share/vm/runtime/vmThread.cpp b/hotspot/src/share/vm/runtime/vmThread.cpp
index 0013444..d4fced2 100644
--- a/hotspot/src/share/vm/runtime/vmThread.cpp
+++ b/hotspot/src/share/vm/runtime/vmThread.cpp
@@ -50,9 +50,11 @@
# include "thread_bsd.inline.hpp"
#endif
+#ifndef USDT2
HS_DTRACE_PROBE_DECL3(hotspot, vmops__request, char *, uintptr_t, int);
HS_DTRACE_PROBE_DECL3(hotspot, vmops__begin, char *, uintptr_t, int);
HS_DTRACE_PROBE_DECL3(hotspot, vmops__end, char *, uintptr_t, int);
+#endif /* !USDT2 */
// Dummy VM operation to act as first element in our circular double-linked list
class VM_Dummy: public VM_Operation {
@@ -162,8 +164,14 @@ void VMOperationQueue::drain_list_oops_do(OopClosure* f) {
// High-level interface
bool VMOperationQueue::add(VM_Operation *op) {
+#ifndef USDT2
HS_DTRACE_PROBE3(hotspot, vmops__request, op->name(), strlen(op->name()),
op->evaluation_mode());
+#else /* USDT2 */
+ HOTSPOT_VMOPS_REQUEST(
+ (char *) op->name(), strlen(op->name()),
+ op->evaluation_mode());
+#endif /* USDT2 */
// Encapsulates VM queue policy. Currently, that
// only involves putting them on the right list
@@ -360,11 +368,23 @@ void VMThread::evaluate_operation(VM_Operation* op) {
{
PerfTraceTime vm_op_timer(perf_accumulated_vm_operation_time());
+#ifndef USDT2
HS_DTRACE_PROBE3(hotspot, vmops__begin, op->name(), strlen(op->name()),
op->evaluation_mode());
+#else /* USDT2 */
+ HOTSPOT_VMOPS_BEGIN(
+ (char *) op->name(), strlen(op->name()),
+ op->evaluation_mode());
+#endif /* USDT2 */
op->evaluate();
+#ifndef USDT2
HS_DTRACE_PROBE3(hotspot, vmops__end, op->name(), strlen(op->name()),
op->evaluation_mode());
+#else /* USDT2 */
+ HOTSPOT_VMOPS_END(
+ (char *) op->name(), strlen(op->name()),
+ op->evaluation_mode());
+#endif /* USDT2 */
}
// Last access of info in _cur_vm_operation!
diff --git a/hotspot/src/share/vm/runtime/vm_version.cpp b/hotspot/src/share/vm/runtime/vm_version.cpp
index 2a7e914..eb55014 100644
--- a/hotspot/src/share/vm/runtime/vm_version.cpp
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp
@@ -128,7 +128,7 @@ void Abstract_VM_Version::initialize() {
#ifndef HOTSPOT_VM_DISTRO
#error HOTSPOT_VM_DISTRO must be defined
#endif
-#define VMNAME HOTSPOT_VM_DISTRO " " VMLP VMTYPE " VM"
+#define VMNAME HOTSPOT_VM_DISTRO " " VMLP EMBEDDED_ONLY("Embedded ") VMTYPE " VM"
const char* Abstract_VM_Version::vm_name() {
return VMNAME;
diff --git a/hotspot/src/share/vm/services/classLoadingService.cpp b/hotspot/src/share/vm/services/classLoadingService.cpp
index 0f3ad68..b26258a 100644
--- a/hotspot/src/share/vm/services/classLoadingService.cpp
+++ b/hotspot/src/share/vm/services/classLoadingService.cpp
@@ -36,6 +36,8 @@
// Only bother with this argument setup if dtrace is available
+#ifndef USDT2
+
HS_DTRACE_PROBE_DECL4(hotspot, class__loaded, char*, int, oop, bool);
HS_DTRACE_PROBE_DECL4(hotspot, class__unloaded, char*, int, oop, bool);
@@ -52,6 +54,24 @@ HS_DTRACE_PROBE_DECL4(hotspot, class__unloaded, char*, int, oop, bool);
data, len, (clss)->class_loader(), (shared)); \
}
+#else /* USDT2 */
+
+#define HOTSPOT_CLASS_unloaded HOTSPOT_CLASS_UNLOADED
+#define HOTSPOT_CLASS_loaded HOTSPOT_CLASS_LOADED
+#define DTRACE_CLASSLOAD_PROBE(type, clss, shared) \
+ { \
+ char* data = NULL; \
+ int len = 0; \
+ Symbol* name = (clss)->name(); \
+ if (name != NULL) { \
+ data = (char*)name->bytes(); \
+ len = name->utf8_length(); \
+ } \
+ HOTSPOT_CLASS_##type( /* type = unloaded, loaded */ \
+ data, len, (clss)->class_loader(), (shared)); \
+ }
+
+#endif /* USDT2 */
#else // ndef DTRACE_ENABLED
#define DTRACE_CLASSLOAD_PROBE(type, clss, shared)
diff --git a/hotspot/src/share/vm/services/g1MemoryPool.cpp b/hotspot/src/share/vm/services/g1MemoryPool.cpp
index ce64f0e..c621ecc 100644
--- a/hotspot/src/share/vm/services/g1MemoryPool.cpp
+++ b/hotspot/src/share/vm/services/g1MemoryPool.cpp
@@ -32,71 +32,44 @@
G1MemoryPoolSuper::G1MemoryPoolSuper(G1CollectedHeap* g1h,
const char* name,
size_t init_size,
+ size_t max_size,
bool support_usage_threshold) :
- _g1h(g1h), CollectedMemoryPool(name,
- MemoryPool::Heap,
- init_size,
- undefined_max(),
- support_usage_threshold) {
+ _g1mm(g1h->g1mm()), CollectedMemoryPool(name,
+ MemoryPool::Heap,
+ init_size,
+ max_size,
+ support_usage_threshold) {
assert(UseG1GC, "sanity");
}
-// See the comment at the top of g1MemoryPool.hpp
-size_t G1MemoryPoolSuper::eden_space_committed(G1CollectedHeap* g1h) {
- return MAX2(eden_space_used(g1h), (size_t) HeapRegion::GrainBytes);
-}
-
-// See the comment at the top of g1MemoryPool.hpp
-size_t G1MemoryPoolSuper::eden_space_used(G1CollectedHeap* g1h) {
- return g1h->g1mm()->eden_space_used();
-}
-
-// See the comment at the top of g1MemoryPool.hpp
-size_t G1MemoryPoolSuper::survivor_space_committed(G1CollectedHeap* g1h) {
- return g1h->g1mm()->survivor_space_committed();
-}
-
-// See the comment at the top of g1MemoryPool.hpp
-size_t G1MemoryPoolSuper::survivor_space_used(G1CollectedHeap* g1h) {
- return g1h->g1mm()->survivor_space_used();
-}
-
-// See the comment at the top of g1MemoryPool.hpp
-size_t G1MemoryPoolSuper::old_space_committed(G1CollectedHeap* g1h) {
- return g1h->g1mm()->old_space_committed();
-}
-
-// See the comment at the top of g1MemoryPool.hpp
-size_t G1MemoryPoolSuper::old_space_used(G1CollectedHeap* g1h) {
- return g1h->g1mm()->old_space_used();
-}
-
G1EdenPool::G1EdenPool(G1CollectedHeap* g1h) :
G1MemoryPoolSuper(g1h,
- "G1 Eden",
- eden_space_committed(g1h), /* init_size */
+ "G1 Eden Space",
+ g1h->g1mm()->eden_space_committed(), /* init_size */
+ _undefined_max,
false /* support_usage_threshold */) { }
MemoryUsage G1EdenPool::get_memory_usage() {
size_t initial_sz = initial_size();
size_t max_sz = max_size();
size_t used = used_in_bytes();
- size_t committed = eden_space_committed(_g1h);
+ size_t committed = _g1mm->eden_space_committed();
return MemoryUsage(initial_sz, used, committed, max_sz);
}
G1SurvivorPool::G1SurvivorPool(G1CollectedHeap* g1h) :
G1MemoryPoolSuper(g1h,
- "G1 Survivor",
- survivor_space_committed(g1h), /* init_size */
+ "G1 Survivor Space",
+ g1h->g1mm()->survivor_space_committed(), /* init_size */
+ _undefined_max,
false /* support_usage_threshold */) { }
MemoryUsage G1SurvivorPool::get_memory_usage() {
size_t initial_sz = initial_size();
size_t max_sz = max_size();
size_t used = used_in_bytes();
- size_t committed = survivor_space_committed(_g1h);
+ size_t committed = _g1mm->survivor_space_committed();
return MemoryUsage(initial_sz, used, committed, max_sz);
}
@@ -104,14 +77,15 @@ MemoryUsage G1SurvivorPool::get_memory_usage() {
G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h) :
G1MemoryPoolSuper(g1h,
"G1 Old Gen",
- old_space_committed(g1h), /* init_size */
+ g1h->g1mm()->old_space_committed(), /* init_size */
+ _undefined_max,
true /* support_usage_threshold */) { }
MemoryUsage G1OldGenPool::get_memory_usage() {
size_t initial_sz = initial_size();
size_t max_sz = max_size();
size_t used = used_in_bytes();
- size_t committed = old_space_committed(_g1h);
+ size_t committed = _g1mm->old_space_committed();
return MemoryUsage(initial_sz, used, committed, max_sz);
}
diff --git a/hotspot/src/share/vm/services/g1MemoryPool.hpp b/hotspot/src/share/vm/services/g1MemoryPool.hpp
index 958a088..ce93d0e 100644
--- a/hotspot/src/share/vm/services/g1MemoryPool.hpp
+++ b/hotspot/src/share/vm/services/g1MemoryPool.hpp
@@ -26,12 +26,11 @@
#define SHARE_VM_SERVICES_G1MEMORYPOOL_HPP
#ifndef SERIALGC
+#include "gc_implementation/g1/g1MonitoringSupport.hpp"
#include "services/memoryPool.hpp"
#include "services/memoryUsage.hpp"
#endif
-class G1CollectedHeap;
-
// This file contains the three classes that represent the memory
// pools of the G1 spaces: G1EdenPool, G1SurvivorPool, and
// G1OldGenPool. In G1, unlike our other GCs, we do not have a
@@ -50,37 +49,19 @@ class G1CollectedHeap;
// on this model.
//
-
// This class is shared by the three G1 memory pool classes
-// (G1EdenPool, G1SurvivorPool, G1OldGenPool). Given that the way we
-// calculate used / committed bytes for these three pools is related
-// (see comment above), we put the calculations in this class so that
-// we can easily share them among the subclasses.
+// (G1EdenPool, G1SurvivorPool, G1OldGenPool).
class G1MemoryPoolSuper : public CollectedMemoryPool {
protected:
- G1CollectedHeap* _g1h;
+ const static size_t _undefined_max = (size_t) -1;
+ G1MonitoringSupport* _g1mm;
// Would only be called from subclasses.
G1MemoryPoolSuper(G1CollectedHeap* g1h,
const char* name,
size_t init_size,
+ size_t max_size,
bool support_usage_threshold);
-
- // The reason why all the code is in static methods is so that it
- // can be safely called from the constructors of the subclasses.
-
- static size_t undefined_max() {
- return (size_t) -1;
- }
-
- static size_t eden_space_committed(G1CollectedHeap* g1h);
- static size_t eden_space_used(G1CollectedHeap* g1h);
-
- static size_t survivor_space_committed(G1CollectedHeap* g1h);
- static size_t survivor_space_used(G1CollectedHeap* g1h);
-
- static size_t old_space_committed(G1CollectedHeap* g1h);
- static size_t old_space_used(G1CollectedHeap* g1h);
};
// Memory pool that represents the G1 eden.
@@ -89,10 +70,10 @@ public:
G1EdenPool(G1CollectedHeap* g1h);
size_t used_in_bytes() {
- return eden_space_used(_g1h);
+ return _g1mm->eden_space_used();
}
size_t max_size() const {
- return undefined_max();
+ return _undefined_max;
}
MemoryUsage get_memory_usage();
};
@@ -103,10 +84,10 @@ public:
G1SurvivorPool(G1CollectedHeap* g1h);
size_t used_in_bytes() {
- return survivor_space_used(_g1h);
+ return _g1mm->survivor_space_used();
}
size_t max_size() const {
- return undefined_max();
+ return _undefined_max;
}
MemoryUsage get_memory_usage();
};
@@ -117,10 +98,10 @@ public:
G1OldGenPool(G1CollectedHeap* g1h);
size_t used_in_bytes() {
- return old_space_used(_g1h);
+ return _g1mm->old_space_used();
}
size_t max_size() const {
- return undefined_max();
+ return _undefined_max;
}
MemoryUsage get_memory_usage();
};
diff --git a/hotspot/src/share/vm/services/heapDumper.cpp b/hotspot/src/share/vm/services/heapDumper.cpp
index 46df8b7..3cc0e5b 100644
--- a/hotspot/src/share/vm/services/heapDumper.cpp
+++ b/hotspot/src/share/vm/services/heapDumper.cpp
@@ -27,6 +27,7 @@
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "gc_implementation/shared/vmGCOperations.hpp"
+#include "memory/gcLocker.inline.hpp"
#include "memory/genCollectedHeap.hpp"
#include "memory/universe.hpp"
#include "oops/objArrayKlass.hpp"
@@ -1709,11 +1710,16 @@ void VM_HeapDumper::doit() {
HandleMark hm;
CollectedHeap* ch = Universe::heap();
+
+ ch->ensure_parsability(false); // must happen, even if collection does
+ // not happen (e.g. due to GC_locker)
+
if (_gc_before_heap_dump) {
- ch->collect_as_vm_thread(GCCause::_heap_dump);
- } else {
- // make the heap parsable (no need to retire TLABs)
- ch->ensure_parsability(false);
+ if (GC_locker::is_active()) {
+ warning("GC locker is held; pre-heapdump GC was skipped");
+ } else {
+ ch->collect_as_vm_thread(GCCause::_heap_dump);
+ }
}
// At this point we should be the only dumper active, so
diff --git a/hotspot/src/share/vm/services/memoryManager.cpp b/hotspot/src/share/vm/services/memoryManager.cpp
index 3977a45..ceb6f4c 100644
--- a/hotspot/src/share/vm/services/memoryManager.cpp
+++ b/hotspot/src/share/vm/services/memoryManager.cpp
@@ -36,10 +36,12 @@
#include "services/gcNotifier.hpp"
#include "utilities/dtrace.hpp"
+#ifndef USDT2
HS_DTRACE_PROBE_DECL8(hotspot, mem__pool__gc__begin, char*, int, char*, int,
size_t, size_t, size_t, size_t);
HS_DTRACE_PROBE_DECL8(hotspot, mem__pool__gc__end, char*, int, char*, int,
size_t, size_t, size_t, size_t);
+#endif /* !USDT2 */
MemoryManager::MemoryManager() {
_num_pools = 0;
@@ -238,11 +240,19 @@ void GCMemoryManager::gc_begin(bool recordGCBeginTime, bool recordPreGCUsage,
MemoryPool* pool = MemoryService::get_memory_pool(i);
MemoryUsage usage = pool->get_memory_usage();
_current_gc_stat->set_before_gc_usage(i, usage);
+#ifndef USDT2
HS_DTRACE_PROBE8(hotspot, mem__pool__gc__begin,
name(), strlen(name()),
pool->name(), strlen(pool->name()),
usage.init_size(), usage.used(),
usage.committed(), usage.max_size());
+#else /* USDT2 */
+ HOTSPOT_MEM_POOL_GC_BEGIN(
+ (char *) name(), strlen(name()),
+ (char *) pool->name(), strlen(pool->name()),
+ usage.init_size(), usage.used(),
+ usage.committed(), usage.max_size());
+#endif /* USDT2 */
}
}
}
@@ -268,11 +278,19 @@ void GCMemoryManager::gc_end(bool recordPostGCUsage,
MemoryPool* pool = MemoryService::get_memory_pool(i);
MemoryUsage usage = pool->get_memory_usage();
+#ifndef USDT2
HS_DTRACE_PROBE8(hotspot, mem__pool__gc__end,
name(), strlen(name()),
pool->name(), strlen(pool->name()),
usage.init_size(), usage.used(),
usage.committed(), usage.max_size());
+#else /* USDT2 */
+ HOTSPOT_MEM_POOL_GC_END(
+ (char *) name(), strlen(name()),
+ (char *) pool->name(), strlen(pool->name()),
+ usage.init_size(), usage.used(),
+ usage.committed(), usage.max_size());
+#endif /* USDT2 */
_current_gc_stat->set_after_gc_usage(i, usage);
}
diff --git a/hotspot/src/share/vm/services/runtimeService.cpp b/hotspot/src/share/vm/services/runtimeService.cpp
index 7efac61..6ff1c68 100644
--- a/hotspot/src/share/vm/services/runtimeService.cpp
+++ b/hotspot/src/share/vm/services/runtimeService.cpp
@@ -30,8 +30,10 @@
#include "utilities/dtrace.hpp"
#include "utilities/exceptions.hpp"
+#ifndef USDT2
HS_DTRACE_PROBE_DECL(hs_private, safepoint__begin);
HS_DTRACE_PROBE_DECL(hs_private, safepoint__end);
+#endif /* !USDT2 */
TimeStamp RuntimeService::_app_timer;
TimeStamp RuntimeService::_safepoint_timer;
@@ -108,7 +110,11 @@ void RuntimeService::init() {
}
void RuntimeService::record_safepoint_begin() {
+#ifndef USDT2
HS_DTRACE_PROBE(hs_private, safepoint__begin);
+#else /* USDT2 */
+ HS_PRIVATE_SAFEPOINT_BEGIN();
+#endif /* USDT2 */
// Print the time interval in which the app was executing
if (PrintGCApplicationConcurrentTime) {
@@ -133,7 +139,11 @@ void RuntimeService::record_safepoint_synchronized() {
}
void RuntimeService::record_safepoint_end() {
+#ifndef USDT2
HS_DTRACE_PROBE(hs_private, safepoint__end);
+#else /* USDT2 */
+ HS_PRIVATE_SAFEPOINT_END();
+#endif /* USDT2 */
// Print the time interval for which the app was stopped
// during the current safepoint operation.
diff --git a/hotspot/src/share/vm/services/threadService.cpp b/hotspot/src/share/vm/services/threadService.cpp
index d52b765..09f09f2 100644
--- a/hotspot/src/share/vm/services/threadService.cpp
+++ b/hotspot/src/share/vm/services/threadService.cpp
@@ -751,7 +751,7 @@ ThreadSnapshot::ThreadSnapshot(JavaThread* thread) {
_blocker_object = obj();
JavaThread* owner = ObjectSynchronizer::get_lock_owner(obj, false);
if ((owner == NULL && _thread_status == java_lang_Thread::BLOCKED_ON_MONITOR_ENTER)
- || (owner != NULL && owner->is_attaching())) {
+ || (owner != NULL && owner->is_attaching_via_jni())) {
// ownership information of the monitor is not available
// (may no longer be owned or releasing to some other thread)
// make this thread in RUNNABLE state.
@@ -899,7 +899,7 @@ ThreadsListEnumerator::ThreadsListEnumerator(Thread* cur_thread,
}
// skip jni threads in the process of attaching
- if (!include_jni_attaching_threads && jt->is_attaching()) {
+ if (!include_jni_attaching_threads && jt->is_attaching_via_jni()) {
continue;
}
diff --git a/hotspot/src/share/vm/utilities/debug.cpp b/hotspot/src/share/vm/utilities/debug.cpp
index 5a68691..b96e5bd 100644
--- a/hotspot/src/share/vm/utilities/debug.cpp
+++ b/hotspot/src/share/vm/utilities/debug.cpp
@@ -209,7 +209,7 @@ bool error_is_suppressed(const char* file_name, int line_no) {
// Place-holder for non-existent suppression check:
#define error_is_suppressed(file_name, line_no) (false)
-#endif //PRODUCT
+#endif // !PRODUCT
void report_vm_error(const char* file, int line, const char* error_msg,
const char* detail_msg)
@@ -264,7 +264,7 @@ void report_unimplemented(const char* file, int line) {
void report_untested(const char* file, int line, const char* message) {
#ifndef PRODUCT
warning("Untested: %s in %s: %d\n", message, file, line);
-#endif // PRODUCT
+#endif // !PRODUCT
}
void report_out_of_shared_space(SharedSpaceType shared_space) {
@@ -309,9 +309,6 @@ void report_java_out_of_memory(const char* message) {
}
}
-
-extern "C" void ps();
-
static bool error_reported = false;
// call this when the VM is dying--it might loosen some asserts
@@ -366,11 +363,10 @@ void test_error_handler(size_t test_num)
default: ShouldNotReachHere();
}
}
-#endif // #ifndef PRODUCT
+#endif // !PRODUCT
// ------ helper functions for debugging go here ------------
-#ifndef PRODUCT
// All debug entries should be wrapped with a stack allocated
// Command object. It makes sure a resource mark is set and
// flushes the logfile to prevent file sharing problems.
@@ -391,11 +387,17 @@ class Command : public StackObj {
tty->print_cr("\"Executing %s\"", str);
}
- ~Command() { tty->flush(); Debugging = debug_save; level--; }
+ ~Command() {
+ tty->flush();
+ Debugging = debug_save;
+ level--;
+ }
};
int Command::level = 0;
+#ifndef PRODUCT
+
extern "C" void blob(CodeBlob* cb) {
Command c("blob");
cb->print();
@@ -478,7 +480,7 @@ extern "C" void pp(void* p) {
oop obj = oop(p);
obj->print();
} else {
- tty->print("%#p", p);
+ tty->print(PTR_FORMAT, p);
}
}
@@ -487,7 +489,10 @@ extern "C" void pp(void* p) {
extern "C" void pa(intptr_t p) { ((AllocatedObj*) p)->print(); }
extern "C" void findpc(intptr_t x);
+#endif // !PRODUCT
+
extern "C" void ps() { // print stack
+ if (Thread::current() == NULL) return;
Command c("ps");
@@ -500,6 +505,11 @@ extern "C" void ps() { // print stack
if (p->has_last_Java_frame()) {
// If the last_Java_fp is set we are in C land and
// can call the standard stack_trace function.
+#ifdef PRODUCT
+ p->print_stack();
+ } else {
+ tty->print_cr("Cannot find the last Java frame, printing stack disabled.");
+#else // !PRODUCT
p->trace_stack();
} else {
frame f = os::current_frame();
@@ -508,6 +518,7 @@ extern "C" void ps() { // print stack
tty->print("(guessing starting frame id=%#p based on current fp)\n", f.id());
p->trace_stack_from(vframe::new_vframe(&f, ®_map, p));
pd_ps(f);
+#endif // PRODUCT
}
}
@@ -524,6 +535,8 @@ extern "C" void pfl() {
}
}
+#ifndef PRODUCT
+
extern "C" void psf() { // print stack frames
{
Command c("psf");
@@ -555,12 +568,15 @@ extern "C" void safepoints() {
SafepointSynchronize::print_state();
}
+#endif // !PRODUCT
extern "C" void pss() { // print all stacks
+ if (Thread::current() == NULL) return;
Command c("pss");
- Threads::print(true, true);
+ Threads::print(true, PRODUCT_ONLY(false) NOT_PRODUCT(true));
}
+#ifndef PRODUCT
extern "C" void debug() { // to set things up for compiler debugging
Command c("debug");
@@ -911,4 +927,4 @@ void get_debug_command()
}
#endif
-#endif // PRODUCT
+#endif // !PRODUCT
diff --git a/hotspot/src/share/vm/utilities/dtrace.hpp b/hotspot/src/share/vm/utilities/dtrace.hpp
index 2f85694..799cd72 100644
--- a/hotspot/src/share/vm/utilities/dtrace.hpp
+++ b/hotspot/src/share/vm/utilities/dtrace.hpp
@@ -25,7 +25,7 @@
#ifndef SHARE_VM_UTILITIES_DTRACE_HPP
#define SHARE_VM_UTILITIES_DTRACE_HPP
-#if defined(SOLARIS) && defined(DTRACE_ENABLED)
+#if defined(DTRACE_ENABLED)
#include <sys/sdt.h>
@@ -36,11 +36,27 @@
#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() \
do { volatile size_t dtrace_workaround_tail_call_bug = 1; } while (0)
-#else // ndef SOLARIS || ndef DTRACE_ENABLED
+#if defined(SOLARIS)
+#define USDT1 1
+#elif defined(__APPLE__)
+#define USDT2 1
+#include <sys/types.h>
+#include "dtracefiles/hotspot.h"
+#include "dtracefiles/hotspot_jni.h"
+#include "dtracefiles/hs_private.h"
+#else
+#error "dtrace enabled for unknown os"
+#endif /* defined(SOLARIS) */
+
+#else /* defined(DTRACE_ENABLED) */
#define DTRACE_ONLY(x)
#define NOT_DTRACE(x) x
+#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG()
+
+#ifndef USDT2
+
#define DTRACE_PROBE(a,b) {;}
#define DTRACE_PROBE1(a,b,c) {;}
#define DTRACE_PROBE2(a,b,c,d) {;}
@@ -48,9 +64,14 @@
#define DTRACE_PROBE4(a,b,c,d,e,f) {;}
#define DTRACE_PROBE5(a,b,c,d,e,f,g) {;}
-#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG()
+#else /* USDT2 */
+
+#include "dtrace_usdt2_disabled.hpp"
+#endif /* USDT2 */
-#endif
+#endif /* defined(DTRACE_ENABLED) */
+
+#ifndef USDT2
#define HS_DTRACE_PROBE_FN(provider,name)\
__dtrace_##provider##___##name
@@ -133,4 +154,6 @@
(uintptr_t)a3,(uintptr_t)a4,(uintptr_t)a5,(uintptr_t)a6,(uintptr_t)a7,\
(uintptr_t)a8,(uintptr_t)a9))
+#endif /* !USDT2 */
+
#endif // SHARE_VM_UTILITIES_DTRACE_HPP
diff --git a/hotspot/src/share/vm/utilities/dtrace_usdt2_disabled.hpp b/hotspot/src/share/vm/utilities/dtrace_usdt2_disabled.hpp
new file mode 100644
index 0000000..5606bf6
--- /dev/null
+++ b/hotspot/src/share/vm/utilities/dtrace_usdt2_disabled.hpp
@@ -0,0 +1,1097 @@
+/*
+ * Copyright (c) 2011, 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.
+ *
+ */
+
+#ifndef SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP
+#define SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP
+
+/* This file contains dummy provider probes needed when compiling a hotspot
+ * that does not support dtrace probes. This could be because we're building
+ * on a system that doesn't suuport dtrace or because we're bulding a variant
+ * of hotspot (like core) where we do not support dtrace
+ */
+#if !defined(DTRACE_ENABLED)
+
+#ifdef USDT2
+
+/* hotspot provider probes */
+#define HOTSPOT_CLASS_LOADED(arg0, arg1, arg2, arg3)
+#define HOTSPOT_CLASS_LOADED_ENABLED() 0
+#define HOTSPOT_CLASS_UNLOADED(arg0, arg1, arg2, arg3)
+#define HOTSPOT_CLASS_UNLOADED_ENABLED() 0
+#define HOTSPOT_CLASS_INITIALIZATION_REQUIRED(arg0, arg1, arg2, arg3)
+#define HOTSPOT_CLASS_INITIALIZATION_REQUIRED_ENABLED() 0
+#define HOTSPOT_CLASS_INITIALIZATION_RECURSIVE(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_CLASS_INITIALIZATION_RECURSIVE_ENABLED() 0
+#define HOTSPOT_CLASS_INITIALIZATION_CONCURRENT(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_CLASS_INITIALIZATION_CONCURRENT_ENABLED() 0
+#define HOTSPOT_CLASS_INITIALIZATION_ERRONEOUS(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_CLASS_INITIALIZATION_ERRONEOUS_ENABLED() 0
+#define HOTSPOT_CLASS_INITIALIZATION_SUPER_FAILED(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_CLASS_INITIALIZATION_SUPER_FAILED_ENABLED() 0
+#define HOTSPOT_CLASS_INITIALIZATION_CLINIT(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_CLASS_INITIALIZATION_CLINIT_ENABLED() 0
+#define HOTSPOT_CLASS_INITIALIZATION_ERROR(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_CLASS_INITIALIZATION_ERROR_ENABLED() 0
+#define HOTSPOT_CLASS_INITIALIZATION_END(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_CLASS_INITIALIZATION_END_ENABLED() 0
+#define HOTSPOT_COMPILED_METHOD_LOAD(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
+#define HOTSPOT_COMPILED_METHOD_LOAD_ENABLED() 0
+#define HOTSPOT_COMPILED_METHOD_UNLOAD(arg0, arg1, arg2, arg3, arg4, arg5)
+#define HOTSPOT_COMPILED_METHOD_UNLOAD_ENABLED() 0
+#define HOTSPOT_GC_BEGIN(arg0)
+#define HOTSPOT_GC_BEGIN_ENABLED() 0
+#define HOTSPOT_GC_END()
+#define HOTSPOT_GC_END_ENABLED() 0
+#define HOTSPOT_MEM_POOL_GC_BEGIN(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
+#define HOTSPOT_MEM_POOL_GC_BEGIN_ENABLED() 0
+#define HOTSPOT_MEM_POOL_GC_END(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
+#define HOTSPOT_MEM_POOL_GC_END_ENABLED() 0
+#define HOTSPOT_METHOD_COMPILE_BEGIN(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
+#define HOTSPOT_METHOD_COMPILE_BEGIN_ENABLED() 0
+#define HOTSPOT_METHOD_COMPILE_END(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8)
+#define HOTSPOT_METHOD_COMPILE_END_ENABLED() 0
+#define HOTSPOT_METHOD_ENTRY(arg0, arg1, arg2, arg3, arg4, arg5, arg6)
+#define HOTSPOT_METHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_METHOD_RETURN(arg0, arg1, arg2, arg3, arg4, arg5, arg6)
+#define HOTSPOT_METHOD_RETURN_ENABLED() 0
+#define HOTSPOT_MONITOR_CONTENDED_ENTER(arg0, arg1, arg2, arg3)
+#define HOTSPOT_MONITOR_CONTENDED_ENTER_ENABLED() 0
+#define HOTSPOT_MONITOR_CONTENDED_ENTERED(arg0, arg1, arg2, arg3)
+#define HOTSPOT_MONITOR_CONTENDED_ENTERED_ENABLED() 0
+#define HOTSPOT_MONITOR_CONTENDED_EXIT(arg0, arg1, arg2, arg3)
+#define HOTSPOT_MONITOR_CONTENDED_EXIT_ENABLED() 0
+#define HOTSPOT_MONITOR_NOTIFY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_MONITOR_NOTIFY_ENABLED() 0
+#define HOTSPOT_MONITOR_NOTIFYALL(arg0, arg1, arg2, arg3)
+#define HOTSPOT_MONITOR_NOTIFYALL_ENABLED() 0
+#define HOTSPOT_MONITOR_WAIT(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_MONITOR_WAIT_ENABLED() 0
+#define HOTSPOT_MONITOR_WAIT_PROBE(arg0, arg1, arg2, arg3)
+#define HOTSPOT_MONITOR_WAIT_PROBE_ENABLED() 0
+#define HOTSPOT_MONITOR_WAITED(arg0, arg1, arg2, arg3)
+#define HOTSPOT_MONITOR_WAITED_ENABLED() 0
+#define HOTSPOT_OBJECT_ALLOC(arg0, arg1, arg2, arg3)
+#define HOTSPOT_OBJECT_ALLOC_ENABLED() 0
+#define HOTSPOT_THREAD_START(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_THREAD_START_ENABLED() 0
+#define HOTSPOT_THREAD_STOP(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_THREAD_STOP_ENABLED() 0
+#define HOTSPOT_THREAD_SLEEP_BEGIN(arg0)
+#define HOTSPOT_THREAD_SLEEP_BEGIN_ENABLED() 0
+#define HOTSPOT_THREAD_SLEEP_END(arg0)
+#define HOTSPOT_THREAD_SLEEP_END_ENABLED() 0
+#define HOTSPOT_THREAD_YIELD()
+#define HOTSPOT_THREAD_YIELD_ENABLED() 0
+#define HOTSPOT_THREAD_PARK_BEGIN(arg0, arg1, arg2)
+#define HOTSPOT_THREAD_PARK_BEGIN_ENABLED() 0
+#define HOTSPOT_THREAD_PARK_END(arg0)
+#define HOTSPOT_THREAD_PARK_END_ENABLED() 0
+#define HOTSPOT_THREAD_UNPARK()
+#define HOTSPOT_THREAD_UNPARK_ENABLED() 0
+#define HOTSPOT_VM_INIT_BEGIN()
+#define HOTSPOT_VM_INIT_BEGIN_ENABLED() 0
+#define HOTSPOT_VM_INIT_END()
+#define HOTSPOT_VM_INIT_END_ENABLED() 0
+#define HOTSPOT_VM_SHUTDOWN()
+#define HOTSPOT_VM_SHUTDOWN_ENABLED() 0
+#define HOTSPOT_VMOPS_REQUEST(arg0, arg1, arg2)
+#define HOTSPOT_VMOPS_REQUEST_ENABLED() 0
+#define HOTSPOT_VMOPS_BEGIN(arg0, arg1, arg2)
+#define HOTSPOT_VMOPS_BEGIN_ENABLED() 0
+#define HOTSPOT_VMOPS_END(arg0, arg1, arg2)
+#define HOTSPOT_VMOPS_END_ENABLED() 0
+
+/* hs_private provider probes */
+#define HS_PRIVATE_CMS_INITMARK_BEGIN()
+#define HS_PRIVATE_CMS_INITMARK_BEGIN_ENABLED() 0
+#define HS_PRIVATE_CMS_INITMARK_END()
+#define HS_PRIVATE_CMS_INITMARK_END_ENABLED() 0
+#define HS_PRIVATE_CMS_REMARK_BEGIN()
+#define HS_PRIVATE_CMS_REMARK_BEGIN_ENABLED() 0
+#define HS_PRIVATE_CMS_REMARK_END()
+#define HS_PRIVATE_CMS_REMARK_END_ENABLED() 0
+#define HS_PRIVATE_HASHTABLE_NEW_ENTRY(arg0, arg1, arg2, arg3)
+#define HS_PRIVATE_HASHTABLE_NEW_ENTRY_ENABLED() 0
+#define HS_PRIVATE_SAFEPOINT_BEGIN()
+#define HS_PRIVATE_SAFEPOINT_BEGIN_ENABLED() 0
+#define HS_PRIVATE_SAFEPOINT_END()
+#define HS_PRIVATE_SAFEPOINT_END_ENABLED() 0
+
+/* hotspot_jni provider probes */
+#define HOTSPOT_JNI_ALLOCOBJECT_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_ALLOCOBJECT_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_ALLOCOBJECT_RETURN(arg0)
+#define HOTSPOT_JNI_ALLOCOBJECT_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_ATTACHCURRENTTHREAD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_ATTACHCURRENTTHREAD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_ATTACHCURRENTTHREAD_RETURN(arg0)
+#define HOTSPOT_JNI_ATTACHCURRENTTHREAD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_ATTACHCURRENTTHREADASDAEMON_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_ATTACHCURRENTTHREADASDAEMON_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_ATTACHCURRENTTHREADASDAEMON_RETURN(arg0)
+#define HOTSPOT_JNI_ATTACHCURRENTTHREADASDAEMON_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLBOOLEANMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLBOOLEANMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLBOOLEANMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLBOOLEANMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLBOOLEANMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLBOOLEANMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLBOOLEANMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLBOOLEANMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLBOOLEANMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLBOOLEANMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLBOOLEANMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLBOOLEANMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLBYTEMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLBYTEMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLBYTEMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLBYTEMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLBYTEMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLBYTEMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLBYTEMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLBYTEMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLBYTEMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLBYTEMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLBYTEMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLBYTEMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLCHARMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLCHARMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLCHARMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLCHARMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLCHARMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLCHARMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLCHARMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLCHARMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLCHARMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLCHARMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLCHARMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLCHARMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLDOUBLEMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLDOUBLEMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLDOUBLEMETHOD_RETURN()
+#define HOTSPOT_JNI_CALLDOUBLEMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLDOUBLEMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLDOUBLEMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLDOUBLEMETHODA_RETURN()
+#define HOTSPOT_JNI_CALLDOUBLEMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLDOUBLEMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLDOUBLEMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLDOUBLEMETHODV_RETURN()
+#define HOTSPOT_JNI_CALLDOUBLEMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLFLOATMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLFLOATMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLFLOATMETHOD_RETURN()
+#define HOTSPOT_JNI_CALLFLOATMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLFLOATMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLFLOATMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLFLOATMETHODA_RETURN()
+#define HOTSPOT_JNI_CALLFLOATMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLFLOATMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLFLOATMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLFLOATMETHODV_RETURN()
+#define HOTSPOT_JNI_CALLFLOATMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLINTMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLINTMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLINTMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLINTMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLINTMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLINTMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLINTMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLINTMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLINTMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLINTMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLINTMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLINTMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLLONGMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLLONGMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLLONGMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLLONGMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLLONGMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLLONGMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLLONGMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLLONGMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLLONGMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLLONGMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLLONGMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLLONGMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODA_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODV_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALBOOLEANMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODA_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODV_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALBYTEMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODA_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODV_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALCHARMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHOD_RETURN()
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODA_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODA_RETURN()
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODV_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODV_RETURN()
+#define HOTSPOT_JNI_CALLNONVIRTUALDOUBLEMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHOD_RETURN()
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODA_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODA_RETURN()
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODV_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODV_RETURN()
+#define HOTSPOT_JNI_CALLNONVIRTUALFLOATMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHODA_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHODV_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALINTMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODA_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODV_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALLONGMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODA_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODV_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALOBJECTMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODA_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODV_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLNONVIRTUALSHORTMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHOD_RETURN()
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODA_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODA_RETURN()
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODV_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODV_RETURN()
+#define HOTSPOT_JNI_CALLNONVIRTUALVOIDMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLOBJECTMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLOBJECTMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLOBJECTMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLOBJECTMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLOBJECTMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLOBJECTMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLOBJECTMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLOBJECTMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLOBJECTMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLOBJECTMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLOBJECTMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLOBJECTMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSHORTMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSHORTMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSHORTMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSHORTMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSHORTMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSHORTMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSHORTMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSHORTMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSHORTMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSHORTMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSHORTMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSHORTMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICBOOLEANMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICBYTEMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICCHARMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICCHARMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICCHARMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICCHARMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICCHARMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICCHARMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICCHARMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICCHARMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICCHARMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICCHARMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICCHARMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICCHARMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHOD_RETURN()
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHODA_RETURN()
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHODV_RETURN()
+#define HOTSPOT_JNI_CALLSTATICDOUBLEMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHOD_RETURN()
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHODA_RETURN()
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHODV_RETURN()
+#define HOTSPOT_JNI_CALLSTATICFLOATMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICINTMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICINTMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICINTMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICINTMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICINTMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICINTMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICINTMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICINTMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICINTMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICINTMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICINTMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICINTMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICLONGMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICLONGMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICLONGMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICLONGMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICLONGMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICLONGMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICLONGMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICLONGMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICLONGMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICLONGMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICLONGMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICLONGMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICOBJECTMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHODA_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHODV_RETURN(arg0)
+#define HOTSPOT_JNI_CALLSTATICSHORTMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHOD_RETURN()
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHODA_RETURN()
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHODV_RETURN()
+#define HOTSPOT_JNI_CALLSTATICVOIDMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLVOIDMETHOD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLVOIDMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLVOIDMETHOD_RETURN()
+#define HOTSPOT_JNI_CALLVOIDMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLVOIDMETHODA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLVOIDMETHODA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLVOIDMETHODA_RETURN()
+#define HOTSPOT_JNI_CALLVOIDMETHODA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CALLVOIDMETHODV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CALLVOIDMETHODV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CALLVOIDMETHODV_RETURN()
+#define HOTSPOT_JNI_CALLVOIDMETHODV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_CREATEJAVAVM_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_CREATEJAVAVM_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_CREATEJAVAVM_RETURN(arg0)
+#define HOTSPOT_JNI_CREATEJAVAVM_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_DEFINECLASS_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_DEFINECLASS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_DEFINECLASS_RETURN(arg0)
+#define HOTSPOT_JNI_DEFINECLASS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_DELETEGLOBALREF_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_DELETEGLOBALREF_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_DELETEGLOBALREF_RETURN()
+#define HOTSPOT_JNI_DELETEGLOBALREF_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_DELETELOCALREF_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_DELETELOCALREF_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_DELETELOCALREF_RETURN()
+#define HOTSPOT_JNI_DELETELOCALREF_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_DELETEWEAKGLOBALREF_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_DELETEWEAKGLOBALREF_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_DELETEWEAKGLOBALREF_RETURN()
+#define HOTSPOT_JNI_DELETEWEAKGLOBALREF_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_DESTROYJAVAVM_ENTRY(arg0)
+#define HOTSPOT_JNI_DESTROYJAVAVM_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_DESTROYJAVAVM_RETURN(arg0)
+#define HOTSPOT_JNI_DESTROYJAVAVM_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_DETACHCURRENTTHREAD_ENTRY(arg0)
+#define HOTSPOT_JNI_DETACHCURRENTTHREAD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_DETACHCURRENTTHREAD_RETURN(arg0)
+#define HOTSPOT_JNI_DETACHCURRENTTHREAD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_ENSURELOCALCAPACITY_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_ENSURELOCALCAPACITY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_ENSURELOCALCAPACITY_RETURN(arg0)
+#define HOTSPOT_JNI_ENSURELOCALCAPACITY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_EXCEPTIONCHECK_ENTRY(arg0)
+#define HOTSPOT_JNI_EXCEPTIONCHECK_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_EXCEPTIONCHECK_RETURN(arg0)
+#define HOTSPOT_JNI_EXCEPTIONCHECK_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_EXCEPTIONCLEAR_ENTRY(arg0)
+#define HOTSPOT_JNI_EXCEPTIONCLEAR_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_EXCEPTIONCLEAR_RETURN()
+#define HOTSPOT_JNI_EXCEPTIONCLEAR_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_EXCEPTIONDESCRIBE_ENTRY(arg0)
+#define HOTSPOT_JNI_EXCEPTIONDESCRIBE_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_EXCEPTIONDESCRIBE_RETURN()
+#define HOTSPOT_JNI_EXCEPTIONDESCRIBE_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_EXCEPTIONOCCURRED_ENTRY(arg0)
+#define HOTSPOT_JNI_EXCEPTIONOCCURRED_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_EXCEPTIONOCCURRED_RETURN(arg0)
+#define HOTSPOT_JNI_EXCEPTIONOCCURRED_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_FATALERROR_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_FATALERROR_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_FINDCLASS_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_FINDCLASS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_FINDCLASS_RETURN(arg0)
+#define HOTSPOT_JNI_FINDCLASS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_FROMREFLECTEDFIELD_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_FROMREFLECTEDFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_FROMREFLECTEDFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_FROMREFLECTEDFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_FROMREFLECTEDMETHOD_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_FROMREFLECTEDMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_FROMREFLECTEDMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_FROMREFLECTEDMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETARRAYLENGTH_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_GETARRAYLENGTH_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETARRAYLENGTH_RETURN(arg0)
+#define HOTSPOT_JNI_GETARRAYLENGTH_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETBOOLEANARRAYELEMENTS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETBOOLEANARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETBOOLEANARRAYELEMENTS_RETURN(arg0)
+#define HOTSPOT_JNI_GETBOOLEANARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETBOOLEANARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_GETBOOLEANARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETBOOLEANARRAYREGION_RETURN()
+#define HOTSPOT_JNI_GETBOOLEANARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETBOOLEANFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETBOOLEANFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETBOOLEANFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETBOOLEANFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETBYTEARRAYELEMENTS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETBYTEARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETBYTEARRAYELEMENTS_RETURN(arg0)
+#define HOTSPOT_JNI_GETBYTEARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETBYTEARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_GETBYTEARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETBYTEARRAYREGION_RETURN()
+#define HOTSPOT_JNI_GETBYTEARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETBYTEFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETBYTEFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETBYTEFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETBYTEFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETCHARARRAYELEMENTS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETCHARARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETCHARARRAYELEMENTS_RETURN(arg0)
+#define HOTSPOT_JNI_GETCHARARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETCHARARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_GETCHARARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETCHARARRAYREGION_RETURN()
+#define HOTSPOT_JNI_GETCHARARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETCHARFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETCHARFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETCHARFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETCHARFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETCREATEDJAVAVMS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETCREATEDJAVAVMS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETCREATEDJAVAVMS_RETURN(arg0)
+#define HOTSPOT_JNI_GETCREATEDJAVAVMS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETDEFAULTJAVAVMINITARGS_ENTRY(arg0)
+#define HOTSPOT_JNI_GETDEFAULTJAVAVMINITARGS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETDEFAULTJAVAVMINITARGS_RETURN(arg0)
+#define HOTSPOT_JNI_GETDEFAULTJAVAVMINITARGS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETDIRECTBUFFERADDRESS_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_GETDIRECTBUFFERADDRESS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETDIRECTBUFFERADDRESS_RETURN(arg0)
+#define HOTSPOT_JNI_GETDIRECTBUFFERADDRESS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETDIRECTBUFFERCAPACITY_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_GETDIRECTBUFFERCAPACITY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETDIRECTBUFFERCAPACITY_RETURN(arg0)
+#define HOTSPOT_JNI_GETDIRECTBUFFERCAPACITY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETDOUBLEARRAYELEMENTS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETDOUBLEARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETDOUBLEARRAYELEMENTS_RETURN(arg0)
+#define HOTSPOT_JNI_GETDOUBLEARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETDOUBLEARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_GETDOUBLEARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETDOUBLEARRAYREGION_RETURN()
+#define HOTSPOT_JNI_GETDOUBLEARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETDOUBLEFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETDOUBLEFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETDOUBLEFIELD_RETURN()
+#define HOTSPOT_JNI_GETDOUBLEFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETENV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETENV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETENV_RETURN(arg0)
+#define HOTSPOT_JNI_GETENV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETFIELDID_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_GETFIELDID_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETFIELDID_RETURN(arg0)
+#define HOTSPOT_JNI_GETFIELDID_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETFLOATARRAYELEMENTS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETFLOATARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETFLOATARRAYELEMENTS_RETURN(arg0)
+#define HOTSPOT_JNI_GETFLOATARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETFLOATARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_GETFLOATARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETFLOATARRAYREGION_RETURN()
+#define HOTSPOT_JNI_GETFLOATARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETFLOATFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETFLOATFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETFLOATFIELD_RETURN()
+#define HOTSPOT_JNI_GETFLOATFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETINTARRAYELEMENTS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETINTARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETINTARRAYELEMENTS_RETURN(arg0)
+#define HOTSPOT_JNI_GETINTARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETINTARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_GETINTARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETINTARRAYREGION_RETURN()
+#define HOTSPOT_JNI_GETINTARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETINTFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETINTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETINTFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETINTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETJAVAVM_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_GETJAVAVM_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETJAVAVM_RETURN(arg0)
+#define HOTSPOT_JNI_GETJAVAVM_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETLONGARRAYELEMENTS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETLONGARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETLONGARRAYELEMENTS_RETURN(arg0)
+#define HOTSPOT_JNI_GETLONGARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETLONGARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_GETLONGARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETLONGARRAYREGION_RETURN()
+#define HOTSPOT_JNI_GETLONGARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETLONGFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETLONGFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETLONGFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETLONGFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETMETHODID_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_GETMETHODID_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETMETHODID_RETURN(arg0)
+#define HOTSPOT_JNI_GETMETHODID_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETOBJECTARRAYELEMENT_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETOBJECTARRAYELEMENT_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETOBJECTARRAYELEMENT_RETURN(arg0)
+#define HOTSPOT_JNI_GETOBJECTARRAYELEMENT_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETOBJECTCLASS_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_GETOBJECTCLASS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETOBJECTCLASS_RETURN(arg0)
+#define HOTSPOT_JNI_GETOBJECTCLASS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETOBJECTFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETOBJECTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETOBJECTFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETOBJECTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETOBJECTREFTYPE_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_GETOBJECTREFTYPE_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETOBJECTREFTYPE_RETURN(arg0)
+#define HOTSPOT_JNI_GETOBJECTREFTYPE_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETPRIMITIVEARRAYCRITICAL_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETPRIMITIVEARRAYCRITICAL_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETPRIMITIVEARRAYCRITICAL_RETURN(arg0)
+#define HOTSPOT_JNI_GETPRIMITIVEARRAYCRITICAL_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSHORTARRAYELEMENTS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSHORTARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSHORTARRAYELEMENTS_RETURN(arg0)
+#define HOTSPOT_JNI_GETSHORTARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSHORTARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_GETSHORTARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSHORTARRAYREGION_RETURN()
+#define HOTSPOT_JNI_GETSHORTARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSHORTFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSHORTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSHORTFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETSHORTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICBOOLEANFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTATICBOOLEANFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICBOOLEANFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTATICBOOLEANFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICBYTEFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTATICBYTEFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICBYTEFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTATICBYTEFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICCHARFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTATICCHARFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICCHARFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTATICCHARFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICDOUBLEFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTATICDOUBLEFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICDOUBLEFIELD_RETURN()
+#define HOTSPOT_JNI_GETSTATICDOUBLEFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICFIELDID_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_GETSTATICFIELDID_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICFIELDID_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTATICFIELDID_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICFLOATFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTATICFLOATFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICFLOATFIELD_RETURN()
+#define HOTSPOT_JNI_GETSTATICFLOATFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICINTFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTATICINTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICINTFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTATICINTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICLONGFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTATICLONGFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICLONGFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTATICLONGFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICMETHODID_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_GETSTATICMETHODID_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICMETHODID_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTATICMETHODID_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICOBJECTFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTATICOBJECTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICOBJECTFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTATICOBJECTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICSHORTFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTATICSHORTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTATICSHORTFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTATICSHORTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGCHARS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTRINGCHARS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGCHARS_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTRINGCHARS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGCRITICAL_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTRINGCRITICAL_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGCRITICAL_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTRINGCRITICAL_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGLENGTH_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_GETSTRINGLENGTH_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGLENGTH_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTRINGLENGTH_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_GETSTRINGREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGREGION_RETURN()
+#define HOTSPOT_JNI_GETSTRINGREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGUTFCHARS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_GETSTRINGUTFCHARS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGUTFCHARS_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTRINGUTFCHARS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGUTFLENGTH_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_GETSTRINGUTFLENGTH_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGUTFLENGTH_RETURN(arg0)
+#define HOTSPOT_JNI_GETSTRINGUTFLENGTH_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGUTFREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_GETSTRINGUTFREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSTRINGUTFREGION_RETURN()
+#define HOTSPOT_JNI_GETSTRINGUTFREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETSUPERCLASS_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_GETSUPERCLASS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETSUPERCLASS_RETURN(arg0)
+#define HOTSPOT_JNI_GETSUPERCLASS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_GETVERSION_ENTRY(arg0)
+#define HOTSPOT_JNI_GETVERSION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_GETVERSION_RETURN(arg0)
+#define HOTSPOT_JNI_GETVERSION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_ISASSIGNABLEFROM_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_ISASSIGNABLEFROM_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_ISASSIGNABLEFROM_RETURN(arg0)
+#define HOTSPOT_JNI_ISASSIGNABLEFROM_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_ISINSTANCEOF_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_ISINSTANCEOF_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_ISINSTANCEOF_RETURN(arg0)
+#define HOTSPOT_JNI_ISINSTANCEOF_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_ISSAMEOBJECT_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_ISSAMEOBJECT_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_ISSAMEOBJECT_RETURN(arg0)
+#define HOTSPOT_JNI_ISSAMEOBJECT_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_MONITORENTER_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_MONITORENTER_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_MONITORENTER_RETURN(arg0)
+#define HOTSPOT_JNI_MONITORENTER_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_MONITOREXIT_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_MONITOREXIT_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_MONITOREXIT_RETURN(arg0)
+#define HOTSPOT_JNI_MONITOREXIT_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWBOOLEANARRAY_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWBOOLEANARRAY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWBOOLEANARRAY_RETURN(arg0)
+#define HOTSPOT_JNI_NEWBOOLEANARRAY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWBYTEARRAY_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWBYTEARRAY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWBYTEARRAY_RETURN(arg0)
+#define HOTSPOT_JNI_NEWBYTEARRAY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWCHARARRAY_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWCHARARRAY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWCHARARRAY_RETURN(arg0)
+#define HOTSPOT_JNI_NEWCHARARRAY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWDIRECTBYTEBUFFER_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_NEWDIRECTBYTEBUFFER_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWDIRECTBYTEBUFFER_RETURN(arg0)
+#define HOTSPOT_JNI_NEWDIRECTBYTEBUFFER_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWDOUBLEARRAY_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWDOUBLEARRAY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWDOUBLEARRAY_RETURN(arg0)
+#define HOTSPOT_JNI_NEWDOUBLEARRAY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWFLOATARRAY_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWFLOATARRAY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWFLOATARRAY_RETURN(arg0)
+#define HOTSPOT_JNI_NEWFLOATARRAY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWGLOBALREF_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWGLOBALREF_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWGLOBALREF_RETURN(arg0)
+#define HOTSPOT_JNI_NEWGLOBALREF_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWINTARRAY_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWINTARRAY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWINTARRAY_RETURN(arg0)
+#define HOTSPOT_JNI_NEWINTARRAY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWLOCALREF_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWLOCALREF_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWLOCALREF_RETURN(arg0)
+#define HOTSPOT_JNI_NEWLOCALREF_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWLONGARRAY_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWLONGARRAY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWLONGARRAY_RETURN(arg0)
+#define HOTSPOT_JNI_NEWLONGARRAY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWOBJECT_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_NEWOBJECT_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWOBJECT_RETURN(arg0)
+#define HOTSPOT_JNI_NEWOBJECT_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWOBJECTA_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_NEWOBJECTA_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWOBJECTA_RETURN(arg0)
+#define HOTSPOT_JNI_NEWOBJECTA_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWOBJECTARRAY_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_NEWOBJECTARRAY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWOBJECTARRAY_RETURN(arg0)
+#define HOTSPOT_JNI_NEWOBJECTARRAY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWOBJECTV_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_NEWOBJECTV_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWOBJECTV_RETURN(arg0)
+#define HOTSPOT_JNI_NEWOBJECTV_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWSHORTARRAY_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWSHORTARRAY_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWSHORTARRAY_RETURN(arg0)
+#define HOTSPOT_JNI_NEWSHORTARRAY_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWSTRING_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_NEWSTRING_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWSTRING_RETURN(arg0)
+#define HOTSPOT_JNI_NEWSTRING_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWSTRINGUTF_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWSTRINGUTF_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWSTRINGUTF_RETURN(arg0)
+#define HOTSPOT_JNI_NEWSTRINGUTF_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_NEWWEAKGLOBALREF_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_NEWWEAKGLOBALREF_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_NEWWEAKGLOBALREF_RETURN(arg0)
+#define HOTSPOT_JNI_NEWWEAKGLOBALREF_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_POPLOCALFRAME_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_POPLOCALFRAME_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_POPLOCALFRAME_RETURN(arg0)
+#define HOTSPOT_JNI_POPLOCALFRAME_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_PUSHLOCALFRAME_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_PUSHLOCALFRAME_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_PUSHLOCALFRAME_RETURN(arg0)
+#define HOTSPOT_JNI_PUSHLOCALFRAME_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_REGISTERNATIVES_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_REGISTERNATIVES_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_REGISTERNATIVES_RETURN(arg0)
+#define HOTSPOT_JNI_REGISTERNATIVES_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEBOOLEANARRAYELEMENTS_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_RELEASEBOOLEANARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEBOOLEANARRAYELEMENTS_RETURN()
+#define HOTSPOT_JNI_RELEASEBOOLEANARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEBYTEARRAYELEMENTS_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_RELEASEBYTEARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEBYTEARRAYELEMENTS_RETURN()
+#define HOTSPOT_JNI_RELEASEBYTEARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASECHARARRAYELEMENTS_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_RELEASECHARARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASECHARARRAYELEMENTS_RETURN()
+#define HOTSPOT_JNI_RELEASECHARARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEDOUBLEARRAYELEMENTS_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_RELEASEDOUBLEARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEDOUBLEARRAYELEMENTS_RETURN()
+#define HOTSPOT_JNI_RELEASEDOUBLEARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEFLOATARRAYELEMENTS_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_RELEASEFLOATARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEFLOATARRAYELEMENTS_RETURN()
+#define HOTSPOT_JNI_RELEASEFLOATARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEINTARRAYELEMENTS_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_RELEASEINTARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEINTARRAYELEMENTS_RETURN()
+#define HOTSPOT_JNI_RELEASEINTARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASELONGARRAYELEMENTS_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_RELEASELONGARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASELONGARRAYELEMENTS_RETURN()
+#define HOTSPOT_JNI_RELEASELONGARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEPRIMITIVEARRAYCRITICAL_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_RELEASEPRIMITIVEARRAYCRITICAL_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASEPRIMITIVEARRAYCRITICAL_RETURN()
+#define HOTSPOT_JNI_RELEASEPRIMITIVEARRAYCRITICAL_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASESHORTARRAYELEMENTS_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_RELEASESHORTARRAYELEMENTS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASESHORTARRAYELEMENTS_RETURN()
+#define HOTSPOT_JNI_RELEASESHORTARRAYELEMENTS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASESTRINGCHARS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_RELEASESTRINGCHARS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASESTRINGCHARS_RETURN()
+#define HOTSPOT_JNI_RELEASESTRINGCHARS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASESTRINGCRITICAL_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_RELEASESTRINGCRITICAL_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASESTRINGCRITICAL_RETURN()
+#define HOTSPOT_JNI_RELEASESTRINGCRITICAL_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_RELEASESTRINGUTFCHARS_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_RELEASESTRINGUTFCHARS_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_RELEASESTRINGUTFCHARS_RETURN()
+#define HOTSPOT_JNI_RELEASESTRINGUTFCHARS_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETBOOLEANARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_SETBOOLEANARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETBOOLEANARRAYREGION_RETURN()
+#define HOTSPOT_JNI_SETBOOLEANARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETBOOLEANFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETBOOLEANFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETBOOLEANFIELD_RETURN()
+#define HOTSPOT_JNI_SETBOOLEANFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETBYTEARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_SETBYTEARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETBYTEARRAYREGION_RETURN()
+#define HOTSPOT_JNI_SETBYTEARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETBYTEFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETBYTEFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETBYTEFIELD_RETURN()
+#define HOTSPOT_JNI_SETBYTEFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETCHARARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_SETCHARARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETCHARARRAYREGION_RETURN()
+#define HOTSPOT_JNI_SETCHARARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETCHARFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETCHARFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETCHARFIELD_RETURN()
+#define HOTSPOT_JNI_SETCHARFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETDOUBLEARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_SETDOUBLEARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETDOUBLEARRAYREGION_RETURN()
+#define HOTSPOT_JNI_SETDOUBLEARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETDOUBLEFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_SETDOUBLEFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETDOUBLEFIELD_RETURN()
+#define HOTSPOT_JNI_SETDOUBLEFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETFLOATARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_SETFLOATARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETFLOATARRAYREGION_RETURN()
+#define HOTSPOT_JNI_SETFLOATARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETFLOATFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_SETFLOATFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETFLOATFIELD_RETURN()
+#define HOTSPOT_JNI_SETFLOATFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETINTARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_SETINTARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETINTARRAYREGION_RETURN()
+#define HOTSPOT_JNI_SETINTARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETINTFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETINTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETINTFIELD_RETURN()
+#define HOTSPOT_JNI_SETINTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETLONGARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_SETLONGARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETLONGARRAYREGION_RETURN()
+#define HOTSPOT_JNI_SETLONGARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETLONGFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETLONGFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETLONGFIELD_RETURN()
+#define HOTSPOT_JNI_SETLONGFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETOBJECTARRAYELEMENT_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETOBJECTARRAYELEMENT_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETOBJECTARRAYELEMENT_RETURN()
+#define HOTSPOT_JNI_SETOBJECTARRAYELEMENT_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETOBJECTFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETOBJECTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETOBJECTFIELD_RETURN()
+#define HOTSPOT_JNI_SETOBJECTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSHORTARRAYREGION_ENTRY(arg0, arg1, arg2, arg3, arg4)
+#define HOTSPOT_JNI_SETSHORTARRAYREGION_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSHORTARRAYREGION_RETURN()
+#define HOTSPOT_JNI_SETSHORTARRAYREGION_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSHORTFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETSHORTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSHORTFIELD_RETURN()
+#define HOTSPOT_JNI_SETSHORTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICBOOLEANFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETSTATICBOOLEANFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICBOOLEANFIELD_RETURN()
+#define HOTSPOT_JNI_SETSTATICBOOLEANFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICBYTEFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETSTATICBYTEFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICBYTEFIELD_RETURN()
+#define HOTSPOT_JNI_SETSTATICBYTEFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICCHARFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETSTATICCHARFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICCHARFIELD_RETURN()
+#define HOTSPOT_JNI_SETSTATICCHARFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICDOUBLEFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_SETSTATICDOUBLEFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICDOUBLEFIELD_RETURN()
+#define HOTSPOT_JNI_SETSTATICDOUBLEFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICFLOATFIELD_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_SETSTATICFLOATFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICFLOATFIELD_RETURN()
+#define HOTSPOT_JNI_SETSTATICFLOATFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICINTFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETSTATICINTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICINTFIELD_RETURN()
+#define HOTSPOT_JNI_SETSTATICINTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICLONGFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETSTATICLONGFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICLONGFIELD_RETURN()
+#define HOTSPOT_JNI_SETSTATICLONGFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICOBJECTFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETSTATICOBJECTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICOBJECTFIELD_RETURN()
+#define HOTSPOT_JNI_SETSTATICOBJECTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICSHORTFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_SETSTATICSHORTFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_SETSTATICSHORTFIELD_RETURN()
+#define HOTSPOT_JNI_SETSTATICSHORTFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_THROW_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_THROW_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_THROW_RETURN(arg0)
+#define HOTSPOT_JNI_THROW_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_THROWNEW_ENTRY(arg0, arg1, arg2)
+#define HOTSPOT_JNI_THROWNEW_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_THROWNEW_RETURN(arg0)
+#define HOTSPOT_JNI_THROWNEW_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_TOREFLECTEDFIELD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_TOREFLECTEDFIELD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_TOREFLECTEDFIELD_RETURN(arg0)
+#define HOTSPOT_JNI_TOREFLECTEDFIELD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_TOREFLECTEDMETHOD_ENTRY(arg0, arg1, arg2, arg3)
+#define HOTSPOT_JNI_TOREFLECTEDMETHOD_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_TOREFLECTEDMETHOD_RETURN(arg0)
+#define HOTSPOT_JNI_TOREFLECTEDMETHOD_RETURN_ENABLED() 0
+#define HOTSPOT_JNI_UNREGISTERNATIVES_ENTRY(arg0, arg1)
+#define HOTSPOT_JNI_UNREGISTERNATIVES_ENTRY_ENABLED() 0
+#define HOTSPOT_JNI_UNREGISTERNATIVES_RETURN(arg0)
+#define HOTSPOT_JNI_UNREGISTERNATIVES_RETURN_ENABLED() 0
+
+#else /* USDT2 */
+#error This file should only be included for USDT2
+#endif /* USDT2 */
+
+#else /* !defined(DTRACE_ENABLED) */
+#error This file should only be included when dtrace is not enabled
+#end /* !defined(DTRACE_ENABLED) */
+
+#endif // SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions.hpp b/hotspot/src/share/vm/utilities/globalDefinitions.hpp
index 5bacab9..dc7532b 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp
@@ -25,7 +25,9 @@
#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
+#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
+#endif
#ifdef TARGET_COMPILER_gcc
# include "utilities/globalDefinitions_gcc.hpp"
diff --git a/hotspot/src/share/vm/utilities/hashtable.cpp b/hotspot/src/share/vm/utilities/hashtable.cpp
index 7e93796..698e137 100644
--- a/hotspot/src/share/vm/utilities/hashtable.cpp
+++ b/hotspot/src/share/vm/utilities/hashtable.cpp
@@ -32,8 +32,10 @@
#include "utilities/hashtable.inline.hpp"
+#ifndef USDT2
HS_DTRACE_PROBE_DECL4(hs_private, hashtable__new_entry,
void*, unsigned int, void*, void*);
+#endif /* !USDT2 */
// This is a generic hashtable, designed to be used for the symbol
// and string tables.
@@ -73,8 +75,13 @@ template <class T> HashtableEntry<T>* Hashtable<T>::new_entry(unsigned int hashV
entry = (HashtableEntry<T>*)BasicHashtable::new_entry(hashValue);
entry->set_literal(obj);
+#ifndef USDT2
HS_DTRACE_PROBE4(hs_private, hashtable__new_entry,
this, hashValue, obj, entry);
+#else /* USDT2 */
+ HS_PRIVATE_HASHTABLE_NEW_ENTRY(
+ this, hashValue, (uintptr_t) obj, entry);
+#endif /* USDT2 */
return entry;
}
diff --git a/hotspot/src/share/vm/utilities/quickSort.cpp b/hotspot/src/share/vm/utilities/quickSort.cpp
index b377d9a..bf68af1 100644
--- a/hotspot/src/share/vm/utilities/quickSort.cpp
+++ b/hotspot/src/share/vm/utilities/quickSort.cpp
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "utilities/quickSort.hpp"
-#ifndef PRODUCT
+/////////////// Unit tests ///////////////
-// Unit tests
+#ifndef PRODUCT
#include "runtime/os.hpp"
+#include "utilities/quickSort.hpp"
#include <stdlib.h>
static int test_comparator(int a, int b) {
@@ -54,16 +54,18 @@ static int test_even_odd_comparator(int a, int b) {
return 1;
}
-static int test_stdlib_comparator(const void* a, const void* b) {
- int ai = *(int*)a;
- int bi = *(int*)b;
- if (ai == bi) {
- return 0;
- }
- if (ai < bi) {
- return -1;
+extern "C" {
+ static int test_stdlib_comparator(const void* a, const void* b) {
+ int ai = *(int*)a;
+ int bi = *(int*)b;
+ if (ai == bi) {
+ return 0;
+ }
+ if (ai < bi) {
+ return -1;
+ }
+ return 1;
}
- return 1;
}
void QuickSort::print_array(const char* prefix, int* array, int length) {
@@ -92,8 +94,7 @@ bool QuickSort::sort_and_compare(int* arrayToSort, int* expectedResult, int leng
}
bool QuickSort::test_quick_sort() {
-#if 0
- tty->print_cr("test_quick_sort\n");
+ tty->print_cr("test_quick_sort");
{
int* test_array = NULL;
int* expected_array = NULL;
@@ -213,7 +214,6 @@ bool QuickSort::test_quick_sort() {
delete[] test_array;
delete[] expected_array;
}
-#endif
return true;
}
diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
index bb34fcd..94ed68e 100644
--- a/hotspot/src/share/vm/utilities/vmError.cpp
+++ b/hotspot/src/share/vm/utilities/vmError.cpp
@@ -680,8 +680,10 @@ void VMError::report(outputStream* st) {
STEP(190, "(printing heap information)" )
if (_verbose && Universe::is_fully_initialized()) {
- // print heap information before vm abort
- Universe::print_on(st);
+ // Print heap information before vm abort. As we'd like as much
+ // information as possible in the report we ask for the
+ // extended (i.e., more detailed) version.
+ Universe::print_on(st, true /* extended */);
st->cr();
}
diff --git a/hotspot/test/Makefile b/hotspot/test/Makefile
index 50818dd..f536592 100644
--- a/hotspot/test/Makefile
+++ b/hotspot/test/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2011, 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
@@ -219,6 +219,15 @@ PHONY_LIST += servertest
################################################################
+# internalvmtests (run internal unit tests inside the VM)
+
+internalvmtests: prep $(PRODUCT_HOME)
+ $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -XX:+ExecuteInternalVMTests -version
+
+PHONY_LIST += internalvmtests
+
+################################################################
+
# packtest
# Expect JPRT to set JPRT_PACKTEST_HOME.
diff --git a/hotspot/test/compiler/6865265/StackOverflowBug.java b/hotspot/test/compiler/6865265/StackOverflowBug.java
new file mode 100644
index 0000000..d474814
--- /dev/null
+++ b/hotspot/test/compiler/6865265/StackOverflowBug.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2011, 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 6865265
+ * @summary JVM crashes with "missing exception handler" error
+ * @author volker.simonis at sap.com
+ *
+ * @run main/othervm -XX:CompileThreshold=100 -Xbatch -Xss224k StackOverflowBug
+ */
+
+
+public class StackOverflowBug {
+
+ public static int run() {
+ try {
+ try {
+ return run();
+ } catch (Throwable e) {
+ // Notice that the class 'Throwable' is NOT resolved by the verifier,
+ // because the verifier only checks if 'Throwable' is assignable to
+ // 'java.lang.Throwable' and this check succeeds immediately if the two
+ // types have equal names (see 'VerificationType::is_assignable_from' which
+ // is called from 'ClassVerifier::verify_exception_handler_table').
+ // This is strange, because if the two classes have different names,
+ // 'is_assignable_from()' calls 'is_reference_assignable_from()' which resolves
+ // both classes by calling 'SystemDictionary::resolve_or_fail()'. This call
+ // also takes into account the current class loader (i.e. the one which was used
+ // to load this class) and would place a corresponding
+ // "java.lang.Throwable / current-Classloader" entry into the system dictionary.
+ // This would in turn allow C2 to see 'java.lang.Throwable' as "loaded"
+ // (see 'Parse::catch_inline_exceptions()') when this method is compiled.
+ return 42;
+ }
+ }
+ finally {
+ }
+ }
+
+ public static void main(String argv[]) {
+ run();
+ }
+}
+
+/*
+ public static int run();
+ Code:
+ 0: invokestatic #2 // Method run:()I
+ 3: istore_0
+ 4: iload_0
+ 5: ireturn
+ 6: astore_0
+ 7: bipush 42
+ 9: istore_1
+ 10: iload_1
+ 11: ireturn
+ 12: astore_2
+ 13: aload_2
+ 14: athrow
+ Exception table:
+ from to target type
+ 0 4 6 Class java/lang/Throwable
+ 0 4 12 any
+ 6 10 12 any
+ 12 13 12 any
+
+ */
diff --git a/hotspot/test/compiler/7100757/Test7100757.java b/hotspot/test/compiler/7100757/Test7100757.java
new file mode 100644
index 0000000..daa0bfe
--- /dev/null
+++ b/hotspot/test/compiler/7100757/Test7100757.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2011, 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 7100757
+ * @summary The BitSet.nextSetBit() produces incorrect result in 32bit VM on Sparc
+ *
+ * @run main/timeout=300 Test7100757
+ */
+
+import java.util.*;
+
+public class Test7100757 {
+
+ public static final int NBITS = 256;
+
+ public static void main(String[] args) {
+
+ BitSet bs = new BitSet(NBITS);
+ Random rnd = new Random();
+ long[] ra = new long[(NBITS+63)/64];
+
+ for(int l=0; l < 5000000; l++) {
+
+ for(int r = 0; r < ra.length; r++) {
+ ra[r] = rnd.nextLong();
+ }
+ test(ra, bs);
+ }
+ }
+
+ static void test(long[] ra, BitSet bs) {
+ bs.clear();
+ int bits_set = 0;
+ for(int i = 0, t = 0, b = 0; i < NBITS; i++) {
+ long bit = 1L << b++;
+ if((ra[t]&bit) != 0) {
+ bs.set(i);
+ bits_set++;
+ }
+ if(b == 64) {
+ t++;
+ b = 0;
+ }
+ }
+ // Test Long.bitCount()
+ int check_bits = bs.cardinality();
+ if (check_bits != bits_set) {
+ String bs_str = bs.toString();
+ System.err.printf("cardinality bits: %d != %d bs: %s\n", check_bits, bits_set, bs_str);
+ System.exit(97);
+ }
+ // Test Long.numberOfTrailingZeros()
+ check_bits = 0;
+ for (int i = bs.nextSetBit(0); i >= 0; i = bs.nextSetBit(i+1)) {
+ check_bits++;
+ }
+ if (check_bits != bits_set) {
+ String bs_str = bs.toString();
+ System.err.printf("nextSetBit bits: %d != %d bs: %s\n", check_bits, bits_set, bs_str);
+ System.exit(97);
+ }
+ // Test Long.numberOfLeadingZeros()
+ for(int i = bs.length(); i > 0; i = bs.length()) {
+ bs.clear(i-1);
+ }
+ // Test Long.bitCount()
+ check_bits = bs.cardinality();
+ if (check_bits != 0) {
+ String bs_str = bs.toString();
+ System.err.printf("after clear bits: %d != 0 bs: %s\n", check_bits, bs_str);
+ System.exit(97);
+ }
+ }
+
+};
diff --git a/hotspot/test/compiler/7103261/Test7103261.java b/hotspot/test/compiler/7103261/Test7103261.java
new file mode 100644
index 0000000..3abdb87
--- /dev/null
+++ b/hotspot/test/compiler/7103261/Test7103261.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2011, 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 7103261
+ * @summary crash with jittester on sparc
+ *
+ * @run main Test7103261
+ */
+
+// exercise implicit null checking in the compiler for various field types
+public class Test7103261 {
+ static Test7103261 null_value;
+ static Test7103261 nonnull_value = new Test7103261();
+ static Test7103261 nonnull_value2 = new Test7103261();
+
+ long l;
+ int i;
+ float f;
+ double d;
+ byte b;
+ char c;
+ short s;
+ boolean z;
+
+ public static void main(String[] args) {
+ constantStore();
+ valueTest(false);
+ valueTest(true);
+ }
+ static void constantStore() {
+ for (int field = 0; field < 8; field++) {
+ try {
+ Test7103261 o = nonnull_value;
+ for (int i = 0; i < 100000; i++) {
+ switch (field) {
+ case 0: o.l = 0; break;
+ case 1: o.i = 0; break;
+ case 2: o.f = 0; break;
+ case 3: o.d = 0; break;
+ case 4: o.b = 0; break;
+ case 5: o.c = 0; break;
+ case 6: o.s = 0; break;
+ case 7: o.z = false; break;
+ default: throw new InternalError();
+ }
+ if (i == 90000) {
+ // hide nullness from optimizer
+ o = null_value;
+ }
+ }
+ } catch (NullPointerException npe) {
+ }
+ }
+ }
+ static void valueTest(boolean store) {
+ for (int field = 0; field < 8; field++) {
+ try {
+ Test7103261 o = nonnull_value;
+ Test7103261 o2 = nonnull_value2;
+ for (int i = 0; i < 100000; i++) {
+ switch (field) {
+ case 0: o.l = o2.l; break;
+ case 1: o.i = o2.i; break;
+ case 2: o.f = o2.f; break;
+ case 3: o.d = o2.d; break;
+ case 4: o.b = o2.b; break;
+ case 5: o.c = o2.c; break;
+ case 6: o.s = o2.s; break;
+ case 7: o.z = o2.z; break;
+ default: throw new InternalError();
+ }
+ if (i == 90000) {
+ // hide nullness from optimizer
+ if (store)
+ o = null_value;
+ else
+ o2 = null_value;
+ }
+ }
+ } catch (NullPointerException npe) {
+ }
+ }
+ }
+}
diff --git a/hotspot/test/runtime/7100935/TestConjointAtomicArraycopy.java b/hotspot/test/runtime/7100935/TestConjointAtomicArraycopy.java
new file mode 100644
index 0000000..3e17118
--- /dev/null
+++ b/hotspot/test/runtime/7100935/TestConjointAtomicArraycopy.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2011 SAP AG. 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 TestConjointAtomicArraycopy
+ * @bug 7100935
+ * @summary verify that oops are copied element-wise atomic
+ * @run main/othervm -Xint TestConjointAtomicArraycopy
+ * @run main/othervm -Xcomp -Xbatch TestConjointAtomicArraycopy
+ * @author axel.siebenborn at sap.com
+ */
+
+public class TestConjointAtomicArraycopy {
+
+ static volatile Object [] testArray = new Object [4];
+
+ static short[] a1 = new short[8];
+ static short[] a2 = new short[8];
+ static short[] a3 = new short[8];
+
+ static volatile boolean keepRunning = true;
+
+ static void testOopsCopy() throws InterruptedException{
+
+ }
+
+ public static void main(String[] args ) throws InterruptedException{
+ for (int i = 0; i < testArray.length; i++){
+ testArray[i] = new String("A");
+ }
+
+ Thread writer = new Thread (new Runnable(){
+ public void run(){
+ for (int i = 0 ; i < 1000000; i++) {
+ System.arraycopy(testArray, 1, testArray, 0, 3);
+ testArray[2] = new String("a");
+ }
+ }
+ });
+
+ Thread reader = new Thread( new Runnable(){
+ public void run(){
+ while (keepRunning){
+ String name = testArray[2].getClass().getName();
+ if(!(name.endsWith("String"))){
+ throw new RuntimeException("got wrong class name");
+ }
+ }
+ }
+ });
+ keepRunning = true;
+ reader.start();
+ writer.start();
+ writer.join();
+ keepRunning = false;
+ reader.join();
+ }
+}
diff --git a/hotspot/test/runtime/7100935/TestShortArraycopy.java b/hotspot/test/runtime/7100935/TestShortArraycopy.java
new file mode 100644
index 0000000..81b0489
--- /dev/null
+++ b/hotspot/test/runtime/7100935/TestShortArraycopy.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2011 SAP AG. 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 TestShortArraycopy
+ * @bug 7100935
+ * @summary verify that shorts are copied element-wise atomic.
+ * @run main/othervm -Xint TestShortArraycopy
+ * @run main/othervm -Xcomp -Xbatch TestShortArraycopy
+ * @author volker.simonis at gmail.com
+ */
+
+public class TestShortArraycopy {
+
+ static short[] a1 = new short[8];
+ static short[] a2 = new short[8];
+ static short[] a3 = new short[8];
+
+ static volatile boolean keepRunning = true;
+
+ public static void main(String[] args) throws InterruptedException {
+
+ for (int i = 0; i < a1.length ; i++) {
+ a1[i] = (short)0xffff;
+ a2[i] = (short)0xffff;
+ a3[i] = (short)0x0000;
+ }
+ Thread reader = new Thread() {
+ public void run() {
+ while (keepRunning) {
+ for (int j = 0; j < a1.length; j++) {
+ short s = a1[j];
+ if (s != (short)0xffff && s != (short)0x0000) {
+ System.out.println("Error: s = " + s);
+ throw new RuntimeException("wrong result");
+
+ }
+ }
+ }
+ }
+ };
+ Thread writer = new Thread() {
+ public void run() {
+ for (int i = 0; i < 1000000; i++) {
+ System.arraycopy(a2, 5, a1, 3, 3);
+ System.arraycopy(a3, 5, a1, 3, 3);
+ }
+ }
+ };
+ keepRunning = true;
+ reader.start();
+ writer.start();
+ writer.join();
+ keepRunning = false;
+ reader.join();
+ }
+}
diff --git a/jaxp/.hg/cache/branchheads b/jaxp/.hg/cache/branchheads
index f756663..616779d 100644
--- a/jaxp/.hg/cache/branchheads
+++ b/jaxp/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-3545c3f8512c1a1b143f880f7ed157bacba51c43 271
-3545c3f8512c1a1b143f880f7ed157bacba51c43 default
+2c65e16432b366631ffe11021c9d3798708ae4d0 283
+2c65e16432b366631ffe11021c9d3798708ae4d0 default
diff --git a/jaxp/.hg/dirstate b/jaxp/.hg/dirstate
index e7067b5..a4dd829 100644
Binary files a/jaxp/.hg/dirstate and b/jaxp/.hg/dirstate differ
diff --git a/jaxp/.hg/store/00changelog.i b/jaxp/.hg/store/00changelog.i
index 0ee80e6..d5bbadb 100644
Binary files a/jaxp/.hg/store/00changelog.i and b/jaxp/.hg/store/00changelog.i differ
diff --git a/jaxp/.hg/store/00manifest.i b/jaxp/.hg/store/00manifest.i
index 9749db2..24d9d03 100644
Binary files a/jaxp/.hg/store/00manifest.i and b/jaxp/.hg/store/00manifest.i differ
diff --git a/jaxp/.hg/store/data/~2ehgtags.i b/jaxp/.hg/store/data/~2ehgtags.i
index f2fd9e9..2b41291 100644
Binary files a/jaxp/.hg/store/data/~2ehgtags.i and b/jaxp/.hg/store/data/~2ehgtags.i differ
diff --git a/jaxp/.hg/store/undo b/jaxp/.hg/store/undo
index 363abd7..3394600 100644
Binary files a/jaxp/.hg/store/undo and b/jaxp/.hg/store/undo differ
diff --git a/jaxp/.hg/undo.desc b/jaxp/.hg/undo.desc
index 36858f6..137cf46 100644
--- a/jaxp/.hg/undo.desc
+++ b/jaxp/.hg/undo.desc
@@ -1,3 +1,3 @@
-263
+272
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/jaxp
diff --git a/jaxp/.hg/undo.dirstate b/jaxp/.hg/undo.dirstate
index 64a8045..e7067b5 100644
Binary files a/jaxp/.hg/undo.dirstate and b/jaxp/.hg/undo.dirstate differ
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 6f52fcb..343fe31 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -136,3 +136,9 @@ ff0a3d78e7a22743eabbaa71e9d17b2f094ddf62 jdk8-b05
d7b8192e7277c49b9c702f4c4fd99bd83ba947ea jdk8-b06
c114306576dcc1cb871a48058b41bf7d87ce882a jdk8-b07
de4794dd69c48b08029d158a972993ff9d5627df jdk8-b08
+93554324c014282571aeeb48552ad00d3fedb089 jdk8-b09
+d21a4d5141c04bc9e88f2c0253121d449b66d667 jdk8-b10
+d1b7a4f6dd2065fdeafbcdfd9dcc0072da8c6881 jdk8-b11
+ca977d167697a561c04894187fc1c4d927582ffa jdk8-b12
+bcc739229f6384786c7ac0b52c1822c85674dcf1 jdk8-b13
+9d0c9d638757cb09de18933b946fa04b4f3fb94f jdk8-b14
diff --git a/jaxws/.hg/cache/branchheads b/jaxws/.hg/cache/branchheads
index 58b2c73..2b3295a 100644
--- a/jaxws/.hg/cache/branchheads
+++ b/jaxws/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-6b9c80bc1e2a2de0eee7facbad62eafd83ced0fd 266
-6b9c80bc1e2a2de0eee7facbad62eafd83ced0fd default
+59f5ae0f3ff1610dd97ab5e948e3fbd01ea483ae 280
+59f5ae0f3ff1610dd97ab5e948e3fbd01ea483ae default
diff --git a/jaxws/.hg/dirstate b/jaxws/.hg/dirstate
index 25bb203..c2a405a 100644
Binary files a/jaxws/.hg/dirstate and b/jaxws/.hg/dirstate differ
diff --git a/jaxws/.hg/store/00changelog.d b/jaxws/.hg/store/00changelog.d
index 2b7029b..6968c2d 100644
Binary files a/jaxws/.hg/store/00changelog.d and b/jaxws/.hg/store/00changelog.d differ
diff --git a/jaxws/.hg/store/00changelog.i b/jaxws/.hg/store/00changelog.i
index fd0495a..81f4fc1 100644
Binary files a/jaxws/.hg/store/00changelog.i and b/jaxws/.hg/store/00changelog.i differ
diff --git a/jaxws/.hg/store/00manifest.d b/jaxws/.hg/store/00manifest.d
index f9a4d66..45c898a 100644
Binary files a/jaxws/.hg/store/00manifest.d and b/jaxws/.hg/store/00manifest.d differ
diff --git a/jaxws/.hg/store/00manifest.i b/jaxws/.hg/store/00manifest.i
index d8fac2a..d2a6d5a 100644
Binary files a/jaxws/.hg/store/00manifest.i and b/jaxws/.hg/store/00manifest.i differ
diff --git a/jaxws/.hg/store/data/jaxws.properties.i b/jaxws/.hg/store/data/jaxws.properties.i
index 1e34b68..a0a0c9b 100644
Binary files a/jaxws/.hg/store/data/jaxws.properties.i and b/jaxws/.hg/store/data/jaxws.properties.i differ
diff --git a/jaxws/.hg/store/data/~2ehgtags.i b/jaxws/.hg/store/data/~2ehgtags.i
index bd632f8..825a11b 100644
Binary files a/jaxws/.hg/store/data/~2ehgtags.i and b/jaxws/.hg/store/data/~2ehgtags.i differ
diff --git a/jaxws/.hg/store/undo b/jaxws/.hg/store/undo
index aa76847..0a19dc0 100644
Binary files a/jaxws/.hg/store/undo and b/jaxws/.hg/store/undo differ
diff --git a/jaxws/.hg/undo.desc b/jaxws/.hg/undo.desc
index 6c4d873..4a14a1f 100644
--- a/jaxws/.hg/undo.desc
+++ b/jaxws/.hg/undo.desc
@@ -1,3 +1,3 @@
-258
+267
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/jaxws
diff --git a/jaxws/.hg/undo.dirstate b/jaxws/.hg/undo.dirstate
index ab1b9d2..25bb203 100644
Binary files a/jaxws/.hg/undo.dirstate and b/jaxws/.hg/undo.dirstate differ
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 59f6a2e..be29238 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -136,3 +136,9 @@ d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
acffff22a9465005e8eb206224fae9f2ea4fd469 jdk8-b06
134b0debf7b04fe6e317394b04b8e7a4a0181b1b jdk8-b07
1c9d4f59acf8f71477473c170239b43b2c9dee24 jdk8-b08
+70172e57cf29efe271b068987eefb601c2a77780 jdk8-b09
+8e7fdc8e3c758644ca6d0fd70bb255e9d2e64cda jdk8-b10
+a12ab897a249feb7859a6e6cd84b49411f4c06ac jdk8-b11
+e6eed2ff5d5f62bdc815beb5276d23347600c760 jdk8-b12
+adf2a6b5fde14090beb9ebc40c4114132ddee731 jdk8-b13
+54c4bf4b83ecc191351747d5d28da849d34c0243 jdk8-b14
diff --git a/jaxws/jaxws.properties b/jaxws/jaxws.properties
index bd6e153..f3952bb 100644
--- a/jaxws/jaxws.properties
+++ b/jaxws/jaxws.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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
@@ -25,15 +25,15 @@
drops.master.copy.base=${drops.dir}
-jaxws_src.bundle.name=jdk7-jaxws2_2_4-b03-2011_05_27.zip
-jaxws_src.bundle.md5.checksum=2f5b829ade70f67fe272d0b322e3e702
+jaxws_src.bundle.name=jdk8-jaxws2_2_4-b01-2011_07_22.zip
+jaxws_src.bundle.md5.checksum=f64bedd3c512e6b1ca265fda2feb0905
jaxws_src.master.bundle.dir=${drops.master.copy.base}
-jaxws_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7
+jaxws_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8
-jaf_src.bundle.name=jdk7-jaf-2010_08_19.zip
+jaf_src.bundle.name=jdk8-jaf-2011_07_22.zip
jaf_src.bundle.md5.checksum=18d15dfd71117daadb332af003d08212
jaf_src.master.bundle.dir=${drops.master.copy.base}
-jaf_src.master.bundle.url.base=https://java.net/downloads/jax-ws/JDK7
+jaf_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8
#jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip
#jaxws_tests.master.bundle.dir=${drops.master.copy.base}
diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index 6412cf7..38c363d 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-960eb03d12700845bef706069fdfa642923af449 4867
-960eb03d12700845bef706069fdfa642923af449 default
+807e450b0e1c810720e6be6abc3ebe017e92578e 4996
+807e450b0e1c810720e6be6abc3ebe017e92578e default
diff --git a/jdk/.hg/dirstate b/jdk/.hg/dirstate
index e6cccfe..40df47d 100644
Binary files a/jdk/.hg/dirstate and b/jdk/.hg/dirstate differ
diff --git a/jdk/.hg/store/00changelog.d b/jdk/.hg/store/00changelog.d
index 2badd11..5387a3b 100644
Binary files a/jdk/.hg/store/00changelog.d and b/jdk/.hg/store/00changelog.d differ
diff --git a/jdk/.hg/store/00changelog.i b/jdk/.hg/store/00changelog.i
index 514ccf2..4b6d449 100644
Binary files a/jdk/.hg/store/00changelog.i and b/jdk/.hg/store/00changelog.i differ
diff --git a/jdk/.hg/store/00manifest.d b/jdk/.hg/store/00manifest.d
index 2507d3a..cc0c951 100644
Binary files a/jdk/.hg/store/00manifest.d and b/jdk/.hg/store/00manifest.d differ
diff --git a/jdk/.hg/store/00manifest.i b/jdk/.hg/store/00manifest.i
index dd3975f..cc90698 100644
Binary files a/jdk/.hg/store/00manifest.i and b/jdk/.hg/store/00manifest.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/org/apache/xml/_makefile.i b/jdk/.hg/store/data/make/com/sun/org/apache/xml/_makefile.i
index daf87c0..585a3c0 100644
Binary files a/jdk/.hg/store/data/make/com/sun/org/apache/xml/_makefile.i and b/jdk/.hg/store/data/make/com/sun/org/apache/xml/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/security/auth/module/_makefile.i b/jdk/.hg/store/data/make/com/sun/security/auth/module/_makefile.i
index c89266c..9e3a6d1 100644
Binary files a/jdk/.hg/store/data/make/com/sun/security/auth/module/_makefile.i and b/jdk/.hg/store/data/make/com/sun/security/auth/module/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/common/_build_native_packages.gmk.i b/jdk/.hg/store/data/make/common/_build_native_packages.gmk.i
index 363aa81..3f5def6 100644
Binary files a/jdk/.hg/store/data/make/common/_build_native_packages.gmk.i and b/jdk/.hg/store/data/make/common/_build_native_packages.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs-linux.gmk.i b/jdk/.hg/store/data/make/common/_defs-linux.gmk.i
index 2474700..7396ecb 100644
Binary files a/jdk/.hg/store/data/make/common/_defs-linux.gmk.i and b/jdk/.hg/store/data/make/common/_defs-linux.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i b/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i
index f739cce..ece4e46 100644
Binary files a/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i and b/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs.gmk.i b/jdk/.hg/store/data/make/common/_defs.gmk.i
index 0d56e54..e0b1874 100644
Binary files a/jdk/.hg/store/data/make/common/_defs.gmk.i and b/jdk/.hg/store/data/make/common/_defs.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_demo.gmk.i b/jdk/.hg/store/data/make/common/_demo.gmk.i
index b7468ee..a9ff488 100644
Binary files a/jdk/.hg/store/data/make/common/_demo.gmk.i and b/jdk/.hg/store/data/make/common/_demo.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_library.gmk.i b/jdk/.hg/store/data/make/common/_library.gmk.i
index b99d452..0503fcf 100644
Binary files a/jdk/.hg/store/data/make/common/_library.gmk.i and b/jdk/.hg/store/data/make/common/_library.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i b/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i
index ea09fd9..d2951cb 100644
Binary files a/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i and b/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/java/_makefile.i b/jdk/.hg/store/data/make/java/java/_makefile.i
index 8f332ce..2ad4312 100644
Binary files a/jdk/.hg/store/data/make/java/java/_makefile.i and b/jdk/.hg/store/data/make/java/java/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/java/mapfile-vers.i b/jdk/.hg/store/data/make/java/java/mapfile-vers.i
index 2cc7930..a5334d2 100644
Binary files a/jdk/.hg/store/data/make/java/java/mapfile-vers.i and b/jdk/.hg/store/data/make/java/java/mapfile-vers.i differ
diff --git a/jdk/.hg/store/data/make/java/nio/_f_i_l_e_s__java.gmk.i b/jdk/.hg/store/data/make/java/nio/_f_i_l_e_s__java.gmk.i
index 6e56457..84ecf15 100644
Binary files a/jdk/.hg/store/data/make/java/nio/_f_i_l_e_s__java.gmk.i and b/jdk/.hg/store/data/make/java/nio/_f_i_l_e_s__java.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/security/_makefile.i b/jdk/.hg/store/data/make/java/security/_makefile.i
index 322ad3d..d31ffa9 100644
Binary files a/jdk/.hg/store/data/make/java/security/_makefile.i and b/jdk/.hg/store/data/make/java/security/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/javax/_makefile.i b/jdk/.hg/store/data/make/javax/_makefile.i
index f6cfcae..fb8e02e 100644
Binary files a/jdk/.hg/store/data/make/javax/_makefile.i and b/jdk/.hg/store/data/make/javax/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/javax/others/_makefile.i b/jdk/.hg/store/data/make/javax/others/_makefile.i
index 9373cae..822f9af 100644
Binary files a/jdk/.hg/store/data/make/javax/others/_makefile.i and b/jdk/.hg/store/data/make/javax/others/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/javax/security/_makefile.i b/jdk/.hg/store/data/make/javax/security/_makefile.i
new file mode 100644
index 0000000..1331388
Binary files /dev/null and b/jdk/.hg/store/data/make/javax/security/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/modules/_makefile.i b/jdk/.hg/store/data/make/modules/_makefile.i
index 7141399..39b806d 100644
Binary files a/jdk/.hg/store/data/make/modules/_makefile.i and b/jdk/.hg/store/data/make/modules/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/modules/jdk.depconfig.i b/jdk/.hg/store/data/make/modules/jdk.depconfig.i
new file mode 100644
index 0000000..1ef9c57
Binary files /dev/null and b/jdk/.hg/store/data/make/modules/jdk.depconfig.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.config.i b/jdk/.hg/store/data/make/modules/modules.config.i
index ce79a36..6e65ea3 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.config.i and b/jdk/.hg/store/data/make/modules/modules.config.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.group.i b/jdk/.hg/store/data/make/modules/modules.group.i
index 68ba5a8..ceb34f2 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.group.i and b/jdk/.hg/store/data/make/modules/modules.group.i differ
diff --git a/jdk/.hg/store/data/make/modules/optional.depconfig.i b/jdk/.hg/store/data/make/modules/optional.depconfig.i
index 430bf5f..323c9eb 100644
Binary files a/jdk/.hg/store/data/make/modules/optional.depconfig.i and b/jdk/.hg/store/data/make/modules/optional.depconfig.i differ
diff --git a/jdk/.hg/store/data/make/org/ietf/jgss/_makefile.i b/jdk/.hg/store/data/make/org/ietf/jgss/_makefile.i
index 6fb9b9d..1371b9b 100644
Binary files a/jdk/.hg/store/data/make/org/ietf/jgss/_makefile.i and b/jdk/.hg/store/data/make/org/ietf/jgss/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/_v_e_r_s_i_o_n.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/_v_e_r_s_i_o_n.i
index 2e732fb..ee8f422 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/_v_e_r_s_i_o_n.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/_v_e_r_s_i_o_n.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/asia.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/asia.i
index 947a027..fe200aa 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/asia.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/asia.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/australasia.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/australasia.i
index 3c8adfd..dcc907d 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/australasia.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/australasia.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/europe.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/europe.i
index ac221f8..1bf1802 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/europe.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/europe.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/northamerica.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/northamerica.i
index eb63bed..4b223fc 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/northamerica.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/northamerica.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/southamerica.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/southamerica.i
index 5ac5a69..17f2ad7 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/southamerica.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/southamerica.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/zone.tab.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/zone.tab.i
index 68e9b4e..a028093 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/zone.tab.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/zone.tab.i differ
diff --git a/jdk/.hg/store/data/make/sun/net/_makefile.i b/jdk/.hg/store/data/make/sun/net/_makefile.i
index a01cb50..36c0437 100644
Binary files a/jdk/.hg/store/data/make/sun/net/_makefile.i and b/jdk/.hg/store/data/make/sun/net/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/rmi/rmi/_makefile.i b/jdk/.hg/store/data/make/sun/rmi/rmi/_makefile.i
index 6743544..2ace872 100644
Binary files a/jdk/.hg/store/data/make/sun/rmi/rmi/_makefile.i and b/jdk/.hg/store/data/make/sun/rmi/rmi/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/ec/_makefile.i b/jdk/.hg/store/data/make/sun/security/ec/_makefile.i
index 42dd880..8dfb982 100644
Binary files a/jdk/.hg/store/data/make/sun/security/ec/_makefile.i and b/jdk/.hg/store/data/make/sun/security/ec/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/jgss/wrapper/_makefile.i b/jdk/.hg/store/data/make/sun/security/jgss/wrapper/_makefile.i
index ab055ed..926b073 100644
Binary files a/jdk/.hg/store/data/make/sun/security/jgss/wrapper/_makefile.i and b/jdk/.hg/store/data/make/sun/security/jgss/wrapper/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/krb5/_makefile.i b/jdk/.hg/store/data/make/sun/security/krb5/_makefile.i
index 5a2c765..6e09158 100644
Binary files a/jdk/.hg/store/data/make/sun/security/krb5/_makefile.i and b/jdk/.hg/store/data/make/sun/security/krb5/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/mscapi/_makefile.i b/jdk/.hg/store/data/make/sun/security/mscapi/_makefile.i
index 4614f47..3c5bc3a 100644
Binary files a/jdk/.hg/store/data/make/sun/security/mscapi/_makefile.i and b/jdk/.hg/store/data/make/sun/security/mscapi/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/other/_makefile.i b/jdk/.hg/store/data/make/sun/security/other/_makefile.i
index 14a94d1..238301d 100644
Binary files a/jdk/.hg/store/data/make/sun/security/other/_makefile.i and b/jdk/.hg/store/data/make/sun/security/other/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i b/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i
index 867b87f..c0c6f82 100644
Binary files a/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i and b/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/smartcardio/_makefile.i b/jdk/.hg/store/data/make/sun/security/smartcardio/_makefile.i
index 5dedf2b..37db8b1 100644
Binary files a/jdk/.hg/store/data/make/sun/security/smartcardio/_makefile.i and b/jdk/.hg/store/data/make/sun/security/smartcardio/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_modularizer.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_modularizer.java.i
index a7d4ca3..a8a3464 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_modularizer.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_modularizer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_connection.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_connection.java.i
index 2c88e65..04b84e4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_connection.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_connection.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/_https_u_r_l_connection.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/_https_u_r_l_connection.java.i
index 115026f..dec99b1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/_https_u_r_l_connection.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/_https_u_r_l_connection.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/_init.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/_init.java.i
index a214cd2..99e4f6b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/_init.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/_init.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_j_c_e_mapper.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_j_c_e_mapper.java.i
index 1f14e3e..d5e3a52 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_j_c_e_mapper.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_j_c_e_mapper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_message_digest_algorithm.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_message_digest_algorithm.java.i
index 9f0b5bf..2cea596 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_message_digest_algorithm.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_message_digest_algorithm.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_signature_algorithm.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_signature_algorithm.java.i
index 0b08624..9c23ca2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_signature_algorithm.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/_signature_algorithm.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/_canonicalizer.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/_canonicalizer.java.i
index 2b28be6..5596e33 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/_canonicalizer.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/_canonicalizer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/_canonicalizer_spi.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/_canonicalizer_spi.java.i
index 84905fc..9838edd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/_canonicalizer_spi.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/_canonicalizer_spi.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/_attr_compare.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/_attr_compare.java.i
index 32312f5..7a3a24b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/_attr_compare.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/_attr_compare.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer11.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer11.java.i
index ddd986f..7db171b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer11.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer11.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer20010315.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer20010315.java.i
index a0134bd..157ebad 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer20010315.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer20010315.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer20010315_excl.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer20010315_excl.java.i
index 1a36e60..933fde8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer20010315_excl.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer20010315_excl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer_base.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer_base.java.i
index 913494a..12f939a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer_base.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_canonicalizer_base.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_name_space_symb_table.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_name_space_symb_table.java.i
index 450a0b5..724974a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_name_space_symb_table.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_name_space_symb_table.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_utf_helpper.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_utf_helpper.java.i
index 83754eb..0e8d4d9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_utf_helpper.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/_utf_helpper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_agreement_method.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_agreement_method.java.i
index 98d9f8c..68be97b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_agreement_method.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_agreement_method.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_method.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_method.java.i
index d4ad626..37e8007 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_method.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_method.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_properties.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_properties.java.i
index 3f4a290..eb038b6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_properties.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_properties.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_property.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_property.java.i
index 102e8cd..271eaec 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_property.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_encryption_property.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_reference.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_reference.java.i
index 1a72035..ce22e2f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_reference.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_reference.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_reference_list.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_reference_list.java.i
index a46fc38..f35d175 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_reference_list.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_reference_list.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_x_m_l_cipher.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_x_m_l_cipher.java.i
index 5136e6a..12100e5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_x_m_l_cipher.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/_x_m_l_cipher.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/_key_info.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/_key_info.java.i
index 5fc58cd..6267bb4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/_key_info.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/_key_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/_key_resolver.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/_key_resolver.java.i
index bc552fb..95fbb72 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/_key_resolver.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/_key_resolver.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/_key_resolver_spi.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/_key_resolver_spi.java.i
index 519a895..f788e05 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/_key_resolver_spi.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/_key_resolver_spi.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/_storage_resolver.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/_storage_resolver.java.i
index efcca79..45aed55 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/_storage_resolver.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/_storage_resolver.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/_storage_resolver_spi.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/_storage_resolver_spi.java.i
index eb24d81..9e26120 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/_storage_resolver_spi.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/_storage_resolver_spi.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/_key_store_resolver.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/_key_store_resolver.java.i
index 17432c8..dc054a4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/_key_store_resolver.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/_key_store_resolver.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_manifest.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_manifest.java.i
index 3037e7b..ac4a697 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_manifest.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_manifest.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_reference.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_reference.java.i
index 4d45ddb..07106a6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_reference.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_reference.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_x_m_l_signature_input.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_x_m_l_signature_input.java.i
index 51002c3..c2c7a21 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_x_m_l_signature_input.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_x_m_l_signature_input.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_x_m_l_signature_input_debugger.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_x_m_l_signature_input_debugger.java.i
index 7931c0e..4f7d51c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_x_m_l_signature_input_debugger.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/_x_m_l_signature_input_debugger.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/_transform.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/_transform.java.i
index fc699c1..7402847 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/_transform.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/_transform.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/_transform_spi.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/_transform_spi.java.i
index 0b64636..92789fc 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/_transform_spi.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/_transform_spi.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/_func_here.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/_func_here.java.i
index ce7ab09..9a2970b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/_func_here.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/_func_here.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/_transform_x_s_l_t.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/_transform_x_s_l_t.java.i
index 70f055c..88937328 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/_transform_x_s_l_t.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/_transform_x_s_l_t.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/_inclusive_namespaces.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/_inclusive_namespaces.java.i
index c9d3a8e..ce31d2d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/_inclusive_namespaces.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/_inclusive_namespaces.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_cached_x_path_a_p_i_holder.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_cached_x_path_a_p_i_holder.java.i
index 9f0f50a..c9a4c2e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_cached_x_path_a_p_i_holder.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_cached_x_path_a_p_i_holder.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_cached_x_path_func_here_a_p_i.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_cached_x_path_func_here_a_p_i.java.i
index 7405041..7372e22 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_cached_x_path_func_here_a_p_i.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_cached_x_path_func_here_a_p_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_element_proxy.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_element_proxy.java.i
index 0ebd567..48f354c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_element_proxy.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_element_proxy.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_helper_node_list.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_helper_node_list.java.i
index 39b089f..2d9f1e1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_helper_node_list.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_helper_node_list.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_id_resolver.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_id_resolver.java.i
index bf83f60..2d9c6aa 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_id_resolver.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_id_resolver.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_unsync_buffered_output_stream.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_unsync_buffered_output_stream.java.i
index 4a2981f..a1eeac2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_unsync_buffered_output_stream.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_unsync_buffered_output_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_unsync_byte_array_output_stream.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_unsync_byte_array_output_stream.java.i
index 68b21be..11de91f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_unsync_byte_array_output_stream.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_unsync_byte_array_output_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_x_m_l_utils.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_x_m_l_utils.java.i
index 79c9729..d21bfcf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_x_m_l_utils.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/_x_m_l_utils.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/_resource_resolver.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/_resource_resolver.java.i
index 1ccf5b1..63f9015 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/_resource_resolver.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/_resource_resolver.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/_resource_resolver_spi.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/_resource_resolver_spi.java.i
index 3ba8182..7bb0582 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/_resource_resolver_spi.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/_resource_resolver_spi.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_krb5_login_module.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_krb5_login_module.java.i
index cd05020..8cd8bbe 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_krb5_login_module.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_krb5_login_module.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_a_w_t_key_stroke.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_a_w_t_key_stroke.java.i
index 11217e2..6d32342 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_a_w_t_key_stroke.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_a_w_t_key_stroke.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_input_stream.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_input_stream.java.i
index 79eee14..7aaded8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_input_stream.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_input_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_object_input_stream.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_object_input_stream.java.i
index 1ddab7a..31756be 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_object_input_stream.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_object_input_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_call_site.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_call_site.java.i
index 77f6b14..27d206f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_call_site.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_call_site.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_method_handle_impl.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_method_handle_impl.java.i
index 07a4cce..15fa261 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_method_handle_impl.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_method_handle_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_method_handle_natives.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_method_handle_natives.java.i
index 7ebf277..1c6d1cb 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_method_handle_natives.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/invoke/_method_handle_natives.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/ref/_reference.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/ref/_reference.java.i
index 24e0903..07a70ae 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/ref/_reference.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/ref/_reference.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_datagram_socket_impl.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_datagram_socket_impl.java.i
index 7f7a00f..bbea013 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_datagram_socket_impl.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_datagram_socket_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_socket_impl.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_socket_impl.java.i
index 03c788a..05c3d87 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_socket_impl.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_socket_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_datagram_socket.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_datagram_socket.java.i
index 24edabf..73be5aa 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_datagram_socket.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_datagram_socket.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_in_memory_cookie_store.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_in_memory_cookie_store.java.i
index 6acb81d..a1038e2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_in_memory_cookie_store.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_in_memory_cookie_store.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_inet_address.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_inet_address.java.i
index d79708b..26c2651 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_inet_address.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_inet_address.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_server_socket.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_server_socket.java.i
index 3a6e42f..9bba5fc 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_server_socket.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_server_socket.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/nio/charset/_charset.java.i b/jdk/.hg/store/data/src/share/classes/java/nio/charset/_charset.java.i
index 1db143b..4ab67b2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/nio/charset/_charset.java.i and b/jdk/.hg/store/data/src/share/classes/java/nio/charset/_charset.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/nio/file/_files.java.i b/jdk/.hg/store/data/src/share/classes/java/nio/file/_files.java.i
index a5bef3f..3e55a3a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/nio/file/_files.java.i and b/jdk/.hg/store/data/src/share/classes/java/nio/file/_files.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/security/_security.java.i b/jdk/.hg/store/data/src/share/classes/java/security/_security.java.i
index 748c679..2765501 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/security/_security.java.i and b/jdk/.hg/store/data/src/share/classes/java/security/_security.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/security/_signature.java.i b/jdk/.hg/store/data/src/share/classes/java/security/_signature.java.i
index 5cd6749..99bda71 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/security/_signature.java.i and b/jdk/.hg/store/data/src/share/classes/java/security/_signature.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/text/_break_iterator.java.i b/jdk/.hg/store/data/src/share/classes/java/text/_break_iterator.java.i
index c6725cf..9c47c39 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/text/_break_iterator.java.i and b/jdk/.hg/store/data/src/share/classes/java/text/_break_iterator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_collections.java.i b/jdk/.hg/store/data/src/share/classes/java/util/_collections.java.i
index e8c4601..ea84e64 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_collections.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/_collections.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_currency_data.properties.i b/jdk/.hg/store/data/src/share/classes/java/util/_currency_data.properties.i
index d28e807..22745b9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_currency_data.properties.i and b/jdk/.hg/store/data/src/share/classes/java/util/_currency_data.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_https_u_r_l_connection.java.i b/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_https_u_r_l_connection.java.i
index b77642b..d61559e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_https_u_r_l_connection.java.i and b/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_https_u_r_l_connection.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_s_s_l_engine.java.i b/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_s_s_l_engine.java.i
index 1e569ad..7331af4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_s_s_l_engine.java.i and b/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_s_s_l_engine.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/auth/_private_credential_permission.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/auth/_private_credential_permission.java.i
index d24ad65..cc24088 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/auth/_private_credential_permission.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/auth/_private_credential_permission.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/auth/_subject.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/auth/_subject.java.i
index 0d02189..1747550 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/auth/_subject.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/auth/_subject.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/auth/_subject_domain_combiner.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/auth/_subject_domain_combiner.java.i
index ca5b572..9cf4fba 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/auth/_subject_domain_combiner.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/auth/_subject_domain_combiner.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/auth/kerberos/_delegation_permission.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/auth/kerberos/_delegation_permission.java.i
index 27a9b5b..569ed22 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/auth/kerberos/_delegation_permission.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/auth/kerberos/_delegation_permission.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/auth/kerberos/_service_permission.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/auth/kerberos/_service_permission.java.i
index 9a99f1b..cd00a73 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/auth/kerberos/_service_permission.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/auth/kerberos/_service_permission.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/auth/login/_login_context.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/auth/login/_login_context.java.i
index 60b9840..681b5a2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/auth/login/_login_context.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/auth/login/_login_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/_x500_principal.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/_x500_principal.java.i
index 7ac50f7..e44d80d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/_x500_principal.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/_x500_principal.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_encoding_exception.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_encoding_exception.java.i
index 93e7f4a..0ed17ec 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_encoding_exception.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_encoding_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_exception.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_exception.java.i
index 0030670..037de16 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_exception.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_expired_exception.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_expired_exception.java.i
index 7af1582..0ae1592 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_expired_exception.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_expired_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_not_yet_valid_exception.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_not_yet_valid_exception.java.i
index 5142316..22c220c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_not_yet_valid_exception.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_not_yet_valid_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_parsing_exception.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_parsing_exception.java.i
index c653b4c..9b8da8f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_parsing_exception.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_certificate_parsing_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_x509_certificate.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_x509_certificate.java.i
index 7974260..e15a05f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/cert/_x509_certificate.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/cert/_x509_certificate.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/sasl/_sasl.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/sasl/_sasl.java.i
index 7bf414a..12ffd36 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/sasl/_sasl.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/sasl/_sasl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/smartcardio/_terminal_factory.java.i b/jdk/.hg/store/data/src/share/classes/javax/smartcardio/_terminal_factory.java.i
index d63643e..4604eaf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/smartcardio/_terminal_factory.java.i and b/jdk/.hg/store/data/src/share/classes/javax/smartcardio/_terminal_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/_buffer_strategy_paint_manager.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/_buffer_strategy_paint_manager.java.i
index 024e0d3..869fa00 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/_buffer_strategy_paint_manager.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/_buffer_strategy_paint_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/_j_table.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/_j_table.java.i
index b3304b0..7824eda 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/_j_table.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/_j_table.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/_j_tree.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/_j_tree.java.i
index 193346e..0a7cc81 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/_j_tree.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/_j_tree.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/text/_default_caret.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/text/_default_caret.java.i
index 923303f..f0a7c60 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/text/_default_caret.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/text/_default_caret.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/text/html/_h_t_m_l_document.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/text/html/_h_t_m_l_document.java.i
index 673734e..6c42a15 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/text/html/_h_t_m_l_document.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/text/html/_h_t_m_l_document.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_manifest.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_manifest.java.i
index 2a6d4fb..5c45d82 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_manifest.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_manifest.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i
new file mode 100644
index 0000000..eaaf69f
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_signer.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_signer.java.i
index da6b949..46fa716 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_signer.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_signer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_verifier.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_verifier.java.i
index 8f2e726..e76293b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_verifier.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_verifier.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_writer.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_writer.java.i
new file mode 100644
index 0000000..410c49f
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_module_file_writer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_signed_module.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_signed_module.java.i
index 622857a..d3ce519 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_signed_module.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_signed_module.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
index df2da6c..95678fc 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i
index e1fc613..0142e5e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_librarian.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i
index 26bc821..03a3d65 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_signer.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_signer.java.i
index f06ac18..6e9106a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_signer.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_signer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/awt/image/_off_screen_image_source.java.i b/jdk/.hg/store/data/src/share/classes/sun/awt/image/_off_screen_image_source.java.i
index 63fc52b..c2d665d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/awt/image/_off_screen_image_source.java.i and b/jdk/.hg/store/data/src/share/classes/sun/awt/image/_off_screen_image_source.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/misc/_v_m.java.i b/jdk/.hg/store/data/src/share/classes/sun/misc/_v_m.java.i
index 54b4b2d..caa7197 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/misc/_v_m.java.i and b/jdk/.hg/store/data/src/share/classes/sun/misc/_v_m.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/net/_resource_manager.java.i b/jdk/.hg/store/data/src/share/classes/sun/net/_resource_manager.java.i
index defec86..8a34482 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/net/_resource_manager.java.i and b/jdk/.hg/store/data/src/share/classes/sun/net/_resource_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/net/www/protocol/http/_http_u_r_l_connection.java.i b/jdk/.hg/store/data/src/share/classes/sun/net/www/protocol/http/_http_u_r_l_connection.java.i
index 60a7627..0593029 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/net/www/protocol/http/_http_u_r_l_connection.java.i and b/jdk/.hg/store/data/src/share/classes/sun/net/www/protocol/http/_http_u_r_l_connection.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_util.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_util.java.i
index db0780e..f04beab 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_util.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_util.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/cs/_c_e_s_u__8.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/cs/_c_e_s_u__8.java.i
new file mode 100644
index 0000000..216478a
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/sun/nio/cs/_c_e_s_u__8.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/cs/_u_t_f__8.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/cs/_u_t_f__8.java.i
index d99891e..42e87dc 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/cs/_u_t_f__8.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/cs/_u_t_f__8.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/cs/standard-charsets.i b/jdk/.hg/store/data/src/share/classes/sun/nio/cs/standard-charsets.i
index 2a28f8c..e545f06 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/cs/standard-charsets.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/cs/standard-charsets.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/print/_p_s_printer_job.java.i b/jdk/.hg/store/data/src/share/classes/sun/print/_p_s_printer_job.java.i
index 5297a86..1be423d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/print/_p_s_printer_job.java.i and b/jdk/.hg/store/data/src/share/classes/sun/print/_p_s_printer_job.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/registry/_registry_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/registry/_registry_impl.java.i
index 52e16d2..c9932b2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/registry/_registry_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/registry/_registry_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_loader_handler.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_loader_handler.java.i
index 64fc919..39300ad 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_loader_handler.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_loader_handler.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_marshal_input_stream.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_marshal_input_stream.java.i
index 0bdff18..25fdfd0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_marshal_input_stream.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_marshal_input_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_server_ref.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_server_ref.java.i
index 481df34..25a99cc 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_server_ref.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_server_ref.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ec/_e_c_public_key_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ec/_e_c_public_key_impl.java.i
index 32b00d8..07dba17 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ec/_e_c_public_key_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ec/_e_c_public_key_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_accept_sec_context_token.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_accept_sec_context_token.java.i
index 31a377b..4e63314 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_accept_sec_context_token.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_accept_sec_context_token.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_init_sec_context_token.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_init_sec_context_token.java.i
index 6a06f6e..55abc32 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_init_sec_context_token.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_init_sec_context_token.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_krb5_context.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_krb5_context.java.i
index d8f947f..f99b495 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_krb5_context.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_krb5_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_message_token__v2.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_message_token__v2.java.i
index b0b8ad9..a6ead84 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_message_token__v2.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/jgss/krb5/_message_token__v2.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_krb_as_req_builder.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_krb_as_req_builder.java.i
index 4e6cce9..f5c85bd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_krb_as_req_builder.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_krb_as_req_builder.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_p_k_c_s7.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_p_k_c_s7.java.i
index 83373c6..99ee401 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_p_k_c_s7.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_p_k_c_s7.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_signer_info.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_signer_info.java.i
index 1ee7ae6..3df2bd4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_signer_info.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_signer_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs10/_p_k_c_s10.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs10/_p_k_c_s10.java.i
new file mode 100644
index 0000000..6c5afd7
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs10/_p_k_c_s10.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs10/_p_k_c_s10_attribute.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs10/_p_k_c_s10_attribute.java.i
new file mode 100644
index 0000000..31c3440
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs10/_p_k_c_s10_attribute.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs10/_p_k_c_s10_attributes.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs10/_p_k_c_s10_attributes.java.i
new file mode 100644
index 0000000..9dfad82
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs10/_p_k_c_s10_attributes.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_config.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_config.java.i
index 27feca5..9706048 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_config.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_config.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_key_cache.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_key_cache.java.i
index ce82c21..68a6df1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_key_cache.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_key_cache.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_e_c_key_factory.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_e_c_key_factory.java.i
index 299664f..510622b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_e_c_key_factory.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_e_c_key_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_key.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_key.java.i
index 656953d..d224b61 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_key.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_key.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_sun_p_k_c_s11.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_sun_p_k_c_s11.java.i
index 258b685..4f31841 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_sun_p_k_c_s11.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_sun_p_k_c_s11.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/_x509_factory.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/_x509_factory.java.i
index a46d446..54aee41 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/_x509_factory.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/_x509_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_cert_store_helper.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_cert_store_helper.java.i
index 06b09c6..9a39ebf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_cert_store_helper.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_cert_store_helper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_u_r_i_cert_store.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_u_r_i_cert_store.java.i
index 7a1d668..69c126e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_u_r_i_cert_store.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_u_r_i_cert_store.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_x509_certificate_pair.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_x509_certificate_pair.java.i
index bf4eec5..d7f9ce1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_x509_certificate_pair.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_x509_certificate_pair.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ldap/_l_d_a_p_cert_store.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ldap/_l_d_a_p_cert_store.java.i
index 888d25e..d692963 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ldap/_l_d_a_p_cert_store.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ldap/_l_d_a_p_cert_store.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ldap/_l_d_a_p_cert_store_helper.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ldap/_l_d_a_p_cert_store_helper.java.i
index 290854d..b4f5d68 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ldap/_l_d_a_p_cert_store_helper.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ldap/_l_d_a_p_cert_store_helper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ssl/_s_s_l_server_cert_store.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ssl/_s_s_l_server_cert_store.java.i
new file mode 100644
index 0000000..e2f2037
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ssl/_s_s_l_server_cert_store.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ssl/_s_s_l_server_cert_store_helper.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ssl/_s_s_l_server_cert_store_helper.java.i
new file mode 100644
index 0000000..6f126c1
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/ssl/_s_s_l_server_cert_store_helper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_app_output_stream.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_app_output_stream.java.i
index a6e7d6e..faba7c4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_app_output_stream.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_app_output_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_box.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_box.java.i
index ddf4f2c..88e79d5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_box.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_box.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_suite.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_suite.java.i
index aaec72c..f6c4959 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_suite.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_suite.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_engine_output_record.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_engine_output_record.java.i
index c0670bc..17976e2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_engine_output_record.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_engine_output_record.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_m_a_c.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_m_a_c.java.i
index e35fa36..3bf2330 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_m_a_c.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_m_a_c.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_record.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_record.java.i
index f5cb1ba..c7bdd4f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_record.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_record.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_engine_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_engine_impl.java.i
index 225248a..40e1305 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_engine_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_engine_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_session_context_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_session_context_impl.java.i
index d0f092e..799ae38 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_session_context_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_session_context_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_socket_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_socket_impl.java.i
index 5688acf..7d9142c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_socket_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_socket_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_http_timestamper.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_http_timestamper.java.i
index 6ed8f83..1fae9b9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_http_timestamper.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_http_timestamper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_t_s_request.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_t_s_request.java.i
index 50f3cd0..e5ee7dc 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_t_s_request.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_t_s_request.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_t_s_response.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_t_s_response.java.i
index a30e363..78b9058 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_t_s_response.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/timestamp/_t_s_response.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_cert_and_key_gen.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_cert_and_key_gen.java.i
new file mode 100644
index 0000000..e0abc4e
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_cert_and_key_gen.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_jar_signer.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_jar_signer.java.i
index 99dd28b..f7aa877 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_jar_signer.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_jar_signer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_key_tool.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_key_tool.java.i
index 68937a9..6a9e1f5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_key_tool.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_key_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_path_list.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_path_list.java.i
new file mode 100644
index 0000000..a7f53ef
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_path_list.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_timestamped_signer.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_timestamped_signer.java.i
index 16f7800..77acaea 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_timestamped_signer.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_timestamped_signer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/util/_cache.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/util/_cache.java.i
index ba31eba..d106ca6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/util/_cache.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/util/_cache.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/util/_signature_file_verifier.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/util/_signature_file_verifier.java.i
index 3307c34..eb89c78 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/util/_signature_file_verifier.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/util/_signature_file_verifier.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/validator/_p_k_i_x_validator.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/validator/_p_k_i_x_validator.java.i
index 8876e8d..4b7bbf5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/validator/_p_k_i_x_validator.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/validator/_p_k_i_x_validator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/validator/_simple_validator.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/validator/_simple_validator.java.i
index 61248b5..84a3e11 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/validator/_simple_validator.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/validator/_simple_validator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/x509/_x509_cert_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/x509/_x509_cert_impl.java.i
index 2590766..3438baa 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/x509/_x509_cert_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/x509/_x509_cert_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/swing/_swing_utilities2.java.i b/jdk/.hg/store/data/src/share/classes/sun/swing/_swing_utilities2.java.i
index 0c60162..756b87a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/swing/_swing_utilities2.java.i and b/jdk/.hg/store/data/src/share/classes/sun/swing/_swing_utilities2.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/text/resources/_collation_data__th.java.i b/jdk/.hg/store/data/src/share/classes/sun/text/resources/_collation_data__th.java.i
index 01f9d31..9df651f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/text/resources/_collation_data__th.java.i and b/jdk/.hg/store/data/src/share/classes/sun/text/resources/_collation_data__th.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/_locale_service_provider_pool.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/_locale_service_provider_pool.java.i
index 203b842..7b49ded 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/_locale_service_provider_pool.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/_locale_service_provider_pool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_calendar_data__lv.properties.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_calendar_data__lv.properties.i
index 0129589..4fd1295 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_calendar_data__lv.properties.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_calendar_data__lv.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names.java.i
index 9cc466d..05e8e61 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__de.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__de.java.i
index ad49fdd..8ab13ca 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__de.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__de.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__es.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__es.java.i
index bb93107..e3d639a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__es.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__es.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__fr.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__fr.java.i
index 08cf064..2066c01 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__fr.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__fr.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__it.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__it.java.i
index 5aabc1b..12757bb 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__it.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__it.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__ja.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__ja.java.i
index 7e78cfd..8ddfb11 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__ja.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__ja.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__ko.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__ko.java.i
index 3645baa..5d894f9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__ko.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__ko.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__pt___b_r.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__pt___b_r.java.i
index 227698e..1751a7c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__pt___b_r.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__pt___b_r.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__sv.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__sv.java.i
index 6a92ab8..992b963 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__sv.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__sv.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__zh___c_n.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__zh___c_n.java.i
index cef4aa3..d59468d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__zh___c_n.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__zh___c_n.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__zh___t_w.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__zh___t_w.java.i
index cd47725..331d201 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__zh___t_w.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_time_zone_names__zh___t_w.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/xml/_x_m_l_utils.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/xml/_x_m_l_utils.java.i
index 2f402fc..124ae5e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/xml/_x_m_l_utils.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/xml/_x_m_l_utils.java.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jfc/_transparent_ruler/_r_e_a_d_m_e.txt.i b/jdk/.hg/store/data/src/share/demo/jfc/_transparent_ruler/_r_e_a_d_m_e.txt.i
index a909ba9..4f0efcd 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jfc/_transparent_ruler/_r_e_a_d_m_e.txt.i and b/jdk/.hg/store/data/src/share/demo/jfc/_transparent_ruler/_r_e_a_d_m_e.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/javavm/export/jvm.h.i b/jdk/.hg/store/data/src/share/javavm/export/jvm.h.i
index df946d6..c0747ea 100644
Binary files a/jdk/.hg/store/data/src/share/javavm/export/jvm.h.i and b/jdk/.hg/store/data/src/share/javavm/export/jvm.h.i differ
diff --git a/jdk/.hg/store/data/src/share/lib/security/sunpkcs11-solaris.cfg.i b/jdk/.hg/store/data/src/share/lib/security/sunpkcs11-solaris.cfg.i
index ed8286e..de38dc6 100644
Binary files a/jdk/.hg/store/data/src/share/lib/security/sunpkcs11-solaris.cfg.i and b/jdk/.hg/store/data/src/share/lib/security/sunpkcs11-solaris.cfg.i differ
diff --git a/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/unpack.cpp.i b/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/unpack.cpp.i
index c070a99..0499f14 100644
Binary files a/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/unpack.cpp.i and b/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/unpack.cpp.i differ
diff --git a/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/utils.cpp.i b/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/utils.cpp.i
index f8e6498..b640bc9 100644
Binary files a/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/utils.cpp.i and b/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/utils.cpp.i differ
diff --git a/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/utils.h.i b/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/utils.h.i
index b47f2c6..e6bac2f 100644
Binary files a/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/utils.h.i and b/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/utils.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/common/jdk__util.c.i b/jdk/.hg/store/data/src/share/native/common/jdk__util.c.i
index 0fd330b..b39e357 100644
Binary files a/jdk/.hg/store/data/src/share/native/common/jdk__util.c.i and b/jdk/.hg/store/data/src/share/native/common/jdk__util.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/java/io/_object_input_stream.c.i b/jdk/.hg/store/data/src/share/native/java/io/_object_input_stream.c.i
index 551fa7d..ab22ec5 100644
Binary files a/jdk/.hg/store/data/src/share/native/java/io/_object_input_stream.c.i and b/jdk/.hg/store/data/src/share/native/java/io/_object_input_stream.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/java2d/loops/_transform_helper.c.i b/jdk/.hg/store/data/src/share/native/sun/java2d/loops/_transform_helper.c.i
index e62e0b5..f1a291f 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/java2d/loops/_transform_helper.c.i and b/jdk/.hg/store/data/src/share/native/sun/java2d/loops/_transform_helper.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/misc/_v_m.c.i b/jdk/.hg/store/data/src/share/native/sun/misc/_v_m.c.i
index 5cde1c3..be31f0f 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/misc/_v_m.c.i and b/jdk/.hg/store/data/src/share/native/sun/misc/_v_m.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__convert.c.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__convert.c.i
index 7a74c51..5bca16e 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__convert.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__convert.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__digest.c.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__digest.c.i
index 0620edd..f5935dc 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__digest.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__digest.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__dual.c.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__dual.c.i
index c2d5283..a5013bf 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__dual.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__dual.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__general.c.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__general.c.i
index 14d28e5..d215599 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__general.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__general.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__keymgmt.c.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__keymgmt.c.i
index e5ae8cf..edd5466 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__keymgmt.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__keymgmt.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__mutex.c.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__mutex.c.i
index 6bb53c8..9b89017 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__mutex.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__mutex.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__objmgmt.c.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__objmgmt.c.i
index 1d9698e..f015b20 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__objmgmt.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__objmgmt.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__sessmgmt.c.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__sessmgmt.c.i
index 572e062..f0ebca3 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__sessmgmt.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__sessmgmt.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__sign.c.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__sign.c.i
index 9bfe624..d66f1da 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__sign.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__sign.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__util.c.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__util.c.i
index b912d28..3a7f8c4 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__util.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/p11__util.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h.i b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h.i
index 0a60863..1cd66f4 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h.i and b/jdk/.hg/store/data/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h.i differ
diff --git a/jdk/.hg/store/data/src/solaris/bin/java__md.c.i b/jdk/.hg/store/data/src/solaris/bin/java__md.c.i
index 257c9e7..2aaa41d 100644
Binary files a/jdk/.hg/store/data/src/solaris/bin/java__md.c.i and b/jdk/.hg/store/data/src/solaris/bin/java__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_component_peer.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_component_peer.java.i
index 205f434..8044c91 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_component_peer.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_component_peer.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/generator/_wrapper_generator.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/generator/_wrapper_generator.java.i
index 7214af4..e8f627f 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/generator/_wrapper_generator.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/generator/_wrapper_generator.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_job.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_job.java.i
index 940230e..f5e6083 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_job.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_job.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_service_lookup.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_service_lookup.java.i
index 01c7ec8..d140cfd 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_service_lookup.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_service_lookup.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/util/_time_zone__md.c.i b/jdk/.hg/store/data/src/solaris/native/java/util/_time_zone__md.c.i
index 6cda672..52ddcd9 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/util/_time_zone__md.c.i and b/jdk/.hg/store/data/src/solaris/native/java/util/_time_zone__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/splashscreen/splashscreen__config.h.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/splashscreen/splashscreen__config.h.i
index 6f1ed8c..cbeb285 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/splashscreen/splashscreen__config.h.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/splashscreen/splashscreen__config.h.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/splashscreen/splashscreen__sys.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/splashscreen/splashscreen__sys.c.i
index 3919272..e193c48 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/splashscreen/splashscreen__sys.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/splashscreen/splashscreen__sys.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_solaris_constants.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_solaris_constants.c.i
index 47ce3b2..0eae208 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_solaris_constants.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_solaris_constants.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_unix_constants.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_unix_constants.c.i
index 4f5d51f..d9fefe2 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_unix_constants.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_unix_constants.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/j2secmod__md.c.i b/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/j2secmod__md.c.i
index 7c12986..31ec2ad 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/j2secmod__md.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/j2secmod__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/security/smartcardio/pcsc__md.c.i b/jdk/.hg/store/data/src/solaris/native/sun/security/smartcardio/pcsc__md.c.i
index 2df0efe..86510ae 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/security/smartcardio/pcsc__md.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/security/smartcardio/pcsc__md.c.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/java/lang/_process_impl.java.i b/jdk/.hg/store/data/src/windows/classes/java/lang/_process_impl.java.i
index ebd6681..fbd40d4 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/java/lang/_process_impl.java.i and b/jdk/.hg/store/data/src/windows/classes/java/lang/_process_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/java/net/_two_stacks_plain_datagram_socket_impl.java.i b/jdk/.hg/store/data/src/windows/classes/java/net/_two_stacks_plain_datagram_socket_impl.java.i
index 4d1aca1..206c33b 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/java/net/_two_stacks_plain_datagram_socket_impl.java.i and b/jdk/.hg/store/data/src/windows/classes/java/net/_two_stacks_plain_datagram_socket_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/java/net/_two_stacks_plain_socket_impl.java.i b/jdk/.hg/store/data/src/windows/classes/java/net/_two_stacks_plain_socket_impl.java.i
index 49add68..f7f4731 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/java/net/_two_stacks_plain_socket_impl.java.i and b/jdk/.hg/store/data/src/windows/classes/java/net/_two_stacks_plain_socket_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/sun/awt/windows/_w_component_peer.java.i b/jdk/.hg/store/data/src/windows/classes/sun/awt/windows/_w_component_peer.java.i
index b518a0c..21c0017 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/sun/awt/windows/_w_component_peer.java.i and b/jdk/.hg/store/data/src/windows/classes/sun/awt/windows/_w_component_peer.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/sun/java2d/d3d/_d3_d_surface_data.java.i b/jdk/.hg/store/data/src/windows/classes/sun/java2d/d3d/_d3_d_surface_data.java.i
index fdcb26c..7c0efa7 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/sun/java2d/d3d/_d3_d_surface_data.java.i and b/jdk/.hg/store/data/src/windows/classes/sun/java2d/d3d/_d3_d_surface_data.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/sun/nio/fs/_windows_directory_stream.java.i b/jdk/.hg/store/data/src/windows/classes/sun/nio/fs/_windows_directory_stream.java.i
index 1856afa..126b63b 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/sun/nio/fs/_windows_directory_stream.java.i and b/jdk/.hg/store/data/src/windows/classes/sun/nio/fs/_windows_directory_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/sun/nio/fs/_windows_path_parser.java.i b/jdk/.hg/store/data/src/windows/classes/sun/nio/fs/_windows_path_parser.java.i
index 3839c69..aa54e04 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/sun/nio/fs/_windows_path_parser.java.i and b/jdk/.hg/store/data/src/windows/classes/sun/nio/fs/_windows_path_parser.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/java/net/_two_stacks_plain_datagram_socket_impl.c.i b/jdk/.hg/store/data/src/windows/native/java/net/_two_stacks_plain_datagram_socket_impl.c.i
index c21644d..f2d6ae9 100644
Binary files a/jdk/.hg/store/data/src/windows/native/java/net/_two_stacks_plain_datagram_socket_impl.c.i and b/jdk/.hg/store/data/src/windows/native/java/net/_two_stacks_plain_datagram_socket_impl.c.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/security/pkcs11/j2secmod__md.c.i b/jdk/.hg/store/data/src/windows/native/sun/security/pkcs11/j2secmod__md.c.i
index e71d992..80f1e44 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/security/pkcs11/j2secmod__md.c.i and b/jdk/.hg/store/data/src/windows/native/sun/security/pkcs11/j2secmod__md.c.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.cpp.i b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.cpp.i
index 06e6c8f..67fc188 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.cpp.i and b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.cpp.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.h.i b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.h.i
index a36aaa0..d08df68 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.h.i and b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.h.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___toolkit.cpp.i b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___toolkit.cpp.i
index 67e2069..cefee96 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___toolkit.cpp.i and b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___toolkit.cpp.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___toolkit.h.i b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___toolkit.h.i
index be42b17..0301e93 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___toolkit.h.i and b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___toolkit.h.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___window.cpp.i b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___window.cpp.i
index 585ec11..2890a52 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___window.cpp.i and b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___window.cpp.i differ
diff --git a/jdk/.hg/store/data/test/_problem_list.txt.i b/jdk/.hg/store/data/test/_problem_list.txt.i
index 675bb5c..eee0c46 100644
Binary files a/jdk/.hg/store/data/test/_problem_list.txt.i and b/jdk/.hg/store/data/test/_problem_list.txt.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/jndi/ldap/_ldaps_read_timeout_test.java.i b/jdk/.hg/store/data/test/com/sun/jndi/ldap/_ldaps_read_timeout_test.java.i
new file mode 100644
index 0000000..3188027
Binary files /dev/null and b/jdk/.hg/store/data/test/com/sun/jndi/ldap/_ldaps_read_timeout_test.java.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/invoke/_call_site_test.java.i b/jdk/.hg/store/data/test/java/lang/invoke/_call_site_test.java.i
new file mode 100644
index 0000000..33feadc
Binary files /dev/null and b/jdk/.hg/store/data/test/java/lang/invoke/_call_site_test.java.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/invoke/_invoke_dynamic_print_args.java.i b/jdk/.hg/store/data/test/java/lang/invoke/_invoke_dynamic_print_args.java.i
index efea48a..0d47619 100644
Binary files a/jdk/.hg/store/data/test/java/lang/invoke/_invoke_dynamic_print_args.java.i and b/jdk/.hg/store/data/test/java/lang/invoke/_invoke_dynamic_print_args.java.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/ref/_reference_enqueue.java.i b/jdk/.hg/store/data/test/java/lang/ref/_reference_enqueue.java.i
new file mode 100644
index 0000000..4d95f71
Binary files /dev/null and b/jdk/.hg/store/data/test/java/lang/ref/_reference_enqueue.java.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/ref/_reference_enqueue_pending.java.i b/jdk/.hg/store/data/test/java/lang/ref/_reference_enqueue_pending.java.i
new file mode 100644
index 0000000..f5722c2
Binary files /dev/null and b/jdk/.hg/store/data/test/java/lang/ref/_reference_enqueue_pending.java.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_cookie_handler/_null_uri_cookie_test.java.i b/jdk/.hg/store/data/test/java/net/_cookie_handler/_null_uri_cookie_test.java.i
new file mode 100644
index 0000000..74038de
Binary files /dev/null and b/jdk/.hg/store/data/test/java/net/_cookie_handler/_null_uri_cookie_test.java.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_datagram_socket/_changing_address.java.i b/jdk/.hg/store/data/test/java/net/_datagram_socket/_changing_address.java.i
new file mode 100644
index 0000000..e2f59cf
Binary files /dev/null and b/jdk/.hg/store/data/test/java/net/_datagram_socket/_changing_address.java.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_u_r_l_connection/_redirect307_test.java.i b/jdk/.hg/store/data/test/java/net/_u_r_l_connection/_redirect307_test.java.i
index 268c289..753528a 100644
Binary files a/jdk/.hg/store/data/test/java/net/_u_r_l_connection/_redirect307_test.java.i and b/jdk/.hg/store/data/test/java/net/_u_r_l_connection/_redirect307_test.java.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_u_r_l_connection/_redirect_limit.java.i b/jdk/.hg/store/data/test/java/net/_u_r_l_connection/_redirect_limit.java.i
index 8de7aa0..178c04a 100644
Binary files a/jdk/.hg/store/data/test/java/net/_u_r_l_connection/_redirect_limit.java.i and b/jdk/.hg/store/data/test/java/net/_u_r_l_connection/_redirect_limit.java.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/charset/coders/_errors.java.i b/jdk/.hg/store/data/test/java/nio/charset/coders/_errors.java.i
index e90ea7e..caefe32 100644
Binary files a/jdk/.hg/store/data/test/java/nio/charset/coders/_errors.java.i and b/jdk/.hg/store/data/test/java/nio/charset/coders/_errors.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_collections/_checked_queue.java.i b/jdk/.hg/store/data/test/java/util/_collections/_checked_queue.java.i
new file mode 100644
index 0000000..76f105f
Binary files /dev/null and b/jdk/.hg/store/data/test/java/util/_collections/_checked_queue.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_collections/_empty_sorted_set.java.i b/jdk/.hg/store/data/test/java/util/_collections/_empty_sorted_set.java.i
new file mode 100644
index 0000000..efb94d2
Binary files /dev/null and b/jdk/.hg/store/data/test/java/util/_collections/_empty_sorted_set.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_currency/_currency_test.java.i b/jdk/.hg/store/data/test/java/util/_currency/_currency_test.java.i
index 35f3eba..28a9675 100644
Binary files a/jdk/.hg/store/data/test/java/util/_currency/_currency_test.java.i and b/jdk/.hg/store/data/test/java/util/_currency/_currency_test.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_currency/_validate_i_s_o4217.java.i b/jdk/.hg/store/data/test/java/util/_currency/_validate_i_s_o4217.java.i
index 51f7be8..f163691 100644
Binary files a/jdk/.hg/store/data/test/java/util/_currency/_validate_i_s_o4217.java.i and b/jdk/.hg/store/data/test/java/util/_currency/_validate_i_s_o4217.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_currency/tablea1.txt.i b/jdk/.hg/store/data/test/java/util/_currency/tablea1.txt.i
index 8ce5df6..4d8a398 100644
Binary files a/jdk/.hg/store/data/test/java/util/_currency/tablea1.txt.i and b/jdk/.hg/store/data/test/java/util/_currency/tablea1.txt.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_locale/_bug6989440.java.i b/jdk/.hg/store/data/test/java/util/_locale/_bug6989440.java.i
index 61ba1ef..15f6b5c 100644
Binary files a/jdk/.hg/store/data/test/java/util/_locale/_bug6989440.java.i and b/jdk/.hg/store/data/test/java/util/_locale/_bug6989440.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/swing/_j_color_chooser/_test6827032.java.i b/jdk/.hg/store/data/test/javax/swing/_j_color_chooser/_test6827032.java.i
new file mode 100644
index 0000000..e4a0601
Binary files /dev/null and b/jdk/.hg/store/data/test/javax/swing/_j_color_chooser/_test6827032.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/swing/_j_editor_pane/4492274/bug4492274.java.i b/jdk/.hg/store/data/test/javax/swing/_j_editor_pane/4492274/bug4492274.java.i
new file mode 100644
index 0000000..0943138
Binary files /dev/null and b/jdk/.hg/store/data/test/javax/swing/_j_editor_pane/4492274/bug4492274.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/swing/_j_editor_pane/4492274/test.html.i b/jdk/.hg/store/data/test/javax/swing/_j_editor_pane/4492274/test.html.i
new file mode 100644
index 0000000..32971ac
Binary files /dev/null and b/jdk/.hg/store/data/test/javax/swing/_j_editor_pane/4492274/test.html.i differ
diff --git a/jdk/.hg/store/data/test/javax/swing/_j_slider/6348946/bug6348946.java.i b/jdk/.hg/store/data/test/javax/swing/_j_slider/6348946/bug6348946.java.i
new file mode 100644
index 0000000..182430d
Binary files /dev/null and b/jdk/.hg/store/data/test/javax/swing/_j_slider/6348946/bug6348946.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/swing/_j_text_area/7049024/bug7049024.java.i b/jdk/.hg/store/data/test/javax/swing/_j_text_area/7049024/bug7049024.java.i
new file mode 100644
index 0000000..81b32c6
Binary files /dev/null and b/jdk/.hg/store/data/test/javax/swing/_j_text_area/7049024/bug7049024.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/swing/_tool_tip_manager/_test6256140.java.i b/jdk/.hg/store/data/test/javax/swing/_tool_tip_manager/_test6256140.java.i
new file mode 100644
index 0000000..46a9322
Binary files /dev/null and b/jdk/.hg/store/data/test/javax/swing/_tool_tip_manager/_test6256140.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/swing/regtesthelpers/_util.java.i b/jdk/.hg/store/data/test/javax/swing/regtesthelpers/_util.java.i
index 1beabe1..7f50c64 100644
Binary files a/jdk/.hg/store/data/test/javax/swing/regtesthelpers/_util.java.i and b/jdk/.hg/store/data/test/javax/swing/regtesthelpers/_util.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_generation_tests.java.i b/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_generation_tests.java.i
index f08d9c1..6accc03 100644
Binary files a/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_generation_tests.java.i and b/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_generation_tests.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/circular-deps.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/circular-deps.sh.i
index 06cd0f5..6045807 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/circular-deps.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/circular-deps.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_jpkg_args_test.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_jpkg_args_test.java.i
index 5c2867a..d6f8018 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_jpkg_args_test.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_jpkg_args_test.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_file_test.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_file_test.java.i
new file mode 100644
index 0000000..6f3d5c2
Binary files /dev/null and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_file_test.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_format_header_hash_test.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_format_header_hash_test.java.i
index 5c049c6..3d89b01 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_format_header_hash_test.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_format_header_hash_test.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_format_test_left_over_bytes.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_format_test_left_over_bytes.java.i
index e941daf..c4ec1ad 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_format_test_left_over_bytes.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_module_format_test_left_over_bytes.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_signed_module_file_test.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_signed_module_file_test.sh.i
new file mode 100644
index 0000000..b3a33d3
Binary files /dev/null and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/_signed_module_file_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i
index 1d0d61b..04d8ac5 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-signed.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-signed.sh.i
index d2a1084..f7437b0 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-signed.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/jmod-signed.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/signed-module.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/signed-module.sh.i
index 9d72224..52b8871 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/signed-module.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/signed-module.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/timestamp-test.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/timestamp-test.sh.i
index bb8bdc3..8715a56 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/timestamp-test.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/cli/timestamp-test.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i
index ed4858d..bbb9dcc 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/preinstall.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/preinstall.sh.i
index 82ef19e..b9dce81 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/preinstall.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/preinstall.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/resource.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/resource.sh.i
index 0590543..6ab3372 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/resource.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/resource.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/java2d/_direct_x/_draw_bitmask_to_surface_test.java.i b/jdk/.hg/store/data/test/sun/java2d/_direct_x/_draw_bitmask_to_surface_test.java.i
new file mode 100644
index 0000000..c8f7839
Binary files /dev/null and b/jdk/.hg/store/data/test/sun/java2d/_direct_x/_draw_bitmask_to_surface_test.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/misc/_jar_index/meta_inf_filenames/_basic.java.i b/jdk/.hg/store/data/test/sun/misc/_jar_index/meta_inf_filenames/_basic.java.i
index 01e9d55..0cca176 100644
Binary files a/jdk/.hg/store/data/test/sun/misc/_jar_index/meta_inf_filenames/_basic.java.i and b/jdk/.hg/store/data/test/sun/misc/_jar_index/meta_inf_filenames/_basic.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/nio/cs/_test_string_coding.java.i b/jdk/.hg/store/data/test/sun/nio/cs/_test_string_coding.java.i
index a5d12ad..85f832a 100644
Binary files a/jdk/.hg/store/data/test/sun/nio/cs/_test_string_coding.java.i and b/jdk/.hg/store/data/test/sun/nio/cs/_test_string_coding.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/nio/cs/_test_string_coding_u_t_f8.java.i b/jdk/.hg/store/data/test/sun/nio/cs/_test_string_coding_u_t_f8.java.i
index 48d0d24..4d3c2e9 100644
Binary files a/jdk/.hg/store/data/test/sun/nio/cs/_test_string_coding_u_t_f8.java.i and b/jdk/.hg/store/data/test/sun/nio/cs/_test_string_coding_u_t_f8.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/nio/cs/_test_u_t_f8.java.i b/jdk/.hg/store/data/test/sun/nio/cs/_test_u_t_f8.java.i
index efd9ade..5258b7a 100644
Binary files a/jdk/.hg/store/data/test/sun/nio/cs/_test_u_t_f8.java.i and b/jdk/.hg/store/data/test/sun/nio/cs/_test_u_t_f8.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/krb5/auto/_acceptor_sub_key.java.i b/jdk/.hg/store/data/test/sun/security/krb5/auto/_acceptor_sub_key.java.i
new file mode 100644
index 0000000..a7397b1
Binary files /dev/null and b/jdk/.hg/store/data/test/sun/security/krb5/auto/_acceptor_sub_key.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/krb5/auto/_context.java.i b/jdk/.hg/store/data/test/sun/security/krb5/auto/_context.java.i
index 7aef291..aca6638 100644
Binary files a/jdk/.hg/store/data/test/sun/security/krb5/auto/_context.java.i and b/jdk/.hg/store/data/test/sun/security/krb5/auto/_context.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/krb5/auto/_no_init_no_keytab.java.i b/jdk/.hg/store/data/test/sun/security/krb5/auto/_no_init_no_keytab.java.i
new file mode 100644
index 0000000..5fdda46
Binary files /dev/null and b/jdk/.hg/store/data/test/sun/security/krb5/auto/_no_init_no_keytab.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/krb5/auto/_r_r_c.java.i b/jdk/.hg/store/data/test/sun/security/krb5/auto/_r_r_c.java.i
new file mode 100644
index 0000000..8efebc3
Binary files /dev/null and b/jdk/.hg/store/data/test/sun/security/krb5/auto/_r_r_c.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_absolute.java.i b/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_absolute.java.i
index 9293ebd..24eb9d9 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_absolute.java.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_absolute.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/fips/_cipher_test.java.i b/jdk/.hg/store/data/test/sun/security/pkcs11/fips/_cipher_test.java.i
index 4dd6925..a0438fd 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/fips/_cipher_test.java.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/fips/_cipher_test.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/fips/_client_j_s_s_e_server_j_s_s_e.java.i b/jdk/.hg/store/data/test/sun/security/pkcs11/fips/_client_j_s_s_e_server_j_s_s_e.java.i
index 50016b0..ef55a22 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/fips/_client_j_s_s_e_server_j_s_s_e.java.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/fips/_client_j_s_s_e_server_j_s_s_e.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/provider/_x509_factory/_big_c_r_l.java.i b/jdk/.hg/store/data/test/sun/security/provider/_x509_factory/_big_c_r_l.java.i
new file mode 100644
index 0000000..cd0282b
Binary files /dev/null and b/jdk/.hg/store/data/test/sun/security/provider/_x509_factory/_big_c_r_l.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_gen_s_s_l_configs/main.java.i b/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_gen_s_s_l_configs/main.java.i
index 27090ef..359a938 100644
Binary files a/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_gen_s_s_l_configs/main.java.i and b/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_gen_s_s_l_configs/main.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_s_s_l_engine_impl/_s_s_l_engine_bad_buffer_array_access.java.i b/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_s_s_l_engine_impl/_s_s_l_engine_bad_buffer_array_access.java.i
new file mode 100644
index 0000000..ab5696d
Binary files /dev/null and b/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_s_s_l_engine_impl/_s_s_l_engine_bad_buffer_array_access.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_check_status.java.i b/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_check_status.java.i
index 77e40ac..d578266 100644
Binary files a/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_check_status.java.i and b/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_check_status.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_large_bufs.java.i b/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_large_bufs.java.i
index 2cd8215..29c624b 100644
Binary files a/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_large_bufs.java.i and b/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_large_bufs.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_large_packet.java.i b/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_large_packet.java.i
index 45100a0..bc1c375 100644
Binary files a/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_large_packet.java.i and b/jdk/.hg/store/data/test/sun/security/ssl/javax/net/ssl/_new_a_p_is/_s_s_l_engine/_large_packet.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/templates/_s_s_l_socket_s_s_l_engine_template.java.i b/jdk/.hg/store/data/test/sun/security/ssl/templates/_s_s_l_socket_s_s_l_engine_template.java.i
new file mode 100644
index 0000000..5ba855f
Binary files /dev/null and b/jdk/.hg/store/data/test/sun/security/ssl/templates/_s_s_l_socket_s_s_l_engine_template.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/text/resources/_collator/_bug6755060.java.i b/jdk/.hg/store/data/test/sun/text/resources/_collator/_bug6755060.java.i
new file mode 100644
index 0000000..7225387
Binary files /dev/null and b/jdk/.hg/store/data/test/sun/text/resources/_collator/_bug6755060.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/text/resources/_locale_data.i b/jdk/.hg/store/data/test/sun/text/resources/_locale_data.i
index a709ee6..3f6cda9 100644
Binary files a/jdk/.hg/store/data/test/sun/text/resources/_locale_data.i and b/jdk/.hg/store/data/test/sun/text/resources/_locale_data.i differ
diff --git a/jdk/.hg/store/data/test/sun/text/resources/_locale_data_test.java.i b/jdk/.hg/store/data/test/sun/text/resources/_locale_data_test.java.i
index 1a78aa9..910d7fe 100644
Binary files a/jdk/.hg/store/data/test/sun/text/resources/_locale_data_test.java.i and b/jdk/.hg/store/data/test/sun/text/resources/_locale_data_test.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jinfo/_basic.sh.i b/jdk/.hg/store/data/test/sun/tools/jinfo/_basic.sh.i
index 7c34765..dbd7b19 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jinfo/_basic.sh.i and b/jdk/.hg/store/data/test/sun/tools/jinfo/_basic.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_external_registry.sh.i b/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_external_registry.sh.i
index 87ba268..e29693c 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_external_registry.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_external_registry.sh.i differ
diff --git a/jdk/.hg/store/data/~2ehgtags.i b/jdk/.hg/store/data/~2ehgtags.i
index ddadd6b..b86ae45 100644
Binary files a/jdk/.hg/store/data/~2ehgtags.i and b/jdk/.hg/store/data/~2ehgtags.i differ
diff --git a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/certsinfile82b6e971fd6c4f5cca5cffeb24ca724290130a3a.i b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/certsinfile82b6e971fd6c4f5cca5cffeb24ca724290130a3a.i
index 19d9e15..6ef65e0 100644
Binary files a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/certsinfile82b6e971fd6c4f5cca5cffeb24ca724290130a3a.i and b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/certsinfile82b6e971fd6c4f5cca5cffeb24ca724290130a3a.i differ
diff --git a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/retrievalme4aaa2612c5661ed318d95a74fca7d22a8fa17410.i b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/retrievalme4aaa2612c5661ed318d95a74fca7d22a8fa17410.i
index 6e3066a..104bfed 100644
Binary files a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/retrievalme4aaa2612c5661ed318d95a74fca7d22a8fa17410.i and b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/retrievalme4aaa2612c5661ed318d95a74fca7d22a8fa17410.i differ
diff --git a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/singlecerti702fcb16af0397bfc24683addfe324b4cebc6881.i b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/singlecerti702fcb16af0397bfc24683addfe324b4cebc6881.i
index d9685b5..cf4f837 100644
Binary files a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/singlecerti702fcb16af0397bfc24683addfe324b4cebc6881.i and b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/keys/singlecerti702fcb16af0397bfc24683addfe324b4cebc6881.i differ
diff --git a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/transfor/transfoe0549a04f669eb784380172c5a561cfe4a333524.i b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/transfor/transfoe0549a04f669eb784380172c5a561cfe4a333524.i
index 2655939..ca9e770 100644
Binary files a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/transfor/transfoe0549a04f669eb784380172c5a561cfe4a333524.i and b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/transfor/transfoe0549a04f669eb784380172c5a561cfe4a333524.i differ
diff --git a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolverdie7744459ebd18b007c48d2b44c1ce9b428650b45.i b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolverdie7744459ebd18b007c48d2b44c1ce9b428650b45.i
index e3e91a6..20ed9ae 100644
Binary files a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolverdie7744459ebd18b007c48d2b44c1ce9b428650b45.i and b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolverdie7744459ebd18b007c48d2b44c1ce9b428650b45.i differ
diff --git a/jdk/.hg/store/fncache b/jdk/.hg/store/fncache
index 14f7734..76ebcc0 100644
--- a/jdk/.hg/store/fncache
+++ b/jdk/.hg/store/fncache
@@ -1,36 +1,36 @@
data/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully_Stub.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_cs_CZ.properties.i
data/test/sun/rmi/rmic/newrmic/equivalence/NotActivatableServerImpl.java.i
-data/test/java/lang/instrument/AInstrumentationTestCase.java.i
+data/test/java/nio/channels/FileChannel/Position.java.i
data/src/share/classes/com/sun/tools/jdi/StratumLineInfo.java.i
data/test/java/util/logging/LoggingNIOChange.java.i
data/src/share/classes/sun/nio/cs/KOI8_U.java.i
data/test/java/awt/FontClass/X11FontPathCrashTest.java.i
data/src/share/classes/sun/nio/fs/Util.java.i
data/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/Echo.java.i
+data/src/share/classes/sun/nio/cs/ext/MSISO2022JP.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthBorder.java.i
data/src/share/native/common/verify_stub.c.i
data/src/solaris/doc/sun/man/man1/tnameserv.1.i
data/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java.i
data/src/share/classes/sun/awt/EventQueueItem.java.i
data/src/share/classes/java/nio/file/FileSystemAlreadyExistsException.java.i
data/test/java/util/TimeZone/DaylightTimeTest.java.i
-data/make/com/sun/java/browser/Makefile.i
+data/test/sun/security/pkcs11/Provider/ConfigShortPath.java.i
data/test/javax/script/E4XErrorTest.java.i
-data/src/share/classes/java/util/TreeMap.java.i
data/src/share/classes/sun/misc/Launcher.java.i
-data/make/tools/CharsetMapping/IBM870.c2b.i
-data/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c.i
-data/src/share/classes/sun/reflect/generics/tree/IntSignature.java.i
data/test/java/rmi/transport/readTimeout/TestImpl.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java.i
+data/test/sun/security/tools/policytool/UsePolicy.sh.i
+data/src/share/classes/sun/management/manifest.i
data/test/java/beans/Statement/Test4530962.java.i
data/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/OutputSink.java.i
data/src/share/sample/vm/clr-jvm/invoked.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java.i
+data/src/share/classes/sun/tools/tree/AssignShiftRightExpression.java.i
data/src/share/classes/java/security/Permission.java.i
data/make/javax/swing/beaninfo/FILES.gmk.i
-data/src/share/instrument/JarFacade.c.i
+data/src/solaris/native/sun/awt/awt_motif21.c.i
data/test/sun/security/tools/keytool/SecretKeyKS.jks.i
data/test/java/rmi/server/RemoteObject/unrecognizedRefType/UnrecognizedRefType.java.i
data/test/com/sun/jdi/Solaris32AndSolaris64Test.sh.i
@@ -38,7 +38,6 @@ data/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java.i
data/src/share/classes/sun/util/resources/LocaleNames_pt.properties.i
data/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java.i
-data/src/share/classes/sun/reflect/UnsafeStaticLongFieldAccessorImpl.java.i
data/src/share/classes/sun/io/CharToByteCp775.java.i
data/src/share/classes/sun/text/resources/FormatData_pt.java.i
data/make/sun/tracing/Makefile.i
@@ -49,28 +48,24 @@ data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properti
data/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh.i
data/src/share/classes/java/rmi/Naming.java.i
data/make/java/nio/genCharsetProvider.sh.i
-data/src/share/classes/com/sun/media/sound/ModelStandardTransform.java.i
data/test/sun/net/InetAddress/nameservice/dns/cname.sh.i
data/test/java/io/pathNames/win32/bug6344646.java.i
data/src/share/classes/sun/awt/image/ByteInterleavedRaster.java.i
-data/src/share/classes/sun/net/httpserver/HttpContextImpl.java.i
+data/src/share/classes/javax/swing/JMenuBar.java.i
data/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java.i
data/src/share/classes/com/sun/tools/jdi/LockObject.java.i
data/src/share/native/sun/font/layout/ThaiShaping.h.i
-data/test/sun/net/www/ftptest/FtpAuthHandler.java.i
data/test/com/sun/jdi/LocalVariableEqual.java.i
data/test/com/sun/jdi/GetLocalVariables2Test.java.i
-data/src/share/classes/sun/font/FontFamily.java.i
-data/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java.i
-data/src/share/classes/java/net/SocksConsts.java.i
+data/src/share/classes/sun/net/www/protocol/http/InMemoryCookieStore.java.i
data/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java.i
data/test/tools/launcher/lib/i386/lib32/liblibrary.so.i
data/src/share/classes/com/sun/tools/example/debug/gui/GUI.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so.i
data/test/java/util/regex/POSIX_ASCII.java.i
data/src/share/classes/javax/swing/text/LabelView.java.i
-data/src/share/classes/sun/security/x509/OIDName.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h.i
+data/src/share/classes/java/io/ObjectInput.java.i
+data/test/java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java.i
data/src/share/classes/sun/tools/tree/BinaryEqualityExpression.java.i
data/test/javax/swing/regtesthelpers/Util.java.i
data/src/share/sample/jmx/jmx-scandir/src/etc/management.properties.i
@@ -83,77 +78,67 @@ data/src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java.i
data/src/share/classes/javax/swing/ScrollPaneLayout.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sv_SE.properties.i
data/src/share/classes/sun/io/CharToByteCp1253.java.i
-data/src/share/classes/sun/text/resources/unorm.icu.i
data/make/netbeans/world/build.xml.i
-data/src/share/classes/org/openjdk/jigsaw/BaseContext.java.i
data/make/java/logging/Makefile.i
data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdSerialGC.sh.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapItem.java.i
+data/test/java/beans/VetoableChangeSupport/1.6.0.ser.i
data/src/windows/classes/sun/nio/fs/WindowsUriSupport.java.i
data/test/org/openjdk/jigsaw/cli/tsa-cert.pem.i
data/src/share/classes/sun/java2d/loops/MaskFill.java.i
-data/test/java/util/Collections/CheckedListBash.java.i
+data/src/share/classes/sun/tools/javac/resources/javac.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java.i
-data/src/share/classes/sun/text/resources/CollationData_cs.java.i
-data/src/share/classes/sun/management/Util.java.i
+data/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java.i
data/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java.i
data/src/share/classes/java/lang/doc-files/iota.gif.i
data/src/share/classes/java/util/Collections.java.i
-data/src/share/classes/java/awt/doc-files/RadialGradientPaint-3.png.i
data/test/java/net/Socket/OldSocketImpl.jar.i
data/src/share/classes/java/net/DatagramPacket.java.i
data/src/share/classes/javax/swing/text/html/HiddenTagView.java.i
data/src/share/classes/sun/nio/ch/FileChannelImpl.java.i
data/src/share/classes/javax/net/package.html.i
data/make/tools/CharsetMapping/HKSCS_XP.map.i
-data/src/windows/native/sun/windows/awt_Window.cpp.i
-data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.SuSE.properties.i
+data/src/share/classes/sun/security/rsa/RSACore.java.i
data/src/share/classes/sun/net/www/protocol/gopher/Handler.java.i
data/test/java/net/URLClassLoader/HttpTest.java.i
-data/test/java/io/InputStreamReader/GrowAfterEOF.java.i
-data/src/share/classes/java/net/DatagramSocket.java.i
data/test/demo/jvmti/hprof/HeapSitesTest.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/package.html.i
data/test/sun/net/www/protocol/file/FileURLTest.java.i
data/src/share/classes/java/security/InvalidAlgorithmParameterException.java.i
-data/src/solaris/bin/ergo_i586.c.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/HttpsURLConnectionLocalCertificateChain.java.i
data/src/share/classes/sun/tools/jstat/OutputFormatter.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java.i
data/src/share/classes/java/awt/event/AdjustmentEvent.java.i
data/src/share/sample/nio/server/DispatcherN.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java.i
+data/src/share/native/sun/java2d/loops/FillParallelogram.c.i
data/src/share/classes/sun/print/PrinterGraphicsConfig.java.i
-data/test/com/sun/security/auth/callback/DialogCallbackHandler/Default.java.i
data/src/share/classes/com/sun/security/ntlm/Server.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S32Func.c.i
data/src/share/classes/sun/io/CharToByteCp1254.java.i
data/src/windows/native/sun/awt_common/awt_makecube.cpp.i
data/make/tools/reorder/tools/util-sparcv9.il.i
-data/src/share/classes/sun/reflect/ConstructorAccessor.java.i
data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java.i
+data/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java.i
data/src/share/classes/java/awt/doc-files/Button-1.gif.i
data/src/solaris/instrument/EncodingSupport_md.c.i
-data/test/java/lang/reflect/Constructor/Equals.java.i
data/src/solaris/doc/sun/man/man1/ja/javap.1.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c.i
-data/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp.i
+data/src/windows/classes/sun/awt/windows/WTrayIconPeer.java.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties.i
data/test/java/util/logging/LoggingMXBeanTest.java.i
-data/src/share/demo/applets/MoleculeViewer/models/water.xyz.i
data/test/java/io/Serializable/nestedReplace/NestedReplace.java.i
data/src/share/classes/com/sun/tracing/ProviderName.java.i
data/src/share/classes/javax/sql/RowSetInternal.java.i
-data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.storePass.i
+data/src/share/classes/sun/text/resources/FormatData_hr_HR.java.i
+data/test/java/security/UnresolvedPermission/Equals.policy.i
data/test/java/security/KeyRep/DESede.pre.1.5.key.i
data/test/java/lang/module/module-info.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/EllipseShape.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java.i
-data/src/share/classes/com/sun/jdi/Mirror.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java.i
+data/src/share/classes/sun/tools/asm/StringExpressionConstantData.java.i
+data/test/java/nio/channels/DatagramChannel/ChangingAddress.java.i
data/src/share/classes/com/sun/tracing/dtrace/FunctionName.java.i
data/test/java/io/FileOutputStream/ManyFiles.java.i
-data/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono16.gif.i
data/src/share/classes/java/awt/GradientPaint.java.i
data/src/share/demo/management/JTop/README.txt.i
data/test/java/util/Formatter/BasicIntObject.java.i
@@ -163,22 +148,20 @@ data/src/share/native/sun/security/ec/ec2_aff.c.i
data/test/sun/security/tools/keytool/StandardAlgName.sh.i
data/src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java.i
-data/src/share/classes/sun/applet/AppletResourceLoader.java.i
-data/src/share/classes/sun/rmi/server/Activation.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java.i
data/test/sun/tools/jps/jps-q_Output1.awk.i
data/src/solaris/classes/sun/print/IPPPrintService.java.i
-data/src/share/native/sun/java2d/loops/ByteBinary4Bit.c.i
-data/src/share/classes/java/net/Socket.java.i
+data/src/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif.i
+data/test/java/net/URLClassLoader/closetest/CloseTest.java.i
data/src/share/classes/sun/io/ByteToCharCp858.java.i
data/src/share/classes/sun/awt/shell/DefaultShellFolder.java.i
data/src/share/classes/javax/swing/text/html/CSS.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/DefaultsGenerator.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/ShortArrays.java.i
data/src/share/classes/java/lang/instrument/Instrumentation.java.i
-data/src/share/classes/sun/io/CharToByteCp964.java.i
+data/make/tools/CharsetMapping/IBM500.c2b.i
data/test/javax/management/namespace/JMXNamespacesTest.java.i
-data/src/share/classes/sun/net/httpserver/HttpConnection.java.i
-data/test/sun/security/pkcs11/Provider/Absolute.cfg.i
+data/src/share/transport/shmem/shmemBase.h.i
data/src/share/classes/java/lang/Package.java.i
data/make/tools/src/build/tools/fontchecker/FontChecker.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java.i
@@ -189,18 +172,15 @@ data/src/share/classes/sun/security/provider/certpath/OCSP.java.i
data/src/share/classes/javax/xml/crypto/XMLCryptoContext.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIColor.java.i
data/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java.i
data/src/share/demo/jvmti/versionCheck/README.txt.i
data/src/share/classes/sun/text/bidi/BidiBase.java.i
data/src/share/classes/java/util/zip/InflaterOutputStream.java.i
-data/make/mkdemo/applets/SimpleGraph/Makefile.i
data/src/share/classes/java/awt/PaintContext.java.i
data/src/share/classes/java/awt/GridBagLayoutInfo.java.i
-data/src/share/classes/java/nio/Direct-X-Buffer.java.i
data/src/share/classes/sun/rmi/rmic/Util.java.i
data/test/com/sun/jdi/JITDebug.sh.i
data/src/share/classes/javax/sql/rowset/spi/package.html.i
-data/src/share/classes/sun/awt/image/BytePackedRaster.java.i
-data/src/share/back/ClassLoaderReferenceImpl.h.i
data/src/share/classes/java/net/ProtocolException.java.i
data/test/java/awt/Mixing/OpaqueTest.java.i
data/src/share/classes/javax/swing/text/html/Option.java.i
@@ -212,28 +192,35 @@ data/src/share/classes/java/lang/invoke/MemberName.java.i
data/src/share/classes/com/sun/rowset/internal/Row.java.i
data/src/share/classes/java/beans/PropertyChangeListenerProxy.java.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientTimeout.java.i
data/src/share/classes/com/sun/management/ThreadMXBean.java.i
-data/src/share/classes/sun/java2d/FontSupport.java.i
data/src/share/native/sun/java2d/loops/IntRgbx.h.i
data/make/tools/swing-beans/beaninfo/images/JSplitPaneMono16.gif.i
data/make/javax/crypto/policy/unlimited/UNLIMITED.i
data/src/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_es.java.i
data/test/java/lang/invoke/PermuteArgsTest.java.i
+data/test/com/sun/crypto/provider/TLS/prfdata.txt.i
data/src/share/classes/sun/nio/fs/NativeBuffer.java.i
-data/src/share/native/sun/security/ec/mpprime.h.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java.i
data/src/solaris/classes/sun/awt/motif/MListPeer.java.i
-data/test/sun/security/krb5/runNameEquals.sh.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleConfig.java.i
+data/make/tools/winver/Makefile.i
+data/src/share/classes/sun/security/action/GetBooleanAction.java.i
+data/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java.i
+data/test/java/lang/instrument/ExampleForClassPath.java.i
data/test/java/io/Serializable/proxy/replace/ReadResolve.java.i
data/test/java/util/jar/JarInputStream/signed.jar.i
data/test/java/util/BitSet/ImportExport.java.i
data/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java.i
data/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh.i
data/src/share/native/com/sun/java/util/jar/pack/bands.h.i
+data/test/java/nio/channels/Selector/ConnectWrite.java.i
+data/test/java/rmi/activation/Activatable/restartLatecomer/rmid.security.policy.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S32Func.c.i
data/src/share/classes/sun/tools/jstat/HeaderClosure.java.i
+data/src/share/classes/java/io/LineNumberReader.java.i
data/src/share/classes/sun/util/resources/CalendarData_ru.properties.i
+data/test/java/io/Serializable/superclassDataLoss/run.sh.i
data/test/java/security/Signature/SignWithOutputBuffer.java.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html.i
data/make/tools/CharsetMapping/IBM037.map.i
@@ -241,9 +228,9 @@ data/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java
data/make/tools/hasher_classes/Makefile.i
data/make/jpda/back/Makefile.i
data/src/share/classes/javax/naming/package.html.i
-data/make/tools/CharsetMapping/sjis0213.map.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java.i
data/src/share/classes/sun/rmi/log/LogHandler.java.i
+data/make/java/nio/reorder-sparcv9.i
data/src/share/classes/sun/util/resources/CurrencyNames_vi_VN.properties.i
data/src/windows/classes/sun/awt/windows/WInputMethod.java.i
data/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties.i
@@ -263,57 +250,52 @@ data/test/java/io/File/ListSpace.java.i
data/test/javax/management/relation/RelationNotificationSeqNoTest.java.i
data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono16.gif.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingSubSystem.java.i
-data/src/share/classes/javax/management/event/FetchingEventForwarder.java.i
+data/src/share/classes/javax/sound/midi/Patch.java.i
data/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh.i
data/src/solaris/native/sun/awt/awt_List.c.i
data/test/javax/management/proxy/NotificationEmitterProxy.java.i
-data/src/share/classes/sun/rmi/transport/Transport.java.i
+data/src/share/classes/sun/text/resources/FormatData_ja_JP_JP.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java.i
data/src/solaris/native/sun/awt/canvas.c.i
data/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java.i
data/src/share/sample/vm/jvm-clr/invokerExp.h.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java.i
-data/src/share/classes/java/lang/Float.java.i
+data/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java.i
+data/src/windows/native/sun/windows/awt_TrayIcon.cpp.i
data/make/sun/headless/reorder-sparc.i
-data/src/share/native/sun/font/layout/TibetanLayoutEngine.h.i
+data/make/sun/awt/mapfile-mawt-vers.i
data/src/share/classes/sun/security/krb5/KrbApReq.java.i
data/test/java/nio/file/etc/Exceptions.java.i
data/test/sun/nio/cs/OLD/IBM939_OLD.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/LayerContainer.java.i
data/test/sun/security/krb5/auto/KDC.java.i
data/make/templates/bsd-header.i
data/src/share/classes/com/sun/jdi/Locatable.java.i
data/test/sun/security/provider/PolicyFile/SomeExtensionClass.java.i
data/src/share/classes/com/sun/tools/hat/internal/parser/ReadBuffer.java.i
-data/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java.i
-data/src/share/classes/sun/tools/jconsole/manifest.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h.i
data/src/share/classes/javax/swing/GroupLayout.java.i
data/src/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java.i
data/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethod.java.i
-data/test/javax/swing/JTextArea/6940863/bug6940863.java.i
data/make/tools/src/build/tools/jdwpgen/ArrayTypeNode.java.i
-data/src/share/native/sun/security/ec/secoidt.h.i
data/src/share/classes/sun/nio/ch/IOStatus.java.i
data/test/java/nio/channels/FileChannel/Args.java.i
data/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java.i
data/make/javax/sound/mapfile-vers.i
data/src/share/classes/java/lang/annotation/Inherited.java.i
-data/test/java/lang/Class/forName/classes/3.class.i
data/test/javax/management/loading/ArrayClassTest.java.i
-data/test/sun/security/util/DerOutputStream/LocaleInTime.java.i
-data/src/share/classes/javax/management/MXBean.java.i
+data/test/sun/rmi/runtime/Log/6409194/logging.properties.i
+data/src/solaris/classes/sun/awt/X11/XDesktopPeer.java.i
data/make/com/sun/org/apache/xml/Makefile.i
data/src/share/classes/java/lang/reflect/ReflectAccess.java.i
-data/make/tools/CharsetMapping/IBM970.map.i
+data/test/java/security/Provider/SupportsParameter.java.i
data/src/share/classes/java/security/SecureRandom.java.i
data/test/com/sun/jdi/EvalArgs.sh.i
data/test/java/io/etc/FailingFlushAndClose.java.i
data/test/java/security/cert/CertificateFactory/openssl/pem.i
data/src/share/classes/sun/security/validator/SimpleValidator.java.i
data/src/share/native/sun/security/ec/secitem.c.i
-data/src/share/classes/java/util/concurrent/ForkJoinTask.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java.i
data/src/share/classes/javax/management/timer/TimerNotification.java.i
data/src/share/classes/sun/text/resources/FormatData_es_BO.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_MA.properties.i
@@ -321,24 +303,26 @@ data/make/javax/crypto/policy/limited/default_local.policy.i
data/src/share/native/java/lang/ResourceBundle.c.i
data/src/share/classes/javax/print/attribute/AttributeSet.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java.i
+data/src/share/native/sun/awt/medialib/mlib.h.i
+data/make/tools/swing-beans/beaninfo/images/JScrollPaneColor32.gif.i
data/src/share/classes/sun/text/resources/CollationData_it.java.i
data/src/share/classes/java/lang/invoke/MethodHandleNatives.java.i
data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub_Stub.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvVersion.c.i
-data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java.i
+data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java.i
data/src/share/classes/sun/misc/resources/Messages_pt_BR.java.i
data/src/share/classes/javax/crypto/interfaces/package.html.i
-data/src/share/classes/java/sql/DataTruncation.java.i
-data/src/share/classes/javax/management/NotificationFilterSupport.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk.i
+data/test/java/rmi/server/RMIClassLoader/spi/TestProvider.java.i
data/src/share/classes/sun/text/ComposedCharIter.java.i
-data/src/solaris/native/java/net/linux_close.c.i
+data/test/java/net/Socket/AccurateTimeout.java.i
data/test/java/net/ipv6tests/B6521014.java.i
+data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java.i
data/src/share/classes/sun/launcher/resources/launcher_es.properties.i
-data/src/share/classes/sun/misc/JavaIOFileDescriptorAccess.java.i
data/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java.i
data/src/share/classes/sun/security/jca/ProviderList.java.i
-data/src/share/classes/java/lang/TypeNotPresentException.java.i
+data/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java.i
+data/test/java/util/AbstractMap/SimpleEntries.java.i
data/test/org/openjdk/jigsaw/hello-native.sh.i
data/test/sun/security/provider/PolicyParser/ExtDirs2.policy.i
data/test/java/util/ResourceBundle/Bug4168625Getter.java.i
@@ -363,21 +347,22 @@ data/src/share/back/threadControl.h.i
data/test/javax/script/Test5.java.i
data/make/java/nio/genExceptions.sh.i
data/src/windows/native/java/io/FileInputStream_md.c.i
-data/src/share/classes/sun/java2d/loops/ProcessPath.java.i
data/test/com/sun/jndi/ldap/InvalidLdapFilters.java.i
data/make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java.i
data/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java.i
+data/test/javax/xml/crypto/dsig/data/signature.xml.i
data/src/share/classes/com/sun/tools/example/debug/bdi/InputListener.java.i
data/test/java/lang/invoke/6998541/Test6998541.java.i
-data/src/share/classes/javax/print/attribute/standard/Sides.java.i
+data/src/share/native/sun/awt/image/jpeg/jdhuff.h.i
data/test/java/lang/StringCoding/locales.txt.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadZeroBytes.java.i
-data/test/java/net/URL/Protocol.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/AppleUser.java.i
+data/test/java/awt/dnd/ImageDecoratedDnD/DnDTarget.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingMetaImpl.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplds4.so.i
data/src/share/classes/sun/tools/jar/JarVerifierStream.java.i
+data/src/solaris/instrument/FileSystemSupport_md.c.i
data/src/share/sample/scripting/scriptpad/build.properties.i
data/src/share/classes/javax/imageio/stream/FileImageInputStream.java.i
data/src/share/lib/cmm/lcms/PYCC.pf.i
@@ -389,28 +374,28 @@ data/make/mkdemo/jni/Poller/Makefile.i
data/src/share/native/sun/awt/image/jpeg/jerror.h.i
data/src/share/classes/sun/tools/tree/MethodExpression.java.i
data/test/java/io/PipedWriter/WriteAfterReaderClose.java.i
-data/test/java/nio/charset/spi/charsetProvider.sp.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Encoder.java.i
+data/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh.i
data/src/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java.i
-data/make/tools/swing-beans/beaninfo/images/JSplitPaneColor16.gif.i
+data/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java.i
+data/test/java/util/ResourceBundle/Control/BadControlsTest.java.i
data/src/share/classes/sun/font/FontManagerForSGE.java.i
data/src/share/classes/overview-core.html.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java.i
data/test/javax/imageio/plugins/jpeg/ReadingInterruptionTest.java.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java.i
+data/test/javax/management/ObjectInstance/MBeanInfoFailTest.java.i
data/test/sun/security/x509/GeneralName/Encode.java.i
data/test/java/beans/Introspector/4168475/infos/ComponentBeanInfo.java.i
data/test/java/rmi/MarshalledObject/compare/makeAnnotatedRef.i
data/src/share/native/sun/awt/image/dither.h.i
data/src/share/classes/com/sun/tools/hat/internal/util/Misc.java.i
-data/make/tools/swing-beans/beaninfo/images/JFileChooserColor16.gif.i
-data/test/java/io/PushbackReader/Skip.java.i
+data/test/sun/net/www/httptest/AbstractCallback.java.i
data/make/com/sun/security/auth/module/mapfile-vers.i
-data/make/tools/swing-beans/beaninfo/SwingBeanInfoBase.java.i
+data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java.i
+data/src/share/classes/sun/java2d/pipe/Region.java.i
+data/test/sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java.i
data/src/share/classes/java/sql/SQLException.java.i
data/src/windows/native/sun/windows/awt_Palette.h.i
-data/src/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java.i
+data/test/com/sun/jndi/cosnaming/CNNameParser.java.i
data/src/share/classes/javax/naming/directory/Attributes.java.i
data/test/com/sun/jdi/NativeInstanceFilter.java.i
data/test/java/io/Serializable/enum/missingConstant/Write.java.i
@@ -418,40 +403,39 @@ data/src/share/classes/java/lang/management/OperatingSystemMXBean.java.i
data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.h.i
data/src/share/classes/java/security/cert/CertPathValidatorResult.java.i
data/test/sun/management/jmxremote/bootstrap/ssl/truststore.i
-data/src/share/classes/javax/imageio/ImageWriter.java.i
data/src/share/classes/javax/xml/crypto/dsig/XMLObject.java.i
data/src/linux/doc/man/ja/java.1.i
-data/src/share/classes/sun/nio/cs/ISO_8859_13.java.i
data/src/share/back/outStream.h.i
data/test/java/rmi/activation/Activatable/inactiveGroup/group.security.policy.i
data/src/share/classes/javax/swing/plaf/basic/icons/image-failed.png.i
data/src/share/classes/com/sun/jdi/FloatValue.java.i
-data/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java.i
+data/test/sun/security/provider/PolicyParser/ExtDirsA.java.i
data/test/java/nio/channels/Channels/ReadByte.java.i
-data/test/java/lang/Class/getClasses/Sanity.java.i
data/src/share/classes/sun/net/www/http/ChunkedOutputStream.java.i
data/make/sun/image/vis/Makefile.i
data/src/share/classes/java/security/interfaces/RSAPrivateKey.java.i
data/src/share/classes/java/rmi/activation/ActivationMonitor.java.i
-data/src/share/classes/java/math/BigDecimal.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthConstants.java.i
data/src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java.i
data/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java.i
data/src/share/native/java/lang/fdlibm/src/e_remainder.c.i
data/src/share/classes/javax/print/attribute/standard/Destination.java.i
-data/make/tools/CharsetMapping/IBM933.map.i
data/src/share/classes/sun/nio/fs/PollingWatchService.java.i
data/src/share/native/sun/awt/libpng/pngwrite.c.i
-data/test/javax/xml/crypto/dsig/data/certs/lugh.crt.i
data/src/share/classes/javax/management/ManagedOperation.java.i
+data/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java.i
+data/test/java/lang/ClassLoader/deadlock/SupAlice.java.i
+data/test/java/util/ServiceLoader/FooService.java.i
data/src/share/classes/sun/security/x509/X509CRLImpl.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.dtd.i
data/src/share/demo/jfc/TransparentRuler/README.txt.i
data/src/share/classes/sun/audio/AudioStreamSequence.java.i
+data/test/com/sun/crypto/provider/Mac/HmacSaltLengths.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_EG.java.i
data/test/java/lang/StringBuffer/Substring.java.i
data/src/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/package.html.i
-data/src/share/classes/java/util/AbstractSet.java.i
-data/src/share/native/sun/java2d/loops/DrawParallelogram.c.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/access.properties.i
+data/src/share/classes/sun/io/ByteToCharMacCyrillic.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIFont.java.i
data/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher.i
data/src/share/back/StackFrameImpl.c.i
@@ -462,38 +446,36 @@ data/src/linux/doc/man/ja/rmid.1.i
data/test/com/sun/crypto/provider/Cipher/PBE/PBEKeyTest.java.i
data/src/solaris/native/sun/awt/awt_Event.c.i
data/test/javax/imageio/plugins/gif/EncodeSubImageTest.java.i
-data/test/java/rmi/testlibrary/ActivationLibrary.java.i
data/src/share/classes/sun/rmi/server/InactiveGroupException.java.i
data/src/share/classes/javax/imageio/IIOImage.java.i
data/src/share/classes/sun/nio/ch/DevPollSelectorProvider.java.i
data/src/share/lib/security/java.security-windows.i
-data/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java.i
data/src/share/classes/sun/tools/asm/TryData.java.i
data/make/modules/tools/src/com/sun/classanalyzer/DependencyConfig.java.i
-data/src/solaris/classes/sun/awt/X11/XWindowAttributesData.java.i
data/src/share/classes/javax/swing/AbstractButton.java.i
data/test/java/util/zip/ZipFile/LargeZipFile.java.i
-data/test/java/io/Reader/OpsAfterClose.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_fr_CA.properties.i
data/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java.i
data/src/share/classes/sun/java2d/loops/BlitBg.java.i
data/test/java/awt/Mixing/HWDisappear.java.i
data/src/share/classes/sun/util/resources/LocaleNames_tr.properties.i
data/src/share/classes/java/awt/image/BufferedImageFilter.java.i
+data/src/share/classes/sun/invoke/util/BytecodeDescriptor.java.i
data/src/share/classes/java/net/CacheResponse.java.i
data/src/share/classes/sun/text/resources/CollationData_ar.java.i
-data/src/share/classes/sun/tools/tree/Statement.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/README.i
+data/test/java/util/BitSet/StickySize.java.i
+data/test/javax/swing/JFileChooser/6713352/bug6713352.java.i
data/src/solaris/classes/sun/awt/X11/XIconWindow.java.i
+data/src/share/classes/sun/util/calendar/ImmutableGregorianDate.java.i
data/src/share/classes/com/sun/tools/jdi/EventQueueImpl.java.i
data/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.html.i
-data/src/solaris/native/sun/awt/awt_Plugin.h.i
-data/src/share/classes/sun/util/locale/LocaleObjectCache.java.i
-data/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java.i
+data/src/share/classes/sun/security/x509/IPAddressName.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ArgCheck.java.i
+data/test/java/util/concurrent/ConcurrentLinkedQueue/LoopHelpers.java.i
data/make/tools/swing-beans/beaninfo/images/JDialogMono16.gif.i
-data/src/share/instrument/PathCharsValidator.c.i
-data/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java.i
+data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html.i
+data/test/javax/management/eventService/UsingEventService.java.i
data/src/share/classes/sun/misc/resources/Messages_ko.java.i
-data/src/share/classes/sun/nio/fs/BasicFileAttributesHolder.java.i
data/src/share/classes/javax/swing/ActionMap.java.i
data/src/solaris/classes/sun/awt/X11/XButtonPeer.java.i
data/src/share/classes/javax/management/Notification.java.i
@@ -502,12 +484,12 @@ data/make/sun/font/reorder-sparc.i
data/src/share/classes/sun/java2d/loops/DrawPolygons.java.i
data/src/share/classes/sun/security/krb5/KrbAsRep.java.i
data/src/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html.i
+data/test/java/text/Format/DateFormat/Bug6683975.java.i
data/src/solaris/native/java/io/FileOutputStream_md.c.i
-data/test/java/net/Socket/ShutdownInput.java.i
+data/test/java/awt/Graphics2D/DrawString/RotTransText.java.i
+data/test/javax/script/RhinoExceptionTest.java.i
data/src/share/classes/javax/imageio/IIOParamController.java.i
data/src/share/classes/java/lang/InheritableThreadLocal.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/compress.c.i
data/src/share/classes/javax/security/auth/Subject.java.i
data/src/share/classes/sun/nio/cs/ext/IBM950.java.d
data/src/share/native/sun/java2d/opengl/OGLMaskFill.h.i
@@ -518,9 +500,9 @@ data/src/share/classes/sun/reflect/generics/scope/ConstructorScope.java.i
data/src/share/classes/javax/management/relation/RelationTypeNotFoundException.java.i
data/make/sun/tracing/dtrace/Makefile.i
data/src/share/classes/sun/reflect/UnsafeShortFieldAccessorImpl.java.i
-data/make/mkdemo/jvmti/mtrace/Makefile.i
data/src/share/classes/sun/io/ByteToCharMacHebrew.java.i
-data/src/solaris/classes/sun/awt/X11/XKeySymConstants.java.i
+data/src/windows/native/sun/windows/awt_DataTransferer.cpp.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c.i
data/src/share/native/sun/java2d/loops/FourByteAbgrPre.c.i
data/src/share/classes/sun/security/krb5/internal/Ticket.java.i
data/src/solaris/native/sun/awt/wsutils.h.i
@@ -531,17 +513,17 @@ data/src/share/native/sun/awt/utility/rect.c.i
data/test/java/io/InputStreamReader/ReadOffset.java.i
data/src/share/classes/java/dyn/SwitchPoint.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.c.i
-data/src/share/classes/sun/print/CustomMediaTray.java.i
-data/src/share/classes/java/nio/channels/ReadableByteChannel.java.i
+data/src/share/classes/sun/tools/jconsole/Plotter.java.i
data/src/share/classes/java/awt/FontMetrics.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif.i
data/src/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java.i
-data/test/java/security/cert/CertPath/Serialize.java.i
+data/src/share/classes/sun/text/resources/FormatData_en.java.i
+data/test/java/security/KeyRep/SerialDSAPubKey.policy.i
+data/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet_Stub.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif.i
-data/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMBean.java.i
data/src/share/classes/sun/management/HotspotMemory.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java.i
+data/src/share/classes/javax/swing/plaf/basic/icons/image-delayed.png.i
data/src/share/classes/sun/tools/tree/NotEqualExpression.java.i
data/src/share/classes/java/util/zip/Checksum.java.i
data/test/java/lang/Class/asSubclass/BasicUnit.java.i
@@ -553,31 +535,29 @@ data/src/share/classes/javax/swing/JTable.java.i
data/src/share/demo/jfc/Metalworks/ContrastMetalTheme.java.i
data/src/windows/hpi/include/threads_md.h.i
data/src/share/classes/sun/io/CharToByteISO8859_13.java.i
-data/src/share/classes/com/sun/media/sound/AuFileWriter.java.i
+data/src/share/classes/com/sun/crypto/provider/DESedeKey.java.i
data/src/share/classes/com/sun/beans/decoder/TrueElementHandler.java.i
data/src/share/classes/sun/io/CharToByteCp1098.java.i
-data/make/tools/winver/bin/winver.exe.i
-data/src/solaris/classes/sun/nio/fs/SolarisFileStore.java.i
+data/test/sun/tools/jstat/gcOldCapacityOutput1.awk.i
data/test/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java.i
data/test/sun/rmi/rmic/minimizeWrapperInstances/Test.java.i
data/test/java/io/Serializable/subclass/AbstractObjectInputStream.java.i
data/src/share/classes/sun/io/CharToByteASCII.java.i
data/test/java/lang/Class/getMethod/Exceptions.java.i
-data/test/java/lang/Class/EnumPoseur.java.src.i
data/test/java/dyn/JavaDocExamples.java.i
+data/src/share/native/sun/awt/medialib/mlib_image.h.i
data/src/share/classes/sun/text/normalizer/CharTrie.java.i
data/make/tools/swing-beans/beaninfo/images/JTableColor16.gif.i
-data/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties.i
data/src/share/classes/java/security/cert/CertPathBuilderResult.java.i
-data/src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES.i
+data/src/share/classes/sun/io/CharToByteCp1381.java.i
data/src/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java.i
data/src/share/classes/sun/util/resources/LocaleData.java.i
+data/src/share/classes/sun/rmi/log/ReliableLog.java.i
+data/make/modules/bootmodule.roots.i
data/test/tools/pack200/pack200-verifier/data/golden.jar.d
data/src/share/classes/javax/swing/text/InternationalFormatter.java.i
-data/src/share/native/sun/awt/libpng/pngwtran.c.i
-data/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java.i
-data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails_Stub.java.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java.i
data/test/javax/management/remote/mandatory/connection/GetConnectionTest.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties.i
data/test/sun/misc/Hello.class.i
@@ -588,39 +568,39 @@ data/test/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java.i
data/test/java/nio/file/Path/Misc.java.i
data/src/windows/classes/sun/java2d/windows/GDIBlitLoops.java.i
data/src/share/native/com/sun/java/util/jar/pack/constants.h.i
-data/src/windows/native/sun/windows/awt_Cursor.cpp.i
+data/test/java/net/Socket/asyncClose/DatagramSocket_receive.java.i
data/test/sun/java2d/GdiRendering/InsetClipping.java.i
data/make/sun/javazic/tzdata/northamerica.i
data/src/share/classes/javax/sound/sampled/LineUnavailableException.java.i
data/test/java/util/PriorityQueue/PriorityQueueSort.java.i
data/src/share/native/sun/awt/image/jpeg/jdinput.c.i
-data/src/share/demo/jfc/Metalworks/MetalThemeMenu.java.i
data/src/share/classes/java/security/Security.java.i
data/src/share/classes/sun/nio/cs/ext/DBCS_ONLY_IBM_EBCDIC_Decoder.java.i
-data/make/tools/README.txt.i
-data/src/share/native/sun/java2d/loops/AnyInt.c.i
+data/src/share/classes/java/awt/doc-files/RadialGradientPaint-2.png.i
+data/test/com/sun/jdi/StepTest.java.i
data/src/share/classes/sun/text/resources/FormatData_in.java.i
data/test/java/rmi/server/UnicastRemoteObject/unexportObject/Ping.java.i
data/src/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java.i
data/src/share/classes/com/sun/tools/jconsole/JConsoleContext.java.i
data/src/share/classes/javax/swing/BoundedRangeModel.java.i
data/src/share/classes/com/sun/crypto/provider/HmacSHA1.java.i
-data/make/java/management/Exportedfiles.gmk.i
-data/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java.i
+data/make/README.i
+data/src/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java.i
data/src/share/classes/javax/print/attribute/standard/Chromaticity.java.i
data/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java.i
data/src/share/classes/sun/awt/WindowAccessor.java.i
data/src/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java.i
data/src/share/classes/sun/font/FontManagerNativeLibrary.java.i
data/src/share/classes/com/sun/security/auth/login/ConfigFile.java.i
+data/src/solaris/native/sun/awt/awt_Label.c.i
data/src/share/classes/java/nio/Bits.java.i
data/src/share/classes/sun/dyn/empty/Empty.java.i
-data/src/share/classes/sun/security/krb5/KrbKdcReq.java.i
+data/test/sun/nio/cs/LatinCharReplacementTWTest.java.i
data/src/share/classes/javax/swing/text/SegmentCache.java.i
-data/src/solaris/native/sun/awt/awt_motif.c.i
data/test/java/lang/Runtime/exec/LotsOfDestroys.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerHandler.java.i
data/make/java/nio/genBuffer.sh.i
-data/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java.i
+data/src/solaris/classes/sun/awt/X11/XMouseInfoPeer.java.i
data/src/windows/native/java/net/NetworkInterface_winXP.c.i
data/test/java/nio/file/Files/TemporaryFiles.java.i
data/src/share/classes/java/rmi/registry/package.html.i
@@ -628,22 +608,18 @@ data/src/share/demo/applets/MoleculeViewer/Matrix3D.java.i
data/src/share/classes/sun/tools/tree/Vset.java.i
data/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java.i
data/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c.i
-data/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java.i
-data/src/share/native/sun/awt/libpng/pnginfo.h.i
data/src/share/classes/sun/java2d/loops/XORComposite.java.i
data/src/share/classes/javax/swing/DefaultBoundedRangeModel.java.i
data/make/tools/swing-beans/beaninfo/images/JLabelColor16.gif.i
data/test/javax/management/monitor/RuntimeExceptionTest.java.i
-data/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java.i
-data/make/modules/tools/src/com/sun/classanalyzer/CheckDeps.java.i
-data/src/share/classes/sun/text/resources/CollationData_bg.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sk_SK.properties.i
+data/test/java/nio/file/attribute/PosixFileAttributeView/Basic.java.i
data/test/sun/security/krb5/ktab/KeyString.java.i
-data/src/share/classes/javax/swing/text/BoxView.java.i
data/src/share/classes/javax/crypto/Cipher.java.i
data/src/share/classes/sun/net/ConnectionResetException.java.i
data/src/solaris/native/sun/awt/awt_MenuBar.h.i
data/src/share/classes/sun/tools/java/ScannerInputReader.java.i
-data/src/share/classes/javax/swing/plaf/basic/icons/image-delayed.png.i
+data/test/javax/management/remote/mandatory/connectorServer/ForwarderChainTest.java.i
data/src/windows/native/sun/windows/awt_AWTEvent.cpp.i
data/src/share/classes/sun/swing/StringUIClientPropertyKey.java.i
data/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java.i
@@ -652,39 +628,41 @@ data/src/share/classes/java/lang/doc-files/capupsil.gif.i
data/src/share/native/sun/security/ec/impl/oid.c.i
data/test/sun/net/www/protocol/http/SetChunkedStreamingMode.java.i
data/src/share/bin/wildcard.h.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java.i
data/src/share/classes/sun/nio/cs/ext/META-INF/services/java.nio.charset.spi.CharsetProvider.i
-data/test/sun/security/ssl/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java.i
data/src/share/classes/java/rmi/RemoteException.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java.i
data/src/share/native/sun/awt/image/jpeg/jmemnobs.c.i
data/test/sun/util/resources/TimeZone/Bug4938846.java.i
data/make/java/java_hprof_demo/mapfile-vers.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapInterestedHost.java.i
+data/src/solaris/doc/sun/man/man1/extcheck.1.i
data/src/share/classes/com/sun/jdi/VMOutOfMemoryException.java.i
data/test/com/sun/jdi/TwoThreadsTest.java.i
data/test/java/net/Authenticator/AuthNPETest.java.i
data/src/share/classes/java/awt/WaitDispatchSupport.java.i
-data/src/share/classes/javax/swing/text/rtf/charsets/cpg850.txt.i
+data/src/share/classes/sun/text/resources/FormatData_mk_MK.java.i
data/src/share/classes/javax/net/ssl/X509ExtendedTrustManager.java.i
-data/test/sun/net/www/protocol/http/WebGet.java.i
+data/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java.i
data/src/solaris/classes/sun/awt/X11/WindowDimensions.java.i
-data/src/share/classes/javax/accessibility/Accessible.java.i
+data/src/share/classes/com/sun/tools/script/shell/Main.java.i
data/test/java/util/zip/LargeZip.java.i
-data/make/tools/src/build/tools/generatecharacter/CharacterScript.java.i
data/test/java/io/Reader/SkipInput.txt.i
data/make/tools/CharsetMapping/MS950.nr.i
-data/src/share/classes/javax/swing/text/html/StyleSheet.java.i
+data/test/com/sun/security/sasl/PropertiesFileCallbackHandler.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/Inform.gif.i
+data/test/java/rmi/reliability/juicer/OrangeEchoImpl.java.i
data/src/share/classes/javax/xml/crypto/dsig/SignatureProperty.java.i
data/src/solaris/sample/dtrace/hotspot/gc_time_stat.d.i
+data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java.i
data/test/java/io/Serializable/PutField/Read.java.i
data/src/share/classes/sun/awt/FontDescriptor.java.i
-data/src/share/native/com/sun/media/sound/MidiInDeviceProvider.c.i
data/src/share/native/sun/awt/libpng/pnggccrd.c.i
data/src/solaris/native/sun/java2d/loops/mlib_ImageZoom.h.i
data/src/solaris/classes/sun/awt/X11/XIconInfo.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent0001.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/Aes128.java.i
-data/src/windows/native/sun/jkernel/graphics/bullet.bmp.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java.i
data/test/sun/tools/native2ascii/N2A_4636448.i
data/src/share/native/java/lang/fdlibm/src/e_fmod.c.i
data/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh.i
@@ -694,67 +672,61 @@ data/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java.i
data/src/share/classes/java/awt/event/TextListener.java.i
data/src/share/classes/com/sun/media/sound/MidiInDevice.java.i
data/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Decoder.java.i
-data/test/java/io/BufferedReader/Fill.java.i
+data/test/javax/swing/GroupLayout/6613904/bug6613904.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties.i
data/src/share/classes/sun/nio/cs/ext/IBM875.java.i
-data/src/share/classes/sun/nio/ch/Secrets.java.i
+data/src/share/classes/sun/security/pkcs/PKCS10Attributes.java.i
data/src/share/demo/jfc/Metalworks/README.txt.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassAnalyzer.java.i
-data/src/share/native/sun/awt/image/gif/gifdecoder.c.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java.i
data/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c.i
-data/src/share/classes/javax/imageio/IIOException.java.i
+data/test/javax/swing/JTextArea/6940863/bug6940863.java.i
data/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java.i
data/make/tools/swing-beans/beaninfo/images/JAppletMono32.gif.i
data/src/linux/doc/man/ja/javap.1.i
-data/src/share/classes/java/lang/annotation/Retention.java.i
+data/src/share/classes/sun/misc/resources/Messages_it.java.i
data/test/com/sun/net/httpserver/LogFilter.java.i
data/src/share/demo/jfc/Metalworks/MetalworksInBox.java.i
-data/make/sun/splashscreen/mapfile-vers.i
-data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono16.gif.i
+data/src/share/classes/sun/instrument/TransformerManager.java.i
+data/src/share/classes/javax/swing/JComponent.java.i
data/src/share/classes/java/text/Normalizer.java.i
-data/test/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java.i
-data/src/share/javavm/include/opcodes.weight.i
data/test/sun/java2d/SunGraphics2D/PolyVertTest.java.i
data/src/share/native/sun/awt/image/cvutils/img_noscale.h.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java.i
data/src/share/classes/javax/script/AbstractScriptEngine.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_fi.properties.i
data/test/javax/management/ObjectName/ApplyWildcardTest.java.i
data/src/share/classes/javax/swing/tree/ExpandVetoException.java.i
data/test/java/lang/Thread/MainThreadTest.java.i
data/src/share/demo/jfc/Notepad/ElementTreePanel.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java.i
data/src/share/classes/sun/nio/cs/ext/IBM860.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so.i
data/src/share/demo/jvmti/hprof/hprof_table.c.i
data/src/share/classes/com/sun/jmx/event/EventConnection.java.i
data/src/share/back/outStream.c.i
data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/NotificationMBeanSupport.java.i
data/test/javax/management/Introspector/FeatureOrderTest.java.i
data/test/java/util/concurrent/TimeUnit/Basic.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/LRGB555.png.i
data/src/share/classes/sun/security/pkcs11/P11Digest.java.i
data/src/share/classes/java/sql/Time.java.i
-data/test/java/io/Serializable/defaulted/GetFieldWrite.java.i
+data/test/java/nio/channels/FileChannel/Transfers.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableSupport.java.i
+data/test/javax/swing/JPopupMenu/6690791/bug6690791.java.i
data/src/solaris/classes/sun/awt/motif/X11FontMetrics.java.i
-data/test/java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java.i
-data/src/share/classes/com/sun/jmx/namespace/RoutingConnectionProxy.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java.i
data/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy.i
data/src/share/classes/sun/rmi/rmic/Constants.java.i
-data/src/share/native/sun/awt/image/dither.c.i
-data/src/share/classes/org/openjdk/jigsaw/Hi.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java.i
+data/src/share/back/ObjectReferenceImpl.h.i
data/make/sun/jpeg/Makefile.i
-data/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/Constants.java.i
data/src/share/classes/sun/nio/ch/NativeThreadSet.java.i
data/src/share/classes/java/util/zip/ZipConstants.java.i
data/src/share/classes/javax/swing/plaf/nimbus/StateImpl.template.i
-data/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java.i
-data/src/share/classes/com/sun/imageio/plugins/common/I18N.java.i
+data/test/sun/net/www/protocol/jar/getcontenttype.sh.i
+data/test/org/openjdk/jigsaw/cli/ModuleFileTest.java.i
data/test/java/net/URLClassLoader/closetest/README.i
-data/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java.i
+data/test/javax/management/namespace/SourceNamespaceTest.java.i
data/test/sun/security/pkcs11/ec/certs/sunlabscerts.pem.i
data/src/solaris/native/sun/awt/awt_DataTransferer.c.i
data/src/share/native/sun/font/layout/IndicLayoutEngine.h.i
@@ -763,64 +735,61 @@ data/src/share/classes/java/nio/file/StandardWatchEventKind.java.i
data/test/java/security/cert/X509Certificate/EmptySubject.java.i
data/src/share/classes/javax/swing/event/MouseInputAdapter.java.i
data/src/share/classes/java/nio/file/attribute/GroupPrincipal.java.i
-data/src/share/classes/com/sun/media/sound/FastSysexMessage.java.i
-data/test/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java.i
+data/test/java/lang/management/MemoryMXBean/LowMemoryTestConcMarkSweepGC.sh.i
data/test/java/beans/XMLEncoder/java_util_JumboEnumSet.java.i
data/make/tools/CharsetMapping/IBM875.nr.i
-data/src/share/classes/sun/beans/editors/FloatEditor.java.i
+data/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMeta.java.i
data/src/share/classes/javax/swing/DefaultCellEditor.java.i
data/src/share/classes/javax/management/MBeanParameterInfo.java.i
data/src/share/classes/javax/crypto/AEADBadTagException.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java.i
data/src/share/classes/javax/print/PrintServiceLookup.java.i
+data/src/share/classes/javax/swing/event/AncestorListener.java.i
data/src/share/classes/sun/net/www/content/audio/basic.java.i
+data/test/sun/net/InetAddress/nameservice/dns/CanonicalName.java.i
data/make/sun/image/generic/mapfile-vers.i
-data/src/share/classes/java/nio/file/PathMatcher.java.i
-data/src/share/classes/sun/awt/TracedEventQueue.java.i
+data/test/sun/management/windows/revokeall.c.i
data/src/share/native/sun/java2d/cmm/lcms/cmscam97.c.i
data/src/share/classes/sun/text/resources/FormatData_ar_LY.java.i
data/src/share/classes/javax/swing/plaf/ActionMapUIResource.java.i
data/src/share/classes/java/util/regex/Pattern.java.i
+data/test/java/util/prefs/PrefsSpi.sh.i
data/src/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java.i
data/src/share/classes/com/sun/crypto/provider/RC2Cipher.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java.i
data/src/share/classes/sun/util/calendar/BaseCalendar.java.i
data/test/sun/net/www/http/HttpClient/IsKeepingAlive.policy.i
data/src/solaris/native/sun/java2d/loops/mlib_ImageLogic_proto.h.i
+data/test/java/nio/channels/ServerSocketChannel/Basic.java.i
data/src/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java.i
data/src/share/classes/javax/security/sasl/SaslClientFactory.java.i
data/src/share/classes/com/sun/jdi/request/ExceptionRequest.java.i
-data/test/java/lang/Throwable/LegacyChainedExceptionSerialization.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/rsa/BrokenRSAPrivateCrtKey.java.i
data/test/sun/security/util/DerInputBuffer/Allow.policy.i
-data/src/share/classes/sun/security/x509/DNSName.java.i
data/test/java/util/ResourceBundle/Control/StressOut_ja.properties.i
data/make/common/Classes.gmk.i
-data/test/java/net/URL/OpenStream.java.i
-data/make/tools/src/build/tools/jdwpgen/BooleanTypeNode.java.i
data/src/share/native/sun/security/ec/ecp_224.c.i
-data/src/share/classes/java/security/CryptoPrimitive.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties.i
data/src/share/classes/javax/imageio/stream/FileImageOutputStream.java.i
data/src/solaris/native/sun/java2d/loops/vis_ByteGray_Mask.c.i
data/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java.i
+data/src/solaris/classes/sun/awt/motif/MButtonPeer.java.i
data/test/java/rmi/activation/CommandEnvironment/Doctor.java.i
data/test/java/util/PluggableLocale/LocaleNameProviderTest.java.i
-data/src/share/classes/java/awt/peer/MenuItemPeer.java.i
data/src/share/classes/java/awt/image/ImageFilter.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/DropShadowEffect.java.i
data/src/share/classes/java/net/SocketOutputStream.java.i
-data/src/share/classes/com/sun/jdi/Value.java.i
data/test/java/util/ResourceBundle/Test4318520RB_de.properties.i
data/src/share/classes/sun/print/PSPrinterJob.java.i
-data/test/sun/net/www/ftptest/FtpServer.java.i
-data/test/java/lang/ThreadLocal/TLRemoveTest.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c.i
-data/test/java/beans/Statement/Test6788531.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/LongCalls.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy.i
+data/src/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java.i
+data/test/tools/pack200/Utils.java.i
+data/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh.i
+data/test/java/lang/Class/IsSynthetic.java.i
data/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java.i
data/src/share/classes/com/sun/jmx/event/EventBuffer.java.i
-data/test/java/awt/List/SetBackgroundTest/SetBackgroundTest.java.i
data/src/share/classes/com/sun/media/sound/MidiDeviceReceiver.java.i
data/make/tools/CharsetMapping/HKSCS_XP.c2b.i
data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Bar.java.i
@@ -836,15 +805,11 @@ data/src/share/classes/java/sql/SQLRecoverableException.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffineIndex_BC.c.i
data/test/java/awt/Frame/DynamicLayout/DynamicLayout.java.i
data/src/share/classes/sun/security/acl/AclImpl.java.i
-data/src/share/classes/java/awt/datatransfer/FlavorEvent.java.i
-data/src/share/classes/javax/crypto/CryptoPermissions.java.i
-data/src/share/classes/sun/tools/tree/AssignShiftRightExpression.java.i
+data/test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java.i
data/src/share/sample/jmx/jmx-scandir/src/etc/testconfig.xml.i
-data/src/share/native/sun/font/layout/GDEFMarkFilter.cpp.i
data/src/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java.i
data/src/share/classes/java/net/NetPermission.java.i
-data/make/tools/CharsetMapping/MS932.nr.i
-data/test/java/beans/EventHandler/Test6277246.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java.i
data/src/share/native/sun/security/ec/mplogic.c.i
data/src/share/classes/java/lang/Math.java.i
data/src/share/classes/java/net/StandardSocketOptions.java.i
@@ -859,49 +824,51 @@ data/src/share/classes/javax/print/attribute/standard/CopiesSupported.java.i
data/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libplc4.so.i
data/src/share/classes/javax/sql/PooledConnection.java.i
-data/src/share/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml.i
+data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java.i
data/make/tools/CharsetMapping/MacIceland.map.i
-data/src/share/classes/javax/swing/event/RowSorterEvent.java.i
+data/src/share/classes/javax/swing/text/TabSet.java.i
data/src/share/classes/sun/io/CharToByteCp1250.java.i
data/test/java/net/MulticastSocket/NoLoopbackPackets.java.i
-data/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html.i
-data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.cpp.i
+data/test/java/awt/Modal/LWModalTest/LWModalTest.java.i
+data/test/org/openjdk/jigsaw/cli/TimestampTest.java.i
data/src/share/classes/java/nio/Direct-X-Buffer.java.template.i
-data/src/share/classes/sun/print/resources/orientRevLandscape.png.i
+data/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java.i
data/test/javax/swing/JInternalFrame/6647340/bug6647340.java.i
-data/src/share/classes/com/sun/security/auth/LdapPrincipal.java.i
-data/make/tools/src/build/tools/jdwpgen/AbstractSimpleTypeNode.java.i
+data/make/sun/font/reorder-i586.i
+data/src/share/classes/javax/naming/ldap/ExtendedResponse.java.i
data/src/share/classes/java/awt/GridBagLayout.java.i
-data/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.h.i
data/src/share/native/sun/java2d/opengl/J2D_GL/gl.h.i
data/src/share/classes/java/util/ComparableTimSort.java.i
-data/src/share/classes/javax/security/sasl/SaslException.java.i
-data/src/share/native/sun/font/layout/Lookups.cpp.i
+data/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java.i
data/src/share/classes/sun/security/util/Resources_zh_CN.java.i
-data/src/share/classes/sun/tools/jstat/ExpressionResolver.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java.i
+data/src/share/classes/javax/swing/Painter.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java.i
data/src/share/demo/jfc/Font2DTest/FontPanel.java.i
data/src/share/classes/com/sun/security/auth/NTSid.java.i
-data/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java.i
-data/make/sun/image/vis/FILES_c.gmk.i
+data/src/share/demo/jvmti/hprof/hprof_event.c.i
data/src/share/native/sun/awt/libpng/pngvcrd.c.i
data/test/java/nio/file/Path/PathOps.java.i
-data/test/java/util/Locale/data/deflocale.sol10.i
-data/src/solaris/native/java/lang/UNIXProcess_md.c.i
-data/test/java/security/testlibrary/ProvidersSnapshot.java.i
+data/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java.i
+data/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java.i
+data/test/java/io/Serializable/subclass/Test.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/inffast.c.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy32.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Repositor.java.i
+data/test/com/sun/crypto/provider/Cipher/CTR/CounterMode.java.i
+data/src/share/classes/sun/security/jgss/krb5/MicToken.java.i
+data/src/share/transport/socket/sysSocket.h.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy16.i
data/test/sun/management/jmxremote/bootstrap/TestManager.java.i
-data/src/share/classes/javax/swing/table/TableColumnModel.java.i
+data/make/tools/src/build/tools/jdwpgen/ClassObjectTypeNode.java.i
data/src/share/classes/java/util/XMLUtils.java.i
data/src/share/classes/java/net/SocksSocketImpl.java.i
-data/test/java/security/cert/CertPathValidatorException/jdk6.serial.i
+data/src/windows/classes/sun/java2d/d3d/D3DContext.java.i
data/src/share/classes/java/util/zip/InflaterInputStream.java.i
data/src/share/classes/javax/imageio/plugins/bmp/package.html.i
data/src/share/classes/sun/management/counter/perf/PerfStringCounter.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java.i
data/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java.i
data/src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java.i
data/test/java/net/URL/win32_file_urls.i
@@ -910,7 +877,7 @@ data/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java.i
data/test/javax/security/auth/login/LoginContext/ModuleSubject.java.i
data/src/share/classes/java/security/SignedObject.java.i
data/src/share/classes/java/sql/ResultSetMetaData.java.i
-data/test/java/nio/channels/Channels/ReadOffset.java.i
+data/src/share/demo/applets/WireFrame/example4.html.i
data/src/share/classes/sun/font/CompositeFontDescriptor.java.i
data/test/java/awt/xembed/server/TestXEmbedServer.java.i
data/src/windows/classes/sun/security/mscapi/RSAPublicKey.java.i
@@ -918,7 +885,7 @@ data/make/tools/CharsetMapping/TIS_620.map.i
data/src/share/native/sun/font/layout/DefaultCharMapper.h.i
data/src/share/classes/sun/security/pkcs11/P11Key.java.i
data/src/share/classes/sun/text/resources/FormatData_el_CY.java.i
-data/src/share/classes/javax/security/auth/callback/CallbackHandler.java.i
+data/src/share/classes/sun/text/normalizer/UCharacterProperty.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/RepeatObjs.java.i
data/src/share/classes/com/sun/media/sound/Platform.java.i
data/src/share/classes/sun/misc/MetaIndex.java.i
@@ -929,53 +896,45 @@ data/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java.i
data/src/share/classes/java/net/InterfaceAddress.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif.i
data/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java.i
-data/src/share/classes/sun/util/resources/TimeZoneNames.java.i
data/src/share/classes/sun/security/jgss/GSSExceptionImpl.java.i
data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml.i
+data/src/share/instrument/EncodingSupport.c.i
data/test/sun/nio/cs/ISO2022JP.trailEsc.i
data/make/tools/CharsetMapping/IBM1381.c2b.i
data/src/share/classes/sun/io/CharToByteCp33722.java.i
data/src/share/demo/jvmti/hprof/hprof_tls.h.i
data/src/share/classes/java/awt/geom/CubicIterator.java.i
data/make/mksample/jmx/jmx-scandir/Makefile.i
-data/src/share/classes/sun/io/CharToByteCp1047.java.i
+data/test/java/util/AbstractList/CheckForComodification.java.i
data/src/share/classes/java/lang/ref/Reference.java.i
-data/src/share/classes/java/lang/ClassCircularityError.java.i
+data/src/share/native/sun/security/ec/mp_gf2m-priv.h.i
+data/test/sun/jvmstat/testlibrary/utils.sh.i
data/src/share/classes/javax/swing/event/TreeSelectionEvent.java.i
data/make/tools/CharsetMapping/SingleByte-X.java.template.i
data/src/share/classes/javax/swing/event/ListDataEvent.java.i
-data/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java.i
data/src/share/classes/sun/text/normalizer/Replaceable.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserTokenManager.java.i
-data/src/windows/hpi/export/hpi_md.h.i
data/test/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeImpl.java.i
data/src/share/classes/java/awt/CheckboxMenuItem.java.i
data/src/share/demo/nbproject/management/MemoryMonitor/build.properties.i
data/test/java/beans/PropertyEditor/TestLongTypeJava.java.i
-data/test/java/lang/Math/WorstCaseTests.java.i
data/make/netbeans/swing/README.i
-data/test/java/lang/ThreadGroup/NullThreadName.java.i
+data/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so.i
data/make/tools/swing-beans/beaninfo/images/JSpinnerMono16.gif.i
data/test/javax/management/Introspector/IdenticalMBeanInfoTest.java.i
-data/src/windows/native/common/jlong_md.h.i
-data/src/share/classes/sun/net/www/ApplicationLaunchException.java.i
+data/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup.i
data/test/tools/launcher/libraryCaller.c.i
-data/src/share/classes/javax/management/AttributeList.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties.i
data/make/java/npt/Makefile.i
data/src/share/classes/sun/io/ByteToCharISO8859_6.java.i
data/src/share/classes/javax/swing/event/TreeSelectionListener.java.i
data/src/share/classes/java/awt/font/LayoutPath.java.i
data/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java.i
data/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java.i
data/test/java/beans/XMLEncoder/Test4935607.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java.i
data/src/share/classes/sun/net/www/protocol/http/AuthCacheValue.java.i
data/src/share/native/sun/java2d/loops/ByteBinary2Bit.h.i
-data/src/share/classes/sun/io/CharToByteCp1026.java.i
data/src/solaris/classes/sun/java2d/jules/IdleTileCache.java.i
-data/src/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java.i
data/src/share/classes/javax/swing/plaf/metal/sounds/FrameClose.wav.i
data/src/share/classes/sun/print/DialogOwner.java.i
data/src/share/classes/javax/management/monitor/Monitor.java.i
@@ -985,26 +944,24 @@ data/test/javax/swing/JTable/6788484/bug6788484.java.i
data/test/java/net/Socket/CloseAvailable.java.i
data/src/share/classes/com/sun/tracing/dtrace/ArgsAttributes.java.i
data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/steve2tom.cer.i
-data/src/share/classes/javax/crypto/BadPaddingException.java.i
data/test/java/io/Serializable/subclass/XObjectOutputStream.java.i
-data/test/sun/security/pkcs11/KeyStore/ClientAuth.java.i
data/src/share/classes/sun/util/resources/LocaleNames_iw.properties.i
data/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java.i
data/src/share/classes/com/sun/java/browser/dom/DOMServiceProvider.java.i
data/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface1.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java.i
data/test/sun/nio/cs/EucJpLinuxDecoderRecoveryTest.java.i
data/src/share/classes/sun/nio/ch/FileDispatcher.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaThing.java.i
data/src/share/classes/sun/nio/cs/ext/MacDingbat.java.i
-data/src/share/classes/sun/java2d/loops/FillRect.java.i
data/src/share/classes/java/util/concurrent/ArrayBlockingQueue.java.i
data/src/share/classes/sun/security/krb5/internal/ASReq.java.i
-data/src/share/demo/jvmti/hprof/hprof_reference.h.i
-data/make/netbeans/common/share-sources.ent.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java.i
data/make/tools/sharing/README.txt.i
-data/src/share/classes/java/lang/annotation/package-info.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java.i
data/src/share/classes/javax/naming/ldap/Rfc2253Parser.java.i
data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java.i
@@ -1017,13 +974,13 @@ data/make/tools/CharsetMapping/IBM1112.nr.i
data/test/com/sun/servicetag/JavaServiceTagTest.java.i
data/make/modules/tools/build.xml.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties.i
-data/src/share/classes/java/io/PushbackReader.java.i
+data/src/share/classes/sun/beans/editors/FontEditor.java.i
data/src/windows/native/sun/windows/awt_Canvas.cpp.i
-data/src/share/classes/java/io/PrintStream.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif.i
+data/test/java/net/URLDecoder/B6463990.java.i
data/test/sun/misc/URLClassPath/FileLoaderTest.java.i
data/make/tools/CharsetMapping/IBM857.map.i
data/src/share/classes/java/awt/event/AWTEventListener.java.i
-data/make/javax/imageio/Makefile.i
data/test/java/io/File/IsAbsolute.java.i
data/src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java.i
data/src/share/classes/sun/management/resources/agent_pt_BR.properties.i
@@ -1034,7 +991,6 @@ data/src/share/classes/com/sun/jmx/snmp/SnmpStringFixed.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java.i
data/src/share/classes/java/io/Console.java.i
data/src/solaris/native/sun/java2d/loops/vis_IntArgbBm.c.i
-data/src/share/classes/java/security/acl/LastOwnerException.java.i
data/test/java/io/RandomAccessFile/SetLength.java.i
data/src/share/classes/org/openjdk/jigsaw/PathContext.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java.i
@@ -1043,28 +999,27 @@ data/src/share/classes/sun/text/resources/CollationData_ja.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/README.i
data/src/share/native/sun/font/layout/CoverageTables.cpp.i
data/src/share/classes/com/sun/crypto/provider/AESConstants.java.i
-data/src/share/classes/sun/instrument/InstrumentationImpl.java.i
-data/src/windows/native/sun/java2d/windows/ddrawUtils.h.i
+data/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java.i
data/test/java/beans/XMLEncoder/AbstractTest.java.i
data/src/solaris/sample/dtrace/helpers/dtrace_helper.d.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html.i
data/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java.i
-data/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java.i
+data/src/solaris/back/proc_md.h.i
data/src/share/classes/javax/swing/plaf/synth/SynthUI.java.i
-data/src/share/classes/sun/nio/cs/KOI8_R.java.i
data/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java.i
data/make/mkdemo/applets/GraphLayout/Makefile.i
data/make/tools/swing-beans/beaninfo/images/JFileChooserColor32.gif.i
data/test/java/awt/print/PrinterJob/PageRanges.java.i
data/make/tools/CharsetMapping/IBM1122.map.i
data/src/share/classes/java/rmi/dgc/package.html.i
data/src/share/classes/java/util/logging/PlatformLoggingMXBean.java.i
+data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/ByteArrays.java.i
data/make/tools/swing-beans/beaninfo/images/JMenuItemMono32.gif.i
data/src/share/classes/sun/security/ec/ECKeyFactory.java.i
-data/test/java/io/Serializable/class/run.sh.i
-data/src/share/classes/javax/swing/table/TableModel.java.i
-data/test/java/security/BasicPermission/SerialVersion.1.2.1.i
+data/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java.i
+data/src/share/classes/sun/java2d/loops/FillRect.java.i
data/test/java/net/URLConnection/olympus.jpg.i
data/src/share/classes/java/security/cert/X509CRLSelector.java.i
data/src/share/classes/sun/swing/SwingAccessor.java.i
@@ -1072,15 +1027,15 @@ data/src/share/demo/nbproject/jfc/FileChooserDemo/build.properties.i
data/src/share/classes/com/sun/beans/finder/InstanceFinder.java.i
data/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java.i
data/src/share/classes/sun/io/ByteToCharGB18030.java.i
-data/src/share/classes/com/sun/media/sound/Printer.java.i
-data/make/sun/rmi/rmi/mapfile-vers.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java.i
data/src/share/classes/sun/io/CharToByteJIS0208.java.i
-data/src/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java.i
data/make/sun/splashscreen/FILES_c.gmk.i
data/src/solaris/native/sun/jdga/jdgadevice.h.i
+data/src/share/classes/com/sun/jmx/event/ReceiverBuffer.java.i
data/test/java/util/Locale/LocaleTest.java.i
data/test/javax/security/auth/login/LoginContext/ModuleSubjectModule.java.i
data/src/share/classes/com/sun/jndi/dns/NameNode.java.i
+data/test/java/io/PipedReader/Ready.java.i
data/src/share/classes/javax/naming/NameNotFoundException.java.i
data/src/share/classes/com/sun/beans/finder/FieldFinder.java.i
data/src/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java.i
@@ -1092,11 +1047,10 @@ data/src/share/native/sun/java2d/loops/Ushort555Rgbx.h.i
data/make/tools/CharsetMapping/IBM285.nr.i
data/src/windows/native/sun/nio/ch/DatagramChannelImpl.c.i
data/make/jpda/transport/shmem/Makefile.i
-data/src/share/demo/jvmti/hprof/hprof_init.h.i
data/src/share/classes/sun/util/locale/UnicodeLocaleExtension.java.i
-data/make/jprt.config.i
data/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java.i
data/make/sun/javazic/tzdata/backward.i
+data/make/sun/security/smartcardio/mapfile-vers.i
data/src/solaris/classes/sun/tools/attach/SolarisAttachProvider.java.i
data/src/share/classes/java/lang/Throwable.java.i
data/test/sun/tools/jstatd/all.policy.i
@@ -1107,10 +1061,11 @@ data/src/share/classes/javax/management/openmbean/package.html.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/memmonitor.js.i
data/src/share/classes/sun/awt/im/InputMethodLocator.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java.i
+data/src/windows/classes/sun/nio/ch/DatagramDispatcher.java.i
+data/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java.i
data/src/share/classes/sun/text/resources/FormatData_da_DK.java.i
data/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java.i
-data/test/java/security/cert/PolicyNode/speech2eve.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java.i
data/src/solaris/native/sun/awt/awt_GraphicsEnv.h.i
data/test/java/util/zip/3GBZipFiles.sh.i
@@ -1119,8 +1074,10 @@ data/test/sun/security/ssl/javax/net/ssl/NewAPIs/KeyManagerTrustManager.java.i
data/src/share/classes/javax/sound/sampled/Control.java.i
data/make/tools/swing-beans/beaninfo/images/JTabbedPaneColor32.gif.i
data/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java.i
+data/test/sun/security/ec/keystore.i
data/src/share/classes/javax/xml/crypto/AlgorithmMethod.java.i
data/src/windows/native/sun/windows/awt_DnDDS.cpp.i
+data/src/share/classes/sun/net/www/protocol/http/NegotiatorImpl.java.i
data/test/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeInterface.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHost.java.i
data/src/windows/native/sun/security/krb5/NativeCreds.c.i
@@ -1131,17 +1088,17 @@ data/src/share/classes/sun/io/CharacterEncoding.java.i
data/src/share/classes/javax/swing/JList.java.i
data/test/java/security/Security/ClassLoaderDeadlock/provider/HashProvider.java.i
data/src/share/classes/sun/reflect/generics/visitor/Reifier.java.i
-data/src/share/classes/java/awt/ScrollPane.java.i
+data/src/solaris/classes/sun/awt/motif/MRobotPeer.java.i
data/make/tools/swing-beans/beaninfo/images/JProgressBarMono32.gif.i
data/test/java/lang/instrument/ManifestTest.sh.i
data/src/share/classes/java/util/Iterator.java.i
-data/src/share/classes/javax/naming/ldap/StartTlsRequest.java.i
+data/src/solaris/classes/sun/awt/motif/X11KSC5601.java.i
+data/src/share/classes/javax/swing/SwingUtilities.java.i
data/src/share/classes/java/rmi/registry/Registry.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java.i
data/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java.i
+data/test/java/security/spec/ECCBasic.java.i
data/src/share/classes/java/net/InMemoryCookieStore.java.i
-data/src/share/classes/sun/text/resources/FormatData_lv_LV.java.i
data/src/share/classes/sun/print/resources/serviceui_sv.properties.i
data/src/share/classes/javax/swing/event/TableColumnModelEvent.java.i
data/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java.i
@@ -1151,8 +1108,8 @@ data/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java.i
data/make/tools/CharsetMapping/IBM1146.map.i
data/src/solaris/native/sun/awt/awt_Mlib.c.i
data/src/windows/native/sun/java2d/d3d/D3DPipelineManager.h.i
-data/src/share/classes/sun/security/provider/certpath/OCSPResponse.java.i
-data/src/share/classes/com/sun/beans/finder/ConstructorFinder.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/TruncateArray.java.i
+data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java.i
data/src/share/native/java/lang/fdlibm/src/s_isnan.c.i
data/test/java/lang/Class/getEnclosingClass/make_src.sh.i
data/src/share/classes/javax/swing/plaf/multi/MultiLabelUI.java.i
@@ -1161,8 +1118,7 @@ data/make/java/redist/sajdi/Makefile.i
data/src/share/classes/javax/xml/crypto/dsig/TransformService.java.i
data/src/share/classes/java/lang/reflect/AccessibleObject.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_no_NO.properties.i
-data/src/share/classes/sun/io/ByteToCharHKSCS_2001.java.i
-data/make/tools/GenerateCharacter/CharacterData02.java.template.i
+data/test/java/io/PushbackInputStream/Available.java.i
data/test/javax/crypto/KeyGenerator/TestGetInstance.java.i
data/test/com/sun/crypto/provider/TLS/Utils.java.i
data/src/share/classes/sun/security/krb5/internal/PAData.java.i
@@ -1178,15 +1134,13 @@ data/src/solaris/native/sun/awt/multi_font.h.i
data/test/java/util/ResourceBundle/Control/StressOut.properties.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIconRegion.java.i
data/test/java/util/Arrays/FloatDoubleOrder.java.i
-data/test/java/util/Formatter/BasicDateTime.java.i
data/src/share/classes/javax/sql/RowSetEvent.java.i
data/src/share/classes/sun/awt/UngrabEvent.java.i
-data/src/share/classes/javax/script/Invocable.java.i
+data/src/share/classes/sun/io/CharToByteCp930.java.i
data/src/share/classes/sun/reflect/ByteVector.java.i
-data/make/tools/swing-beans/beaninfo/images/JButtonMono16.gif.i
data/src/share/classes/java/sql/SQLXML.java.i
data/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java.i
-data/make/tools/CharsetMapping/MS1250.map.i
+data/test/java/util/jar/JarInputStream/EmptyJar.java.i
data/test/java/io/PipedOutputStream/ClosedWrite.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-bw24.png.i
data/src/share/classes/sun/util/resources/CalendarData_ko.properties.i
@@ -1197,45 +1151,45 @@ data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java
data/src/share/classes/java/beans/beancontext/BeanContext.java.i
data/make/tools/swing-beans/beaninfo/images/JFrameColor16.gif.i
data/src/linux/doc/man/jdb.1.i
-data/test/java/security/UnresolvedPermission/DebugPermissionBad.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain2.txt.i
data/src/solaris/native/sun/java2d/loops/vis_Interp.c.i
data/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java.i
+data/src/share/classes/sun/net/util/IPAddressUtil.java.i
data/test/java/lang/instrument/FromShutdownHook.java.i
data/src/share/classes/javax/sql/rowset/RowSetWarning.java.i
-data/src/share/classes/org/openjdk/jigsaw/ModuleFileFormat.java.i
data/test/java/util/PluggableLocale/providersrc/BreakIteratorProviderImpl.java.i
data/make/javax/swing/plaf/nimbus/Makefile.i
-data/src/share/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz.i
+data/test/sun/nio/cs/TestIBMBugs.java.i
data/src/share/classes/sun/nio/cs/ISO_8859_1.java.i
data/src/share/demo/management/VerboseGC/VerboseGC.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionParserState.java.i
-data/test/TEST.ROOT.i
+data/test/com/sun/jdi/sde/MangleTest.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_CO.java.i
data/test/java/beans/XMLEncoder/java_awt_Cursor.java.i
-data/src/share/classes/sun/applet/AppletMessageHandler.java.i
+data/src/share/classes/java/awt/print/Paper.java.i
data/make/tools/swing-beans/GenDocletBeanInfo.java.i
data/test/sun/security/tools/jarsigner/passtype.sh.i
data/src/share/classes/sun/management/HotspotRuntimeMBean.java.i
data/src/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java.i
data/test/sun/security/tools/policytool/Alias.sh.i
-data/test/java/util/jar/Attributes/PutAndPutAll.java.i
-data/make/common/internal/Defs-corba.gmk.i
+data/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.i
data/test/sun/security/krb5/auto/KerberosHashEqualsTest.java.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanInfo.java.i
data/src/solaris/native/sun/awt/awt_Font.h.i
-data/test/java/beans/XMLDecoder/spec/TestClass.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java.i
+data/test/java/util/zip/ZipInputStream/Constructor.java.i
data/make/tools/src/build/tools/jarreorder/JarReorder.java.i
-data/test/java/rmi/testlibrary/RegistryRunner.java.i
-data/src/share/classes/java/lang/StringBuffer.java.i
data/src/share/classes/org/openjdk/jigsaw/cli/Command.java.i
data/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java.i
data/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java.i
data/test/tools/launcher/6842838/CreateBadJar.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java.i
+data/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java.i
data/src/share/classes/com/sun/tools/hat/internal/parser/PositionInputStream.java.i
+data/test/java/nio/Buffer/CopyDirectMemory.java.i
data/src/share/classes/sun/rmi/server/resources/rmid_de.properties.i
data/test/java/nio/channels/DatagramChannel/ConnectedSend.java.i
data/src/share/classes/java/io/PushbackInputStream.java.i
-data/test/javax/imageio/EmptyFileTest.java.i
+data/src/share/native/sun/security/ec/impl/ec2.h.i
+data/src/share/classes/sun/util/resources/TimeZoneNames_ko.java.i
data/src/share/classes/java/security/acl/NotOwnerException.java.i
data/src/share/classes/com/sun/tracing/dtrace/StabilityLevel.java.i
data/src/share/classes/sun/io/CharToByteMacCyrillic.java.i
@@ -1243,18 +1197,18 @@ data/src/share/classes/javax/swing/RootPaneContainer.java.i
data/test/javax/management/mxbean/OverloadTest.java.i
data/src/share/classes/java/awt/MenuShortcut.java.i
data/make/java/java/Makefile.i
+data/test/java/net/BindException/Test.java.i
data/src/share/native/sun/java2d/loops/AnyShort.c.i
data/src/share/classes/sun/rmi/server/UnicastRef2.java.i
data/src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java.i
data/src/share/classes/sun/awt/image/ShortBandedRaster.java.i
-data/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp.i
+data/src/share/native/sun/font/layout/LEGlyphStorage.cpp.i
data/src/windows/native/sun/windows/WPrinterJob.cpp.i
-data/src/share/classes/sun/text/resources/FormatData_ar_KW.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_no_NO_NY.properties.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadTSProvider.java.i
data/src/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java.i
data/make/tools/src/build/tools/generatebreakiteratordata/CharacterCategory.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java.i
-data/test/sun/net/www/protocol/http/B6296310.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Decoder.java.i
data/src/share/classes/javax/management/loading/PrivateMLet.java.i
data/src/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java.i
@@ -1262,34 +1216,39 @@ data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.
data/test/java/rmi/reliability/benchmark/bench/rmi/ShortCalls.java.i
data/src/share/native/sun/awt/image/jpeg/jcprepct.c.i
data/test/com/sun/jdi/JITDebug.java.i
-data/test/java/beans/PropertyEditor/TestFontClass.java.i
-data/src/windows/native/sun/windows/awt_PrintJob.cpp.i
+data/test/java/util/logging/ParentLoggersTest.java.i
data/src/share/classes/javax/management/AttributeNotFoundException.java.i
data/make/tools/src/build/tools/jdwpgen/InterfaceTypeNode.java.i
-data/src/share/classes/java/lang/management/MemoryPoolMXBean.java.i
+data/src/share/classes/javax/print/CancelablePrintJob.java.i
data/src/share/classes/javax/print/attribute/PrintJobAttributeSet.java.i
+data/test/java/beans/Introspector/Test4634390.java.i
+data/test/java/beans/Beans/6669869/TestDesignTime.java.i
data/src/share/native/sun/java2d/loops/DrawPolygons.c.i
+data/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java.i
data/src/share/classes/javax/sql/rowset/webrowset.xsd.i
-data/test/java/lang/management/MemoryMXBean/Pending.java.i
+data/test/sun/nio/cs/OLD/GBK_OLD.java.i
data/src/share/classes/java/awt/color/ICC_ProfileGray.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c.i
data/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java.i
data/test/javax/management/Introspector/ExceptionsDescriptorTest.java.i
data/src/share/classes/java/security/cert/CertPathBuilderSpi.java.i
data/src/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java.i
+data/src/share/classes/sun/text/resources/CollationData_en.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedLongFieldAccessorImpl.java.i
data/test/sun/security/pkcs11/Secmod/anchor.cer.i
data/src/share/classes/sun/util/resources/CalendarData_bg.properties.i
+data/src/solaris/classes/sun/awt/X11/XWarningWindow.java.i
data/test/sun/tools/jstat/jstatSnap1.sh.i
data/src/share/classes/sun/text/normalizer/UBiDiProps.java.i
data/src/share/native/com/sun/java/util/jar/pack/bytes.h.i
+data/src/share/classes/sun/text/normalizer/Trie.java.i
data/src/share/classes/java/awt/dnd/DragGestureEvent.java.i
data/src/share/instrument/JPLISAssert.h.i
data/test/sun/security/pkcs11/Secmod/JksSetPrivateKey.java.i
data/src/share/classes/java/awt/image/LookupTable.java.i
-data/src/share/classes/javax/management/JMException.java.i
-data/src/share/classes/javax/management/StandardEmitterMBean.java.i
+data/test/java/beans/XMLEncoder/Test5023559.java.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java.i
+data/test/org/openjdk/jigsaw/security.sh.i
data/src/share/classes/java/awt/font/CharArrayIterator.java.i
data/src/windows/native/sun/windows/awt_Container.h.i
data/test/javax/xml/crypto/dsig/data/signature-x509-crt-crl.xml.i
@@ -1297,13 +1256,11 @@ data/test/sun/security/provider/PolicyFile/AliasExpansion.policy.i
data/test/java/nio/channels/SocketChannel/VectorParams.java.i
data/src/share/classes/sun/nio/cs/ext/IBM937.java.d
data/src/share/classes/com/sun/tools/jdi/ThreadAction.java.i
-data/test/java/security/Security/signedfirst/Dyn.sh.i
-data/test/java/util/PluggableLocale/CollatorProviderTest.sh.i
data/src/share/classes/sun/net/httpserver/AuthFilter.java.i
-data/src/solaris/classes/sun/nio/ch/Port.java.i
data/test/java/util/Currency/CurrencyTest.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_et_EE.properties.i
data/test/java/net/URL/normal_http_urls.i
+data/test/java/lang/invoke/CallSiteTest.java.i
data/src/share/classes/sun/nio/cs/ext/IBM937.java.i
data/src/windows/classes/sun/security/provider/NativeSeedGenerator.java.i
data/test/java/nio/file/PathMatcher/Basic.java.i
@@ -1313,52 +1270,52 @@ data/src/share/classes/java/lang/ref/Finalizer.java.i
data/src/share/native/com/sun/media/sound/Utilities.c.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java.i
data/make/tools/src/build/tools/compilefontconfig/CompileFontConfig.java.i
-data/make/tools/winver/Makefile.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties.i
+data/src/windows/classes/java/lang/Terminator.java.i
+data/test/sun/security/krb5/runNameEquals.sh.i
+data/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java.i
data/make/tools/CharsetMapping/KOI8_U.map.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_test06_ok.password.in.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassMapper.java.i
data/src/windows/native/sun/windows/awt_DCHolder.h.i
data/src/share/classes/sun/io/ByteToCharCp863.java.i
+data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono32.gif.i
data/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java.i
data/make/java/fdlibm/FILES_c.gmk.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png.i
+data/src/share/classes/sun/security/util/DerOutputStream.java.i
data/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpEngineParameters.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java.i
data/src/share/classes/java/util/concurrent/ConcurrentMap.java.i
data/src/share/classes/sun/security/pkcs11/SunPKCS11.java.i
data/test/sun/nio/cs/ZeroedByteArrayEUCTWTest.java.i
data/test/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java.i
-data/make/tools/CharsetMapping/IBM855.map.i
+data/test/java/util/concurrent/BlockingQueue/LastElement.java.i
data/src/share/native/sun/java2d/loops/GlyphImageRef.h.i
data/test/java/lang/Thread/ThreadStateTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java.i
data/src/share/classes/com/sun/tools/jdi/LinkedHashMap.java.i
-data/src/share/classes/java/sql/SQLPermission.java.i
data/src/share/classes/com/sun/jdi/event/StepEvent.java.i
data/src/share/demo/jfc/Metalworks/DemoMetalTheme.java.i
data/src/share/classes/java/util/concurrent/RunnableFuture.java.i
-data/src/share/classes/java/lang/IndexOutOfBoundsException.java.i
data/src/share/classes/sun/beans/editors/StringEditor.java.i
data/src/windows/native/sun/windows/awt_Clipboard.cpp.i
data/test/sun/tools/jstatd/jstatdExternalRegistry.sh.i
-data/src/share/classes/sun/net/www/protocol/http/NegotiateCallbackHandler.java.i
data/test/javax/management/remote/mandatory/notif/AddRemoveTest.java.i
data/src/share/classes/javax/management/event/FetchingEventRelay.java.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/AbsoluteComponentCenterCalculator.java.i
data/src/share/classes/com/sun/tools/example/trace/Trace.java.i
data/src/share/classes/javax/print/attribute/standard/NumberUp.java.i
-data/test/java/rmi/activation/Activatable/checkActivateRef/security.policy.i
data/src/share/classes/sun/java2d/loops/SurfaceType.java.i
data/src/share/classes/javax/management/MBeanServerPermission.java.i
+data/src/share/native/sun/security/ec/impl/ecp.h.i
data/src/share/classes/sun/nio/ch/CompletedFuture.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/BasicTest.java.i
data/src/share/classes/java/io/Externalizable.java.i
-data/test/java/awt/print/Dialog/DialogType.java.i
data/src/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java.i
data/src/share/classes/sun/awt/ComponentFactory.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/Question.gif.i
+data/test/java/nio/channels/SocketChannel/OutOfBand.java.i
+data/test/java/util/zip/Bounds.java.i
data/test/java/nio/channels/Selector/HelperSlowToDie.java.i
data/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java.i
data/src/share/native/java/lang/fdlibm/src/w_gamma_r.c.i
@@ -1370,15 +1327,17 @@ data/test/javax/xml/crypto/dsig/data/signature-x509-is.xml.i
data/make/mkdemo/applets/JumpingBox/Makefile.i
data/src/share/native/sun/awt/image/cvutils/img_ordgray.h.i
data/src/share/native/sun/java2d/loops/Ushort555Rgb.c.i
+data/src/share/classes/sun/io/ByteToCharCp949C.java.i
data/make/LICENSE.i
+data/src/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java.i
data/src/share/classes/java/util/zip/CheckedInputStream.java.i
data/test/sun/security/tools/policytool/Alias.java.i
data/src/share/classes/java/lang/Double.java.i
data/src/share/classes/com/sun/jdi/IntegerValue.java.i
data/src/share/classes/sun/misc/IOUtils.java.i
data/test/java/security/Security/SynchronizedAccess.java.i
-data/src/share/classes/java/text/RuleBasedCollator.java.i
-data/test/java/rmi/server/useCustomRef/UseCustomRef.java.i
+data/src/share/classes/javax/swing/text/JTextComponent.java.i
+data/test/sun/security/pkcs11/ec/TestECDH.java.i
data/test/javax/security/auth/login/Configuration/GetInstanceProvider.java.i
data/src/share/classes/javax/sql/rowset/package.html.i
data/test/java/util/zip/StreamConstructor.java.i
@@ -1389,17 +1348,19 @@ data/src/share/classes/sun/management/counter/Counter.java.i
data/src/share/classes/com/sun/java/swing/plaf/nimbus/AbstractRegionPainter.java.i
data/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java.i
data/test/java/lang/annotation/loaderLeak/Main.java.i
+data/test/java/nio/channels/SocketChannel/GetChannel.java.i
data/test/javax/management/remote/mandatory/notif/DiffHBTest.java.i
data/src/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipDirectoryStream.java.i
-data/src/share/classes/java/awt/dnd/DropTargetDragEvent.java.i
-data/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java.i
+data/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html.i
data/test/java/beans/PropertyEditor/TestDoubleClassJava.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObject.java.i
data/src/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java.i
+data/make/mkdemo/jvmti/gctest/Makefile.i
data/make/mkdemo/jvmti/Makefile.i
data/make/tools/swing-beans/beaninfo/images/JRadioButtonColor16.gif.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java.i
data/src/share/classes/com/sun/media/sound/EmergencySoundbank.java.i
data/src/share/classes/sun/io/ByteToCharCp1124.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SocketCreation/SocketCreation.java.i
@@ -1412,17 +1373,18 @@ data/src/share/classes/javax/sql/CommonDataSource.java.i
data/src/share/classes/javax/net/ssl/SSLKeyException.java.i
data/src/linux/doc/man/ja/tnameserv.1.i
data/test/javax/naming/Name/j2se13-name.ser.i
+data/test/java/rmi/server/RMIClassLoader/spi/security.policy.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS.i
data/src/share/classes/javax/sound/sampled/CompoundControl.java.i
data/make/tools/swing-beans/beaninfo/images/JEditorPaneMono32.gif.i
-data/make/tools/swing-beans/beaninfo/images/JRootPaneMono32.gif.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/OwnerImpl.java.i
data/src/share/classes/java/net/ConnectException.java.i
-data/src/share/classes/java/util/UUID.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility.properties.i
data/src/windows/native/sun/windows/CmdIDList.h.i
-data/src/share/classes/com/sun/media/sound/SoftPointResampler.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java.i
+data/test/sun/security/pkcs11/SecureRandom/Basic.java.i
data/src/share/classes/java/security/cert/CRLSelector.java.i
-data/src/share/classes/sun/io/ByteToCharISO8859_8.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/Reflection.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java.i
data/src/share/classes/java/lang/StrictMath.java.i
data/src/share/sample/jmx/jmx-scandir/manifest.mf.i
data/test/java/security/Provider/RemoveProvider.java.i
@@ -1431,37 +1393,38 @@ data/src/share/classes/java/nio/charset/spi/CharsetProvider.java.i
data/src/share/classes/sun/util/resources/CalendarData_uk.properties.i
data/src/share/classes/javax/sql/rowset/spi/SyncProvider.java.i
data/src/share/classes/javax/naming/ContextNotEmptyException.java.i
-data/src/share/classes/java/nio/file/WatchKey.java.i
data/src/solaris/classes/sun/java2d/xr/XRBackendNative.java.i
data/test/com/sun/nio/sctp/SctpServerChannel/Util.java.i
data/src/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java.i
+data/test/sun/tools/jstat/jstatLineCounts3.sh.i
data/test/sun/security/tools/policytool/UpdatePermissions.html.i
data/src/share/classes/sun/font/GraphicComponent.java.i
data/test/java/lang/Class/getEnclosingClass/EnclosingClassTest.java.i
+data/test/javax/management/remote/mandatory/loading/SingleClassLoader.java.i
+data/test/javax/security/auth/login/LoginContext/ResetConfigModule.java.i
data/test/java/nio/channels/SocketChannel/SocketInheritance.java.i
data/test/java/rmi/registry/emptyName/EmptyName.java.i
data/src/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java.i
data/test/javax/xml/crypto/dsig/data/xml-stylesheet.i
-data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav.i
+data/src/share/classes/java/io/PipedOutputStream.java.i
+data/src/share/classes/com/sun/crypto/provider/JarVerifier.java.i
data/src/share/classes/javax/crypto/package.html.i
data/src/share/classes/com/sun/jdi/event/MethodEntryEvent.java.i
data/src/windows/bin/ia64/jvm.cfg.i
data/src/share/classes/java/util/TimSort.java.i
-data/make/tools/CharsetMapping/IBM939.c2b.i
data/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java.i
data/src/share/classes/sun/awt/SunDisplayChanger.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/Node.java.i
data/src/share/classes/com/sun/tools/jconsole/JConsolePlugin.java.i
-data/src/share/back/eventHandler.h.i
data/src/solaris/demo/jni/Poller/README.txt.i
data/test/com/sun/nio/sctp/MessageInfoTests.java.i
-data/src/share/classes/java/util/HashSet.java.i
+data/src/share/native/com/sun/media/sound/MidiInDeviceProvider.c.i
data/src/share/native/sun/awt/image/cvutils/img_colors.c.i
data/test/sun/net/www/protocol/jar/jarbug/src/test/TestBug4361044.java.i
+data/make/altclasses/Makefile.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserTreeConstants.java.i
data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1.xml.i
data/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java.i
data/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java.i
data/src/share/classes/java/awt/doc-files/modal-example4.gif.i
data/src/share/classes/sun/io/CharToByteCp1046.java.i
@@ -1469,33 +1432,30 @@ data/src/share/classes/java/nio/file/attribute/package-info.java.i
data/src/share/native/sun/awt/image/jpeg/jcomapi.c.i
data/src/share/classes/java/beans/PropertyChangeEvent.java.i
data/src/share/native/sun/awt/image/cvutils/img_ordclrsgn.h.i
-data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so.i
data/src/share/classes/com/sun/jdi/event/MonitorWaitEvent.java.i
data/test/java/util/Formatter/BasicShortObject.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/zutil.h.i
+data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so.i
data/test/org/openjdk/jigsaw/optional-reexport.sh.i
-data/src/share/classes/sun/font/SunFontManager.java.i
-data/make/tools/CharsetMapping/IBM424.map.i
-data/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Decoder.java.i
-data/src/linux/doc/man/ja/javadoc.1.d
+data/src/solaris/native/sun/awt/awt_Button.c.i
+data/src/share/classes/sun/text/resources/FormatData_ko_KR.java.i
+data/src/share/classes/java/awt/GraphicsEnvironment.java.i
+data/src/share/classes/sun/jkernel/Mutex.java.i
data/src/share/classes/sun/security/provider/certpath/OCSPChecker.java.i
data/src/solaris/native/sun/awt/X11Color.c.i
data/src/share/classes/java/util/logging/MemoryHandler.java.i
data/test/java/util/jar/JarFile/ScanSignedJar.java.i
data/test/javax/management/modelmbean/ModelMBeanInfoSupport/policy.i
data/src/share/classes/sun/security/util/AuthResources_zh_CN.java.i
-data/test/java/io/Serializable/ClassCastExceptionDetail/Write.java.i
data/test/java/util/Formatter/Basic-X.java.template.i
data/src/share/classes/sun/util/resources/LocaleNames_es_US.properties.i
+data/make/netbeans/common/closed-share-view.ent.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties.i
-data/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_in.properties.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S16Func.c.i
data/make/tools/swing-beans/beaninfo/images/BoxMono32.gif.i
-data/make/tools/CharsetMapping/IBM870.map.i
data/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludes.java.i
data/src/share/classes/sun/misc/ExtensionDependency.java.i
data/src/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java.i
-data/src/share/demo/applets/MoleculeViewer/XYZApp.java.i
data/make/tools/swing-beans/beaninfo/images/JScrollBarMono16.gif.i
data/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh.i
data/src/windows/native/sun/windows/DllUtil.cpp.i
@@ -1511,8 +1471,8 @@ data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so.d
data/src/share/classes/sun/invoke/WrapperInstance.java.i
data/src/share/demo/jvmti/versionCheck/sample.makefile.txt.i
data/test/java/io/File/ListRoots.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c.i
-data/src/share/classes/sun/applet/AppletPanel.java.i
+data/test/sun/tools/jps/jps-l_Output1.awk.i
+data/src/share/classes/sun/security/util/BigInt.java.i
data/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/infback.c.i
data/src/share/classes/java/lang/management/ThreadMXBean.java.i
@@ -1523,17 +1483,17 @@ data/src/share/classes/javax/swing/SpinnerModel.java.i
data/src/share/classes/com/sun/jmx/snmp/Enumerated.java.i
data/test/sun/security/krb5/auto/PrincipalNameEquals.java.i
data/test/java/security/Security/signedfirst/keystore.jks.i
-data/test/java/lang/ClassLoader/deadlock/Starter.java.i
data/src/share/classes/sun/rmi/rmic/Generator.java.i
data/src/share/classes/com/sun/jndi/ldap/LdapClient.java.i
data/src/share/classes/java/io/ObjectOutputStream.java.i
-data/src/share/classes/javax/swing/border/EtchedBorder.java.i
+data/src/share/classes/javax/swing/text/AsyncBoxView.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java.i
data/src/share/demo/applets/WireFrame/example1.html.i
data/make/sunw/Makefile.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java.i
data/test/javax/management/namespace/NamespaceController.java.i
data/make/mkdemo/jfc/FileChooserDemo/Makefile.i
-data/test/javax/management/eventService/EventDelegateSecurityTest.java.i
+data/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy.i
data/src/share/classes/java/text/StringCharacterIterator.java.i
data/src/share/classes/sun/util/resources/CalendarData_da.properties.i
data/test/java/lang/StringBuffer/SBBasher.java.i
@@ -1541,36 +1501,32 @@ data/src/share/classes/sun/misc/UCDecoder.java.i
data/src/share/classes/sun/io/CharToByteISO2022JP.java.i
data/test/java/security/cert/CertPathValidator/nameConstraints/generate.sh.i
data/src/share/classes/java/io/FileNotFoundException.java.i
+data/test/sun/security/jgss/CtorTests2.java.i
data/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java.i
data/src/solaris/demo/jni/Poller/SimpleServer.java.i
-data/src/share/native/sun/font/layout/LookupTables.h.i
data/src/share/classes/javax/xml/crypto/dsig/XMLSignContext.java.i
data/test/javax/management/loading/LibraryLoader/jar_src/UseNativeLibMBean.java.i
-data/src/solaris/bin/sparcv9/jvm.cfg.i
data/src/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/A.2.i
data/test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java.i
-data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.login.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecBuilder.java.i
data/src/share/classes/com/sun/media/sound/EventDispatcher.java.i
+data/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java.i
data/src/windows/native/sun/jkernel/kernel.h.i
data/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java.i
data/test/java/security/Security/NoInstalledProviders.java.i
data/test/java/io/charStreams/IntGenerator.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Matte.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java.i
data/test/java/beans/XMLEncoder/java_util_EnumMap.java.i
data/make/tools/CharsetMapping/IBM273.nr.i
data/src/share/classes/javax/imageio/spi/ImageWriterSpi.java.i
data/src/share/classes/com/sun/media/sound/SoftReceiver.java.i
-data/src/share/classes/javax/security/sasl/AuthenticationException.java.i
data/test/sun/tools/jps/jps-vm_Output1.awk.i
data/src/solaris/classes/sun/net/www/protocol/file/Handler.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpPduRequestType.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java.i
data/src/share/classes/sun/util/resources/LocaleNames_cs.properties.i
data/src/share/classes/javax/security/auth/kerberos/package.html.i
-data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h.i
+data/src/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java.i
data/src/share/classes/sun/invoke/util/BytecodeName.java.i
data/src/share/classes/java/security/UnresolvedPermission.java.i
@@ -1580,21 +1536,22 @@ data/src/windows/classes/sun/nio/fs/WindowsPathParser.java.i
data/make/common/internal/Defs-langtools.gmk.i
data/test/sun/security/tools/keytool/importreadall.sh.i
data/make/tools/swing-beans/beaninfo/images/JSplitPaneColor32.gif.i
-data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java.i
+data/src/share/classes/sun/tools/jconsole/ProxyClient.java.i
data/make/tools/freetypecheck/freetypecheck.c.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Commands.java.i
+data/test/java/net/URLConnection/HandleContentTypeWithAttrs.java.i
+data/make/java/util/FILES_properties.gmk.i
+data/test/sun/jvmstat/monitor/VmIdentifier/testcases.i
data/make/java/nio/reorder-i586.i
-data/test/java/util/TreeMap/NullPermissiveComparator.java.i
+data/test/com/sun/java/swing/plaf/gtk/Test6635110.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Canvas.java.i
data/test/java/util/PluggableLocale/providersrc/NumberFormatProviderImpl.java.i
data/test/sun/security/provider/PolicyFile/getinstance/NoArgPermission.java.i
data/make/mkdemo/Makefile.i
data/test/java/beans/XMLEncoder/4741757/TestFieldAccess.java.i
-data/src/share/classes/sun/security/jgss/ProviderList.java.i
data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy.i
data/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java.i
data/src/share/classes/sun/awt/geom/Order2.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BlendingMode.java.i
+data/src/share/classes/sun/text/resources/FormatData_el.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaInt.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/CodeAttributeParser.java.i
data/test/java/beans/PropertyEditor/TestLongClassValue.java.i
@@ -1607,38 +1564,40 @@ data/src/share/classes/com/sun/media/sound/SF2Region.java.i
data/test/java/security/cert/CertPath/cert_file.i
data/src/share/classes/sun/awt/DesktopBrowse.java.i
data/test/java/io/PipedReader/Constructors.java.i
-data/src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java.i
+data/src/share/native/sun/security/ec/secoidt.h.i
data/src/share/sample/nio/chatserver/MessageReader.java.i
-data/test/javax/print/applet/applet4/Applet4PrintServiceLookup.java.i
+data/test/java/security/CodeSigner/Serialize.java.i
data/src/share/back/eventFilterRestricted.h.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/PainterGenerator.java.i
data/src/share/classes/sun/nio/ch/Util.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so.i
-data/src/share/classes/sun/text/resources/FormatData_zh_SG.java.i
+data/test/java/util/Collections/Ser.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java.i
data/test/java/security/UnresolvedPermission/Debug.policy.i
data/src/windows/classes/sun/awt/windows/WScrollbarPeer.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties.i
data/src/share/classes/java/rmi/server/SkeletonMismatchException.java.i
data/src/share/classes/com/sun/crypto/provider/PBECipherCore.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java.i
+data/src/share/native/sun/java2d/loops/Ushort555Rgb.h.i
data/src/windows/native/sun/java2d/windows/WindowsFlags.cpp.i
-data/src/share/classes/javax/swing/table/AbstractTableModel.java.i
+data/test/java/nio/channels/Selector/KeysReady.java.i
data/src/share/classes/java/security/KeyPairGeneratorSpi.java.i
-data/test/sun/java2d/cmm/ProfileOp/MTReadProfileTest.java.i
+data/test/sun/security/pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12.i
data/test/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java.i
data/src/share/classes/java/rmi/UnmarshalException.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/JavaShort.java.i
+data/src/share/classes/java/awt/image/DataBufferByte.java.i
+data/src/share/classes/javax/management/PersistentMBean.java.i
data/src/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java.i
data/src/share/classes/com/sun/beans/decoder/ObjectElementHandler.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java.i
-data/src/share/classes/com/sun/jdi/request/EventRequest.java.i
+data/test/javax/swing/ToolTipManager/Test6256140.java.i
+data/src/share/classes/javax/swing/colorchooser/ColorSelectionModel.java.i
+data/test/java/io/PrintStream/ClearErrorStream.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassConverter.java.i
data/src/share/classes/sun/io/CharToByteISO2022CN_CNS.java.i
-data/src/solaris/classes/sun/awt/X11/XCustomCursor.java.i
+data/test/sun/security/pkcs11/fips/certs/anchor.cer.i
data/src/share/native/sun/security/pkcs11/j2secmod.c.i
data/test/java/math/BigDecimal/IntegralDivisionTests.java.i
-data/src/share/classes/sun/tools/tree/PreDecExpression.java.i
+data/src/share/native/sun/font/layout/Lookups.cpp.i
+data/src/share/classes/sun/security/action/PutAllAction.java.i
data/src/windows/native/sun/windows/awt_Panel.cpp.i
data/src/share/classes/java/lang/Enum.java.i
data/src/share/classes/java/text/NumberFormat.java.i
@@ -1646,40 +1605,41 @@ data/test/java/text/Bidi/BidiSurrogateTest.java.i
data/make/com/sun/nio/sctp/Makefile.i
data/src/share/classes/javax/swing/text/html/parser/TagStack.java.i
data/test/java/net/DatagramSocket/PortUnreachable.java.i
-data/src/share/classes/java/awt/peer/TrayIconPeer.java.i
+data/test/com/sun/net/httpserver/Test13.java.i
+data/test/java/util/EnumSet/EnumSetBash.java.i
data/test/org/openjdk/jigsaw/hello-jar.sh.i
data/src/solaris/doc/sun/man/man1/javaws.1.i
data/test/java/lang/Class/TypeCheckMicroBenchmark.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java.i
+data/src/share/classes/sun/io/ByteToCharCp852.java.i
+data/test/sun/misc/Cleaner/ExitOnThrow.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_4.java.i
data/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java.i
+data/make/sun/security/jgss/Makefile.i
data/src/share/native/sun/java2d/Disposer.c.i
data/src/share/classes/com/sun/net/httpserver/HttpsServer.java.i
data/src/share/classes/java/nio/file/attribute/AttributeView.java.i
data/test/java/net/URLConnection/Responses.java.i
-data/test/javax/swing/text/html/parser/Parser/7003777/bug7003777.java.i
+data/src/share/classes/sun/security/x509/CertException.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiViewportUI.java.i
-data/src/solaris/classes/sun/java2d/xr/XRBackend.java.i
+data/test/com/sun/servicetag/FindServiceTags.java.i
data/src/share/bin/main.c.i
data/make/tools/CharsetMapping/IBM930.map.i
data/src/share/classes/java/awt/SequencedEvent.java.i
data/test/javax/swing/border/Test6910490.html.i
data/src/share/classes/sun/tools/java/ParserActions.java.i
-data/test/java/util/PluggableLocale/providersrc/CollatorProviderImpl.java.i
+data/test/javax/management/Introspector/AnnotationSecurityTest.java.i
data/test/java/io/BufferedReader/SkipNegative.java.i
data/src/share/classes/java/awt/RadialGradientPaintContext.java.i
-data/src/share/classes/java/util/concurrent/atomic/AtomicLong.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/Load9.java.i
data/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java.i
data/src/share/classes/sun/security/krb5/internal/EncTGSRepPart.java.i
data/src/share/classes/javax/swing/text/html/NoFramesView.java.i
-data/src/solaris/classes/sun/awt/X11GraphicsConfig.java.i
+data/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java.i
data/src/share/classes/sun/reflect/generics/tree/ShortSignature.java.i
data/src/share/classes/com/sun/media/sound/DLSModulator.java.i
-data/src/share/classes/sun/io/ByteToCharISO2022KR.java.i
-data/test/tools/jar/ChangeDir.java.i
-data/src/share/classes/java/util/concurrent/FutureTask.java.i
+data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.login.i
+data/src/share/classes/javax/swing/InputVerifier.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java.i
data/src/share/classes/java/security/KeyRep.java.i
data/test/java/lang/Runtime/exec/BadEnvp.java.i
@@ -1688,16 +1648,15 @@ data/make/modules/tools/src/com/sun/classanalyzer/ClassFileParser.java.i
data/src/share/classes/com/sun/pept/Delegate.java.i
data/src/share/classes/javax/swing/plaf/basic/LazyActionMap.java.i
data/test/java/rmi/activation/Activatable/inactiveGroup/ActivateMe.java.i
-data/src/share/classes/javax/print/FlavorException.java.i
+data/src/share/classes/sun/security/tools/KeyStoreUtil.java.i
data/src/share/classes/sun/security/action/OpenFileInputStreamAction.java.i
data/test/sun/security/tools/keytool/CloneKeyAskPassword.jks.i
+data/src/share/classes/sun/net/smtp/SmtpClient.java.i
data/src/share/classes/java/awt/PrintGraphics.java.i
data/test/java/util/concurrent/Phaser/FickleRegister.java.i
data/test/java/net/URLConnection/contentHandler/UserContentHandler.java.i
-data/src/share/native/java/security/AccessController.c.i
+data/test/java/beans/Introspector/Test6528714.java.i
data/src/share/classes/sun/tools/tree/AssignRemainderExpression.java.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java.i
-data/test/java/lang/Runtime/exec/setcwd.sh.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java.i
data/src/windows/classes/sun/security/mscapi/RSACipher.java.i
@@ -1709,49 +1668,50 @@ data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSo
data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy.i
data/src/share/classes/java/lang/invoke/MethodHandles.java.i
data/src/share/sample/jmx/jmx-scandir/nbproject/project.xml.i
-data/make/tools/swing-beans/beaninfo/images/JToolBarColor16.gif.i
+data/src/share/instrument/Reentrancy.h.i
data/src/share/classes/javax/swing/text/html/AccessibleHTML.java.i
data/src/share/classes/javax/swing/text/StyledDocument.java.i
data/src/share/classes/javax/swing/text/GapContent.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java.i
-data/src/share/classes/java/awt/JobAttributes.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy24.i
data/src/share/classes/javax/crypto/spec/PSource.java.i
data/src/share/classes/java/beans/ChangeListenerMap.java.i
-data/src/share/classes/sun/nio/cs/UTF_16BE.java.i
+data/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure_Stub.java.i
data/src/share/classes/com/sun/jarsigner/ContentSignerParameters.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java.i
data/make/com/sun/tools/Makefile.i
data/test/java/io/Serializable/unshared/Write.java.i
-data/test/java/net/URLClassLoader/getresourceasstream/test.sh.i
+data/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy.i
data/test/java/awt/Component/Revalidate/Revalidate.java.i
-data/src/share/classes/com/sun/beans/decoder/FloatElementHandler.java.i
-data/src/share/classes/sun/security/x509/CertificateSerialNumber.java.i
+data/src/share/sample/nio/file/AclEdit.java.i
+data/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh.i
data/src/linux/doc/man/jmap.1.i
-data/src/share/classes/sun/tools/jar/JarException.java.i
+data/test/sun/java2d/XRenderBlitsTest.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java.i
-data/src/linux/doc/man/orbd.1.i
data/test/java/net/Authenticator/BasicTest3.java.i
data/src/share/classes/sun/text/resources/CollationData_hi.java.i
data/src/share/classes/java/awt/dnd/DropTargetDropEvent.java.i
-data/src/solaris/native/sun/nio/fs/genUnixConstants.c.i
data/src/share/classes/sun/text/resources/FormatData_en_ZA.java.i
data/test/javax/swing/JSlider/6923305/bug6923305.java.i
data/src/windows/native/sun/windows/Devices.cpp.i
data/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java.i
data/make/tools/src/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java.i
+data/test/sun/net/www/protocol/jar/jarbug/src/test/RunAllTests.java.i
data/test/sun/nio/cs/SurrogateGB18030Test.java.i
data/src/share/classes/java/util/spi/CurrencyNameProvider.java.i
+data/src/solaris/native/sun/java2d/loops/vis_ByteGray_FromRgb.c.i
data/src/solaris/native/sun/java2d/loops/vis_FourByteAbgr.c.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java.i
data/src/solaris/classes/sun/awt/motif/MPopupMenuPeer.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_1.c.i
-data/src/linux/doc/man/jsadebugd.1.i
+data/src/share/classes/java/util/logging/Level.java.i
+data/test/javax/security/auth/Subject/Serial.java.i
data/src/share/classes/javax/swing/JTextPane.java.i
-data/src/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_HN.java.i
data/src/share/classes/javax/security/auth/AuthPermission.java.i
-data/make/netbeans/common/windows-sources.ent.i
+data/src/share/classes/java/lang/InstantiationException.java.i
data/src/share/classes/sun/io/ByteToCharKOI8_R.java.i
-data/test/java/lang/Runtime/exec/StreamsSurviveDestroy.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java.i
data/test/java/lang/reflect/DefaultAccessibility.java.i
data/src/share/classes/java/rmi/RMISecurityManager.java.i
data/test/java/awt/regtesthelpers/AbstractPolicyTest.java.i
@@ -1761,15 +1721,15 @@ data/src/share/classes/sun/awt/image/VSyncedBSManager.java.i
data/test/java/nio/channels/SocketChannel/LocalAddress.java.i
data/src/share/native/sun/awt/image/awt_parseImage.h.i
data/test/java/nio/channels/Selector/LotsOfChannels.java.i
-data/src/share/classes/java/io/InputStreamReader.java.i
-data/src/share/classes/sun/tools/javac/CompilerMember.java.i
+data/test/sun/text/resources/Collator/Bug4848897.java.i
data/src/share/classes/sun/nio/fs/AbstractPoller.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableCallbackHandler.java.i
+data/test/javax/imageio/plugins/jpeg/ConcurrentReadingTest.java.i
data/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh.i
data/src/share/classes/java/beans/beancontext/BeanContextChildSupport.java.i
data/src/share/classes/sun/misc/SoftCache.java.i
data/src/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java.i
-data/src/share/classes/java/nio/file/CopyMoveHelper.java.i
+data/src/share/classes/sun/awt/image/OffScreenImageSource.java.i
data/src/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java.i
@@ -1778,18 +1738,20 @@ data/src/share/classes/java/awt/dnd/DragSource.java.i
data/test/sun/nio/cs/FindOneCharEncoderBugs.java.i
data/src/share/classes/sun/tools/tree/CompoundStatement.java.i
data/src/share/classes/java/security/acl/AclEntry.java.i
-data/src/share/classes/java/awt/event/MouseMotionAdapter.java.i
+data/test/com/sun/jdi/ClassesByName2Test.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_ru.properties.i
data/make/org/ietf/jgss/Makefile.i
data/src/share/classes/com/sun/jmx/mbeanserver/Repository.java.i
data/make/javax/sql/Makefile.i
data/src/windows/native/sun/jkernel/kernel_zh.rc.i
data/src/share/native/sun/font/layout/SegmentArrayProcessor.h.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_DZ.properties.i
-data/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java.i
+data/src/share/native/sun/awt/image/cvutils/img_output8.h.i
+data/src/share/classes/sun/net/www/protocol/http/AuthScheme.java.i
data/src/share/classes/java/util/concurrent/RecursiveTask.java.i
data/test/com/sun/java/swing/plaf/gtk/Test6963870.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.xsd.i
-data/src/share/native/java/util/zip/zlib-1.2.3/zutil.c.i
+data/src/share/classes/sun/security/krb5/internal/SeqNumber.java.i
data/test/java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java.i
data/src/share/classes/sun/io/ByteToCharCp1142.java.i
data/src/share/classes/javax/swing/colorchooser/ValueFormatter.java.i
@@ -1799,33 +1761,33 @@ data/src/share/native/sun/font/bidi/jbidi.h.i
data/src/share/native/java/lang/fdlibm/src/w_log.c.i
data/src/share/classes/sun/swing/DefaultLookup.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java.i
+data/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c.i
data/src/share/classes/java/net/URLEncoder.java.i
data/test/java/lang/Runtime/exec/LotsOfOutput.java.i
-data/src/share/classes/javax/xml/crypto/KeySelector.java.i
+data/src/share/native/sun/java2d/loops/AnyByte.c.i
+data/test/java/lang/instrument/RedefineClassWithNativeMethod.sh.i
data/src/share/classes/sun/awt/im/InputMethodJFrame.java.i
data/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java.i
data/src/solaris/native/sun/java2d/opengl/J2D_GL/glxext.h.i
+data/src/share/classes/java/awt/geom/IllegalPathStateException.java.i
data/src/share/classes/java/security/cert/CertificateParsingException.java.i
+data/test/java/util/ResourceBundle/RestrictedBundleTest.html.i
data/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java.i
-data/src/share/classes/sun/io/ByteToCharCp933.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java.i
data/src/share/classes/javax/accessibility/AccessibleAction.java.i
+data/test/java/awt/EventQueue/SecondaryLoopTest/SecondaryLoopTest.java.i
data/make/tools/src/build/tools/javazic/Time.java.i
data/src/share/classes/sun/io/ByteToCharCp861.java.i
-data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy.i
data/src/share/classes/sun/tools/tree/DoubleExpression.java.i
data/test/java/net/InetAddress/ptr/Lookup.java.i
data/src/share/native/sun/security/ec/ecl-curve.h.i
-data/src/solaris/classes/sun/awt/X11/XHorizontalScrollbar.java.i
+data/test/sun/nio/cs/TestEUC_TW.java.i
data/make/sun/javazic/tzdata/southamerica.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java.i
-data/src/share/classes/java/security/spec/ECParameterSpec.java.i
-data/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java.i
+data/test/org/openjdk/jigsaw/cli/ModuleFormatTest01.sh.i
data/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c.i
data/src/share/classes/java/lang/annotation/AnnotationFormatError.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java.i
data/test/com/sun/jdi/JdbArgTest.sh.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry.properties.i
data/src/share/classes/sun/nio/cs/IBM858.java.i
data/test/sun/tools/common/SleeperApplication.java.i
data/make/tools/CharsetMapping/IBM280.c2b.i
@@ -1833,29 +1795,26 @@ data/src/share/classes/org/openjdk/jigsaw/Resolution.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java.i
data/test/java/util/TreeMap/SubMapClear.java.i
data/src/share/classes/java/io/SyncFailedException.java.i
-data/src/share/classes/sun/management/resources/agent_it.properties.i
+data/test/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java.i
data/src/share/demo/nbproject/management/JTop/nbproject/netbeans-targets.xml.i
data/src/share/classes/sun/awt/image/BufImgSurfaceManager.java.i
data/test/java/net/URLClassLoader/sealing/manifest.i
data/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java.i
-data/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java.i
-data/make/com/sun/tools/attach/FILES_c.gmk.i
+data/src/share/classes/sun/security/ssl/Alerts.java.i
+data/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java.i
data/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java.i
-data/src/share/native/sun/font/layout/IndicReordering.h.i
+data/src/share/classes/sun/text/resources/FormatData_fr_CH.java.i
data/src/share/classes/java/security/acl/package.html.i
data/src/solaris/classes/sun/awt/motif/MScrollbarPeer.java.i
data/make/sun/serialver/Makefile.i
data/test/tools/launcher/ClassPathWildCard.sh.i
-data/src/share/test/pack200/pack.conf.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.rng.i
data/test/javax/management/interop/MBeanExceptionInteropTest.java.i
-data/test/java/awt/dnd/ImageDecoratedDnD/MyCursor.java.i
data/test/java/awt/Window/GrabSequence/GrabSequence.java.i
-data/src/share/classes/javax/management/openmbean/TabularType.java.i
+data/src/share/demo/scripting/jconsole-plugin/src/scripts/verbose.js.i
data/src/share/classes/java/awt/TrayIcon.java.i
data/test/com/sun/jdi/NotAField.sh.i
data/test/java/net/URLEncoder/DecodeNonEncoded.java.i
-data/src/share/classes/sun/util/locale/LanguageTag.java.i
data/src/share/classes/sun/rmi/transport/tcp/MultiplexInputStream.java.i
data/make/tools/CharsetMapping/IBM866.map.i
data/make/mkdemo/management/Makefile.i
@@ -1865,12 +1824,12 @@ data/src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java.i
data/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java.i
data/make/sun/native2ascii/Makefile.i
data/src/solaris/hpi/native_threads/src/mutex_md.c.i
-data/src/share/classes/sun/util/resources/CurrencyNames_de.properties.i
data/src/share/classes/javax/swing/text/Highlighter.java.i
data/test/java/io/Serializable/oldTests/ValidateClass.java.i
data/test/java/io/Serializable/resolveClass/consTest/run.sh.i
data/src/windows/classes/sun/awt/windows/WPrintDialog.java.i
-data/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html.i
+data/src/share/classes/sun/text/normalizer/Utility.java.i
+data/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java.i
data/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java.i
data/src/share/classes/java/net/URLDecoder.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c.i
@@ -1879,7 +1838,6 @@ data/test/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java.
data/test/java/nio/channels/Selector/SelectAndCancel.java.i
data/src/share/classes/sun/util/resources/LocaleNames_is.properties.i
data/src/share/classes/java/lang/Error.java.i
-data/make/sun/security/smartcardio/Makefile.i
data/src/share/classes/java/rmi/server/RemoteObject.java.i
data/src/share/classes/javax/swing/plaf/basic/DesktopIconMover.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so.d
@@ -1887,19 +1845,16 @@ data/src/share/classes/sun/beans/infos/ComponentBeanInfo.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java.i
data/src/share/classes/java/util/FormattableFlags.java.i
-data/src/share/demo/jfc/TableExample/TableExample.java.i
data/src/windows/native/sun/windows/awt_Pen.cpp.i
data/src/share/classes/sun/security/x509/NameConstraintsExtension.java.i
-data/src/share/classes/java/security/spec/ECField.java.i
data/test/java/io/Serializable/evolution/AddedExternField/run.sh.i
-data/src/share/classes/sun/io/ByteToCharCp33722.java.i
data/src/share/native/sun/java2d/loops/FillPath.c.i
data/src/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java.i
data/src/share/lib/colorname.properties.i
data/src/share/classes/sun/tools/jconsole/Resources.java.i
data/src/share/classes/java/lang/LinkageError.java.i
data/test/java/rmi/activation/Activatable/inactiveGroup/security.policy.i
-data/src/share/classes/com/sun/jndi/dns/DnsNameParser.java.i
+data/test/javax/management/query/CustomQueryTest.java.i
data/src/share/classes/java/nio/channels/spi/AbstractSelector.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/ClientHandler.java.i
data/src/share/native/sun/font/bidi/cmemory.h.i
@@ -1909,94 +1864,95 @@ data/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java.i
data/test/javax/swing/SwingWorker/6880336/NestedWorkers.java.i
data/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties.i
data/src/share/classes/javax/swing/tree/package.html.i
-data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java.i
data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface1.java.i
data/make/tools/swing-beans/beaninfo/images/JProgressBarColor32.gif.i
data/test/java/net/URLConnection/jars/test.jar.i
-data/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java.i
+data/src/share/classes/javax/naming/LinkRef.java.i
data/test/javax/management/namespace/WombatMBean.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalBumps.java.i
data/make/netbeans/common/sample-sources.ent.i
data/src/share/classes/javax/swing/LookAndFeel.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java.i
-data/test/sun/security/pkcs11/Provider/Login.java.i
+data/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java.i
data/src/share/classes/sun/beans/editors/EnumEditor.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h.i
+data/test/java/beans/Beans/Test4080522.java.i
data/test/com/sun/net/httpserver/Test7.java.i
data/make/tools/CharsetMapping/IBM277.map.i
-data/src/linux/doc/man/ja/javaws.1.i
+data/src/windows/native/sun/windows/awt_KeyEvent.cpp.i
data/test/java/net/InetAddress/BadDottedIPAddress.java.i
-data/src/share/classes/java/security/AlgorithmParametersSpi.java.i
data/make/sun/pisces/Makefile.i
data/test/sun/nio/cs/OLD/MS949_OLD.java.i
data/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java.i
data/src/share/classes/sun/misc/ASCIICaseInsensitiveComparator.java.i
data/src/share/classes/java/security/BasicPermission.java.i
-data/src/share/classes/sun/print/RasterPrinterJob.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/PainterImpl.template.i
data/test/java/security/KeyStore/EntryMethods.java.i
-data/test/java/io/Serializable/oldTests/ArrayFields.java.i
+data/test/java/util/concurrent/FutureTask/Customized.java.i
data/src/share/classes/sun/font/ExtendedTextSourceLabel.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java.i
data/test/java/util/logging/LoggerSubclass.java.i
-data/src/linux/doc/man/policytool.1.i
+data/src/share/classes/org/openjdk/jigsaw/LibraryPool.java.i
data/make/tools/CharsetMapping/IBM1383.nr.i
data/src/share/classes/sun/misc/resources/Messages_de.java.i
data/src/share/native/sun/font/layout/ArabicShaping.h.i
-data/test/com/sun/crypto/provider/Mac/MacKAT.java.i
+data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java.i
data/src/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java.i
data/src/share/classes/javax/security/auth/Destroyable.java.i
-data/src/share/demo/jvmti/hprof/hprof_ioname.h.i
+data/src/share/classes/javax/swing/AbstractCellEditor.java.i
data/src/share/classes/com/sun/jmx/namespace/JMXNamespaceUtils.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicPanelUI.java.i
data/src/share/classes/sun/dyn/util/BytecodeName.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_GT.java.i
data/src/share/classes/sun/misc/FloatingDecimal.java.i
data/src/share/classes/javax/print/attribute/standard/NumberUpSupported.java.i
-data/src/solaris/hpi/native_threads/include/condvar_md.h.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java.i
data/src/share/classes/java/beans/MethodDescriptor.java.i
data/src/share/classes/sun/nio/cs/ext/MS932_0213.java.i
-data/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java.i
+data/test/java/nio/channels/FileChannel/TransferToNonWritable.java.i
data/test/java/io/Serializable/checkModifiers/CheckModifiers.java.i
data/test/java/lang/reflect/TypeVariable/TestAnnotatedElement.java.i
data/src/share/classes/sun/security/x509/UniqueIdentity.java.i
-data/src/share/classes/java/lang/StringBuilder.java.i
+data/make/netbeans/jdwpgen/nbproject/sqe.properties.i
data/src/share/classes/java/awt/doc-files/Label-1.gif.i
data/src/share/classes/sun/security/util/Resources_pt_BR.java.i
-data/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java.i
+data/test/java/lang/instrument/BootClassPath/Setup.java.i
data/test/javax/security/auth/x500/X500Principal/InvalidConstructorInput.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java.i
-data/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java.i
+data/test/java/beans/PropertyEditor/TestEnumSubclassJava.java.i
data/src/share/classes/sun/nio/cs/ext/IBM863.java.i
data/src/share/classes/sun/dyn/anon/ConstantPoolParser.java.i
-data/src/share/classes/com/sun/jdi/CharValue.java.i
+data/src/share/sample/jmx/jmx-scandir/build.xml.i
data/make/tools/CharsetMapping/IBM1147.c2b.i
data/src/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java.i
+data/make/tools/src/build/tools/charsetmapping/GenerateMapping.java.i
data/src/share/classes/java/lang/ExceptionInInitializerError.java.i
data/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java.i
data/src/share/classes/sun/security/provider/DSA.java.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java.i
-data/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java.i
+data/src/share/native/sun/font/layout/MorphStateTables.h.i
data/test/java/awt/Toolkit/RealSync/RealSyncOnEDT.java.i
data/src/share/classes/sun/nio/ch/ChannelInputStream.java.i
-data/src/share/classes/sun/io/CharToByteCp285.java.i
+data/src/share/classes/sun/nio/cs/SingleByteDecoder.java.i
data/test/java/lang/Throwable/StackTraceSerialization.java.i
+data/test/javax/management/eventService/EventClientExecutorTest.java.i
data/test/java/beans/PropertyEditor/TestBooleanType.java.i
data/test/java/nio/channels/FileChannel/ClosedByInterrupt.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/BenchServerImpl.java.i
data/src/solaris/hpi/native_threads/src/interrupt_md.c.i
-data/test/java/nio/charset/Charset/EmptyCharsetName.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthPainter.java.i
data/test/java/nio/file/DirectoryStream/DriveLetter.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent1101.java.i
data/src/share/native/sun/font/layout/ArabicShaping.cpp.i
data/test/javax/management/Introspector/ObjectNameTemplateTest.java.i
data/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java.i
-data/src/share/classes/com/sun/java/browser/dom/DOMService.java.i
-data/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java.i
+data/test/java/util/ResourceBundle/Bug4177489_Resource_jf_JF.properties.i
+data/test/java/rmi/reliability/juicer/Apple.java.i
data/test/java/util/prefs/RemoveUnregedListener.java.i
-data/src/share/demo/jfc/CodePointIM/CodePointInputMethod.java.i
-data/src/share/classes/java/awt/geom/Point2D.java.i
+data/test/com/sun/jdi/redefine/RedefineSubTarg.java.i
+data/test/javax/swing/text/GlyphView/6539700/bug6539700.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlSubSystem.java.i
data/test/java/awt/Mixing/LWComboBox.java.i
data/src/share/classes/java/security/cert/X509Extension.java.i
@@ -2005,11 +1961,12 @@ data/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java.i
data/make/modules/modules.group.i
data/make/jpda/jdwp/Makefile.i
data/src/share/classes/java/security/cert/CertPathValidatorException.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif.i
data/src/share/classes/java/lang/instrument/ClassDefinition.java.i
-data/src/share/native/sun/font/layout/HangulLayoutEngine.h.i
+data/test/java/math/BigInteger/ModPow.java.i
data/src/share/classes/com/sun/media/sound/ModelTransform.java.i
data/src/share/native/sun/font/bidi/utypes.h.i
+data/src/share/instrument/JPLISAgent.h.i
+data/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java.i
data/test/java/lang/instrument/SingleTransformerTest.java.i
data/test/java/io/Serializable/serialver/classpath/run.sh.i
data/src/share/classes/java/security/spec/ECPublicKeySpec.java.i
@@ -2021,8 +1978,7 @@ data/test/java/awt/PrintJob/Security/policy.i
data/make/tools/src/build/tools/jdwpgen/MethodTypeNode.java.i
data/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java.i
data/src/share/classes/sun/security/x509/KeyUsageExtension.java.i
-data/test/java/util/Locale/serialized/java6locale_en.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c.i
+data/src/share/classes/sun/tools/jconsole/resources/mbean.gif.i
data/test/java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java.i
data/src/share/classes/sun/tools/java/Imports.java.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain8.txt.i
@@ -2032,73 +1988,66 @@ data/test/com/sun/jdi/ThreadGroupTest.java.i
data/src/share/classes/java/util/jar/JarException.java.i
data/src/share/classes/sun/misc/BootClassLoaderHook.java.i
data/test/java/beans/XMLEncoder/6777487/TestEnumSet.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java.i
data/src/share/classes/javax/management/remote/SubjectDelegationPermission.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/GeneratorUtils.java.i
data/src/share/classes/sun/reflect/UnsafeObjectFieldAccessorImpl.java.i
data/test/sun/tools/jps/jps_Output1.awk.i
data/src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java.i
-data/test/java/io/FileOutputStream/AtomicAppend.java.i
-data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy.i
+data/src/share/native/sun/security/ec/impl/ecl_curve.c.i
data/test/com/sun/servicetag/UpdateServiceTagTest.java.i
data/src/share/classes/java/awt/LinearGradientPaint.java.i
data/src/share/classes/com/sun/media/sound/ModelInstrument.java.i
-data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so.d
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java.i
-data/src/solaris/native/sun/awt/awt_motif.h.i
data/src/share/classes/sun/io/CharToByteMS950.java.i
-data/src/share/classes/java/awt/peer/MenuBarPeer.java.i
data/src/share/classes/sun/tools/jconsole/resources/expand-winlf.png.i
data/src/share/classes/javax/xml/crypto/dsig/DigestMethod.java.i
data/src/share/classes/sun/tools/tree/AssignShiftLeftExpression.java.i
-data/test/java/util/ResourceBundle/RB4353454_en.properties.i
data/src/share/classes/java/text/AttributedString.java.i
data/src/share/classes/com/sun/tracing/dtrace/Attributes.java.i
data/test/sun/nio/cs/TestMS5022X.java.i
data/test/java/rmi/activation/Activatable/unregisterInactive/ActivateMe.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/batch.sh.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostTrap.java.i
data/src/windows/native/sun/java2d/windows/dxInit.h.i
data/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java.i
data/src/share/classes/javax/swing/table/DefaultTableModel.java.i
data/src/share/classes/java/lang/invoke/MethodTypeForm.java.i
-data/src/share/classes/javax/xml/crypto/dsig/SignedInfo.java.i
+data/test/java/net/Socket/InheritTimeout.java.i
data/test/java/io/File/DeleteOnExitLong.java.i
data/make/sun/jconsole/Makefile.i
data/src/share/classes/com/sun/net/httpserver/HttpPrincipal.java.i
data/src/share/classes/sun/java2d/pipe/DrawImage.java.i
data/src/solaris/native/sun/awt/awt_TopLevel.c.i
-data/src/share/classes/sun/awt/GlobalCursorManager.java.i
+data/src/solaris/doc/sun/man/man1/ja/jdb.1.i
data/src/share/classes/sun/security/timestamp/Timestamper.java.i
-data/src/windows/native/sun/java2d/d3d/D3DResourceManager.h.i
data/test/java/io/readBytes/ReadBytesBounds.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_ja.properties.i
+data/src/share/classes/javax/sound/midi/spi/package.html.i
data/test/java/util/concurrent/locks/ReentrantReadWriteLock/RWMap.java.i
data/test/javax/security/auth/kerberos/KerberosHashEqualsTest.java.i
data/src/share/classes/sun/tools/asm/ConstantPoolData.java.i
-data/test/java/nio/channels/FileChannel/TransferToChannel.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/LoopbackSSLSocket.java.i
data/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties.i
-data/src/share/classes/javax/swing/text/html/HRuleView.java.i
data/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties.i
data/src/share/classes/java/nio/file/ProviderNotFoundException.java.i
data/src/share/classes/java/awt/image/BufferStrategy.java.i
-data/src/share/classes/javax/swing/doc-files/BoxLayout-1.gif.i
+data/test/java/security/BasicPermission/EqualsImplies.java.i
+data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java.i
data/src/share/classes/java/lang/management/ClassLoadingMXBean.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java.i
+data/test/java/io/BufferedReader/Ready.java.i
data/src/share/classes/com/sun/jmx/namespace/HandlerInterceptor.java.i
data/test/tools/launcher/UnicodeTest.sh.i
-data/make/jpda/jdwp/jdwp.spec.i
data/src/share/classes/javax/swing/plaf/nimbus/Defaults.template.i
data/src/share/classes/com/sun/crypto/provider/SslMacCore.java.i
data/test/java/io/Serializable/skipWriteObject/Read.java.i
-data/src/share/lib/audio/soundbank.gm.i
+data/src/share/classes/javax/management/remote/JMXConnectorFactory.java.i
data/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressInputStream.java.i
+data/src/share/classes/javax/print/attribute/standard/NumberOfDocuments.java.i
data/src/share/classes/java/applet/AudioClip.java.i
-data/src/share/native/sun/awt/medialib/awt_ImagingLib.h.i
-data/src/share/classes/sun/awt/CausedFocusEvent.java.i
+data/src/solaris/classes/sun/nio/ch/PipeImpl.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/SnmpAcl.java.i
data/test/java/io/DataInputStream/OpsAfterClose.java.i
-data/src/share/classes/sun/io/ByteToCharSJIS.java.i
+data/test/java/lang/instrument/PremainClass/InheritAgent0101.java.i
data/src/share/demo/nbproject/management/VerboseGC/nbproject/project.xml.i
data/test/java/net/URLDecoder/URLDecoderArgs.java.i
data/src/share/classes/java/awt/datatransfer/MimeTypeParameterList.java.i
@@ -2108,54 +2057,47 @@ data/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java.i
data/src/share/classes/sun/reflect/generics/factory/GenericsFactory.java.i
data/src/share/classes/sun/tools/tree/IntegerExpression.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties.i
+data/src/windows/native/java/net/TwoStacksPlainSocketImpl.c.i
data/src/share/classes/sun/text/resources/FormatData_ja_JP.java.i
-data/src/share/classes/javax/naming/ldap/ControlFactory.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c.i
data/src/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java.i
data/src/share/classes/java/beans/Transient.java.i
-data/src/share/classes/sun/rmi/rmic/RemoteClass.java.i
-data/test/javax/management/mxbean/PreRegisterNameTest.java.i
data/src/share/classes/java/io/FilterReader.java.i
data/test/java/awt/image/mlib/mlib.security.policy.i
-data/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c.i
data/src/share/classes/java/security/AlgorithmParameters.java.i
data/test/sun/security/ec/TestEC.java.i
-data/test/javax/swing/JSlider/4987336/box.gif.i
+data/test/javax/xml/crypto/dsig/data/certs/crl.i
data/test/sun/text/resources/Format/Bug4810032.java.i
data/src/share/demo/jfc/CodePointIM/README.html.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Gradient.java.i
+data/make/tools/GenerateCharacter/CharacterDataLatin1.java.template.i
data/src/share/classes/java/security/cert/Certificate.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_EG.properties.i
-data/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java.i
data/test/javax/swing/JColorChooser/Test4759306.java.i
+data/test/sun/net/www/http/ChunkedInputStream/test.txt.d
data/test/sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java.i
-data/src/share/classes/sun/security/smartcardio/PCSC.java.i
-data/test/sun/security/util/DerValue/EmptyValue.java.i
+data/src/share/classes/sun/text/resources/FormatData_no_NO_NY.java.i
data/test/sun/security/provider/PolicyFile/Comparator.Combined.Policy.i
data/src/share/classes/java/lang/NoSuchMethodError.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java.i
data/src/share/demo/applets/BarChart/BarChart.java.i
data/src/share/bin/manifest_info.h.i
-data/src/share/classes/sun/management/snmp/util/SnmpCachedData.java.i
-data/src/share/classes/sun/security/ssl/ByteBufferInputStream.java.i
+data/test/java/io/FileInputStream/OpsAfterClose.java.i
data/test/sun/security/mscapi/RSAEncryptDecrypt.java.i
data/test/javax/management/namespace/NullDomainObjectNameTest.java.i
data/test/java/util/prefs/ExportNode.java.i
data/src/share/classes/java/awt/event/ContainerListener.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/PKIXExtendedTM.java.i
-data/src/share/classes/java/awt/image/renderable/RenderableImage.java.i
+data/src/share/demo/applets/WireFrame/Matrix3D.java.i
data/src/solaris/classes/sun/awt/X11/XCanvasPeer.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java.i
+data/src/share/classes/sun/print/SunAlternateMedia.java.i
data/test/com/sun/jdi/DataModelTest.java.i
-data/src/share/classes/sun/nio/cs/ext/MS932DB.java.i
+data/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ProxyTunnelServer.java.i
-data/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java.i
+data/test/java/rmi/reliability/benchmark/bench/Benchmark.java.i
data/test/java/net/InetAddress/B6246242.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/FloatArrayCalls.java.i
data/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp.i
-data/src/share/classes/javax/sound/sampled/BooleanControl.java.i
+data/src/share/classes/sun/nio/cs/ext/HKSCS_2001.java.i
data/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java.i
data/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java.i
data/src/solaris/doc/sun/man/man1/servertool.1.i
@@ -2166,24 +2108,22 @@ data/src/share/classes/javax/swing/plaf/metal/icons/ocean/hardDrive.gif.i
data/test/java/beans/Introspector/Test4619792.java.i
data/src/share/classes/sun/management/LockDataConverter.java.i
data/test/java/net/InetAddress/IsHostReachableBug.java.i
-data/src/solaris/classes/sun/awt/X11/XStateProtocol.java.i
data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java.i
-data/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java.i
+data/src/share/native/sun/font/layout/HanLayoutEngine.cpp.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy12.i
data/src/share/native/java/util/zip/zlib-1.1.3/zcrc32.c.i
data/make/tools/swing-beans/beaninfo/images/JTextPaneColor16.gif.i
-data/test/com/sun/jdi/ClassLoaderClassesTest.java.i
data/test/tools/launcher/lib/sparc/lib64/liblibrary.so.i
-data/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java.i
+data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh.i
data/src/share/classes/java/util/ListResourceBundle.java.i
data/src/share/classes/javax/naming/spi/ObjectFactoryBuilder.java.i
data/src/share/classes/java/awt/ImageCapabilities.java.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/NextFramePositionCalculator.java.i
data/src/share/classes/javax/swing/plaf/ScrollPaneUI.java.i
-data/src/share/classes/javax/management/relation/RelationType.java.i
+data/src/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java.i
data/src/share/transport/shmem/shmemBase.c.i
-data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties.i
+data/test/javax/management/eventService/EventDelegateSecurityTest.java.i
data/test/com/sun/tools/attach/Agent.java.i
data/src/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java.i
data/src/share/classes/sun/text/resources/CollationData_th.java.i
@@ -2191,21 +2131,20 @@ data/src/share/classes/sun/text/resources/FormatData_tr_TR.java.i
data/make/tools/CharsetMapping/MS950.map.i
data/src/solaris/classes/sun/awt/X11/XlibUtil.java.i
data/src/share/classes/java/lang/CharacterName.java.i
-data/make/sun/cmm/lcms/mapfile-vers.i
-data/test/sun/security/validator/certreplace.sh.i
+data/test/java/beans/PropertyEditor/Test4968709.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java.i
data/src/share/classes/com/sun/tracing/Probe.java.i
-data/make/launchers/Makefile.launcher.i
+data/src/share/classes/java/net/JarURLConnection.java.i
+data/make/com/sun/security/Makefile.i
data/src/share/classes/sun/jvmstat/monitor/AbstractMonitor.java.i
data/src/share/classes/com/sun/crypto/provider/DHPublicKey.java.i
data/src/share/classes/java/net/ContentHandlerFactory.java.i
-data/test/java/util/concurrent/BlockingQueue/Interrupt.java.i
data/src/share/classes/javax/management/relation/InvalidRelationServiceException.java.i
data/src/share/demo/applets/Clock/Clock.java.i
data/src/share/classes/java/awt/image/LookupOp.java.i
-data/make/com/sun/org/Makefile.i
+data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java.i
data/src/share/classes/java/awt/Color.java.i
-data/test/java/nio/channels/AsynchronousChannelGroup/BadProperties.java.i
+data/src/share/classes/sun/io/ByteToCharCp970.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java.i
data/src/share/demo/applets/MoleculeViewer/example3.html.i
data/test/java/net/CookieHandler/B6277794.java.i
@@ -2213,7 +2152,7 @@ data/test/javax/swing/border/Test4856008.java.i
data/test/java/net/MulticastSocket/Reuse.java.i
data/src/share/classes/sun/io/CharToByteCp855.java.i
data/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java.i
-data/src/share/classes/javax/print/attribute/standard/MediaSize.java.i
+data/src/share/classes/javax/swing/DebugGraphics.java.i
data/src/share/classes/javax/swing/colorchooser/DefaultHSBChooserPanel.java.i
data/make/tools/CharsetMapping/IBM939.map.i
data/src/share/classes/sunw/util/EventObject.java.i
@@ -2222,22 +2161,22 @@ data/src/share/classes/javax/sql/rowset/RowSetProvider.java.i
data/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java.i
data/src/share/classes/java/nio/file/NoSuchFileException.java.i
data/src/share/classes/sun/java2d/opengl/OGLMaskFill.java.i
-data/make/jdk_generic_profile.sh.i
-data/src/share/classes/javax/print/ServiceUI.java.i
+data/src/share/classes/javax/swing/ListCellRenderer.java.i
data/src/share/classes/java/nio/file/StandardOpenOption.java.i
data/test/com/sun/security/sasl/gsskerb/gsseg_jaas.conf.i
data/src/share/classes/com/sun/media/sound/DLSSampleLoop.java.i
data/src/share/native/java/lang/fdlibm/src/e_log10.c.i
data/src/share/classes/javax/management/ServiceNotFoundException.java.i
-data/test/java/lang/ThreadGroup/Suspend.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java.i
data/test/java/util/Formatter/BasicInt.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll.i
data/src/windows/back/path_md.h.i
-data/make/sun/motif12/reorder-sparc.i
+data/test/java/security/testlibrary/ProvidersSnapshot.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludesImpl.java.i
+data/test/java/util/zip/ZipFile/Available.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/Modifier.java.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/CanCreateStubs.java.i
data/test/javax/swing/JMenuItem/6883341/bug6883341.java.i
-data/src/share/classes/sun/io/ByteToCharCp1258.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java.i
data/make/tools/swing-beans/beaninfo/images/JSliderColor16.gif.i
data/src/solaris/classes/java/lang/Terminator.java.i
@@ -2257,28 +2196,32 @@ data/test/javax/management/ObjectName/NullEmptyKeyValueTest.java.i
data/src/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java.i
data/src/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java.i
data/src/share/classes/sun/io/ByteToCharTIS620.java.i
-data/src/share/classes/java/nio/Buffer.java.i
+data/src/share/classes/sun/net/httpserver/ServerImpl.java.i
+data/test/javax/sound/midi/Gervill/SF2SoundbankReader/ding.sf2.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/trees.c.i
data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateMe.java.i
-data/src/share/classes/sun/font/TextLabelFactory.java.i
data/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java.i
-data/test/java/rmi/activation/Activatable/restartService/RestartService.java.i
+data/src/share/classes/javax/management/NumericValueExp.java.i
+data/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java.i
data/test/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider.i
-data/src/share/classes/javax/management/relation/RelationNotification.java.i
+data/test/java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java.i
+data/src/share/back/util.c.i
+data/test/java/security/cert/pkix/policyChanges/ca.cer.i
+data/test/java/nio/charset/spi/Test.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java.i
data/make/mkdemo/jfc/SwingSet2/Makefile.i
data/test/sun/security/tools/keytool/p11-nss.txt.i
data/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java.i
-data/src/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java.i
-data/src/share/classes/java/awt/color/ICC_ColorSpace.java.i
+data/src/solaris/native/sun/awt/awt_ScrollPane.c.i
data/src/share/classes/java/nio/file/attribute/Attributes.java.i
+data/src/share/classes/sun/net/www/content/text/plain.java.i
data/src/share/classes/sun/management/snmp/util/SnmpTableCache.java.i
data/src/share/classes/javax/naming/spi/DirStateFactory.java.i
+data/src/share/classes/sun/security/krb5/internal/TGSRep.java.i
data/src/share/classes/javax/net/ssl/KeyManager.java.i
-data/src/linux/doc/man/javaws.1.i
-data/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java.i
+data/test/java/security/Security/ClassLoaderDeadlock/CreateSerialized.java.i
data/src/share/classes/sun/io/ByteToCharCp930.java.i
data/src/share/classes/sun/misc/FpUtils.java.i
data/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider.i
@@ -2289,80 +2232,76 @@ data/test/sun/nio/cs/FindCanEncodeBugs.java.i
data/test/sun/security/pkcs11/Secmod/nsscrypto.cfg.i
data/test/javax/swing/Security/6657138/ComponentTest.java.i
data/test/com/sun/crypto/provider/KeyGenerator/Test4628062.java.i
+data/test/sun/security/ssl/sun/net/www/httpstest/ClosedChannelList.java.i
data/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.java.i
data/src/share/classes/java/dyn/CallSite.java.i
data/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java.i
data/src/share/classes/sun/text/resources/FormatData_sv_SE.java.i
data/src/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java.i
+data/test/java/awt/im/4490692/bug4490692.html.i
data/make/tools/src/build/tools/jdwpgen/FieldTypeNode.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServerMBean.java.i
-data/test/java/dyn/ClassValueTest.java.i
+data/test/java/awt/regtesthelpers/Sysout.java.i
data/make/javax/others/Makefile.i
data/src/share/classes/com/sun/script/javascript/META-INF/services/javax.script.ScriptEngineFactory.i
+data/make/netbeans/common/architectures/name-Linux.properties.i
data/make/modules/image.boot.ls.i
+data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html.i
data/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java.i
data/src/share/classes/sun/security/util/ResourcesMgr.java.i
data/test/sun/security/tools/jarsigner/concise_jarsigner.sh.i
data/test/java/beans/PropertyEditor/TestShortClassNull.java.i
data/src/share/classes/javax/naming/directory/InvalidAttributesException.java.i
-data/test/java/lang/ClassLoader/findSystemClass/Loadee.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/Warn.gif.i
data/make/sun/jconsole/FILES.gmk.i
data/test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector.i
data/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java.i
data/src/share/classes/java/beans/PropertyVetoException.java.i
+data/test/java/io/LineNumberReader/SkipInput.txt.i
data/src/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java.i
data/src/solaris/doc/sun/man/man1/ja/rmid.1.i
data/src/share/classes/sun/applet/AppletViewerPanel.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java.i
data/src/share/classes/java/awt/SentEvent.java.i
-data/src/share/classes/com/sun/net/httpserver/spi/package-info.java.i
data/src/share/native/sun/awt/image/cvutils/img_nodither.h.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pk2.cert.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/Klass.java.i
data/test/sun/nio/cs/OLD/DoubleByteEncoder.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java.i
data/src/share/classes/java/awt/AWTException.java.i
data/test/java/lang/Class/getMethods/NonPublicStaticInitializer.java.i
-data/src/share/classes/java/security/cert/CertStoreParameters.java.i
+data/src/solaris/back/util_md.h.i
data/src/share/classes/sun/print/resources/orientPortrait.png.i
-data/make/tools/reorder/tools/mcount.c.i
-data/src/solaris/native/sun/awt/cursor.c.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java.i
-data/test/sun/rmi/rmic/oldjavacRemoved/Foo.java.i
+data/src/share/classes/sun/management/snmp/util/SnmpTableHandler.java.i
data/src/share/classes/com/sun/jmx/interceptor/SingleMBeanForwarder.java.i
data/src/share/classes/sun/print/SunPrinterJobService.java.i
data/src/share/sample/nio/chatserver/ClientReader.java.i
data/src/share/back/error_messages.c.i
-data/make/modules/jdk.boot.ls.i
-data/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java.i
-data/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java.i
-data/src/share/demo/scripting/jconsole-plugin/build.xml.i
-data/src/share/classes/sun/security/ec/ECDSASignature.java.i
+data/src/share/native/sun/security/ec/impl/mpi.c.i
+data/src/share/classes/javax/swing/DefaultListModel.java.i
data/src/share/classes/javax/xml/crypto/dom/DOMURIReference.java.i
data/src/share/classes/com/sun/pept/presentation/Stub.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Arrays.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif.i
data/src/share/classes/java/nio/file/ClosedDirectoryStreamException.java.i
data/make/tools/reorder/tests/Sleep.java.i
-data/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java.i
-data/make/tools/CharsetMapping/IBM424.nr.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java.i
+data/src/share/classes/com/sun/jndi/dns/DnsNameParser.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/HasUIStyle.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java.i
data/src/share/classes/java/util/prefs/BackingStoreException.java.i
+data/test/com/sun/servicetag/DuplicateNotFound.java.i
data/test/java/util/Timer/NameConstructors.java.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/java.awt.im.spi.InputMethodDescriptor.i
data/test/sun/security/tools/policytool/UsePolicy.java.i
data/src/share/native/sun/font/layout/ArabicLayoutEngine.h.i
-data/src/share/classes/sun/misc/resources/Messages_es.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java.i
-data/test/sun/nio/cs/OLD/EUC_KR_OLD.java.i
-data/src/share/classes/sun/tools/jconsole/MemoryTab.java.i
-data/make/tools/swing-beans/beaninfo/images/JMenuMono16.gif.i
+data/make/tools/src/build/tools/javazic/Gen.java.i
data/src/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java.i
data/test/java/awt/dnd/ImageDecoratedDnD/DnDSource.java.i
data/src/windows/native/sun/windows/awt_MMStub.cpp.i
-data/test/java/io/PrintStream/FailingConstructors.java.i
+data/test/java/rmi/testlibrary/TestFailedException.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java.i
data/src/share/classes/sun/text/resources/FormatData_es_EC.java.i
data/test/java/beans/PropertyEditor/TestFontClassJava.java.i
@@ -2370,26 +2309,30 @@ data/test/sun/java2d/pipe/MutableColorTest/MutableColorTest.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/mail.js.i
data/src/share/classes/sun/text/resources/FormatData_be_BY.java.i
data/src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java.i
-data/src/share/classes/java/beans/DesignMode.java.i
+data/test/java/lang/Character/PropertyValueAliases.txt.i
+data/src/share/classes/com/sun/security/auth/NTUserPrincipal.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/package.html.i
+data/src/solaris/native/common/jlong_md.h.i
data/src/share/classes/javax/sound/sampled/TargetDataLine.java.i
data/src/share/classes/sun/security/krb5/internal/EncTicketPart.java.i
-data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif.i
+data/test/sun/security/pkcs11/fips/ImportKeyStore.java.i
data/test/java/util/ResourceBundle/Bug4257318.java.i
-data/src/share/classes/javax/sql/rowset/serial/SerialArray.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java.i
+data/test/sun/net/www/protocol/http/B6296310.java.i
+data/src/share/classes/sun/text/resources/FormatData_uk.java.i
data/src/share/instrument/EncodingSupport.h.i
data/src/share/classes/org/openjdk/jigsaw/JigsawVersion.java.i
data/test/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form.i
data/src/share/classes/com/sun/java/util/jar/pack/Histogram.java.i
+data/src/solaris/classes/sun/net/spi/SdpProvider.java.i
data/test/java/io/Serializable/evolution/AddedField/WriteAddedField.java.i
data/test/sun/java2d/cmm/ColorConvertOp/ColCvtAlpha.java.i
-data/test/javax/swing/plaf/nimbus/Test7048204.java.i
+data/make/tools/CharsetMapping/Big5.nr.i
data/src/share/classes/com/sun/jndi/ldap/LdapReferralContext.java.i
+data/src/windows/native/sun/windows/awt_Label.cpp.i
data/src/windows/native/sun/java2d/windows/Win32SurfaceData.cpp.i
data/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy.i
data/src/share/back/ArrayTypeImpl.h.i
-data/src/share/classes/sun/io/ByteToCharCp1143.java.i
data/src/share/native/sun/java2d/loops/ByteGray.h.i
data/make/tools/CharsetMapping/IBM852.map.i
data/src/share/classes/java/io/Flushable.java.i
@@ -2402,15 +2345,14 @@ data/src/share/classes/sun/util/resources/LocaleNames_zh_HK.java.i
data/src/share/classes/java/lang/Appendable.java.i
data/src/share/classes/javax/management/ListenerNotFoundException.java.i
data/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c.i
+data/src/share/classes/org/openjdk/jigsaw/Repository.java.i
data/src/share/classes/sun/util/resources/CalendarData_fr_CA.properties.i
data/src/share/demo/jvmti/waiters/Thread.hpp.i
-data/src/share/native/sun/font/layout/Lookups.h.i
-data/src/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java.i
+data/test/java/beans/XMLEncoder/6380849/TestPersistenceDelegate.java.i
data/make/netbeans/common/architectures/arch-sparc.properties.i
-data/src/solaris/native/sun/awt/awt_InputMethod.c.i
-data/src/solaris/classes/sun/awt/X11/XWINProtocol.java.i
-data/src/share/classes/sun/nio/fs/Globs.java.i
-data/test/javax/security/auth/kerberos/ServicePermissionTest.java.i
+data/src/share/classes/java/awt/package.html.i
+data/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java.i
+data/src/share/classes/sun/tools/tree/LocalMember.java.i
data/test/java/nio/charset/coders/CheckSJISMappingProp.sh.i
data/make/mkdemo/management/VerboseGC/Makefile.i
data/make/netbeans/common/demo-view.ent.i
@@ -2422,12 +2364,12 @@ data/test/java/lang/module/ModuleAnnotationTest.java.i
data/make/sun/javazic/tzdata_jdk/jdk11_full_backward.i
data/src/share/classes/java/awt/geom/Path2D.java.i
data/src/share/classes/com/sun/crypto/provider/DESedeParameters.java.i
-data/src/share/classes/com/sun/media/sound/ModelStandardDirector.java.i
data/src/solaris/classes/com/sun/security/auth/module/README.i
data/src/share/classes/sun/print/ServiceNotifier.java.i
data/test/javax/swing/JLayer/SerializationTest/SerializationTest.java.i
data/make/sun/jpeg/reorder-sparcv9.i
data/test/com/sun/net/httpserver/bugs/B6526158.java.i
+data/src/share/classes/sun/text/resources/FormatData_et_EE.java.i
data/src/solaris/native/java/net/NetworkInterface.c.i
data/src/share/classes/sun/rmi/transport/DGCClient.java.i
data/src/share/classes/javax/swing/text/SimpleAttributeSet.java.i
@@ -2440,56 +2382,60 @@ data/src/share/classes/javax/crypto/JarVerifier.java.i
data/test/demo/jvmti/mtrace/TraceJFrame.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/memory.sh.i
data/make/tools/src/build/tools/jdwpgen/ReplyNode.java.i
+data/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.Connector.i
data/test/java/net/Inet6Address/serialize/serial-bge0.ser.i
data/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java.i
data/make/tools/src/build/tools/hasher/Hasher.java.i
data/src/share/classes/com/sun/net/ssl/internal/ssl/Provider.java.i
-data/src/share/classes/javax/management/openmbean/InvalidKeyException.java.i
data/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java.i
data/src/share/classes/sun/awt/im/InputMethodWindow.java.i
data/src/share/classes/javax/security/auth/login/package.html.i
data/test/sun/rmi/rmic/newrmic/equivalence/Callback.java.i
data/src/share/classes/com/sun/crypto/provider/ISO10126Padding.java.i
-data/src/share/classes/java/security/cert/X509CertSelector.java.i
-data/test/java/awt/Toolkit/Headless/AWTEventListener/AWTListener.java.i
+data/test/java/lang/Runtime/exec/Space.java.i
data/test/java/lang/ClassLoader/Assert.sh.i
data/test/sun/security/krb5/MicroTime.java.i
data/src/share/classes/sun/net/www/content/image/gif.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedSet.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java.i
data/make/mkdemo/applets/Fractal/Makefile.i
data/src/share/classes/java/lang/reflect/Field.java.i
data/src/share/classes/java/security/spec/InvalidParameterSpecException.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java.i
-data/make/tools/src/build/tools/charsetmapping/Utils.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp.i
+data/src/share/native/sun/awt/image/jpeg/jmemsys.h.i
data/test/java/rmi/activation/Activatable/restartService/ActivateMe.java.i
data/src/share/classes/java/rmi/ServerException.java.i
data/src/windows/native/sun/java2d/d3d/D3DMaskCache.cpp.i
+data/test/com/sun/jdi/JdbMissStep.sh.i
data/src/share/classes/sun/java2d/pipe/AlphaColorPipe.java.i
-data/src/share/classes/sun/text/resources/CollationData_is.java.i
-data/src/share/classes/sun/nio/cs/UTF_8.java.i
+data/src/share/native/com/sun/media/sound/Platform.c.i
data/test/java/lang/Runtime/exec/SetCwd.java.i
data/src/share/classes/java/util/IdentityHashMap.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties.i
+data/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java.i
data/src/share/classes/sun/security/pkcs11/SessionManager.java.i
data/src/share/native/sun/tracing/dtrace/jvm_symbols.h.i
data/src/windows/native/sun/nio/ch/DatagramDispatcher.c.i
-data/src/share/classes/javax/swing/text/NavigationFilter.java.i
data/test/java/nio/ByteOrder/NativeOrder.java.i
data/src/share/classes/sun/tools/tree/AndExpression.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/ContextListener.java.i
data/make/tools/CharsetMapping/IBM948.c2b.i
data/src/share/classes/javax/swing/text/GlyphPainter1.java.i
data/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java.i
+data/test/com/sun/security/sasl/digest/Privacy.java.i
data/test/javax/script/JavaScriptScopeTest.java.i
data/make/com/sun/security/auth/module/FILES_c_windows.gmk.i
data/test/java/rmi/activation/Activatable/restartCrashedService/rmid.security.policy.i
data/test/sun/security/pkcs11/SampleTest.java.i
+data/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java.i
data/src/share/classes/sun/security/x509/OtherName.java.i
data/make/java/hpi/native/mapfile-vers.i
+data/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java.i
data/test/java/net/URLConnection/6212146/Test.java.i
data/test/java/beans/XMLEncoder/java_lang_Class.java.i
-data/test/javax/management/Introspector/AnnotationSecurityTest.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java.i
data/src/share/classes/sun/jvmstat/monitor/event/HostListener.java.i
data/test/sun/java2d/cmm/ColorConvertOp/SRGB.png.i
@@ -2497,6 +2443,8 @@ data/src/share/classes/java/lang/management/LockInfo.java.i
data/src/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java.i
data/test/java/io/Serializable/clearHandleTable/ClearHandleTable.java.i
data/test/javax/security/auth/PrivateCredentialPermission/CanonError.java.i
+data/src/windows/bin/i586/jvm.cfg.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java.i
data/src/share/native/sun/security/ec/impl/ecl.h.i
data/src/share/classes/sun/font/PhysicalFont.java.i
data/src/share/classes/sun/java2d/pipe/BufferedMaskFill.java.i
@@ -2504,7 +2452,8 @@ data/src/share/sample/scripting/scriptpad/src/scripts/insertfile.js.i
data/test/java/lang/Runtime/exec/Duped.java.i
data/src/share/demo/applets/SortDemo/SortAlgorithm.java.i
data/test/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatSymbolsProvider.i
-data/src/share/native/sun/awt/image/jpeg/jddctmgr.c.i
+data/test/java/net/DatagramSocket/ChangingAddress.java.i
+data/src/solaris/classes/sun/font/NativeGlyphMapper.java.i
data/src/share/classes/sun/util/resources/LocaleNames_en_PH.properties.i
data/test/java/awt/Frame/ShownOnPack/ShownOnPack.java.i
data/make/mkdemo/applets/Makefile.i
@@ -2523,14 +2472,13 @@ data/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java.i
data/test/java/nio/file/Files/SBC.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/MultipleArgumentsForOptionException.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java.i
-data/test/java/util/ResourceBundle/Control/StressOut_ko.properties.i
+data/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java.i
-data/src/share/classes/com/sun/jmx/snmp/InetAddressAcl.java.i
data/src/share/classes/javax/xml/crypto/dsig/XMLSignature.java.i
data/make/mkdemo/applets/SortDemo/Makefile.i
+data/src/windows/native/sun/windows/awt_Frame.h.i
data/src/share/classes/java/util/jar/JarFile.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1142.java.i
-data/make/tools/swing-beans/beaninfo/images/JInternalFrameColor32.gif.i
data/src/linux/doc/man/ja/javah.1.i
data/src/share/classes/javax/xml/crypto/dsig/package.html.i
data/src/share/classes/javax/crypto/spec/GCMParameterSpec.java.i
@@ -2539,6 +2487,8 @@ data/src/share/classes/java/util/prefs/Base64.java.i
data/test/java/io/Serializable/oldTests/ArraysOfArrays.java.i
data/test/java/net/Socket/LingerTest.java.i
data/make/java/instrument/mapfile-vers.i
+data/src/share/demo/applets/SpreadSheet/SpreadSheet.java.i
+data/src/solaris/doc/sun/man/man1/jstack.1.i
data/test/java/lang/HashCode.java.i
data/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOption.java.i
data/src/share/classes/javax/management/package.html.i
@@ -2546,18 +2496,19 @@ data/src/share/classes/sun/security/krb5/KrbAppMessage.java.i
data/src/share/classes/java/net/Inet6AddressImpl.java.i
data/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java.i
data/src/share/classes/sun/util/calendar/JulianCalendar.java.i
+data/test/com/sun/crypto/provider/TLS/TestPremaster.java.i
data/src/solaris/classes/sun/nio/ch/SctpPeerAddrChange.java.i
data/src/share/classes/javax/imageio/event/package.html.i
-data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java.i
+data/src/share/classes/javax/management/event/EventRelay.java.i
data/src/share/classes/java/nio/channels/SelectableChannel.java.i
data/make/tools/swing-beans/beaninfo/images/JMenuItemColor16.gif.i
data/test/org/openjdk/jigsaw/resolver.sh.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties.i
-data/test/sun/tools/jps/jps-help.sh.i
+data/test/java/awt/List/SetBackgroundTest/SetBackgroundTest.java.i
data/src/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java.i
data/test/java/io/pathNames/win32/SJIS.java.i
data/test/java/io/Serializable/skippedObjCNFException/Read.java.i
-data/src/share/classes/javax/management/remote/rmi/RMIConnection.java.i
+data/src/solaris/native/sun/awt/awt_Window.h.i
data/src/solaris/native/sun/awt/awt_p.h.i
data/src/windows/native/sun/java2d/windows/DDRenderer.cpp.i
data/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties.i
@@ -2565,7 +2516,6 @@ data/src/windows/native/sun/windows/awt_TextArea.cpp.i
data/src/share/classes/javax/swing/plaf/metal/package.html.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java.i
data/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java.i
-data/test/org/openjdk/jigsaw/resource.sh.i
data/src/share/classes/sun/tools/tree/ConvertExpression.java.i
data/test/sun/net/www/protocol/http/B5017051.java.i
data/test/java/net/URLConnection/GetContentType.java.i
@@ -2573,23 +2523,22 @@ data/test/java/rmi/activation/ActivateFailedException/activateFails/ShutdownThre
data/test/java/nio/Buffer/CharAt.java.i
data/make/jpda/transport/socket/Makefile.i
data/src/share/classes/sun/tools/tree/CastExpression.java.i
-data/src/share/native/common/check_version.c.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties.i
data/src/share/classes/java/security/PrivateKey.java.i
+data/test/java/lang/StackTraceElement/PublicConstructor.java.i
data/src/share/native/sun/font/layout/CharSubstitutionFilter.h.i
data/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduPacket.java.i
data/src/share/classes/javax/swing/GrayFilter.java.i
data/src/share/classes/com/sun/tracing/dtrace/DependencyClass.java.i
data/make/tools/compile_properties/Makefile.i
data/make/tools/src/build/tools/generatenimbus/Generator.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java.i
data/src/linux/doc/man/ja/jhat.1.i
data/test/java/rmi/server/useCustomRef/UseCustomRef_Skel.java.i
data/src/share/classes/sun/reflect/UnsafeBooleanFieldAccessorImpl.java.i
data/src/share/classes/javax/script/ScriptException.java.i
-data/src/share/classes/java/awt/image/renderable/RenderContext.java.i
+data/test/java/awt/font/StyledMetrics/BoldSpace.java.i
data/make/sun/javazic/tzdata/iso3166.tab.i
-data/src/share/classes/sun/io/ByteToCharCp935.java.i
+data/src/share/classes/sun/misc/JavaIOAccess.java.i
data/src/solaris/native/java/io/FileInputStream_md.c.i
data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties.i
data/test/com/sun/crypto/provider/Cipher/RC2ArcFour/CipherKAT.java.i
@@ -2602,61 +2551,65 @@ data/test/java/io/Serializable/packageAccess/run.sh.i
data/src/share/classes/com/sun/media/sound/SoftChannel.java.i
data/src/share/classes/java/util/zip/ZipError.java.i
data/test/javax/swing/border/Test4129681.java.i
+data/src/share/classes/java/nio/Heap-X-Buffer.java.i
data/test/java/net/InetAddress/GetLoopbackAddress.java.i
-data/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java.i
+data/src/share/classes/sun/util/locale/AsciiUtil.java.i
data/src/solaris/classes/sun/java2d/xr/DirtyRegion.java.i
data/test/javax/management/monitor/ThreadPoolTest.java.i
data/src/share/native/sun/security/ec/impl/mp_gf2m-priv.h.i
data/test/javax/management/loading/mlet2.html.i
data/test/com/sun/security/sasl/digest/CheckNegotiatedQOPs.java.i
+data/test/sun/security/provider/PolicyFile/Comparator.java.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init6.java.i
data/src/share/classes/java/text/MergeCollation.java.i
-data/src/share/native/java/lang/fdlibm/src/s_tanh.c.i
-data/src/share/classes/java/sql/Types.java.i
+data/src/solaris/doc/sun/man/man1/jsadebugd.1.i
+data/src/share/classes/sun/reflect/ClassFileAssembler.java.i
data/src/share/native/sun/awt/image/jpeg/jdmerge.c.i
+data/test/tools/launcher/CreatePlatformFile.java.i
data/test/com/sun/security/sasl/digest/Integrity.java.i
data/src/share/classes/sun/invoke/util/VerifyAccess.java.i
-data/make/com/sun/jndi/dns/Makefile.i
+data/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java.i
data/src/share/classes/sun/net/www/content/audio/x_wav.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java.i
data/src/share/classes/sun/text/resources/FormatData_es_UY.java.i
+data/test/javax/swing/border/Test6625450.java.i
+data/src/share/classes/com/sun/net/httpserver/package-info.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java.i
+data/test/java/io/etc/FileDescriptorSharing.java.i
data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java.i
data/src/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java.i
data/src/share/classes/sun/util/logging/LoggingSupport.java.i
data/src/share/classes/sun/util/resources/LocaleNames_lv.properties.i
data/test/sun/security/provider/PolicyFile/Alias.java.i
-data/src/share/classes/javax/security/auth/callback/PasswordCallback.java.i
+data/src/share/native/java/lang/fdlibm/src/e_hypot.c.i
data/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java.i
data/src/share/classes/java/util/logging/LogRecord.java.i
data/src/windows/native/sun/windows/awt_Object.cpp.i
-data/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java.i
-data/src/share/classes/javax/swing/text/TabExpander.java.i
data/src/share/classes/java/lang/management/BufferPoolMXBean.java.i
data/src/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java.i
data/src/solaris/native/sun/awt/img_util_md.h.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine.h.i
data/src/solaris/doc/sun/man/man1/ja/jmap.1.i
data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java.i
-data/test/org/openjdk/jigsaw/cli/signer-prikey.pem.i
-data/src/share/classes/sun/tools/tree/NewInstanceExpression.java.i
+data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java.i
+data/src/windows/classes/sun/java2d/windows/Win32OffScreenSurfaceData.java.i
data/src/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java.i
data/test/java/util/List/LockStep.java.i
data/src/share/classes/sun/nio/cs/ext/IBM865.java.i
data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapCtx.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_it_IT.properties.i
data/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java.i
data/make/tools/GenerateCharacter/CharacterData00.java.template.i
-data/src/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java.i
+data/src/share/classes/sun/reflect/FieldAccessorImpl.java.i
data/src/share/classes/java/io/StringWriter.java.i
-data/src/share/classes/sun/management/CompilationImpl.java.i
+data/test/javax/crypto/JceSecurity/MyProvider.java.i
data/src/share/classes/javax/management/Impact.java.i
data/src/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java.i
data/src/share/classes/sun/java2d/loops/Blit.java.i
data/test/java/nio/channels/AsynchronousFileChannel/LotsOfWrites.java.i
data/make/tools/src/build/tools/fontchecker/FontFileFilter.java.i
-data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java.i
+data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java.i
data/src/solaris/classes/sun/security/provider/NativePRNG.java.i
data/src/share/classes/sun/awt/WindowClosingSupport.java.i
data/src/solaris/native/sun/awt/multiVis.c.i
@@ -2665,17 +2618,17 @@ data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s.i
data/src/share/classes/java/lang/ThreadLocal.java.i
data/src/share/classes/sun/tools/tree/CatchStatement.java.i
data/src/share/classes/sun/awt/image/WritableRasterNative.java.i
-data/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c.i
+data/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java.i
+data/test/javax/crypto/Cipher/TestCipherMode.java.i
data/test/java/io/Serializable/oldTests/SerializeWithException.java.i
-data/src/share/classes/sun/tools/jconsole/JConsole.java.i
data/src/share/classes/sun/text/resources/FormatData_en_MT.java.i
+data/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java.i
data/src/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java.i
data/src/share/classes/sun/text/resources/FormatData_es_US.java.i
data/test/java/security/KeyRep/DES.pre.1.5.key.i
-data/test/javax/naming/ldap/LdapName/LdapParserTests.java.i
-data/src/share/classes/sun/rmi/transport/DGCImpl.java.i
+data/src/share/classes/org/ietf/jgss/ChannelBinding.java.i
data/test/java/beans/VetoableChangeSupport/TestSerialization.java.i
-data/src/share/classes/java/nio/file/StandardCopyOption.java.i
+data/make/tools/swing-beans/beaninfo/images/JDialogColor16.gif.i
data/src/share/classes/java/util/logging/ConsoleHandler.java.i
data/src/share/classes/java/net/URLConnection.java.i
data/test/java/util/zip/ZipFile/ReadZip.java.i
@@ -2683,20 +2636,18 @@ data/src/share/classes/javax/swing/plaf/metal/icons/Error.gif.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java.i
data/src/share/classes/sun/awt/image/PixelConverter.java.i
data/make/tools/src/build/tools/jdwpgen/AltNode.java.i
-data/src/share/classes/javax/accessibility/AccessibleEditableText.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/ExternObjTrees.java.i
data/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java.i
data/test/java/lang/Class/Cast.java.i
-data/test/java/nio/Buffer/BasicDouble.java.i
-data/src/share/classes/com/sun/beans/decoder/BooleanElementHandler.java.i
-data/src/share/classes/java/lang/NoSuchFieldException.java.i
+data/src/share/classes/com/sun/jdi/InvalidTypeException.java.i
+data/src/share/classes/com/sun/media/sound/AiffFileFormat.java.i
data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java.i
-data/src/share/classes/com/sun/tools/jdi/SocketTransportService.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionParser.java.i
data/src/share/classes/java/net/PortUnreachableException.java.i
data/src/share/classes/sun/io/CharToByteCp280.java.i
data/test/java/lang/StringBuffer/Replace.java.i
+data/src/share/demo/applets/SortDemo/BubbleSortAlgorithm.java.i
data/src/share/classes/com/sun/jndi/dns/DnsContext.java.i
data/test/javax/naming/ldap/LdapName/TrailingSpaceTest.java.i
data/src/share/classes/com/sun/media/sound/PortMixer.java.i
@@ -2707,46 +2658,46 @@ data/src/share/classes/sun/security/pkcs/ContentInfo.java.i
data/src/share/classes/java/rmi/activation/ActivateFailedException.java.i
data/src/share/classes/com/sun/jmx/snmp/defaults/DefaultPaths.java.i
data/src/share/classes/sun/nio/cs/StreamDecoder.java.i
+data/test/java/io/Serializable/longString/LongString.java.i
data/src/solaris/doc/sun/man/man1/javah.1.i
-data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java.i
+data/src/share/classes/javax/management/modelmbean/package.html.i
data/make/tools/swing-beans/beaninfo/images/JTreeColor16.gif.i
data/src/share/classes/javax/xml/crypto/URIReference.java.i
data/test/java/util/EnumSet/Range.java.i
data/src/solaris/doc/sun/man/man1/ja/orbd.1.i
data/src/share/classes/java/io/Reader.java.i
+data/test/sun/security/validator/samedn.sh.i
+data/src/share/native/sun/security/ec/impl/mp_gf2m.h.i
data/test/java/rmi/reliability/benchmark/bench/serial/ProxyArrays.java.i
data/src/solaris/doc/sun/man/man1/ja/idlj.1.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jjt.i
-data/test/java/io/File/ListNull.java.i
+data/test/java/security/KeyPairGenerator/GenerateKeypair.java.i
data/test/java/lang/instrument/MakeJAR2.sh.i
data/test/java/rmi/activation/CommandEnvironment/Retireable.java.i
data/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java.i
-data/make/com/sun/crypto/provider/Makefile.i
+data/src/solaris/classes/sun/awt/X11/Native.java.i
data/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.sh.i
data/src/share/classes/sun/io/ByteToCharEUC_CN.java.i
data/src/share/classes/sun/text/resources/FormatData_ro_RO.java.i
-data/src/share/classes/com/sun/java/swing/SwingUtilities3.java.i
+data/test/java/lang/ProcessBuilder/FeelingLucky.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/trees.h.i
data/src/share/classes/java/security/spec/ECPrivateKeySpec.java.i
data/make/tools/CharsetMapping/IBM1364.c2b.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityModel.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/Destinations.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_de_DE.properties.i
-data/src/share/classes/com/sun/net/ssl/X509KeyManager.java.i
+data/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval_Stub.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java.i
data/src/share/classes/com/sun/media/sound/SoftChannelProxy.java.i
-data/src/share/classes/sun/nio/ch/Interruptible.java.i
data/src/share/classes/sun/nio/cs/ext/SJIS.java.i
data/src/share/demo/jfc/Font2DTest/RangeMenu.java.i
-data/test/java/security/SecureRandom/sha1prng-old.bin.i
-data/src/share/classes/com/sun/tools/example/doc/index.html.i
+data/test/java/beans/XMLEncoder/java_util_Collections_CheckedMap.java.i
+data/src/share/classes/sun/security/jgss/GSSNameImpl.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModel.java.i
+data/src/share/classes/javax/sql/package.html.i
data/make/tools/CharsetMapping/IBM935.map.i
-data/src/windows/native/sun/jkernel/graphics/masthead.bmp.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDimension.java.i
+data/test/java/nio/file/Files/walkFileTree/grantAll.policy.i
data/src/share/classes/sun/io/CharToByteCp850.java.i
data/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html.i
data/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java.i
@@ -2757,38 +2708,35 @@ data/test/java/lang/Class/getEnclosingClass/common/TestMe.java.i
data/src/solaris/sample/dtrace/hotspot/README.txt.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.java.i
data/test/sun/nio/cs/TestTrailingEscapesISO2022JP.java.i
-data/test/java/net/SocketPermission/Ctor.java.i
data/src/share/classes/java/awt/SecondaryLoop.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java.i
-data/src/share/classes/java/awt/font/GlyphJustificationInfo.java.i
+data/test/sun/security/rsa/TestCACerts.java.i
data/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.html.i
data/src/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java.i
data/src/share/classes/javax/naming/ldap/BasicControl.java.i
data/src/share/classes/sun/tools/tree/NotExpression.java.i
-data/test/sun/nio/cs/FindASCIIRangeCodingBugs.java.i
+data/src/share/classes/sun/io/CharToByteMacCentralEurope.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMeta.java.i
data/src/share/classes/javax/swing/ViewportLayout.java.i
-data/src/share/native/sun/security/ec/impl/ecdecode.c.i
data/src/linux/doc/man/serialver.1.i
data/src/windows/native/sun/windows/awt_DesktopProperties.cpp.i
data/test/java/lang/management/ThreadMXBean/ThreadCounts.java.i
-data/src/share/native/sun/font/layout/LESwaps.h.i
-data/src/share/native/sun/java2d/opengl/OGLMaskFill.c.i
+data/test/java/util/Collections/T5078378.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java.i
data/test/java/io/Serializable/fieldTypeString/Write.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectRef.java.i
data/src/share/classes/java/beans/NameGenerator.java.i
data/src/windows/classes/sun/nio/ch/FileDispatcher.java.i
data/src/share/classes/javax/management/MBeanServerConnection.java.i
-data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java.i
data/src/share/sample/nio/server/N1.java.i
data/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine.i
data/src/windows/native/sun/windows/initIDs.cpp.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/MiscTests.java.i
data/make/tools/CharsetMapping/ISO_8859_4.map.i
-data/make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java.i
+data/test/sun/util/resources/TimeZone/Bug4858517.java.i
data/src/share/classes/sun/misc/SignalHandler.java.i
-data/src/share/classes/sun/io/CharToByteCp858.java.i
+data/test/java/io/File/FileMethods.java.i
data/test/java/io/Serializable/skipWriteObject/Write.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java.i
@@ -2797,22 +2745,25 @@ data/src/solaris/native/sun/java2d/x11/XRBackendNative.c.i
data/test/java/util/Vector/SyncLastIndexOf.java.i
data/src/share/classes/sun/nio/cs/ext/MacThai.java.i
data/src/share/classes/java/net/InetAddressImpl.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties.i
+data/src/share/classes/sun/rmi/rmic/Names.java.i
data/make/common/Defs.gmk.i
data/test/sun/security/x509/X500Name/EmailKeyword.java.i
-data/test/sun/security/pkcs11/fips/certs/ca.cer.i
+data/test/java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java.i
data/src/share/classes/sun/tools/tree/BinaryArithmeticExpression.java.i
data/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java.i
data/test/com/sun/jdi/RedefineCrossEvent.java.i
data/test/java/security/UnresolvedPermission/Debug.java.i
data/src/share/native/sun/font/layout/ScriptAndLanguageTags.h.i
-data/test/sun/tools/jstat/timeStamp1.awk.i
+data/test/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java.i
data/test/java/awt/font/TextLayout/VisibleAdvance.java.i
data/src/share/classes/javax/naming/Reference.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java.i
data/src/share/classes/javax/swing/event/InternalFrameListener.java.i
data/test/java/nio/file/attribute/DosFileAttributeView/Basic.java.i
-data/src/share/classes/sun/tools/java/ArrayType.java.i
+data/src/share/classes/sun/tools/jconsole/MemoryTab.java.i
+data/src/share/classes/sun/security/ssl/Debug.java.i
+data/src/windows/classes/sun/awt/windows/WMenuPeer.java.i
data/make/tools/CharsetMapping/IBM838.nr.i
data/src/solaris/doc/sun/man/man1/jconsole.1.i
data/test/java/beans/PropertyEditor/TestLongType.java.i
@@ -2822,18 +2773,18 @@ data/src/share/classes/javax/print/attribute/standard/JobImpressionsSupported.ja
data/test/com/sun/crypto/provider/TLS/keymatdata.txt.i
data/src/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java.i
data/src/share/classes/com/sun/tools/jdi/resources/jdi.properties.i
-data/src/share/classes/com/sun/jndi/dns/ResourceRecord.java.i
+data/test/javax/print/applet/applet2/Applet2PrintServiceLookup.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png.i
data/test/sun/nio/cs/OLD/IBM937_OLD.java.i
data/test/sun/nio/cs/OLD/IBM937_OLD.java.d
data/test/java/util/EnumSet/ComplementOf.java.i
data/src/share/classes/sun/text/resources/FormatData_en_SG.java.i
-data/src/share/demo/jfc/Metalworks/BigContrastMetalTheme.java.i
+data/test/com/sun/jndi/ldap/NoWaitForReplyTest.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java.i
data/src/share/classes/sun/security/validator/PKIXValidator.java.i
data/src/share/classes/sun/misc/Version-template.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java.i
-data/src/share/classes/sun/tools/tree/PreIncExpression.java.i
+data/src/share/sample/nio/file/DiskUsage.java.i
data/make/sun/security/tools/Makefile.i
data/make/tools/jdwpgen/Makefile.i
data/src/share/classes/java/nio/channels/SelectionKey.java.i
@@ -2841,52 +2792,48 @@ data/src/share/classes/java/beans/beancontext/BeanContextServiceProvider.java.i
data/make/com/sun/inputmethods/indicim/Makefile.i
data/test/sun/security/ssl/templates/SSLSocketTemplate.java.i
data/test/javax/crypto/spec/RC2ParameterSpec/RC2AlgorithmParameters.java.i
-data/src/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java.i
-data/test/java/io/SequenceInputStream/ConstructorNull.java.i
+data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml.i
data/test/sun/security/pkcs11/KeyStore/ProviderLoader.java.i
data/src/share/classes/com/sun/crypto/provider/OAEPParameters.java.i
+data/test/tools/pack200/T7007157.java.i
data/src/solaris/native/sun/awt/awt_dnd_dt.c.i
-data/src/solaris/classes/sun/awt/motif/MFontConfiguration.java.i
-data/src/windows/native/sun/jkernel/kernel_it.rc.i
+data/src/solaris/native/java/io/FileSystem_md.c.i
data/test/java/beans/PropertyEditor/TestIntegerClass.java.i
data/test/sun/util/resources/TimeZone/Bug6317929.java.i
-data/test/java/awt/Robot/CtorTest/CtorTest.java.i
data/src/share/classes/java/nio/BufferPoolMXBean.java.i
data/src/share/back/MethodImpl.c.i
-data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh.i
-data/src/share/classes/java/sql/ClientInfoStatus.java.i
+data/test/java/nio/Buffer/genBasic.sh.i
+data/src/share/classes/sun/security/krb5/internal/Authenticator.java.i
data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemColor32.gif.i
-data/src/linux/doc/man/appletviewer.1.i
data/src/share/classes/javax/naming/InvalidNameException.java.i
data/src/share/native/java/io/io_util.c.i
data/test/java/lang/Integer/ValueOf.java.i
data/test/com/sun/jdi/redefineMethod/RedefineSubTarg.java.i
-data/test/java/beans/Statement/Test6224433.java.i
data/src/share/classes/sun/misc/URLClassPath.java.i
+data/test/sun/tools/jconsole/ResourceCheckTest.java.i
data/src/share/classes/java/awt/Event.java.i
data/src/share/classes/javax/management/MBeanRegistration.java.i
+data/test/java/io/Serializable/sanityCheck/SanityCheck.java.i
data/src/share/classes/com/sun/jdi/VMCannotBeModifiedException.java.i
data/src/share/classes/sun/io/CharToByteCp866.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java.i
data/test/java/util/concurrent/ConcurrentLinkedQueue/ConcurrentQueueLoops.java.i
data/test/java/io/PushbackInputStream/Skip.java.i
-data/make/sun/security/jgss/wrapper/mapfile-vers.i
+data/src/share/classes/javax/imageio/plugins/jpeg/package.html.i
data/test/javax/crypto/spec/RC2ParameterSpec/RC2ParameterSpecEquals.java.i
data/test/java/security/testlibrary/Providers.java.i
data/test/sun/security/pkcs11/Provider/ConfigQuotedString-nss.txt.i
data/src/share/classes/java/awt/KeyboardFocusManager.java.i
-data/test/java/awt/print/PrinterJob/GetMediasTest.java.i
+data/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h.i
data/src/share/classes/com/sun/jmx/snmp/SnmpEngineFactory.java.i
-data/src/share/classes/java/io/OutputStreamWriter.java.i
+data/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java.i
data/test/sun/net/www/protocol/http/B6369510.java.i
data/src/share/classes/sun/security/jgss/GSSUtil.java.i
-data/src/share/classes/com/sun/jndi/ldap/BindingWithControls.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java.i
+data/src/share/classes/sun/nio/ch/ThreadPool.java.i
data/src/solaris/classes/sun/print/CUPSPrinter.java.i
data/src/share/demo/applets/MoleculeViewer/example1.html.i
data/src/solaris/native/sun/awt/gtk2_interface.c.i
-data/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java.i
-data/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java.i
+data/make/tools/src/build/tools/javazic/RuleDay.java.i
data/test/java/security/Signature/ByteBuffers.java.i
data/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java.i
data/test/com/sun/jdi/FinalLocalsTest.java.i
@@ -2900,23 +2847,20 @@ data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Par
data/src/share/classes/sun/util/resources/CurrencyNames_hu_HU.properties.i
data/src/solaris/native/sun/nio/ch/SctpChannelImpl.c.i
data/make/tools/reorder/tools/MaxTime.java.i
-data/test/java/beans/VetoableChangeSupport/Test4092906.java.i
data/src/share/native/sun/awt/libpng/pngpriv.h.i
data/test/java/lang/StringBuffer/AppendSB.java.i
-data/src/share/classes/sun/reflect/generics/tree/Tree.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java.i
+data/test/java/util/Formatter/Basic-X.java.i
+data/src/share/classes/java/rmi/activation/ActivationGroupID.java.i
data/src/share/classes/java/awt/event/MouseAdapter.java.i
data/src/share/classes/java/security/CodeSigner.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent0010.java.i
-data/src/linux/doc/man/ja/xjc.1.i
+data/src/share/classes/javax/swing/JFrame.java.i
data/src/share/classes/sun/tools/tree/DoStatement.java.i
data/src/share/classes/com/sun/jdi/connect/spi/Connection.java.i
data/test/javax/management/remote/mandatory/connection/ReconnectTest.java.i
data/src/share/classes/sun/tools/tree/CaseStatement.java.i
-data/test/sun/security/pkcs11/fips/keystore.i
data/make/README.html.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/TemplateWriter.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_NI.properties.i
data/src/share/classes/sun/security/jgss/SunProvider.java.i
data/test/java/beans/Introspector/Test4619536.java.i
@@ -2930,15 +2874,13 @@ data/test/demo/jvmti/hprof/CpuTimesTest.java.i
data/test/javax/xml/crypto/dsig/X509KeySelector.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java.i
data/test/java/io/Serializable/6559775/SerialRace.java.i
-data/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java.i
data/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java.i
data/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java.i
data/test/javax/print/applet/applet4/Applet4PrintService.java.i
data/src/share/classes/sun/security/x509/README.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformInterestedHost.java.i
+data/src/share/classes/javax/management/StandardMBean.java.i
data/src/share/classes/sun/io/CharToByteISO8859_9.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java.i
-data/test/sun/misc/EscapePath.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java.i
data/src/share/classes/sun/io/UnknownCharacterException.java.i
data/src/share/classes/java/util/zip/ZipConstants64.java.i
@@ -2946,37 +2888,42 @@ data/src/solaris/npt/npt_md.h.i
data/src/share/classes/java/beans/ParameterDescriptor.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalTitlePane.java.i
data/test/java/util/Locale/data/deflocale.winvista.i
+data/test/java/nio/channels/FileChannel/Transfer.java.i
data/test/java/rmi/transport/pinLastArguments/PinLastArguments.java.i
data/test/demo/jvmti/mtrace/JFrameCreateTime.java.i
data/src/share/demo/nbproject/management/JTop/nbproject/file-targets.xml.i
data/test/java/lang/instrument/redefineAgent.mf.i
data/make/modules/image.tools.ls.i
-data/src/share/modules/jdk.awt/module-info.java.i
-data/make/docs/Notes.html.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Chars.java.i
+data/src/share/sample/README.i
data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java.i
+data/test/sun/nio/cs/OLD/IBM970_OLD.java.i
data/src/share/classes/java/net/ProxySelector.java.i
data/test/java/util/AbstractList/FailFastIterator.java.i
-data/src/share/classes/javax/swing/text/rtf/RTFParser.java.i
+data/src/share/native/sun/font/FontInstanceAdapter.h.i
+data/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
data/src/share/classes/javax/swing/undo/CannotRedoException.java.i
data/src/share/classes/com/sun/jdi/VirtualMachineManager.java.i
data/src/share/classes/javax/management/MBeanServerBuilder.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c.i
data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java.i
data/src/share/classes/sun/security/x509/EDIPartyName.java.i
data/src/share/classes/com/sun/rowset/internal/CachedRowSetReader.java.i
data/src/share/classes/com/sun/rowset/providers/package.html.i
data/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName_Stub.java.i
-data/src/share/native/sun/font/layout/LigatureSubstProc.cpp.i
-data/make/java/main/java/mapfile-sparc.i
+data/test/java/net/InetSocketAddress/B6469803.java.i
+data/test/com/sun/jdi/sde/FilterMangleTest.java.i
data/src/share/classes/sun/util/resources/LocaleNames_zh_SG.properties.i
data/test/javax/swing/JComboBox/7031551/bug7031551.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingRequest.java.i
-data/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java.i
+data/src/share/classes/sun/io/CharToByteCp834.java.i
data/src/share/classes/sun/dyn/util/package-info.java.i
data/test/java/lang/InheritableThreadLocal/Basic.java.i
data/src/share/classes/java/util/Deque.java.i
data/src/share/classes/java/awt/Desktop.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy.i
-data/src/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java.i
+data/src/share/native/sun/awt/medialib/awt_ImagingLib.h.i
+data/test/org/openjdk/jigsaw/tester.sh.i
data/test/java/util/Collection/MOAT.java.i
data/src/share/classes/com/sun/beans/TypeResolver.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c.i
@@ -2989,60 +2936,60 @@ data/test/java/rmi/reliability/scripts/run_juicer.ksh.i
data/make/tools/CharsetMapping/MacSymbol.map.i
data/test/com/sun/jdi/SDENullTest.java.i
data/src/share/demo/jvmti/hprof/hprof_stack.c.i
-data/test/java/net/Socket/reset/Test.java.i
data/src/share/native/sun/awt/medialib/mlib_types.h.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xenc-schema.xsd.i
data/src/share/classes/sun/io/CharToByteCp862.java.i
-data/make/tools/CharsetMapping/IBM1143.map.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509KeyManager.java.i
data/test/com/sun/crypto/provider/Cipher/AES/Test4626070.java.i
+data/src/share/classes/java/awt/KeyEventPostProcessor.java.i
data/src/solaris/classes/sun/awt/motif/AWTLockAccess.java.i
data/make/tools/swing-beans/beaninfo/images/JTextAreaMono32.gif.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c.i
data/src/share/classes/sun/io/ByteToCharPCK.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U8Func.c.i
data/src/share/classes/sun/io/ByteToCharCp856.java.i
+data/test/java/security/cert/pkix/policyChanges/TestPolicy.java.i
data/src/share/native/sun/awt/image/jpeg/jdcoefct.c.i
-data/src/solaris/classes/sun/nio/fs/UnixFileKey.java.i
+data/test/java/util/Locale/bug4123285.html.i
data/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak_Stub.java.i
data/src/solaris/classes/sun/awt/motif/MEmbeddedFramePeer.java.i
+data/src/share/classes/java/awt/print/PrinterGraphics.java.i
+data/src/share/classes/sun/util/resources/CalendarData_iw.properties.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Texture.java.i
data/make/tools/src/build/tools/jdwpgen/Node.java.i
data/src/share/classes/javax/swing/plaf/IconUIResource.java.i
data/src/share/classes/java/security/PrivilegedActionException.java.i
-data/src/share/classes/sun/applet/resources/MsgAppletViewer_ko.java.i
data/src/share/classes/sun/text/resources/FormatData_es_AR.java.i
data/make/tools/CharsetMapping/IBM1047.map.i
-data/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SamePackageCtor.java.i
data/src/solaris/native/sun/awt/awt_dnd.c.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/NoAuthClientAuth.java.i
data/test/com/sun/jdi/RedefineChangeClassOrder.sh.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c.i
data/src/share/native/java/net/DatagramPacket.c.i
-data/make/netbeans/README.i
data/test/java/beans/XMLDecoder/spec/TestDouble.java.i
data/make/java/verify/reorder-i586.i
-data/src/share/classes/com/sun/jdi/event/EventQueue.java.i
-data/src/share/classes/java/awt/datatransfer/FlavorMap.java.i
-data/src/share/classes/sun/text/resources/FormatData_sq.java.i
+data/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java.i
data/src/share/classes/java/net/NoRouteToHostException.java.i
data/src/share/classes/java/dyn/ClassValue.java.i
+data/src/share/classes/sun/tools/java/CompilerError.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaLong.java.i
data/src/solaris/classes/sun/font/XRTextRenderer.java.i
data/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic.h.i
data/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java.i
data/src/share/native/sun/awt/splashscreen/splashscreen_impl.c.i
data/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp.i
-data/src/share/native/sun/font/layout/CanonShaping.cpp.i
-data/src/share/classes/com/sun/tools/example/debug/event/JDIListener.java.i
+data/test/javax/management/namespace/ExportNamespaceTest.java.i
+data/src/solaris/native/sun/nio/ch/SocketChannelImpl.c.i
data/src/share/classes/com/sun/media/sound/ModelChannelMixer.java.i
-data/make/sun/font/Makefile.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java.i
data/test/java/awt/im/6396526/IMLookAndFeel.java.i
data/src/windows/native/java/net/NetworkInterface.c.i
-data/src/share/classes/sun/jvmstat/monitor/remote/package.html.i
data/src/share/sample/nio/server/README.txt.i
data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java.i
data/src/solaris/classes/sun/awt/motif/MPanelPeer.java.i
data/src/solaris/classes/sun/awt/X11/XEmbedChildProxyPeer.java.i
data/src/share/classes/java/lang/Integer.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleInfo.java.i
data/test/java/lang/Throwable/ChainedExceptions.java.i
data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PrivateCtor.java.i
data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12CipherKAT.java.i
@@ -3050,40 +2997,43 @@ data/src/share/classes/com/sun/pept/ept/ContactInfoListIterator.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpOutgoingRequest.java.i
data/src/share/classes/sun/management/counter/LongCounter.java.i
data/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java.i
+data/src/share/classes/sun/io/ByteToCharCp1149.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_YE.java.i
data/src/share/classes/javax/net/ssl/SSLParameters.java.i
data/src/share/classes/sun/java2d/pipe/BufferedPaints.java.i
-data/test/java/lang/instrument/ilib/ClassDump.java.i
+data/make/tools/javazic/Makefile.i
+data/test/java/util/Locale/data/deflocale.rhel4.i
data/make/tools/CharsetMapping/Makefile.i
data/make/java/text/Makefile.i
data/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh.i
data/src/share/classes/java/util/EventListener.java.i
-data/src/share/native/sun/font/layout/LookupProcessor.h.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java.i
-data/src/share/classes/sun/java2d/StateTrackableDelegate.java.i
+data/test/com/sun/jdi/BreakpointWithFullGC.sh.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java.i
+data/src/share/native/sun/java2d/opengl/OGLContext.h.i
data/test/java/net/Socket/asyncClose/Socket_getOutputStream_write.java.i
data/src/share/classes/sun/security/util/Resources_fr.java.i
data/test/com/sun/jdi/RequestReflectionTest.java.i
data/src/share/classes/java/util/Objects.java.i
-data/src/share/classes/java/lang/instrument/package.html.i
data/src/share/classes/sun/text/Normalizer.java.i
data/src/share/classes/sun/security/x509/CertificateX509Key.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplds4.so.i
data/src/share/classes/javax/swing/Renderer.java.i
-data/src/windows/native/sun/windows/awt_GDIObject.h.i
data/test/java/nio/channels/AsynchronousChannelGroup/Basic.java.i
data/src/share/native/sun/font/layout/AnchorTables.h.i
data/src/share/native/sun/awt/image/jpeg/jcinit.c.i
data/src/share/classes/javax/swing/text/html/parser/html32.bdtd.i
+data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java.i
data/test/java/util/jar/JarFile/Constructor.java.i
+data/test/com/sun/tools/attach/ProviderTests.sh.i
data/test/java/lang/StringBuffer/Trim.java.i
data/test/org/openjdk/jigsaw/cli/signer-cert.pem.i
data/src/share/classes/sun/tools/tree/FieldUpdater.java.i
data/src/share/classes/sun/io/ByteToCharCp943C.java.i
-data/src/share/classes/sun/security/provider/IdentityDatabase.java.i
+data/test/java/rmi/reliability/scripts/run_serialbench.ksh.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpEntryOid.java.i
data/src/share/classes/com/sun/crypto/provider/SunJCE.java.i
data/test/javax/management/monitor/DerivedGaugeMonitorTest.java.i
+data/src/share/classes/java/security/Guard.java.i
data/test/javax/management/eventService/SubscribeTest.java.i
data/test/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow.i
data/make/tools/swing-beans/beaninfo/images/JTextFieldMono32.gif.i
@@ -3093,16 +3043,16 @@ data/test/javax/management/loading/mlet3.html.i
data/make/tools/swing-beans/beaninfo/images/JComponentColor16.gif.i
data/src/share/demo/jfc/Font2DTest/resources/TextResources_zh_CN.properties.i
data/src/share/classes/sun/text/resources/FormatData_iw.java.i
-data/test/java/util/logging/LoggingDeadlock4.java.i
+data/src/share/classes/sun/util/calendar/CalendarSystem.java.i
data/test/java/io/File/GetAbsolutePath.java.i
data/src/share/classes/javax/naming/directory/SchemaViolationException.java.i
data/make/tools/swing-beans/beaninfo/images/JOptionPaneColor32.gif.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy34.i
+data/src/share/native/sun/awt/debug/debug_assert.c.i
data/src/share/classes/sun/security/x509/DistributionPointName.java.i
data/src/share/native/sun/font/layout/IndicClassTables.cpp.i
data/src/solaris/native/sun/awt/HPkeysym.h.i
-data/src/share/classes/java/lang/doc-files/theta.gif.i
data/test/java/util/ResourceBundle/FakeTestResource.java.i
data/test/java/lang/ProcessBuilder/SecurityManagerClinit.java.i
data/src/share/demo/jfc/Font2DTest/Font2DTest.java.i
@@ -3110,18 +3060,17 @@ data/src/share/classes/sun/util/resources/CurrencyNames_es_CR.properties.i
data/test/java/util/zip/ZipFile/Constructor.java.i
data/src/share/classes/sun/security/provider/certpath/LDAPCertStore.java.i
data/src/share/classes/java/awt/LinearGradientPaintContext.java.i
+data/src/solaris/demo/jigsaw/basic/Makefile.i
data/src/share/classes/sun/security/provider/PolicyParser.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1145.java.i
-data/src/share/classes/java/lang/invoke/InvokeGeneric.java.i
+data/test/java/beans/XMLDecoder/spec/TestVar.java.i
data/test/java/security/UnresolvedPermission/AccessorMethods.ca.i
data/src/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java.i
-data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassSyntax.java.i
data/test/javax/management/namespace/MXBeanRefTest.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeyEngine.java.i
-data/src/share/classes/javax/swing/text/rtf/RTFGenerator.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U8Func.c.i
data/src/solaris/native/com/sun/management/LinuxOperatingSystem.c.i
-data/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java.i
+data/src/share/classes/javax/sql/ConnectionEvent.java.i
data/src/share/classes/javax/security/auth/spi/LoginModule.java.i
data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java.i
data/src/share/classes/javax/sound/sampled/SourceDataLine.java.i
@@ -3140,7 +3089,7 @@ data/test/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java.i
data/src/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java.i
data/test/java/nio/channels/SocketChannel/AdaptSocket.java.i
data/src/share/classes/sun/security/krb5/internal/TGSReq.java.i
-data/test/java/util/ResourceBundle/Control/StressOut_ja_JP.properties.i
+data/src/share/classes/java/util/zip/ZipInputStream.java.i
data/src/share/classes/java/awt/AWTKeyStroke.java.i
data/src/share/classes/javax/xml/crypto/KeySelectorException.java.i
data/make/tools/CharsetMapping/IBM1025.nr.i
@@ -3148,23 +3097,22 @@ data/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java.i
data/src/share/classes/javax/management/event/ListenerInfo.java.i
data/test/com/sun/security/sasl/digest/NoQuoteParams.java.i
data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl.java.i
-data/src/share/classes/java/beans/MetaData.java.i
data/src/windows/native/sun/java2d/d3d/D3DTextRenderer_md.cpp.i
-data/src/share/classes/javax/swing/SpinnerListModel.java.i
-data/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java.i
+data/src/solaris/native/sun/awt/awt_Checkbox.c.i
data/test/sun/rmi/rmic/newrmic/equivalence/MyObjectImpl.java.i
+data/src/share/classes/com/sun/java/browser/dom/DOMAccessException.java.i
data/test/javax/management/Introspector/AnnotationTest.java.i
+data/src/share/native/sun/font/layout/ExtensionSubtables.cpp.i
data/src/share/classes/sun/management/resources/agent_fr.properties.i
-data/src/share/classes/java/rmi/dgc/Lease.java.i
data/src/share/classes/java/lang/reflect/Method.java.i
data/test/com/sun/net/httpserver/Test14.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java.i
data/make/tools/CharsetMapping/IBM1123.c2b.i
-data/src/share/classes/javax/crypto/spec/DHParameterSpec.java.i
+data/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java.i
data/test/java/lang/reflect/Generics/TestN1.java.i
data/test/java/util/LinkedHashSet/Basic.java.i
data/make/sun/image/generic/FILES_c.gmk.i
-data/make/templates/gpl-cp-header.i
+data/test/sun/security/provider/certpath/ReverseBuilder/BuildPath.java.i
data/test/java/util/zip/test.zip.i
data/src/share/classes/javax/swing/plaf/metal/OceanTheme.java.i
data/src/share/classes/javax/xml/crypto/MarshalException.java.i
@@ -3173,24 +3121,21 @@ data/src/share/demo/jfc/CodePointIM/CodePointInputMethodDescriptor.java.i
data/src/share/classes/javax/security/auth/kerberos/KeyTab.java.i
data/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java.i
data/test/java/net/InetAddress/policy.file.i
-data/src/share/classes/java/util/concurrent/ThreadFactory.java.i
+data/test/java/util/logging/LoggingDeadlock.java.i
data/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java.i
data/test/javax/xml/crypto/dsig/data/certs/badb.crt.i
data/src/share/native/sun/awt/image/jpeg/jccoefct.c.i
data/src/share/classes/sun/nio/cs/ext/IBM1097.java.i
data/make/tools/src/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java.i
-data/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java.i
-data/src/share/classes/sun/io/ByteToCharCp964.java.i
+data/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java.i
data/src/share/classes/sun/net/ftp/FtpDirParser.java.i
data/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java.i
data/src/share/classes/javax/sound/sampled/LineEvent.java.i
data/src/share/classes/java/util/UnknownFormatFlagsException.java.i
data/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java.i
data/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.i
-data/test/java/lang/reflect/Generics/TestC2.java.i
-data/test/java/util/PluggableLocale/providersrc/java.util.spi.CurrencyNameProvider.i
-data/src/share/classes/com/sun/tools/hat/internal/model/JavaClass.java.i
-data/src/share/classes/sun/util/resources/CalendarData_fi.properties.i
+data/make/java/text/FILES_java.gmk.i
+data/src/share/classes/sun/security/x509/RDN.java.i
data/src/share/classes/java/io/FileFilter.java.i
data/test/javax/swing/border/Test6910490.java.i
data/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c.i
@@ -3200,54 +3145,57 @@ data/src/share/native/java/lang/Package.c.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/Effect.java.i
data/test/sun/tools/jrunscript/jrunscriptTest.sh.i
data/src/share/classes/sun/management/snmp/util/SnmpLoadedClassData.java.i
-data/src/share/classes/com/sun/security/auth/SubjectCodeSource.java.i
+data/make/com/sun/java/browser/dom/Makefile.i
data/src/share/classes/java/text/ParseException.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalLabelUI.java.i
data/src/share/classes/java/util/concurrent/RunnableScheduledFuture.java.i
-data/src/share/classes/java/awt/TextComponent.java.i
-data/src/solaris/native/sun/awt/awt_LoadLibrary.c.i
+data/src/share/classes/sun/nio/ch/MembershipRegistry.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so.d
data/test/javax/swing/plaf/synth/Test6933784.java.i
data/src/share/classes/sun/io/CharToByteCp737.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java.i
+data/test/java/rmi/dgc/dgcImplInsulation/security.policy.i
data/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html.i
-data/test/java/lang/instrument/PremainClass/DummyMain.java.i
data/test/java/util/Currency/ValidateISO4217.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_iw_IL.properties.i
-data/test/java/io/InputStream/OpsAfterClose.java.i
+data/test/sun/net/InetAddress/nameservice/CacheTest.java.i
data/src/share/native/sun/awt/debug/debug_trace.c.i
-data/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java.i
+data/src/share/classes/sun/rmi/server/Activation.java.i
+data/src/share/native/sun/awt/libpng/png.h.i
data/src/share/classes/java/io/FileReader.java.i
data/test/tools/pack200/badattr.jar.i
data/make/tools/src/build/tools/generatecharacter/Utility.java.i
data/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java.i
+data/src/share/classes/javax/print/package.html.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/expresso.mid.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java.i
-data/src/share/classes/java/text/Bidi.java.i
+data/src/share/demo/jvmti/hprof/hprof_tls.c.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java.i
data/src/share/classes/sun/java2d/loops/RenderLoops.java.i
data/src/share/classes/com/sun/jmx/namespace/serial/package.html.i
data/test/sun/tools/common/CommonSetup.sh.i
+data/test/java/beans/PropertyEditor/TestByteClassJava.java.i
data/test/java/util/Locale/HashCodeTest.java.i
data/test/java/net/Socks/SocksProxyVersion.java.i
data/test/java/beans/VetoableChangeSupport/TestMethods.java.i
-data/src/share/classes/sun/applet/Main.java.i
+data/test/java/net/URI/RelativeEncoding.java.i
+data/src/share/classes/sun/security/util/AuthResources_ja.java.i
data/test/java/util/PriorityQueue/NoNulls.java.i
data/src/share/classes/sun/misc/ExtensionInfo.java.i
data/src/share/classes/javax/swing/JScrollBar.java.i
+data/test/java/lang/ref/ReferenceEnqueuePending.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java.i
-data/src/share/classes/sun/awt/resources/awt_ja.properties.i
+data/test/java/util/HashMap/ToString.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java.i
-data/test/java/beans/Introspector/Test4144543.java.i
+data/test/java/util/Locale/Bug4152725.java.i
data/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java.i
data/src/share/native/sun/java2d/loops/ScaledBlit.c.i
+data/src/share/native/sun/font/layout/PairPositioningSubtables.h.i
data/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c.i
-data/src/share/classes/sun/text/resources/CollationData_de.java.i
+data/test/java/net/ipv6tests/TcpTest.java.i
data/make/tools/src/build/tools/jdwpgen/SelectNode.java.i
data/src/share/classes/java/util/GregorianCalendar.java.i
data/src/share/classes/sun/text/resources/FormatData_de_AT.java.i
data/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java.i
data/src/share/classes/com/sun/jdi/PrimitiveValue.java.i
-data/src/share/classes/sun/java2d/InvalidPipeException.java.i
data/src/share/classes/java/security/cert/CertPathParameters.java.i
data/src/share/classes/sun/tools/java/MemberDefinition.java.i
data/test/java/lang/Appendable/Basic.java.i
@@ -3260,29 +3208,25 @@ data/src/share/classes/java/awt/Graphics.java.i
data/src/share/classes/sun/nio/cs/ext/MS936.java.i
data/test/sun/security/tools/jarsigner/TimestampCheck.java.i
data/src/share/classes/sun/tracing/ProviderSkeleton.java.i
-data/src/windows/native/sun/windows/awt_PrintControl.h.i
-data/src/share/classes/java/dyn/package-info.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java.i
data/test/javax/swing/text/html/Test4783068.java.i
data/test/tools/launcher/Arrrghs.sh.i
data/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/SourcePanel.java.i
data/test/javax/swing/border/Test6461042.java.i
-data/make/java/nio/genCoder.sh.i
+data/make/tools/winver/bin/winver.exe.i
data/test/java/io/Serializable/serialver/nested/run.sh.i
data/src/share/classes/javax/swing/text/doc-files/Document-structure.gif.i
data/src/share/classes/java/security/KeyStore.java.i
data/src/share/classes/javax/management/relation/InvalidRelationIdException.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapResult.java.i
data/src/share/classes/com/sun/jdi/LongValue.java.i
data/src/share/classes/sun/net/www/content/audio/aiff.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/LongArrayCalls.java.i
data/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java.i
-data/src/share/classes/sun/util/calendar/CalendarSystem.java.i
data/src/share/classes/java/net/SecureCacheResponse.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java.i
data/test/java/beans/XMLEncoder/java_lang_String.java.i
-data/test/java/lang/instrument/PremainClass/InheritAgent1011.java.i
+data/src/share/classes/javax/swing/plaf/TextUI.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java.i
data/make/tools/CharsetMapping/IBM871.map.i
data/test/java/util/concurrent/ThreadPoolExecutor/SelfInterrupt.java.i
@@ -3293,57 +3237,51 @@ data/src/share/classes/java/lang/reflect/GenericDeclaration.java.i
data/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java.i
data/test/java/beans/PropertyEditor/6380849/FirstBean.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/SimpleShape.java.i
+data/test/java/io/BufferedReader/Fill.java.i
data/src/share/classes/javax/swing/JTree.java.i
data/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/ObjArrayCalls.java.i
+data/src/share/sample/nio/server/N2.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStateType.java.i
-data/make/javax/swing/plaf/Makefile.i
data/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so.i
data/src/solaris/sample/dtrace/hotspot/object_allocation_stat.d.i
data/make/tools/dtdbuilder/dtds/HTMLspecial.sgml.i
-data/src/share/classes/sun/rmi/transport/DGCAckHandler.java.i
data/src/share/classes/sun/nio/cs/ext/IBM277.java.i
+data/test/java/lang/management/ThreadMXBean/Semaphore.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java.i
-data/src/share/classes/sun/util/resources/CalendarData_th.properties.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java.i
data/test/java/awt/xembed/server/JavaClient.java.i
+data/src/share/native/sun/awt/image/DataBufferNative.c.i
data/test/java/nio/Buffer/LimitDirectMemory.java.i
data/src/windows/classes/sun/awt/windows/WDataTransferer.java.i
-data/src/share/classes/java/awt/peer/LabelPeer.java.i
data/src/share/classes/java/net/URISyntaxException.java.i
data/test/com/sun/jdi/RedefineClearBreakpoint.sh.i
data/make/jprt.gmk.i
-data/src/share/native/sun/management/MemoryImpl.c.i
-data/src/share/classes/javax/management/loading/MLetObjectInputStream.java.i
+data/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy.i
data/test/java/util/zip/ZipFile/ManyEntries.java.i
-data/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c.i
data/src/share/classes/java/util/concurrent/Delayed.java.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServerMBean.java.i
data/test/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html.i
data/test/sun/java2d/cmm/ColorConvertOp/ImageFactory.java.i
data/src/share/classes/javax/naming/CompoundName.java.i
+data/src/share/classes/java/sql/Clob.java.i
data/src/share/classes/javax/script/ScriptEngineManager.java.i
data/test/javax/swing/JFileChooser/4150029/bug4150029.java.i
-data/src/share/classes/sun/io/ByteToCharISO8859_3.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/Modularizer.java.i
data/src/share/native/sun/management/GcInfoBuilder.c.i
data/src/solaris/classes/sun/awt/X11/security-icon-yellow16.png.i
data/src/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java.i
-data/src/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java.i
+data/test/java/util/ResourceBundle/Test4318520.java.i
data/src/share/classes/com/sun/jmx/snmp/BerException.java.i
data/src/windows/classes/sun/nio/fs/WindowsPathType.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java.i
+data/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectArray.java.i
data/test/sun/security/tools/jarsigner/samename.sh.i
data/test/java/awt/image/mlib/MlibOpsTest.java.i
data/src/linux/doc/man/ja/apt.1.i
-data/src/share/classes/sun/util/resources/CurrencyNames_is_IS.properties.i
data/src/share/classes/com/sun/tools/hat/internal/server/AllRootsQuery.java.i
data/make/tools/CharsetMapping/IBM1122.nr.i
data/src/share/classes/javax/swing/text/StateInvariantError.java.i
data/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java.i
-data/src/share/classes/sun/util/logging/resources/logging_ja.properties.i
+data/test/java/util/Formatter/BasicDateTime.java.i
data/test/java/rmi/dgc/VMID/security.policy.i
data/src/share/classes/javax/naming/spi/Resolver.java.i
data/test/sun/jvmstat/testlibrary/JavaProcess.java.i
@@ -3354,26 +3292,25 @@ data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif.i
data/src/windows/classes/sun/print/Win32PrintJob.java.i
data/src/share/native/sun/font/sunfontids.h.i
data/src/share/classes/sun/security/jgss/wrapper/GSSCredElement.java.i
-data/test/java/awt/geom/CubicCurve2D/IntersectsTest.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/Commands.java.i
data/test/java/io/readBytes/input.txt.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/TargetPanel.java.i
data/src/share/native/sun/font/layout/SubstitutionLookups.h.i
data/src/share/classes/javax/swing/border/package.html.i
data/src/share/classes/sun/awt/image/ByteArrayImageSource.java.i
data/src/share/classes/sun/reflect/generics/tree/Signature.java.i
-data/make/javax/swing/beaninfo/Makefile.i
-data/test/java/nio/file/WatchService/grantDirOnly.policy.i
+data/test/java/lang/instrument/TransformMethodTest.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java.i
data/src/share/classes/java/net/SocketOption.java.i
data/src/share/classes/java/awt/image/WritableRenderedImage.java.i
data/src/share/classes/sun/java2d/pipe/SpanIterator.java.i
data/test/java/awt/FontClass/BigMetrics.java.i
data/src/share/classes/org/openjdk/jigsaw/Platform.java.i
+data/src/share/native/sun/java2d/cmm/lcms/lcms2.h.i
data/src/share/classes/javax/naming/directory/InvalidAttributeValueException.java.i
data/src/share/classes/sun/util/resources/LocaleNames_sr_Latn.properties.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java.i
-data/src/share/native/sun/font/layout/MPreFixups.cpp.i
data/src/share/classes/sun/reflect/generics/tree/TypeArgument.java.i
-data/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure_Stub.java.i
+data/src/share/classes/sun/net/www/content/audio/x_aiff.java.i
data/test/java/beans/Beans/Test4343723.java.i
data/make/tools/CharsetMapping/IBM437.map.i
data/src/share/classes/com/sun/tools/jdi/ClassTypeImpl.java.i
@@ -3386,8 +3323,10 @@ data/src/solaris/native/java/net/SocketOutputStream.c.i
data/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c.i
data/test/java/security/cert/pkix/nameConstraintsMinMax/sun2labs2.cer.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java.i
+data/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java.i
data/src/share/native/sun/awt/libpng/pngtrans.c.i
data/src/share/classes/sun/tracing/dtrace/DTraceProviderFactory.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/EffectUtils.java.i
data/src/solaris/native/sun/awt/awt_MenuComponent.h.i
data/test/java/util/ResourceBundle/ReferencesTest.java.i
data/src/share/classes/sun/util/resources/LocaleNames_pt_PT.properties.i
@@ -3397,40 +3336,48 @@ data/.hgignore.i
data/src/share/classes/sun/text/resources/FormatData_fr_CA.java.i
data/test/java/security/PermissionCollection/Concurrent.java.i
data/src/share/native/sun/font/layout/ValueRecords.cpp.i
+data/make/tools/src/build/tools/javazic/Zoneinfo.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c.i
data/src/share/classes/org/ietf/jgss/GSSManager.java.i
data/test/java/nio/channels/Pipe/PipeChannel.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownModelException.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java.i
data/test/java/util/TreeMap/HeadTailTypeError.java.i
data/src/share/classes/java/lang/invoke/FromGeneric.java.i
data/test/java/rmi/activation/Activatable/shutdownGracefully/rmid.security.policy.i
-data/src/share/classes/sun/awt/image/BufferedImageDevice.java.i
+data/src/windows/native/java/io/dirent_md.c.i
data/src/share/classes/sun/tools/tree/InstanceOfExpression.java.i
data/test/java/io/charStreams/RandomLineSource.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties.i
+data/test/java/nio/MappedByteBuffer/Truncate.java.i
data/test/java/rmi/activation/Activatable/checkRegisterInLog/ActivateMe.java.i
data/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java.i
data/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java.i
+data/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java.i
data/src/share/classes/sun/security/util/Resources_ja.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif.i
data/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java.i
-data/src/share/native/sun/awt/splashscreen/splashscreen_gfx.h.i
data/src/share/classes/sun/text/resources/CollationData_zh_HK.java.i
-data/src/share/classes/com/sun/servicetag/SolarisServiceTag.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java.i
+data/test/javax/swing/JInternalFrame/6726866/bug6726866.java.i
data/src/share/classes/javax/naming/Referenceable.java.i
-data/src/share/classes/javax/sql/rowset/JdbcRowSet.java.i
-data/src/share/native/sun/java2d/loops/IntArgbBm.c.i
+data/test/java/beans/Beans/6669869/TestGuiAvailable.java.i
+data/test/sun/nio/cs/OLD/SimpleEUCDecoder.java.i
data/src/share/classes/java/rmi/NoSuchObjectException.java.i
-data/test/java/util/regex/SupplementaryTestCases.txt.i
+data/src/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java.i
+data/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java.i
data/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java.i
data/test/java/util/Collections/BigBinarySearch.java.i
data/src/share/classes/javax/print/attribute/standard/PresentationDirection.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java.i
-data/src/solaris/native/sun/java2d/loops/vis_ThreeByteBgr.c.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLCtxAccessToSessCtx.java.i
data/src/share/classes/java/nio/Heap-X-Buffer.java.template.i
data/test/java/nio/channels/SocketChannel/CloseAfterConnect.java.i
data/src/share/classes/javax/sound/midi/package.html.i
data/src/share/classes/javax/management/modelmbean/ModelMBean.java.i
+data/make/mkdemo/applets/TicTacToe/Makefile.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h.i
data/src/share/classes/javax/swing/Box.java.i
data/test/java/util/Locale/data/deflocale.sol10.fmtasdefault.i
data/src/share/native/java/lang/fdlibm/src/s_modf.c.i
@@ -3439,17 +3386,18 @@ data/make/tools/src/build/tools/fontchecker/FontCheckerConstants.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java.i
data/test/sun/tools/jps/jps-m_Output1.awk.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/ControlPoint.java.i
-data/src/share/native/sun/font/layout/SinglePositioningSubtables.h.i
+data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java.i
data/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java.i
-data/test/java/security/Provider/SupportsParameter.java.i
+data/make/tools/CharsetMapping/IBM970.map.i
data/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java.i
data/src/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd.i
data/src/share/classes/sun/print/resources/orientRevPortrait.png.i
data/src/share/classes/sun/util/resources/CalendarData_es.properties.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_US.properties.i
data/test/sun/security/pkcs11/nss/p11-nss.txt.i
-data/make/java/util/FILES_java.gmk.i
+data/test/demo/jvmti/hprof/HeapAllTest.java.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java.i
data/test/java/io/Serializable/recursiveClassDescLookup/Test.java.i
data/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java.i
data/test/javax/management/standardmbean/FindMethodTest.java.i
@@ -3460,18 +3408,18 @@ data/src/share/classes/com/sun/security/auth/module/NTLoginModule.java.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java.i
data/src/share/classes/javax/management/relation/RelationService.java.i
data/src/share/classes/java/util/regex/UnicodeProp.java.i
-data/src/share/classes/javax/naming/ldap/ManageReferralControl.java.i
+data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Cipher.java.i
data/src/share/classes/java/security/InvalidKeyException.java.i
data/test/javax/print/applet/applet3/Applet3.java.i
data/src/share/classes/java/util/concurrent/locks/Condition.java.i
data/src/share/classes/javax/sql/RowSetListener.java.i
data/src/linux/doc/man/ja/policytool.1.i
data/test/java/net/InetAddress/B4762344.java.i
+data/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java.i
data/test/com/sun/jdi/ArrayLengthDumpTest.sh.i
data/test/sun/security/smartcardio/TestPresent.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_CO.properties.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_GT.properties.i
-data/src/share/classes/java/nio/file/FileRef.java.i
+data/src/share/back/stream.c.i
data/test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java.i
data/test/java/util/ServiceLoader/FooProvider3.java.i
data/src/share/native/sun/awt/image/jpeg/jdmaster.c.i
@@ -3483,33 +3431,34 @@ data/src/share/classes/sun/tools/tree/GreaterOrEqualExpression.java.i
data/make/tools/generate_nimbus/Makefile.i
data/src/share/classes/java/awt/geom/RectangularShape.java.i
data/src/share/classes/javax/print/event/PrintJobAttributeListener.java.i
-data/src/share/classes/sun/io/CharToByteCp1381.java.i
+data/src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES.i
+data/src/share/classes/sun/util/resources/CalendarData_ro.properties.i
data/test/sun/management/jmxremote/bootstrap/TestLogger.java.i
-data/src/windows/native/sun/jkernel/kernel_en.rc.i
+data/test/sun/security/krb5/auto/Action.java.i
data/src/share/classes/java/awt/image/DirectColorModel.java.i
data/src/share/classes/java/security/spec/X509EncodedKeySpec.java.i
data/src/share/classes/javax/management/openmbean/SimpleType.java.i
+data/test/com/sun/jdi/GenericsTest.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/Root.java.i
data/test/java/security/KeyRep/HmacMD5.pre.1.5.key.i
-data/src/share/classes/java/awt/event/WindowFocusListener.java.i
-data/test/java/net/SocketPermission/Wildcard.java.i
+data/test/java/beans/PropertyEditor/TestByteTypeNull.java.i
+data/test/sun/tools/jconsole/ResourceCheckTest.sh.i
data/src/share/classes/java/io/TempFileHelper.java.i
data/src/windows/native/sun/windows/awt_CustomPaletteDef.h.i
data/src/share/classes/java/awt/event/HierarchyEvent.java.i
data/src/share/demo/jfc/Metalworks/resources/HelpFiles/swing.html.i
data/src/share/classes/com/sun/script/util/BindingsEntrySet.java.i
data/src/share/classes/sun/reflect/generics/tree/FloatSignature.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/Inform.gif.i
+data/src/share/classes/javax/swing/text/html/StyleSheet.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/CharArrays.java.i
data/test/java/awt/image/ConvolveOp/OpCompatibleImageTest.java.i
data/src/solaris/classes/java/io/UnixFileSystem.java.i
data/src/share/classes/java/util/Hashtable.java.i
data/test/java/lang/Double/Extrema.java.i
data/test/java/io/Serializable/proxy/skipMissing/Handler.java.i
-data/src/share/classes/sun/font/FontLineMetrics.java.i
-data/test/java/io/Serializable/evolution/RenamePackage/run.sh.i
+data/test/sun/invoke/util/ValueConversionsTest.java.i
data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecInvalidEncoding.java.i
-data/src/share/native/java/lang/fdlibm/src/e_hypot.c.i
+data/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java.i
data/src/share/native/sun/awt/image/jpeg/jdphuff.c.i
data/make/modules/tools/src/com/sun/classanalyzer/ModuleConfig.java.i
data/test/sun/security/krb5/etype/ETypeOrder.java.i
@@ -3518,7 +3467,7 @@ data/src/solaris/classes/sun/nio/ch/SctpShutdown.java.i
data/src/share/classes/java/dyn/MethodHandleNatives.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java.i
data/src/share/classes/com/sun/jmx/remote/util/CacheMap.java.i
-data/test/java/awt/font/FontNames/LocaleFamilyNames.java.i
+data/src/share/classes/sun/java2d/loops/CustomComponent.java.i
data/test/java/awt/Focus/FocusTraversalPolicy/LayoutFTPTest.java.i
data/src/share/classes/javax/swing/text/TextAction.java.i
data/src/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java.i
@@ -3527,11 +3476,11 @@ data/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActi
data/test/sun/security/x509/AVA/DomainComponentEncoding.java.i
data/make/sun/image/generic/Makefile.i
data/test/java/net/URI/URItoURLTest.java.i
-data/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java.i
data/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.i
+data/src/share/classes/java/awt/Shape.java.i
+data/test/java/util/zip/ConstructDeflaterInput.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/package.html.i
+data/src/share/native/sun/font/layout/Lookups.h.i
data/test/javax/management/MBeanServer/InstanceNotFoundExceptionTest.java.i
data/test/java/util/Formatter/BasicLongObject.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Encoder.java.i
@@ -3543,16 +3492,16 @@ data/make/tools/CharsetMapping/MS949.map.i
data/src/share/classes/javax/management/openmbean/MXBeanMappingClass.java.i
data/test/java/io/DataOutputStream/CounterOverflow.java.i
data/src/share/classes/com/sun/media/sound/SoftPerformer.java.i
-data/src/share/classes/java/awt/event/ComponentEvent.java.i
data/src/share/native/sun/font/layout/AttachmentPosnSubtables.h.i
data/src/share/native/sun/java2d/loops/Any4Byte.c.i
-data/test/java/beans/XMLEncoder/java_awt_MenuShortcut.java.i
+data/src/share/classes/javax/swing/text/LayoutQueue.java.i
data/src/share/classes/com/sun/java/util/jar/pack/DriverResource.java.i
data/src/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java.i
-data/src/share/classes/com/sun/tools/jdi/JNITypeParser.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/FontMapper.java.i
+data/test/sun/security/provider/certpath/ReverseBuilder/prjM2mgrM.i
+data/test/tools/pack200/pack200-verifier/data/README.i
data/test/java/util/Formatter/BasicFloatObject.java.i
+data/test/java/io/NegativeInitSize.java.i
data/src/share/classes/sun/java2d/cmm/PCMM.java.i
data/src/share/classes/java/rmi/ConnectIOException.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libplc4.so.i
@@ -3560,42 +3509,46 @@ data/src/windows/classes/java/lang/ProcessEnvironment.java.i
data/src/share/classes/javax/print/attribute/HashDocAttributeSet.java.i
data/src/share/native/sun/java2d/opengl/OGLBlitLoops.c.i
data/make/tools/swing-beans/beaninfo/images/JMenuBarColor16.gif.i
-data/make/mkdemo/jfc/Notepad/Makefile.i
+data/test/com/sun/servicetag/DeleteServiceTag.java.i
data/src/share/classes/sun/security/provider/SystemIdentity.java.i
data/test/javax/management/remote/mandatory/connection/ConnectionTest.java.i
data/src/share/classes/sun/io/ByteToCharCp1252.java.i
data/test/java/net/URLConnection/TimeoutTest.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif.i
data/test/java/math/BigDecimal/Constructor.java.i
+data/make/tools/src/build/tools/generatenimbus/UIStyle.java.i
data/make/sun/font/FILES_c.gmk.i
data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java.i
data/src/share/classes/org/openjdk/jigsaw/Context.java.i
-data/src/share/classes/javax/print/attribute/standard/JobKOctets.java.i
-data/test/java/io/Writer/Append.java.i
-data/test/java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java.i
+data/test/sun/security/pkcs11/tls/masterdata.txt.i
data/src/share/classes/sun/io/ByteToCharEUC.java.i
data/test/sun/tools/jstat/jstatLineCounts2.sh.i
data/test/com/sun/nio/sctp/SctpChannel/Send.java.i
data/test/java/io/Serializable/userRWObjError/UserRWObjError.java.i
data/src/solaris/native/sun/nio/ch/FileDispatcher.c.i
+data/test/java/nio/file/TestUtil.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java.i
+data/test/sun/security/krb5/auto/AcceptorSubKey.java.i
data/test/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html.i
-data/src/share/classes/javax/management/MBeanNotificationInfo.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java.i
data/src/share/classes/java/security/IdentityScope.java.i
data/src/share/classes/sun/net/httpserver/SSLStreams.java.i
data/src/share/classes/java/security/cert/CRLException.java.i
-data/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/Reflection.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BezierControlPoint.java.i
+data/src/share/classes/sun/io/ByteToCharISO8859_8.java.i
+data/src/share/classes/sun/tools/tree/NewArrayExpression.java.i
+data/src/solaris/hpi/native_threads/include/porting.h.i
data/src/share/classes/sun/security/ssl/ECDHCrypt.java.i
data/test/java/net/Socket/SoTimeout.java.i
data/src/share/classes/java/nio/channels/package.html.i
data/src/share/classes/sun/misc/FloatConsts.java.i
+data/src/share/classes/java/beans/XMLEncoder.java.i
data/src/share/demo/nio/zipfs/README.txt.i
data/src/share/sample/jmx/jmx-scandir/nbproject/jdk.xml.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties.i
-data/src/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java.i
+data/src/share/lib/images/cursors/win32_MoveDrop32x32.gif.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressInputStream.java.i
data/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java.i
data/src/solaris/native/sun/awt/robot_common.c.i
@@ -3606,23 +3559,22 @@ data/test/javax/management/remote/mandatory/loading/MissingClassTest.java.i
data/src/share/native/java/lang/fdlibm/src/s_sin.c.i
data/src/share/classes/java/io/EOFException.java.i
data/src/share/classes/com/sun/jmx/remote/util/ClassLogger.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java.i
+data/src/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java.i
data/test/java/nio/channels/SocketChannel/Shutdown.java.i
data/test/java/lang/instrument/PremainClass/CreateFiles.java.i
data/src/solaris/native/sun/java2d/loops/vis_DrawLine.c.i
data/test/sun/security/krb5/OptionPADataInKDCReq.java.i
data/test/javax/crypto/CryptoPermission/LowercasePermCheck.java.i
-data/src/share/classes/com/sun/servicetag/SunConnection.java.i
data/test/java/beans/PropertyEditor/TestFontClassValue.java.i
data/src/share/classes/com/sun/tools/hat/internal/parser/Reader.java.i
data/test/java/security/cert/X509Certificate/emptyIssuerCert.i
-data/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Basics.java.i
data/test/java/lang/reflect/Proxy/returnTypes/Test.java.i
data/src/share/classes/sun/nio/cs/ext/IBM280.java.i
data/src/share/classes/sun/text/resources/CollationData_mk.java.i
data/src/share/classes/sun/security/pkcs/PKCS10Attribute.java.i
data/src/share/classes/sun/nio/cs/UnicodeEncoder.java.i
-data/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html.i
data/src/share/classes/javax/print/event/PrintServiceAttributeListener.java.i
data/test/java/beans/PropertyEditor/TestEnumClassValue.java.i
data/src/share/classes/org/openjdk/jigsaw/FileHeader.java.i
@@ -3630,136 +3582,136 @@ data/src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties.i
data/src/share/classes/com/sun/tools/jdi/FloatValueImpl.java.i
data/src/share/classes/sun/tools/jstat/Token.java.i
-data/src/share/classes/java/net/CookieStore.java.i
data/make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java.i
data/src/share/classes/com/sun/jdi/request/WatchpointRequest.java.i
-data/src/share/classes/sun/awt/SunHints.java.i
+data/src/windows/back/exec_md.c.i
data/src/solaris/doc/sun/man/man1/wsgen.1.i
data/src/share/classes/sun/text/resources/FormatData_de_DE.java.i
-data/src/share/classes/java/awt/image/ImageConsumer.java.i
data/test/sun/security/x509/Extensions/BCNull.java.i
+data/test/java/lang/management/MemoryMXBean/MemoryUtil.java.i
data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException.java.i
-data/test/javax/script/Test4.java.i
+data/src/share/classes/sun/tools/tree/CommaExpression.java.i
data/src/share/classes/com/sun/tools/hat/internal/util/VectorSorter.java.i
-data/src/share/classes/javax/management/namespace/MBeanServerConnectionWrapper.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties.i
+data/src/windows/native/sun/windows/awt_BitmapUtil.cpp.i
data/test/java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java.i
data/test/java/util/Formatter/BasicLong.java.i
data/src/share/native/sun/security/ec/impl/ecp_jac.c.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java.i
data/src/share/classes/sun/security/krb5/KrbCred.java.i
-data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html.i
-data/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java.i
+data/src/windows/native/sun/windows/awt_Desktop.cpp.i
+data/src/solaris/classes/sun/nio/fs/UnixMountEntry.java.i
data/src/solaris/hpi/src/interrupt.c.i
data/src/share/native/sun/java2d/loops/BlitBg.c.i
data/src/share/native/java/util/zip/zlib-1.1.3/trees.h.i
data/test/java/rmi/server/RMIClassLoader/spi/Foo.java.i
data/test/java/io/DataInputStream/SkipBytes.java.i
data/src/share/classes/sun/font/EAttribute.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/OwnerImpl.java.i
+data/test/sun/nio/cs/OLD/X11KSC5601_OLD.java.i
data/test/java/lang/instrument/BootClassPath/AgentSupport.java.i
data/make/mkdemo/jfc/Stylepad/Makefile.i
data/src/share/classes/sun/io/CharToByteCp942.java.i
-data/src/share/classes/javax/management/PersistentMBean.java.i
+data/src/share/classes/sun/reflect/UnsafeStaticLongFieldAccessorImpl.java.i
data/make/tools/CharsetMapping/MS1253.map.i
data/src/share/classes/javax/security/auth/callback/TextOutputCallback.java.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java.i
data/test/javax/swing/text/html/HRuleView/Test5062055.java.i
data/src/share/classes/java/lang/invoke/CallSite.java.i
data/src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarB/b/B.java.i
data/src/share/classes/com/sun/jndi/ldap/ManageReferralControl.java.i
data/src/windows/native/sun/nio/ch/ServerSocketChannelImpl.c.i
data/src/share/classes/com/sun/jmx/snmp/SnmpUsmKeyHandler.java.i
-data/make/java/management/FILES_c.gmk.i
+data/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Stub.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java.i
data/test/java/util/ResourceBundle/RestrictedBundleTest.java.i
data/make/java/zip/FILES_java.gmk.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java.i
-data/src/share/classes/com/sun/jmx/namespace/RoutingServerProxy.java.i
-data/src/share/classes/sun/font/TextSourceLabel.java.i
data/make/tools/swing-beans/beaninfo/images/JTextAreaColor16.gif.i
-data/make/jpda/Makefile.i
-data/test/java/util/zip/ZipFile/GetDirEntry.java.i
+data/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java.i
data/make/common/shared/Defs-control.gmk.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_QA.properties.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java.i
-data/make/java/zip/reorder-sparc.i
+data/src/share/classes/org/relaxng/datatype/DatatypeException.java.i
data/src/share/classes/java/security/package.html.i
+data/test/java/lang/String/SBConstructor.java.i
data/src/share/classes/javax/security/cert/X509Certificate.java.i
data/src/share/classes/sun/awt/util/IdentityArrayList.java.i
data/src/share/classes/java/awt/image/ComponentSampleModel.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java.i
data/src/share/classes/sun/text/resources/FormatData_is.java.i
-data/src/share/classes/com/sun/tools/jdi/CharTypeImpl.java.i
+data/src/solaris/classes/sun/awt/motif/X11GB18030_1.java.i
data/src/share/demo/jfc/SampleTree/SampleData.java.i
data/test/java/net/NetworkInterface/Test.java.i
+data/test/java/io/Reader/SkipNegative.java.i
data/test/java/nio/Buffer/CopyDirectFloatMemory.java.i
data/src/share/classes/sun/swing/AccumulativeRunnable.java.i
data/make/com/sun/security/auth/module/FILES_export_solaris.gmk.i
-data/src/share/classes/sun/text/resources/FormatData_fr_CH.java.i
+data/src/share/native/sun/font/layout/IndicReordering.h.i
+data/src/share/classes/sun/nio/cs/ext/IBM420.java.i
data/src/share/classes/javax/xml/crypto/NoSuchMechanismException.java.i
data/src/share/classes/com/sun/crypto/provider/CipherFeedback.java.i
data/src/share/classes/sun/text/resources/CollationData_tr.java.i
+data/test/java/util/Collections/CheckedIdentityMap.java.i
+data/src/windows/native/sun/windows/awt_Button.cpp.i
data/make/sun/jkernel/FILES_c_windows.gmk.i
-data/src/share/classes/org/openjdk/jigsaw/RemoteRepository.java.i
+data/test/java/nio/Buffer/CopyDirectByteMemory.java.i
data/src/windows/classes/sun/nio/fs/WindowsFileSystem.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java.i
-data/src/share/classes/com/sun/jdi/ByteValue.java.i
-data/src/share/classes/javax/swing/tree/TreeSelectionModel.java.i
+data/test/java/io/Serializable/available/Available.java.i
+data/make/java/management/Exportedfiles.gmk.i
data/src/share/classes/sun/nio/cs/ext/MS50220.java.i
data/src/share/classes/java/util/concurrent/RecursiveAction.java.i
data/src/solaris/classes/sun/awt/motif/MToolkit.java.i
-data/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java.i
data/src/solaris/native/sun/awt/awt_dnd_ds.c.i
-data/src/share/classes/com/sun/tools/jdi/CharValueImpl.java.i
data/make/launchers/Makefile.i
data/src/share/demo/jvmti/hprof/debug_malloc.h.i
data/src/share/classes/com/sun/tools/hat/internal/server/RootStackQuery.java.i
+data/src/windows/classes/sun/awt/windows/WCheckboxPeer.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties.i
data/src/share/classes/java/rmi/server/RemoteStub.java.i
-data/test/java/nio/charset/coders/ResetISO2022JP.java.i
+data/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java.i
data/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java.i
-data/src/share/classes/javax/accessibility/AccessibleExtendedText.java.i
data/src/share/classes/com/sun/jdi/NativeMethodException.java.i
data/test/java/net/URL/RelativeURLTest.java.i
data/src/share/classes/java/sql/ResultSet.java.i
+data/src/share/classes/sun/awt/im/CompositionAreaHandler.java.i
data/src/windows/classes/sun/awt/windows/WPanelPeer.java.i
+data/src/share/classes/java/lang/IncompatibleClassChangeError.java.i
data/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java.i
data/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java.i
data/src/share/classes/java/util/zip/Inflater.java.i
data/src/share/classes/javax/swing/text/rtf/AbstractFilter.java.i
-data/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java.i
-data/test/java/security/cert/CertPathBuilder/GetInstance.java.i
+data/test/java/util/ResourceBundle/Control/PackagePrivateRB.java.i
data/src/share/classes/java/security/cert/CertificateFactorySpi.java.i
data/src/share/native/sun/java2d/Trace.c.i
data/src/share/classes/java/lang/StackTraceElement.java.i
+data/test/java/net/URLConnection/GetFileNameMap.java.i
data/src/share/classes/sun/io/ByteToCharCp1250.java.i
+data/test/java/awt/dnd/Button2DragTest/Button2DragTest.java.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll.i
-data/src/share/classes/sun/net/httpserver/HttpExchangeImpl.java.i
+data/src/windows/native/sun/windows/ShellFolder2.cpp.i
data/src/share/classes/java/beans/FeatureDescriptor.java.i
data/src/share/classes/javax/sound/sampled/spi/AudioFileWriter.java.i
data/test/java/rmi/activation/Activatable/inactiveGroup/rmid.security.policy.i
data/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java.i
data/src/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java.i
-data/src/windows/native/java/net/TwoStacksPlainSocketImpl.c.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties.i
+data/test/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java.i
data/src/share/javavm/export/jvmti.h.i
-data/make/modules/jdk.awt.ls.i
-data/make/tools/src/build/tools/javazic/GenDoc.java.i
+data/test/javax/swing/Security/6657138/bug6657138.java.i
+data/src/share/classes/sun/reflect/SignatureIterator.java.i
data/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java.i
data/src/share/classes/sun/text/resources/FormatData_es_VE.java.i
-data/src/share/classes/javax/management/DefaultLoaderRepository.java.i
+data/test/sun/tools/jps/jps-lm_Output1.awk.i
data/src/share/native/sun/security/ec/ecp_256.c.i
data/make/netbeans/jdwpgen/nbproject/build-impl.xml.i
data/test/javax/swing/ToolTipManager/Test6657026.java.i
data/src/share/lib/security/sunpkcs11-solaris.cfg.i
-data/src/share/classes/sun/security/x509/GeneralSubtrees.java.i
data/src/share/classes/com/sun/java/util/jar/pack/Utils.java.i
data/test/sun/security/tools/keytool/i18n.html.i
data/test/java/beans/Introspector/6976577/test/Accessor.java.i
data/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java.i
-data/src/share/classes/javax/naming/spi/package.html.i
data/src/share/classes/com/sun/rowset/internal/BaseRow.java.i
-data/src/share/classes/sun/jkernel/BackgroundDownloader.java.i
data/src/share/classes/org/openjdk/jigsaw/RepositoryCatalog.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java.i
data/test/javax/management/monitor/MBeanServerBuilderImpl.java.i
@@ -3768,10 +3720,10 @@ data/test/java/util/AbstractMap/AbstractMapClone.java.i
data/make/mkdemo/jfc/Metalworks/Makefile.i
data/src/share/hpi/export/bool.h.i
data/src/share/classes/com/sun/tools/jdi/GenericListeningConnector.java.i
-data/src/share/classes/sun/tools/tree/NewArrayExpression.java.i
+data/test/tools/launcher/SolarisRunpath.sh.i
data/make/com/sun/demo/jvmti/hprof/Makefile.i
data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.html.i
-data/src/share/classes/com/sun/imageio/plugins/common/BitFile.java.i
+data/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java.i
data/make/tools/CharsetMapping/IBM1112.c2b.i
data/src/solaris/classes/sun/java2d/xr/XRDrawImage.java.i
data/test/javax/management/mxbean/customtypes/CustomMXBean.java.i
@@ -3779,161 +3731,158 @@ data/test/javax/swing/JComboBox/4743225/bug4743225.java.i
data/test/sun/security/tools/policytool/i18n.html.i
data/src/share/classes/sun/security/timestamp/TimestampToken.java.i
data/make/javax/sound/jsoundhs/FILES.gmk.i
-data/test/java/io/FileInputStream/FinalizeShdCallClose.java.i
data/test/java/rmi/activation/ActivateFailedException/activateFails/rmid.security.policy.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ResolutionInfo.java.i
-data/src/share/classes/sun/io/CharToByteUnicodeBigUnmarked.java.i
+data/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java.i
data/src/share/lib/images/cursors/motif_CopyNoDrop32x32.gif.i
data/src/share/demo/scripting/jconsole-plugin/README.txt.i
data/make/tools/reorder/tools/util-sparc.il.i
-data/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so.d
data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml.i
data/src/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so.i
data/src/share/classes/java/nio/MappedByteBuffer.java.i
data/test/com/sun/jdi/ProcessAttachTest.sh.i
data/test/sun/tools/jstat/snap2.awk.i
-data/make/tools/CharsetMapping/Big5.nr.i
+data/test/javax/swing/plaf/nimbus/Test7048204.java.i
data/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java.i
data/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh.i
data/src/windows/native/sun/windows/Devices.h.i
data/test/java/util/Collection/HotPotatoes.java.i
data/test/com/sun/nio/sctp/SctpChannel/Shutdown.java.i
data/src/solaris/native/sun/awt/awt_wm.h.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java.i
-data/src/share/classes/java/awt/event/FocusAdapter.java.i
+data/src/share/native/sun/java2d/opengl/OGLBlitLoops.h.i
+data/src/share/classes/sun/text/normalizer/NormalizerBase.java.i
data/test/javax/script/Test3.java.i
data/make/tools/CharsetMapping/MS1256.map.i
data/src/linux/doc/man/ja/idlj.1.i
data/src/share/classes/java/nio/file/NotDirectoryException.java.i
-data/src/share/classes/java/sql/Savepoint.java.i
+data/src/share/sample/scripting/scriptpad/nbproject/netbeans-targets.xml.i
data/test/java/beans/PropertyEditor/MemoryClassLoader.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java.i
+data/test/java/io/Serializable/oldTests/CircularList.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties.i
-data/src/share/back/invoker.h.i
data/src/share/classes/java/net/InetSocketAddress.java.i
data/test/sun/security/acl/PermissionImpl/PermissionEqualsHashCode.java.i
data/test/com/sun/jdi/sde/SourceDebugExtensionTarg.java.i
-data/test/java/util/Vector/ComodifiedRemoveAllElements.java.i
data/src/share/demo/jvmti/hprof/hprof_event.h.i
data/src/share/classes/com/sun/jmx/namespace/serial/IdentityProcessor.java.i
data/test/javax/security/auth/login/Configuration/GetInstance.bad.configURI.i
data/src/share/classes/sun/tools/tree/IntExpression.java.i
-data/src/solaris/native/java/io/FileDescriptor_md.c.i
data/test/demo/jvmti/hprof/UseAllBytecodes.java.i
data/src/share/classes/sun/security/x509/CertificateSubjectName.java.i
+data/src/share/classes/javax/swing/ProgressMonitorInputStream.java.i
data/src/share/native/java/lang/fdlibm/src/e_atanh.c.i
data/src/solaris/classes/sun/awt/X11/XDropTargetProtocolListener.java.i
+data/test/java/net/Authenticator/B6870935.java.i
+data/src/windows/native/sun/nio/ch/FileDispatcherImpl.c.i
data/src/share/native/java/util/zip/zlib-1.1.3/infcodes.h.i
data/src/share/classes/java/nio/channels/NetworkChannel.java.i
-data/src/share/classes/sun/nio/cs/IBM852.java.i
+data/test/java/beans/XMLEncoder/java_sql_Timestamp.java.i
data/src/share/native/java/lang/Compiler.c.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NewSocketMethods.java.i
data/src/solaris/native/sun/font/X11TextRenderer.c.i
data/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java.i
data/test/java/util/concurrent/atomic/Lazy.java.i
+data/test/java/net/URLConnection/Connect.java.i
data/src/share/classes/javax/swing/text/FieldView.java.i
data/src/share/classes/com/sun/security/auth/UnixPrincipal.java.i
-data/src/share/classes/sun/invoke/util/ValueConversions.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/Application.java.i
+data/test/java/net/B6499348.java.i
data/src/share/demo/jvmti/hprof/hprof_util.c.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/beans/AbstractBean.java.i
data/src/share/classes/java/awt/image/MemoryImageSource.java.i
data/make/tools/CharsetMapping/IBM1026.nr.i
data/src/share/classes/java/awt/font/TextHitInfo.java.i
-data/src/share/classes/java/sql/RowId.java.i
-data/test/javax/swing/plaf/nimbus/ColorCustomizationTest.java.i
+data/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java.i
data/test/javax/crypto/spec/IvParameterSpec/NullIV.java.i
+data/src/share/classes/sun/io/CharToByteCp1144.java.i
data/src/share/classes/sun/nio/ch/SelectorProviderImpl.java.i
data/test/java/util/Locale/LocaleCategory.java.i
data/src/share/classes/com/sun/media/sound/AutoClosingClip.java.i
+data/test/sun/net/www/http/HttpClient/RetryPost.sh.i
data/test/java/rmi/activation/Activatable/createPrivateActivable/ActivateMe.java.i
data/src/share/classes/sun/awt/EventQueueDelegate.java.i
data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html.i
data/src/share/classes/sun/net/RegisteredDomain.java.i
data/src/share/classes/sun/nio/cs/ext/TIS_620.java.i
-data/src/share/classes/java/nio/channels/AsynchronousChannel.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirAgent.java.i
-data/test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java.i
+data/src/share/classes/java/util/concurrent/ForkJoinPool.java.i
data/src/share/classes/sun/nio/cs/ext/IBM922.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-bw32.png.i
data/src/share/classes/sun/java2d/pipe/RegionSpanIterator.java.i
data/test/javax/swing/MultiUIDefaults/4300666/bug4300666.java.i
data/make/tools/src/build/tools/addjsum/AddJsum.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java.i
data/src/linux/doc/man/ja/jvisualvm.1.i
data/src/share/demo/zipfs.i
data/test/java/net/ProxySelector/B6737819.java.i
data/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java.i
-data/src/solaris/native/sun/java2d/loops/vis_FourByteAbgrPre.c.i
+data/test/javax/swing/JFileChooser/4847375/bug4847375.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties.i
data/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java.i
-data/test/java/security/cert/CertificateFactory/openssl/open.i
-data/src/solaris/classes/sun/font/FcFontConfiguration.java.i
+data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirClient.java.i
data/test/java/util/concurrent/LinkedBlockingQueue/LastElement.java.i
data/src/share/classes/java/util/jar/Attributes.java.i
-data/test/javax/swing/border/Test4243289.html.i
-data/src/share/classes/sun/nio/cs/ext/IBM1122.java.i
+data/test/sun/text/resources/Format/Bug4762201.java.i
+data/src/share/classes/java/lang/ThreadDeath.java.i
+data/src/windows/native/sun/windows/awt.h.i
data/src/share/classes/java/awt/image/SinglePixelPackedSampleModel.java.i
data/test/com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java.i
data/test/java/security/cert/CertPathBuilder/targetConstraints/anchor.cer.i
+data/src/solaris/doc/sun/man/man1/ja/apt.1.i
data/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java.i
data/src/windows/native/java/io/FileDescriptor_md.c.i
data/src/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java.i
data/src/share/classes/sun/java2d/pipe/PixelToShapeConverter.java.i
-data/test/java/nio/channels/TestThread.java.i
data/src/share/classes/java/io/Writer.java.i
data/test/sun/tools/jstat/jstatClassOutput1.sh.i
data/src/solaris/native/sun/awt/awt_Menu.c.i
data/src/share/classes/java/awt/Cursor.java.i
data/src/share/classes/java/net/URLClassLoader.java.i
-data/src/share/classes/sun/io/CharToByteCp834.java.i
+data/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java.i
data/src/solaris/hpi/native_threads/src/sys_api_td.c.i
data/test/java/io/Serializable/parents/OriginalClass.java.i
data/src/share/npt/npt.h.i
+data/test/java/nio/charset/Charset/default.sh.i
data/src/share/classes/java/net/SocketImpl.java.i
data/src/share/classes/sun/security/jgss/krb5/MessageToken.java.i
+data/test/sun/security/util/HostnameMatcher/cert2.crt.i
data/src/share/classes/sun/tools/jps/Arguments.java.i
+data/src/share/classes/sun/tools/tree/BinaryLogicalExpression.java.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java.i
-data/src/share/classes/java/nio/file/FileVisitor.java.i
+data/test/java/rmi/server/serverStackTrace/ServerStackTrace.java.i
data/test/java/awt/font/TextLayout/KernCrash.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java.i
-data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java.i
data/src/share/classes/java/awt/font/TransformAttribute.java.i
-data/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java.i
+data/test/sun/security/krb5/auto/BadKdc.java.i
data/src/share/classes/sun/io/CharToByteCp838.java.i
data/src/share/classes/java/awt/GraphicsDevice.java.i
data/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java.i
-data/src/share/demo/jfc/Font2DTest/resources/resource.data.i
data/src/windows/classes/sun/print/services/javax.print.PrintServiceLookup.i
data/test/javax/print/attribute/autosense/PrintAutoSenseData.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties.i
+data/test/java/security/Security/signedfirst/exp.jar.i
data/src/share/classes/java/util/zip/ZipFile.java.i
+data/src/solaris/native/sun/nio/ch/PollArrayWrapper.c.i
data/src/share/classes/java/security/cert/PolicyNode.java.i
data/src/share/classes/java/lang/IllegalAccessException.java.i
-data/test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy.i
-data/src/share/lib/images/cursors/win32_MoveNoDrop32x32.gif.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif.i
data/src/share/classes/com/sun/jmx/event/DaemonThreadFactory.java.i
data/src/share/classes/sun/io/CharToByteEUC_KR.java.i
data/test/java/io/Serializable/classDescHooks/ExternLoopback.java.i
-data/src/share/classes/org/openjdk/jigsaw/Trace.java.i
data/src/solaris/native/java/net/SocketInputStream.c.i
-data/src/share/classes/javax/swing/colorchooser/SyntheticImage.java.i
data/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java.i
data/make/tools/CharsetMapping/ISO_8859_7.map.i
+data/src/share/classes/com/sun/rowset/RowSetFactoryImpl.java.i
data/src/share/classes/javax/sql/rowset/BaseRowSet.java.i
data/test/javax/imageio/plugins/shared/BitDepth.java.i
-data/test/java/awt/im/InputContext/InputContextTest.java.i
-data/src/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java.i
-data/src/share/classes/sun/net/ftp/FtpDirEntry.java.i
+data/src/share/native/sun/security/ec/ecl.c.i
data/src/share/classes/javax/swing/SwingWorker.java.i
-data/src/share/native/sun/java2d/opengl/OGLMaskBlit.h.i
+data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Stub.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/CheckDeps.java.i
data/src/share/classes/javax/print/attribute/standard/ColorSupported.java.i
-data/test/java/util/ResourceBundle/Test4314141B_fr.properties.i
-data/src/share/native/sun/font/layout/MorphTables.h.i
+data/test/java/io/Serializable/NoClassDefFoundErrorTrap/NoClassDefFoundErrorTrap.java.i
data/make/tools/src/build/tools/javazic/Main.java.i
data/src/share/native/sun/font/layout/LEGlyphStorage.h.i
data/src/share/classes/sun/tools/tree/SuperExpression.java.i
@@ -3942,20 +3891,21 @@ data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.ja
data/src/share/classes/javax/swing/doc-files/SizeSequence-1.gif.i
data/test/java/beans/PropertyEditor/TestLongTypeNull.java.i
data/test/com/sun/jdi/RedefineStep.sh.i
-data/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java.i
-data/src/windows/native/java/io/FileSystem_md.c.i
+data/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java.i
data/src/share/classes/java/security/spec/PKCS8EncodedKeySpec.java.i
data/src/share/classes/com/sun/jdi/event/ThreadDeathEvent.java.i
data/test/com/sun/jdi/VMDeathLastTest.java.i
data/test/java/nio/Buffer/CopyDirectShortMemory.java.i
data/test/javax/management/Introspector/ResourceInjectionTest.java.i
+data/src/share/classes/sun/print/PrintJob2D.java.i
data/make/tools/classanalyzer/build.xml.i
data/make/netbeans/common/architectures/arch-amd64.properties.i
-data/src/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java.i
+data/test/java/util/regex/SupplementaryTestCases.txt.i
+data/src/share/demo/java2d/J2DBench/resources/textdata/greek.ut8.txt.i
data/src/share/classes/sun/management/MemoryManagerImpl.java.i
data/src/share/classes/com/sun/servicetag/Util.java.i
data/src/share/classes/java/awt/EventQueue.java.i
-data/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html.i
+data/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java.i
data/src/share/native/sun/java2d/loops/FourByteAbgr.h.i
data/src/share/classes/sun/awt/geom/Curve.java.i
data/src/share/classes/java/awt/event/KeyEvent.java.i
@@ -3968,18 +3918,19 @@ data/src/share/classes/com/sun/tools/jdi/TargetVM.java.i
data/test/java/util/logging/AnonLoggerWeakRefLeak.sh.i
data/src/share/classes/com/sun/net/httpserver/HttpsParameters.java.i
data/src/share/classes/java/text/MessageFormat.java.i
-data/src/share/classes/com/sun/jdi/ShortType.java.i
+data/src/share/classes/java/sql/ParameterMetaData.java.i
data/make/java/sun_nio/FILES_java.gmk.i
data/src/share/classes/javax/sql/rowset/WebRowSet.java.i
data/src/share/classes/com/sun/media/sound/SoftChorus.java.i
data/src/share/classes/sun/nio/cs/ext/IBM870.java.i
data/src/share/classes/java/lang/reflect/AnnotatedElement.java.i
-data/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java.i
data/src/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java.i
data/test/java/io/RandomAccessFile/ReadLine.java.i
+data/test/java/security/KeyRep/AES.pre.1.5.key.i
data/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java.i
data/src/share/classes/sun/print/SunPageSelection.java.i
data/src/share/classes/com/sun/tools/extcheck/Main.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java.i
data/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.java.i
data/src/share/classes/javax/xml/crypto/NodeSetData.java.i
data/src/share/classes/java/awt/datatransfer/StringSelection.java.i
@@ -3991,33 +3942,34 @@ data/src/share/classes/javax/swing/DropMode.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java.i
data/make/tools/swing-beans/beaninfo/images/JDesktopPaneMono16.gif.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/Platform.java.i
-data/make/tools/swing-beans/beaninfo/images/JScrollBarColor32.gif.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U16Func.c.i
data/test/sun/security/mscapi/KeytoolChangeAlias.sh.i
-data/make/tools/CharsetMapping/IBM1144.c2b.i
+data/test/java/net/URL/GetContent.java.i
data/test/java/lang/module/_ModuleId.java.i
data/src/share/classes/javax/print/event/PrintJobAttributeEvent.java.i
data/test/javax/management/context/LocalizableTest.java.i
data/src/share/classes/sun/dyn/BoundMethodHandle.java.i
+data/make/javax/print/Makefile.i
data/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java.i
-data/src/share/classes/java/io/DataInputStream.java.i
-data/src/share/classes/java/awt/doc-files/MultiScreen.gif.i
+data/test/sun/security/provider/PolicyFile/TrustedCert.keystore.i
+data/test/java/nio/Buffer/SwapMicroBenchmark.java.i
data/test/java/io/FileDescriptor/Finalize.java.i
data/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate_Stub.java.i
-data/src/share/classes/sun/net/TelnetProtocolException.java.i
-data/test/java/nio/file/Files/SkipSiblings.java.i
-data/src/share/classes/sun/reflect/ByteVectorFactory.java.i
+data/src/share/demo/nbproject/scripting/jconsole-plugin/build.properties.i
+data/test/javax/management/descriptor/UnionTest.java.i
data/make/tools/CharsetMapping/IBM1140.c2b.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sr_ME.properties.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java.i
data/test/java/beans/Introspector/Test6723447.java.i
data/test/javax/management/remote/mandatory/notif/ServerNotifs.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java.i
+data/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java.i
data/src/share/classes/sun/rmi/server/UnicastServerRef.java.i
data/test/java/util/zip/GZIP/Accordion.java.i
data/src/share/classes/sun/tools/jconsole/MBeansTab.java.i
data/src/share/classes/java/awt/image/ColorConvertOp.java.i
+data/src/share/classes/javax/accessibility/AccessibleExtendedComponent.java.i
data/src/share/classes/sun/io/ByteToCharCp775.java.i
data/make/common/internal/ImportComponents.gmk.i
+data/src/share/classes/sun/nio/ch/PollSelectorProvider.java.i
data/test/java/rmi/transport/dgcDeadLock/TestImpl.java.i
data/src/share/classes/javax/net/ssl/X509TrustManager.java.i
data/make/sun/rmi/rmid/Makefile.i
@@ -4029,31 +3981,33 @@ data/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java.i
data/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java.i
-data/src/windows/resource/version.rc.i
data/test/javax/security/auth/PrivateCredentialPermission/Equals.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java.i
+data/test/javax/swing/DataTransfer/6456844/bug6456844.java.i
data/test/sun/security/ec/pkcs12/secp256r1server-secp384r1ca.p12.i
data/test/sun/security/util/HostnameMatcher/cert3.crt.i
-data/src/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java.i
+data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template.i
data/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java.i
data/src/share/classes/sun/print/PrinterGraphicsDevice.java.i
+data/test/javax/security/auth/login/LoginContext/DefaultHandlerImpl.java.i
data/test/java/util/ResourceBundle/TestResource_de.java.i
data/src/share/classes/java/util/logging/Formatter.java.i
data/src/solaris/native/sun/awt/robot_common.h.i
data/src/share/classes/javax/swing/text/FlowView.java.i
data/test/java/beans/XMLEncoder/Bean.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipUtils.java.i
-data/src/solaris/bin/jexec.c.i
+data/src/windows/native/sun/java2d/windows/dxCapabilities.cpp.i
data/src/share/classes/sun/util/resources/TimeZoneNames_fr.java.i
-data/src/share/classes/javax/management/loading/MLetParser.java.i
+data/src/share/sample/vm/jvm-clr/invoker.h.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_SY.properties.i
data/src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiTreeUI.java.i
data/src/share/classes/com/sun/media/sound/InvalidFormatException.java.i
data/src/share/classes/com/sun/media/sound/RIFFWriter.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java.i
-data/src/share/classes/sun/text/normalizer/UCharacterIterator.java.i
+data/test/java/nio/file/WatchService/denyAll.policy.i
+data/test/java/net/URLConnection/xml/xml1.i
data/src/share/classes/sun/net/www/http/Hurryable.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java.i
+data/src/windows/native/sun/jkernel/graphics/bullet.bmp.i
data/src/share/classes/com/sun/tools/jdi/StringReferenceImpl.java.i
data/make/tools/CharsetMapping/IBM862.map.i
data/src/share/classes/sun/audio/AudioDataStream.java.i
@@ -4063,7 +4017,8 @@ data/test/java/io/charStreams/CharGenerator.java.i
data/test/com/sun/net/httpserver/bugs/HeadTest.java.i
data/test/java/net/Authenticator/B4759514.java.i
data/src/share/classes/com/sun/jdi/connect/TransportTimeoutException.java.i
-data/src/share/classes/java/security/spec/DSAParameterSpec.java.i
+data/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java.i
+data/make/tools/CharsetMapping/IBM1145.map.i
data/src/share/sample/scripting/scriptpad/src/resources/mm.js.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java.i
data/test/java/beans/VetoableChangeSupport/TestSynchronization.java.i
@@ -4071,38 +4026,40 @@ data/test/sun/security/util/DerValue/Indefinite.java.i
data/test/java/util/PluggableLocale/DateFormatProviderTest.sh.i
data/test/sun/net/InetAddress/nameservice/deadlock/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
data/test/java/beans/PropertyEditor/TestBooleanTypeNull.java.i
-data/src/share/classes/sun/io/ByteToCharMacTurkish.java.i
+data/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java.i
data/src/share/classes/sun/audio/AudioSecurityExceptionAction.java.i
+data/src/share/classes/javax/management/DynamicMBean.java.i
data/src/solaris/native/sun/java2d/loops/java2d_Mlib.h.i
-data/make/java/nio/addNotices.sh.i
+data/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
data/test/java/io/Serializable/subclass/XObjectInputStream.java.i
data/test/java/security/BasicPermission/PermClass.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java.i
+data/test/javax/swing/JOptionPane/6464022/bug6464022.java.i
data/src/share/classes/org/openjdk/jigsaw/IdentityHashSet.java.i
data/test/java/io/Serializable/stopCustomDeserialization/Write.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c.i
data/src/share/classes/sun/java2d/pisces/PiscesMath.java.i
data/test/java/util/zip/ZipEntry/Constructor.java.i
-data/src/share/classes/javax/management/event/NotificationManager.java.i
+data/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java.i
data/src/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java.i
data/src/windows/native/sun/java2d/d3d/D3DPipeline.h.i
data/src/share/classes/sun/io/CharToByteMS949.java.i
data/src/share/native/sun/security/ec/ecdecode.c.i
data/src/share/classes/sun/awt/resources/awt_de.properties.i
-data/src/share/classes/com/sun/tools/jdi/ConnectorImpl.java.i
+data/test/java/io/PipedInputStream/CloseAndAvailableRC.java.i
+data/src/share/classes/javax/swing/JMenuItem.java.i
data/src/share/classes/javax/management/remote/rmi/RMIConnector.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadBlocksClose.java.i
+data/src/share/classes/java/awt/ModalEventFilter.java.i
data/src/share/classes/java/awt/dnd/DnDEventMulticaster.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java.i
+data/src/share/native/sun/awt/medialib/mlib_sys.c.i
data/src/share/classes/sun/security/validator/ValidatorException.java.i
data/src/share/classes/javax/print/attribute/standard/JobPriority.java.i
data/make/tools/auto_multi/Makefile.i
data/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh.i
-data/src/share/classes/java/nio/X-Buffer-bin.java.template.i
+data/test/sun/java2d/pisces/Renderer/Test7019861.java.i
data/src/share/classes/javax/imageio/spi/ImageTranscoderSpi.java.i
data/test/javax/xml/crypto/dsig/ValidationTests.java.i
data/test/java/net/URLConnection/6212146/test.jar.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html.i
data/test/sun/security/krb5/auto/DupEtypes.java.i
data/test/java/security/Provider/GetInstance.java.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties.i
@@ -4110,27 +4067,27 @@ data/test/java/beans/PropertyEditor/TestByteClass.java.i
data/make/sun/awt/make.depend.i
data/src/share/classes/sun/font/ExtendedTextLabel.java.i
data/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java.i
-data/src/share/classes/javax/swing/event/DocumentListener.java.i
data/test/javax/swing/border/Test4252164.html.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java.i
+data/test/sun/security/pkcs11/ec/TestKeyFactory.java.i
data/test/com/sun/nio/sctp/SctpChannel/CommUp.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java.i
-data/make/tools/CharsetMapping/IBM1145.map.i
+data/src/share/classes/java/security/spec/DSAParameterSpec.java.i
data/src/share/classes/sun/font/TextRecord.java.i
-data/test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java.i
+data/src/share/classes/sun/security/util/ByteArrayLexOrder.java.i
+data/test/java/lang/reflect/Constructor/Equals.java.i
data/src/solaris/classes/sun/awt/motif/MInputMethod.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java.i
data/src/share/classes/java/rmi/activation/ActivationDesc.java.i
data/test/sun/security/smartcardio/TestControl.java.i
data/src/share/classes/java/beans/beancontext/BeanContextSupport.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmscgats.c.i
-data/src/share/classes/java/lang/doc-files/captheta.gif.i
data/src/share/classes/sun/net/httpserver/StreamClosedException.java.i
data/test/sun/net/www/protocol/jar/resource.jar.i
data/test/java/util/PluggableLocale/TimeZoneNameProviderTest.sh.i
data/src/share/classes/com/sun/jdi/ShortValue.java.i
-data/src/share/classes/sun/security/pkcs/PKCS10Attributes.java.i
+data/src/share/classes/sun/nio/ch/Secrets.java.i
data/src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp.i
+data/test/java/util/StringTokenizer/ResetPos.java.i
data/src/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java.i
data/src/share/classes/java/beans/PropertyChangeListener.java.i
data/src/share/classes/sun/nio/cs/ext/IBM868.java.i
@@ -4141,36 +4098,37 @@ data/src/share/classes/javax/script/ScriptEngineFactory.java.i
data/test/sun/security/provider/PolicyParser/TokenStore.java.i
data/make/tools/src/build/tools/automulti/AutoMulti.java.i
data/src/solaris/native/sun/java2d/loops/vis_IntRgb.c.i
-data/src/solaris/native/com/sun/security/auth/module/Unix.c.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties.i
-data/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java.i
+data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html.i
data/src/share/classes/java/io/StreamTokenizer.java.i
data/src/share/classes/sun/io/ByteToCharCp278.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java.i
-data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java.i
-data/src/share/classes/sun/tools/jconsole/InternalDialog.java.i
+data/src/share/classes/sun/security/ssl/SSLSessionImpl.java.i
+data/test/java/io/Serializable/skippedObjCNFException/Write.java.i
+data/src/share/native/java/lang/fdlibm/src/s_tan.c.i
data/src/share/classes/com/sun/jdi/doc-files/signature.html.i
data/src/share/native/java/lang/Double.c.i
data/test/sun/security/tools/jarsigner/JarSigning.keystore.i
data/src/share/classes/java/util/concurrent/ScheduledExecutorService.java.i
data/src/share/classes/java/util/PropertyResourceBundle.java.i
data/src/share/classes/java/awt/MenuContainer.java.i
-data/src/share/classes/com/sun/rowset/internal/XmlErrorHandler.java.i
+data/test/tools/pack200/TestExceptions.java.i
data/src/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Decoder.java.i
data/make/tools/CharsetMapping/IBM838.c2b.i
data/src/share/classes/java/awt/image/RescaleOp.java.i
+data/src/share/native/java/lang/fdlibm/src/e_acosh.c.i
data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider.i
-data/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java.i
+data/src/share/classes/com/sun/script/util/BindingsBase.java.i
data/test/java/rmi/reliability/benchmark/bench/Harness.java.i
data/test/java/util/Formatter/genBasic.sh.i
data/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh.i
data/test/java/nio/file/Path/temporary_files.sh.i
data/src/share/classes/java/io/BufferedInputStream.java.i
data/src/share/demo/jvmti/hprof/debug_malloc.c.i
+data/test/javax/management/MBeanServer/PreRegisterTest.java.i
data/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java.i
-data/src/windows/native/sun/font/fontpath.c.i
-data/src/share/classes/javax/sound/sampled/FloatControl.java.i
+data/src/windows/classes/sun/security/mscapi/Key.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-interim32.png.i
data/src/share/classes/javax/swing/plaf/FontUIResource.java.i
data/test/java/awt/Modal/WsDisabledStyle/OverBlocker/OverBlocker.java.i
@@ -4179,26 +4137,23 @@ data/test/org/openjdk/jigsaw/package.sh.i
data/test/java/nio/Buffer/BasicInt.java.i
data/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SubclassAcrossPackage.java.i
data/test/java/lang/module/module-info-reader.sh.i
-data/make/tools/reorder/tests/Null.java.i
-data/src/share/classes/sun/util/resources/LocaleNamesBundle.java.i
+data/test/java/net/URLClassLoader/B5077773.sh.i
data/src/share/classes/java/beans/BeanInfo.java.i
data/test/java/beans/XMLDecoder/spec/TestObject.java.i
data/test/sun/nio/cs/TestStringCodingUTF8.java.i
-data/test/sun/security/pkcs11/KeyStore/loader.jar.i
+data/make/sun/splashscreen/mapfile-vers.i
data/src/share/classes/com/sun/jndi/ldap/ClientId.java.i
data/src/share/classes/java/net/SocketOptions.java.i
data/src/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java.i
data/src/share/classes/javax/naming/NoPermissionException.java.i
-data/src/share/classes/sun/applet/AppletIllegalArgumentException.java.i
-data/make/sun/javazic/javatz/java_us_ids.txt.i
+data/src/share/classes/sun/java2d/loops/DrawGlyphList.java.i
data/src/share/classes/sun/net/www/HeaderParser.java.i
data/src/share/classes/sun/tools/jstat/OptionOutputFormatter.java.i
-data/src/share/classes/com/sun/security/auth/SolarisPrincipal.java.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Skel.java.i
data/src/share/classes/com/sun/jdi/connect/Transport.java.i
data/test/java/util/StringTokenizer/Supplementary.java.i
data/src/share/classes/sun/management/HotspotMemoryMBean.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclItem.java.i
+data/test/java/dyn/InvokeGenericTest.java.i
data/src/share/classes/com/sun/jdi/MonitorInfo.java.i
data/test/java/io/Serializable/misplacedArrayClassDesc/MisplacedArrayClassDesc.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java.i
@@ -4210,23 +4165,25 @@ data/make/tools/swing-beans/beaninfo/images/JButtonColor32.gif.i
data/src/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java.i
data/test/java/rmi/activation/Activatable/nestedActivate/group.security.policy.i
data/src/share/classes/sun/net/www/http/HttpCaptureInputStream.java.i
-data/src/share/classes/com/sun/script/util/BindingsImpl.java.i
+data/test/sun/security/util/Debug/MultiOptions.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressConstants.java.i
+data/test/java/lang/management/MemoryMXBean/LowMemoryTestSerialGC.sh.i
data/src/share/classes/java/lang/InternalError.java.i
data/src/share/classes/org/openjdk/jigsaw/ContextSet.java.i
data/src/share/classes/com/sun/jmx/namespace/DomainInterceptor.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties.i
data/test/sun/net/www/protocol/mailto/HandlerParse.java.i
data/make/tools/swing-beans/beaninfo/images/JViewportMono32.gif.i
data/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
-data/test/java/lang/annotation/Missing/Missing.java.i
-data/test/java/nio/channels/Channels/ShortWrite.java.i
-data/src/share/classes/sun/security/provider/certpath/AdjacencyList.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/p11-solaris.txt.i
+data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java.i
+data/make/tools/src/build/tools/jdwpgen/ErrorSetNode.java.i
data/src/share/classes/com/sun/jdi/request/MethodExitRequest.java.i
data/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java.i
data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldMono32.gif.i
data/src/share/classes/java/awt/geom/Line2D.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsTableMetaImpl.java.i
-data/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethodDescriptor.java.i
+data/src/share/classes/java/awt/peer/TextAreaPeer.java.i
data/src/share/classes/javax/swing/event/MenuDragMouseEvent.java.i
data/src/share/classes/com/sun/java/util/jar/pack/Coding.java.i
data/src/share/classes/javax/imageio/spi/ServiceRegistry.java.i
@@ -4237,19 +4194,18 @@ data/test/java/util/Hashtable/SelfRef.java.i
data/test/java/util/regex/BMPTestCases.txt.i
data/test/com/sun/servicetag/newer-registry-version.xml.i
data/src/share/classes/java/beans/VetoableChangeListener.java.i
-data/src/share/classes/java/util/concurrent/locks/ReadWriteLock.java.i
-data/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java.i
-data/src/share/classes/sun/io/CharToByteCp870.java.i
+data/make/mkdemo/applets/GraphicsTest/Makefile.i
+data/src/share/native/sun/security/ec/ec.h.i
data/src/share/classes/sun/io/ByteToCharMS874.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java.i
data/src/share/classes/javax/print/attribute/standard/PrintQuality.java.i
-data/src/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java.i
+data/src/share/classes/java/sql/SQLTransactionRollbackException.java.i
data/src/share/native/sun/misc/MessageUtils.c.i
+data/src/share/classes/javax/swing/text/TabableView.java.i
data/src/solaris/native/sun/awt/awt_wm.c.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/DoubleBean.java.i
data/src/share/classes/com/sun/beans/decoder/DocumentHandler.java.i
data/src/share/classes/sun/nio/ch/MembershipKeyImpl.java.i
-data/make/mkdemo/applets/NervousText/Makefile.i
+data/src/share/classes/com/sun/media/sound/RIFFReader.java.i
data/test/javax/management/openmbean/BadConstraintTest.java.i
data/test/javax/management/mxbean/ExceptionDiagnosisTest.java.i
data/test/java/net/SocketPermission/B4414825.java.i
@@ -4257,58 +4213,61 @@ data/src/share/demo/management/index.html.i
data/src/share/classes/sun/util/locale/InternalLocaleBuilder.java.i
data/src/share/classes/sun/util/resources/LocaleNames_es.properties.i
data/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Skel.java.i
-data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg.i
-data/src/share/classes/java/awt/MenuBar.java.i
-data/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java.i
+data/make/java/nio/mxbean/Makefile.i
+data/test/sun/security/provider/PolicyFile/SelfWildcard.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ko.properties.i
data/src/share/demo/jvmti/hprof/hprof_md.h.i
-data/src/share/classes/sun/awt/image/ShortInterleavedRaster.java.i
+data/src/share/classes/sun/text/resources/CollationData_sk.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ru_RU.properties.i
data/src/share/classes/java/awt/Robot.java.i
+data/src/solaris/native/java/io/canonicalize_md.c.i
+data/src/share/classes/sun/management/resources/agent_es.properties.i
data/test/java/beans/Introspector/Test5063390.java.i
-data/src/share/classes/java/lang/ClassLoader.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties.i
data/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext_Stub.java.i
data/src/share/classes/sun/tools/java/BinaryCode.java.i
data/test/java/util/PluggableLocale/CollatorProviderTest.java.i
-data/src/share/classes/javax/accessibility/AccessibleContext.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java.i
+data/test/java/util/PluggableLocale/ClasspathTest.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XObject.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/util/KeyValuePair.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java.i
data/test/javax/management/modelmbean/DescriptorSupportSerialTest.java.i
data/test/javax/swing/JFileChooser/7036025/bug7036025.java.i
data/src/share/native/sun/awt/libpng/pngset.c.i
+data/src/share/classes/sun/swing/text/TextComponentPrintable.java.i
data/src/share/classes/sun/text/normalizer/ICUData.java.i
data/src/share/classes/javax/swing/text/html/parser/TagElement.java.i
-data/src/share/classes/java/awt/image/BufferedImageOp.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XTextField.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1098.java.i
-data/make/java/zip/mapfile-vers.i
-data/src/share/classes/sun/nio/cs/SingleByteEncoder.java.i
+data/make/tools/CharsetMapping/GBK.map.i
+data/test/java/util/Random/NextIntPowerOfTwoMod.java.i
+data/src/windows/classes/com/sun/security/auth/module/README.i
data/src/share/classes/javax/sound/sampled/AudioFormat.java.i
-data/test/java/net/URLConnection/DisconnectAfterEOF.java.i
data/make/jpda/transport/Makefile.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_ES.properties.i
data/test/com/sun/security/auth/login/ConfigFile/Override.good.config.i
-data/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java.i
data/src/share/demo/nbproject/management/FullThreadDump/nbproject/jdk.xml.i
data/make/tools/swing-beans/beaninfo/images/JSeparatorColor32.gif.i
data/src/share/demo/jvmti/hprof/hprof_util.h.i
+data/src/windows/native/sun/jkernel/DownloadDialog.h.i
data/src/share/classes/javax/smartcardio/CardNotPresentException.java.i
data/test/java/util/jar/JarFile/Signed.jar.i
data/src/share/classes/java/lang/ref/PhantomReference.java.i
data/src/solaris/hpi/include/hpi_init.h.i
+data/src/share/classes/java/sql/package.html.i
data/src/share/classes/sun/rmi/log/LogInputStream.java.i
data/test/javax/swing/JFileChooser/6798062/bug6798062.html.i
data/src/share/classes/sun/util/resources/CurrencyNames_sr_BA.properties.i
data/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java.i
-data/src/windows/back/exec_md.c.i
+data/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java.i
+data/src/share/classes/sun/io/CharToByteEUC_JP_LINUX.java.i
+data/test/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java.i
data/test/javax/swing/JTable/6768387/bug6768387.java.i
-data/make/tools/CharsetMapping/ISO_8859_15.map.i
+data/test/java/util/EnumSet/RetainAll.java.i
data/test/java/lang/ClassLoader/getdotresource.sh.i
-data/make/common/Defs-modules.gmk.i
data/test/sun/util/logging/SourceClassName.java.i
data/src/share/classes/javax/print/event/PrintJobAdapter.java.i
data/src/share/classes/sun/tools/javac/resources/javac_ja.properties.i
-data/src/share/classes/java/awt/dnd/DragSourceAdapter.java.i
data/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java.i
data/src/share/classes/java/lang/System.java.i
data/test/java/rmi/transport/checkFQDN/CheckFQDNClient.java.i
@@ -4317,21 +4276,23 @@ data/test/java/net/PlainSocketImpl/SetOption.java.i
data/src/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java.i
data/src/share/classes/sun/tools/java/RuntimeConstants.java.i
data/src/share/classes/sun/util/resources/LocaleNames_en_MT.properties.i
+data/src/share/classes/sun/io/ByteToCharCp1098.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java.i
+data/src/share/classes/sun/reflect/UTF8.java.i
data/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java.i
data/make/netbeans/common/architectures/arch-x86.properties.i
-data/src/share/classes/java/io/package.html.i
data/src/share/classes/java/util/logging/LoggingPermission.java.i
data/src/share/classes/sun/tools/jconsole/VMPanel.java.i
data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManager.java.i
data/test/java/awt/print/PrinterJob/PageFormatChange.java.i
data/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.policy.i
-data/src/share/classes/sun/rmi/server/ActivationGroupInit.java.i
data/make/tools/CharsetMapping/IBM937.nr.i
data/test/java/awt/print/Dialog/DialogOrient.java.i
data/test/sun/tools/jrunscript/repl.out.i
+data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java.i
data/src/share/classes/java/io/Closeable.java.i
+data/test/javax/swing/RepaintManager/7013453/bug7013453.java.i
data/test/java/security/AccessController/PreserveCombiner.java.i
data/src/share/classes/sun/io/ByteToCharCp1257.java.i
data/src/share/classes/sun/reflect/MagicAccessorImpl.java.i
@@ -4340,19 +4301,17 @@ data/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java.i
data/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html.i
data/src/share/classes/javax/sql/rowset/serial/SerialBlob.java.i
data/test/java/security/cert/CertPathBuilder/provider.policy.i
-data/src/share/classes/java/security/AllPermission.java.i
+data/src/share/classes/javax/naming/ldap/Rdn.java.i
+data/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapCommunity.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java.i
-data/test/java/io/StreamTokenizer/ReadAhead.java.i
data/test/java/util/zip/ReadLoc.java.i
data/test/javax/management/remote/mandatory/util/MapNullValuesTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sv.properties.i
data/src/share/classes/sun/text/resources/FormatData_zh_TW.java.i
-data/test/tools/pack200/Utils.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java.i
data/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif.i
+data/src/share/demo/jvmti/heapViewer/README.txt.i
data/test/java/beans/PropertyEditor/TestStringClassValue.java.i
data/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java.i
data/src/share/classes/javax/management/InQueryExp.java.i
@@ -4364,76 +4323,77 @@ data/src/share/back/standardHandlers.c.i
data/src/share/classes/java/math/RoundingMode.java.i
data/src/share/classes/sun/beans/editors/NumberEditor.java.i
data/src/solaris/native/sun/nio/ch/IOUtil.c.i
-data/src/solaris/native/sun/awt/awt_Scrollbar.c.i
+data/src/share/classes/sun/security/krb5/internal/KrbApErrException.java.i
+data/test/javax/management/remote/mandatory/version/ImplVersionTest.java.i
data/test/java/rmi/reliability/juicer/AppleUserImpl.java.i
data/src/share/classes/java/net/CacheRequest.java.i
data/src/share/classes/javax/imageio/spi/DigraphNode.java.i
-data/src/share/native/java/net/net_util.c.i
+data/src/solaris/native/sun/awt/swing_GTKEngine.c.i
data/src/share/native/sun/awt/debug/debug_util.h.i
-data/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java.i
-data/src/linux/doc/man/ja/jrunscript.1.i
+data/src/share/classes/java/io/FilterInputStream.java.i
+data/test/com/sun/tools/attach/badagent.mf.i
data/src/share/classes/java/io/ObjectStreamField.java.i
data/src/share/classes/sun/net/httpserver/SelectorCache.java.i
-data/src/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java.i
data/test/java/util/PluggableLocale/providersrc/FooDateFormat.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java.i
+data/src/share/classes/sun/awt/image/FileImageSource.java.i
data/make/java/zip/reorder-sparcv9.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties.i
data/src/share/classes/javax/management/namespace/JMXNamespaces.java.i
data/src/share/classes/com/sun/servicetag/resources/product_registration.xsd.i
data/test/java/math/BigDecimal/ScaleByPowerOfTenTests.java.i
-data/test/com/sun/awt/Translucency/TranslucentJAppletTest/TranslucentJAppletTest.java.i
+data/src/share/native/sun/font/layout/OpenTypeUtilities.cpp.i
data/src/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java.i
data/src/share/classes/java/beans/PropertyEditor.java.i
+data/test/java/lang/invoke/InvokeDynamicPrintArgs.java.i
data/src/windows/native/sun/java2d/windows/Win32OffScreenSurfaceData.cpp.i
data/test/sun/tools/jrunscript/jrunscript-cpTest.sh.i
data/src/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIcon.java.i
data/src/linux/doc/man/ja/jsadebugd.1.i
-data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav.i
data/test/java/beans/XMLEncoder/Test4880633.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM285.java.i
data/src/share/classes/java/awt/LayoutManager.java.i
data/test/java/io/Serializable/InvalidClassException/noargctor/Test.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/SessionListener.java.i
data/src/share/classes/java/lang/invoke/InvokeDynamic.java.i
-data/src/share/classes/java/util/IllegalFormatPrecisionException.java.i
-data/src/share/native/sun/awt/image/cvutils/img_ordclruns.h.i
+data/test/sun/security/provider/PolicyParser/ExtDirs.policy.i
data/src/share/classes/sun/tools/java/Parser.java.i
data/test/javax/xml/crypto/dsig/data/certs/ca.crt.i
data/src/share/classes/javax/swing/text/rtf/charsets/ansi.txt.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java.i
+data/src/share/classes/java/awt/Choice.java.i
data/test/java/util/Formatter/BasicByte.java.i
data/test/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java.i
data/src/share/demo/applets/CardTest/example1.html.i
+data/make/tools/CharsetMapping/MS932.map.i
data/test/java/util/zip/StoredCRC.java.i
+data/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIInsets.java.i
-data/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup_Stub.java.i
+data/src/share/classes/java/util/concurrent/BlockingDeque.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java.i
+data/test/com/sun/crypto/provider/Mac/MacClone.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/PixelTests.java.i
+data/test/java/nio/channels/FileChannel/MapTest.java.i
data/src/solaris/hpi/native_threads/src/threads_md.c.i
data/src/windows/classes/sun/nio/ch/FileKey.java.i
data/src/solaris/native/sun/nio/ch/EPoll.c.i
data/src/share/classes/sun/management/ManagementFactoryHelper.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ipstore.i
data/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java.i
+data/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h.i
data/src/share/classes/sun/nio/ch/Reflect.java.i
data/src/share/classes/java/awt/image/ColorModel.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java.i
-data/src/share/classes/sun/security/x509/SerialNumber.java.i
+data/test/java/security/cert/CertificateFactory/ReturnStream.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/NoArgumentOptionSpec.java.i
+data/src/share/classes/java/security/spec/MGF1ParameterSpec.java.i
data/src/share/classes/com/sun/security/sasl/digest/FactoryImpl.java.i
data/src/share/classes/java/sql/SQLClientInfoException.java.i
data/test/java/util/ResourceBundle/Bug6572242.java.i
data/test/sun/security/provider/certpath/ReverseBuilder/mgrM2prjM.i
data/test/java/security/cert/X509Certificate/certextkeyusage.i
-data/src/share/classes/javax/swing/border/MatteBorder.java.i
-data/test/sun/security/pkcs11/Secmod/keystore.jks.i
data/make/java/java/FILES_c.gmk.i
data/src/share/classes/com/sun/net/httpserver/HttpServer.java.i
data/src/share/classes/sun/font/GlyphList.java.i
data/make/netbeans/jarzip/nbproject/project.xml.i
-data/src/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy.i
data/src/share/classes/sun/tools/asm/Label.java.i
data/src/share/classes/java/security/KeyFactory.java.i
@@ -4442,24 +4402,24 @@ data/test/sun/security/krb5/auto/LifeTimeInSeconds.java.i
data/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h.i
data/src/share/demo/jvmti/mtrace/Mtrace.java.i
data/src/share/demo/jvmti/hprof/manual.html.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties.i
data/test/java/net/NetworkInterface/IndexTest.java.i
data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java.i
data/test/jprt.config.i
-data/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh.i
-data/src/share/classes/javax/swing/JRadioButtonMenuItem.java.i
+data/src/share/classes/java/sql/Date.java.i
+data/src/share/native/common/check_format.c.i
data/src/share/classes/javax/crypto/NoSuchPaddingException.java.i
data/src/share/classes/sun/print/ProxyGraphics2D.java.i
data/test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameService.java.i
data/make/tools/CharsetMapping/MacCroatian.map.i
-data/src/share/native/sun/awt/giflib/dgif_lib.c.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java.i
-data/src/share/classes/sun/text/resources/FormatData_ca.java.i
+data/src/share/classes/java/security/cert/CertificateException.java.i
+data/src/share/native/sun/font/layout/ShapingTypeData.cpp.i
data/test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java.i
data/src/share/classes/sun/tools/tree/ShiftRightExpression.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathTableMeta.java.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModelLcd.java.i
+data/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java.i
data/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java.i
-data/test/java/beans/XMLEncoder/6777487/TestEnumMap.java.i
+data/src/share/classes/javax/crypto/ExemptionMechanismSpi.java.i
data/src/windows/native/sun/windows/awt_PrintDialog.h.i
data/src/share/classes/com/sun/security/jgss/InquireType.java.i
data/test/sun/rmi/rmic/minimizeWrapperInstances/P.java.i
@@ -4467,28 +4427,28 @@ data/src/share/classes/com/sun/tools/jdi/FieldImpl.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_fr_LU.properties.i
data/src/share/classes/javax/management/NotificationInfo.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/PaintModel.java.i
-data/test/java/net/InetAddress/HashSpread.java.i
-data/src/share/classes/java/lang/invoke/MutableCallSite.java.i
+data/src/share/classes/sun/awt/image/VolatileSurfaceManager.java.i
+data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer_Stub.java.i
+data/src/share/classes/sun/tools/tree/AssignDivideExpression.java.i
data/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh.i
data/src/share/classes/java/awt/doc-files/GridBagLayout-1.gif.i
data/src/share/classes/java/lang/management/MemoryNotificationInfo.java.i
data/test/com/sun/net/httpserver/bugs/B6361557.java.i
data/src/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java.i
data/src/solaris/native/sun/awt/utility/rect.h.i
-data/src/share/classes/com/sun/java/util/jar/pack/Code.java.i
data/src/share/classes/java/util/logging/Logger.java.i
data/test/javax/swing/JSlider/6848475/bug6848475.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java.i
data/src/solaris/doc/sun/man/man1/jhat.1.i
data/src/share/classes/java/awt/peer/FramePeer.java.i
-data/test/sun/security/smartcardio/Utils.java.i
data/test/java/rmi/server/RemoteObject/toStub/ToStub_Stub.java.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingResponse.java.i
data/src/share/classes/sun/reflect/FieldAccessor.java.i
+data/test/java/beans/XMLDecoder/spec/TestNull.java.i
data/src/share/classes/sun/java2d/SurfaceManagerFactory.java.i
data/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c.i
+data/src/solaris/native/sun/java2d/loops/vis_IntBgr.c.i
data/src/share/classes/sun/security/krb5/internal/crypto/NullEType.java.i
-data/src/share/classes/com/sun/rowset/WebRowSetImpl.java.i
data/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java.i
data/test/java/beans/XMLDecoder/Test6338070.java.i
data/test/javax/swing/JFileChooser/6524424/bug6524424.html.i
@@ -4507,16 +4467,15 @@ data/src/share/classes/javax/crypto/spec/DESedeKeySpec.java.i
data/src/share/classes/java/net/IDN.java.i
data/src/share/classes/sun/font/SunLayoutEngine.java.i
data/src/share/classes/sun/security/provider/certpath/BasicChecker.java.i
-data/src/share/classes/sun/awt/image/ImageWatched.java.i
data/make/sun/javazic/tzdata/factory.i
data/src/share/classes/java/security/DigestException.java.i
data/src/share/classes/java/awt/peer/TextFieldPeer.java.i
+data/src/solaris/native/sun/security/pkcs11/j2secmod_md.h.i
+data/src/share/classes/sun/tools/tree/LengthExpression.java.i
data/src/share/sample/scripting/scriptpad/src/resources/gui.js.i
data/src/share/classes/javax/management/NotificationListener.java.i
data/src/share/classes/sun/io/CharToByteMacDingbat.java.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c.i
data/test/java/lang/reflect/Proxy/Boxing.java.i
-data/src/linux/doc/man/servertool.1.i
data/test/sun/security/x509/AVA/EmailAddressEncoding.java.i
data/src/solaris/hpi/native_threads/include/mutex_md.h.i
data/make/tools/src/build/tools/generatecharacter/PropList.java.i
@@ -4524,20 +4483,21 @@ data/test/sun/tools/jrunscript/dash-e.out.i
data/src/solaris/classes/sun/awt/X11/XEmbedHelper.java.i
data/src/share/classes/sun/io/CharToByteBig5.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh.i
-data/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java.i
+data/src/share/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml.i
+data/src/solaris/native/sun/java2d/x11/X11SurfaceData.h.i
data/src/share/classes/java/util/concurrent/CyclicBarrier.java.i
data/src/share/classes/sun/security/krb5/internal/rcache/AuthTime.java.i
+data/src/share/classes/sun/rmi/server/Dispatcher.java.i
data/src/share/native/sun/security/ec/impl/mplogic.c.i
data/src/share/classes/sun/print/resources/tumble.png.i
data/src/share/classes/java/awt/Button.java.i
-data/src/share/classes/sun/management/GcInfoBuilder.java.i
data/src/solaris/classes/sun/java2d/xr/XRUtils.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java.i
-data/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Compress.java.i
+data/src/share/classes/sun/java2d/pisces/Dasher.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load4.java.i
data/test/javax/imageio/CachePremissionsTest/rw.policy.i
data/src/share/classes/sun/tools/java/ClassNotFound.java.i
-data/test/ProblemList.txt.i
+data/src/share/classes/sun/print/PSStreamPrintJob.java.i
data/src/share/classes/java/net/Inet6Address.java.i
data/src/share/classes/com/sun/pept/presentation/TargetFinder.java.i
data/src/solaris/classes/sun/awt/motif/MTextAreaPeer.java.i
@@ -4546,37 +4506,36 @@ data/src/share/classes/javax/swing/text/rtf/RTFEditorKit.java.i
data/src/share/classes/javax/naming/directory/AttributeModificationException.java.i
data/test/javax/xml/crypto/dsig/data/certs/balor.crt.i
data/test/javax/print/applet/applet1/Applet1PrintServiceLookup.java.i
+data/test/java/nio/channels/Selector/Wakeup.java.i
data/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.java.i
-data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html.i
+data/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c.i
-data/make/tools/classanalyzer/Makefile.i
data/make/java/management/Makefile.i
data/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java.i
-data/src/share/classes/com/sun/crypto/provider/DESCrypt.java.i
+data/src/share/native/sun/java2d/loops/FourByteAbgr.c.i
data/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java.i
data/src/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java.i
+data/src/share/classes/sun/security/pkcs10/PKCS10.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/Session.java.i
-data/test/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.java.i
data/src/share/native/sun/java2d/cmm/lcms/LCMS.c.i
+data/src/share/classes/com/sun/tools/example/debug/gui/ClassManager.java.i
data/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java.i
data/test/javax/management/monitor/CounterMonitorDeadlockTest.java.i
-data/make/docs/Makefile.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties.i
+data/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java.i
data/src/share/classes/javax/naming/CompositeName.java.i
data/test/java/io/File/isDirectory/Applet.java.i
-data/src/linux/doc/man/ja/serialver.1.i
-data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java.i
+data/src/share/classes/javax/swing/table/TableCellRenderer.java.i
data/test/java/beans/PropertyEditor/6380849/SecondBean.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java.i
data/test/java/lang/instrument/NullRedefineClassesTests.java.i
data/test/java/beans/Introspector/Test6422403.java.i
-data/test/sun/security/provider/PolicyParser/p002.policy.i
+data/src/share/classes/javax/swing/DefaultDesktopManager.java.i
data/test/java/util/AbstractMap/Equals.java.i
data/src/share/classes/com/sun/media/sound/SF2Modulator.java.i
data/make/tools/manifest.mf.i
data/test/sun/net/www/http/HttpClient/B6726695.java.i
-data/src/share/native/sun/java2d/opengl/OGLContext.c.i
data/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java.i
+data/test/java/dyn/indify/Indify.java.i
data/src/share/classes/javax/swing/JCheckBox.java.i
data/src/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMEnterprise.java.i
@@ -4585,48 +4544,47 @@ data/src/share/classes/com/sun/java/browser/dom/DOMUnsupportedException.java.i
data/src/share/classes/java/lang/management/PlatformLoggingMXBean.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_bg_BG.properties.i
+data/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy.i
data/src/share/classes/javax/swing/JDialog.java.i
data/src/share/classes/javax/swing/text/html/parser/AttributeList.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java.i
data/src/share/classes/javax/print/attribute/standard/JobImpressions.java.i
data/src/solaris/native/sun/awt/awt_Cursor.c.i
data/src/solaris/classes/sun/awt/X11/XMouseDragGestureRecognizer.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_AE.properties.i
-data/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java.i
+data/src/share/classes/com/sun/pept/ept/EPTFactory.java.i
data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/JarFileCompare.java.i
data/test/sun/security/krb5/TimeInCCache.java.i
data/src/share/back/FieldImpl.c.i
-data/test/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java.i
-data/test/java/net/Socks/SocksServer.java.i
data/src/share/classes/com/sun/pept/protocol/MessageDispatcher.java.i
data/src/share/classes/sun/security/util/AuthResources_it.java.i
data/test/javax/management/loading/LibraryLoader/UseNativeLib0.html.i
-data/src/share/classes/sun/io/CharToByteCp857.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties.i
-data/src/share/classes/sun/tools/tree/FinallyStatement.java.i
+data/src/share/classes/sun/text/resources/FormatData_bg_BG.java.i
data/src/linux/doc/man/ja/extcheck.1.i
data/src/share/classes/sun/net/ProgressMonitor.java.i
+data/test/java/util/ResourceBundle/Test4300693RB.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java.i
data/test/java/lang/reflect/Generics/TestBadSignatures.java.i
data/src/share/classes/sun/java2d/pipe/GlyphListPipe.java.i
data/src/share/classes/sun/util/resources/LocaleNames_vi.properties.i
-data/src/share/classes/java/io/StreamCorruptedException.java.i
-data/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h.i
+data/src/solaris/classes/sun/awt/UNIXToolkit.java.i
data/make/com/sun/nio/sctp/FILES_java.gmk.i
-data/src/share/classes/java/awt/doc-files/modal-example3.gif.i
+data/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c.i
data/src/share/classes/com/sun/beans/decoder/LongElementHandler.java.i
data/test/com/sun/net/httpserver/testkeys.i
data/make/java/rmi/Makefile.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java.i
+data/test/java/io/Serializable/enum/missingConstant/Read.java.i
data/test/java/nio/channels/Pipe/NonBlocking.java.i
data/src/share/classes/javax/sound/sampled/EnumControl.java.i
+data/src/share/classes/java/rmi/server/ObjID.java.i
data/test/java/util/Locale/bug6312358.java.i
data/test/java/nio/channels/SocketChannel/Basic.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java.i
data/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java.i
data/test/java/util/PluggableLocale/fooprovider.jar.i
data/src/share/classes/sun/text/normalizer/RuleCharacterIterator.java.i
-data/src/share/classes/sun/text/resources/CollationData_ko.java.i
+data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Encoder.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties.i
data/src/share/native/sun/java2d/opengl/OGLTextRenderer.c.i
data/test/org/openjdk/jigsaw/cli/ModuleFormatHeaderHashTest.java.i
@@ -4639,6 +4597,7 @@ data/src/share/classes/java/awt/doc-files/LinearGradientPaint.png.i
data/src/share/classes/java/awt/FontFormatException.java.i
data/src/share/classes/javax/imageio/ImageTypeSpecifier.java.i
data/test/java/net/URLClassLoader/closetest/test2/com/foo/Resource2.i
+data/test/java/lang/Float/BitwiseConversion.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U16Func.c.i
data/src/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java.i
data/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java.i
@@ -4646,10 +4605,11 @@ data/test/java/io/File/CompareTo.java.i
data/src/share/classes/sun/security/x509/NetscapeCertTypeExtension.java.i
data/src/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java.i
data/src/share/classes/sun/security/jgss/GSSToken.java.i
-data/src/share/classes/com/sun/script/util/BindingsBase.java.i
+data/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java.i
data/test/javax/swing/plaf/nimbus/Test6741426.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/AclEntryImpl.java.i
-data/src/share/back/ClassObjectReferenceImpl.h.i
+data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipCoder.java.i
+data/src/linux/doc/man/ja/rmic.1.i
data/make/tools/winver/src/StdAfx.cpp.i
data/test/javax/swing/text/WrappedPlainView/6857057/StubLeafElement.java.i
data/test/java/awt/font/LineBreakMeasurer/FRCTest.java.i
@@ -4657,58 +4617,64 @@ data/test/java/rmi/activation/checkusage/CheckUsage.java.i
data/make/javax/sound/jsoundalsa/mapfile-vers.i
data/src/share/classes/org/relaxng/datatype/DatatypeBuilder.java.i
data/src/linux/doc/man/rmid.1.i
-data/src/share/classes/com/sun/jndi/ldap/SimpleClientId.java.i
data/src/share/classes/javax/sql/RowSetWriter.java.i
-data/test/java/awt/im/4959409/bug4959409.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java.i
data/test/java/nio/file/Files/PrintFileTree.java.i
+data/test/sun/security/krb5/auto/NoInitNoKeytab.java.i
data/src/share/classes/javax/swing/text/DefaultEditorKit.java.i
data/test/sun/security/tools/keytool/AltProviderPath.sh.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java.i
data/src/share/classes/sun/net/www/MessageHeader.java.i
-data/src/share/demo/nbproject/jfc/TransparentRuler/build.xml.i
+data/src/solaris/native/sun/security/smartcardio/MUSCLE/COPYING.i
data/test/com/sun/jdi/Exit0.java.i
data/test/java/nio/charset/coders/Surrogates.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java.i
data/src/share/classes/sun/util/resources/LocaleNames_ar.properties.i
-data/src/solaris/native/sun/awt/medialib/vis_32.il.i
-data/src/share/classes/sun/rmi/transport/Endpoint.java.i
+data/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java.i
+data/test/java/io/Writer/Append.java.i
data/test/sun/misc/URLClassPath/testclasses.jar.i
data/src/share/bin/splashscreen.h.i
data/src/windows/native/sun/java2d/windows/ddrawUtils.cpp.i
data/test/javax/swing/JTable/6937798/bug6937798.java.i
data/src/share/classes/sun/security/util/Debug.java.i
-data/src/share/demo/nbproject/scripting/jconsole-plugin/build.xml.i
+data/test/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.java.i
data/src/share/classes/sun/reflect/generics/tree/LongSignature.java.i
data/test/javax/security/auth/login/LoginContext/ModuleSubject.config.i
data/src/share/classes/sun/jvmstat/monitor/MonitoredVm.java.i
data/test/java/beans/Statement/Test4653179.java.i
+data/test/javax/script/Test7.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapClientFactory.java.i
data/test/java/io/OutputStreamWriter/WriteAfterClose.java.i
-data/test/javax/print/attribute/SupportedPrintableAreas.java.i
data/src/windows/native/sun/windows/Hashtable.cpp.i
data/src/share/classes/sun/io/ByteToCharCp1256.java.i
data/src/share/classes/java/security/cert/CRLReason.java.i
-data/make/common/Mapfile-vers.gmk.i
+data/test/sun/security/pkcs11/Secmod/TrustAnchors.java.i
+data/make/org/Makefile.i
data/src/share/classes/sun/security/acl/GroupImpl.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java.i
data/src/share/native/sun/font/layout/ScriptAndLanguage.h.i
-data/src/share/classes/sun/util/resources/CalendarData_in_ID.properties.i
+data/src/share/native/sun/awt/image/cvutils/img_input8.h.i
+data/src/share/classes/java/security/PublicKey.java.i
data/make/tools/CharsetMapping/MS932.c2b.i
data/src/solaris/bin/sparc/jvm.cfg.i
data/src/share/classes/sun/text/resources/FormatData.java.i
+data/test/javax/security/auth/PrivateCredentialPermission/Subset.policy.i
data/src/share/classes/sun/misc/JavaSecurityAccess.java.i
+data/src/share/classes/sun/text/CollatorUtilities.java.i
+data/src/share/modules/jdk.swing/module-info.java.i
+data/src/share/native/sun/security/ec/impl/mpprime.h.i
data/src/windows/native/sun/nio/ch/IOUtil.c.i
-data/src/share/native/sun/java2d/loops/ImageData.h.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/generate.sh.i
data/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java.i
data/src/share/classes/javax/swing/text/html/FormSubmitEvent.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java.i
data/src/share/demo/jfc/Font2DTest/resources/TextResources.properties.i
-data/src/share/classes/sun/misc/RegexpTarget.java.i
data/test/com/sun/jdi/AcceptTimeout.java.i
data/src/share/classes/javax/swing/text/View.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpPduFactoryBER.java.i
+data/src/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java.i
data/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java.i
data/src/share/native/sun/security/ec/impl/ecl_gf.c.i
-data/src/share/classes/com/sun/tools/hat/internal/model/StackTrace.java.i
-data/src/solaris/classes/sun/awt/X11/XScrollPanePeer.java.i
+data/src/share/classes/javax/swing/text/ZoneView.java.i
+data/test/java/rmi/activation/Activatable/nestedActivate/rmid.security.policy.i
data/src/share/classes/java/lang/management/MemoryMXBean.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java.i
data/src/share/classes/sun/nio/cs/ext/IBM933.java.i
@@ -4716,6 +4682,7 @@ data/src/share/classes/sun/awt/image/IntegerInterleavedRaster.java.i
data/src/share/classes/sun/launcher/resources/launcher_de.properties.i
data/test/demo/jvmti/minst/MinstTest.java.i
data/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java.i
+data/src/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java.i
data/make/javax/sound/jsoundhs/mapfile-vers.i
data/src/share/classes/java/util/PropertyPermission.java.i
data/src/windows/classes/sun/awt/windows/WFramePeer.java.i
@@ -4725,7 +4692,7 @@ data/make/tools/CharsetMapping/IBM922.map.i
data/src/share/classes/sun/text/resources/FormatData_tr.java.i
data/test/java/io/LineNumberInputStream/SkipEOL.java.i
data/src/share/classes/sun/nio/cs/ext/MacTurkish.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h.i
data/src/share/classes/sun/text/resources/FormatData_nl_NL.java.i
data/src/share/classes/sun/dyn/WrapperInstance.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/NotifySupport.java.i
@@ -4736,10 +4703,9 @@ data/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstLogic.h.i
data/src/share/classes/sun/text/resources/FormatData_sr_Latn_ME.java.i
data/test/java/io/Serializable/maskSyntheticModifier/run.sh.i
data/src/share/classes/sun/io/CharToByteEUC_JP_Solaris.java.i
-data/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java.i
data/src/share/classes/javax/management/MBean.java.i
data/src/share/classes/sun/print/PSStreamPrinterFactory.java.i
-data/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy.i
+data/test/java/util/Collections/EmptyIterator.java.i
data/src/share/classes/java/sql/SQLTransientConnectionException.java.i
data/test/com/sun/nio/sctp/SctpMultiChannel/Util.java.i
data/src/solaris/classes/sun/font/NativeStrike.java.i
@@ -4753,12 +4719,11 @@ data/test/tools/launcher/UnicodeTest.java.i
data/src/share/classes/sun/io/ByteToCharCp1047.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java.i
data/src/share/classes/java/awt/TextArea.java.i
-data/src/share/native/common/jni_util.h.i
data/test/java/lang/instrument/RetransformApp.java.i
data/src/share/back/StringReferenceImpl.h.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties.i
data/test/java/awt/dnd/ImageDecoratedDnDNegative/MyCursor.java.i
-data/test/java/net/URLClassLoader/B5077773.sh.i
+data/make/tools/reorder/tests/Null.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html.i
data/src/share/classes/sun/nio/cs/IBM866.java.i
data/test/java/net/Authenticator/BasicTest.java.i
@@ -4771,87 +4736,81 @@ data/src/share/classes/sun/security/krb5/internal/APRep.java.i
data/src/share/classes/sun/security/acl/PermissionImpl.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownAccContrModelException.java.i
data/test/java/util/Collections/BinarySearchNullComparator.java.i
-data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java.i
-data/src/share/classes/javax/security/auth/login/CredentialNotFoundException.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java.i
-data/src/share/classes/java/awt/im/spi/InputMethod.java.i
data/test/sun/security/pkcs11/sslecc/JSSEClient.java.i
data/src/share/classes/javax/swing/JSpinner.java.i
data/src/solaris/native/sun/awt/awt_MToolkit.c.i
data/src/share/classes/sun/management/counter/Units.java.i
data/src/share/classes/java/net/Proxy.java.i
data/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html.i
-data/src/share/classes/javax/swing/plaf/nimbus/package.html.i
+data/test/sun/security/pkcs11/KeyStore/loader.jar.i
data/src/share/classes/sun/tools/tree/EqualExpression.java.i
-data/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java.i
+data/src/share/native/sun/font/layout/MirroredCharData.cpp.i
data/src/share/back/VirtualMachineImpl.c.i
data/src/share/classes/sun/font/CompositeGlyphMapper.java.i
-data/make/com/sun/java/browser/net/Makefile.i
data/test/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java.i
data/src/share/classes/org/openjdk/jigsaw/ConfigurationException.java.i
data/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls_Stub.java.i
-data/src/share/classes/javax/sound/midi/spi/MidiFileReader.java.i
-data/make/tools/swing-beans/beaninfo/images/JRootPaneColor16.gif.i
+data/src/share/classes/sun/security/x509/RFC822Name.java.i
data/test/java/beans/PropertyEditor/TestDoubleTypeValue.java.i
data/src/share/classes/java/sql/SQLDataException.java.i
data/test/javax/management/namespace/JMXNamespaceSecurityTest.java.i
data/src/share/classes/javax/naming/ldap/PagedResultsControl.java.i
+data/src/share/classes/sun/nio/cs/ext/MacHebrew.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.chk.i
+data/src/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java.i
data/src/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java.i
-data/test/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java.i
-data/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java.i
-data/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest11_ok.ssl.in.i
+data/src/windows/native/sun/jkernel/resource.h.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadHandshake.java.i
data/test/sun/tools/jps/jps-V_2.sh.i
data/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java.i
-data/src/share/classes/javax/sound/sampled/Clip.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java.i
data/src/share/classes/java/io/PipedInputStream.java.i
data/src/share/classes/sun/nio/cs/ext/MS950.java.i
data/make/modules/tools/src/com/sun/classanalyzer/CodeAttributeParser.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_PH.properties.i
data/test/java/lang/annotation/Missing/C.java.i
-data/src/share/classes/sun/tools/javac/resources/javac_zh_CN.properties.i
+data/src/share/classes/java/sql/Savepoint.java.i
data/src/share/classes/sun/tools/java/MethodSet.java.i
data/src/share/classes/javax/print/ServiceUIFactory.java.i
data/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java.i
data/src/windows/native/sun/jkernel/kernel_zh_TW.rc.i
-data/test/java/util/ResourceBundle/Control/ExpirationTest.java.i
-data/src/linux/doc/man/ja/jps.1.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/Test.java.i
+data/test/sun/rmi/rmic/defaultStubVersion/run.sh.i
data/src/share/classes/javax/security/auth/login/AccountExpiredException.java.i
-data/test/java/lang/Double/ParseHexFloatingPoint.java.i
+data/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java.i
data/src/solaris/native/sun/nio/ch/SolarisEventPort.c.i
data/test/java/lang/Class/getDeclaredMethod/Exceptions.java.i
data/src/share/classes/java/lang/reflect/GenericArrayType.java.i
-data/src/share/classes/sun/java2d/loops/DrawGlyphList.java.i
-data/src/share/classes/sun/security/ssl/DHClientKeyExchange.java.i
+data/make/sun/javazic/javatz/java_us_ids.txt.i
+data/test/sun/net/www/ParseUtil_6274990.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c.i
data/src/share/classes/sun/management/ThreadInfoCompositeData.java.i
data/src/windows/classes/sun/nio/ch/WindowsSelectorProvider.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java.i
+data/src/share/classes/sun/nio/cs/ext/GB18030.java.i
data/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipUtils.java.i
data/src/share/classes/sun/management/HotSpotDiagnostic.java.i
-data/src/share/classes/com/sun/net/ssl/SSLPermission.java.i
data/make/tools/swing-beans/beaninfo/images/JOptionPaneColor16.gif.i
data/src/share/demo/jvmti/mtrace/mtrace.c.i
data/src/share/classes/sun/tools/tree/OrExpression.java.i
-data/src/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java.i
data/src/share/demo/nbproject/management/FullThreadDump/build.properties.i
data/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java.i
data/src/share/classes/java/awt/im/InputContext.java.i
data/src/share/classes/java/text/package.html.i
data/src/solaris/native/java/util/FileSystemPreferences.c.i
data/src/share/classes/sun/net/www/MimeEntry.java.i
-data/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java.i
-data/src/share/classes/sun/nio/cs/US_ASCII.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/Functions.java.i
data/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/ReplaceTrees.java.i
-data/test/java/beans/PropertyChangeSupport/TestMethods.java.i
+data/test/java/io/Serializable/backRefCNFException/Write.java.i
data/src/share/classes/sun/java2d/pipe/BufferedContext.java.i
data/src/share/classes/javax/swing/SwingHeavyWeight.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java.i
-data/src/share/classes/javax/crypto/spec/package.html.i
-data/test/javax/swing/text/html/TableView/7030332/sample4.png.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java.i
data/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java.i
data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/infblock.h.i
@@ -4860,18 +4819,21 @@ data/src/share/sample/nio/server/Acceptor.java.i
data/src/share/classes/sun/nio/cs/ext/Big5.java.i
data/src/share/classes/java/util/concurrent/RejectedExecutionException.java.i
data/src/share/classes/javax/naming/NoInitialContextException.java.i
+data/test/javax/swing/JComponent/6989617/bug6989617.java.i
data/src/share/classes/com/sun/jdi/DoubleType.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java.i
-data/src/share/classes/sun/security/x509/X509Key.java.i
data/src/share/classes/javax/swing/ButtonGroup.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_EmptySet.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties.i
data/src/windows/classes/sun/awt/windows/WComponentPeer.java.i
-data/src/share/classes/sun/management/CompilerThreadStat.java.i
+data/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java.i
data/make/tools/swing-beans/beaninfo/images/JComboBoxColor16.gif.i
data/src/share/classes/javax/swing/text/html/parser/ResourceLoader.java.i
data/src/share/classes/javax/swing/plaf/TableHeaderUI.java.i
+data/src/windows/classes/sun/awt/windows/ThemeReader.java.i
data/src/windows/classes/sun/awt/windows/WFileDialogPeer.java.i
data/README.i
+data/src/windows/classes/sun/awt/windows/fontconfig.98.properties.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java.i
data/src/share/classes/com/sun/management/mgmt-overview.html.i
data/src/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java.i
@@ -4883,17 +4845,14 @@ data/src/windows/classes/sun/nio/fs/WindowsFileCopy.java.i
data/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java.i
data/src/share/classes/com/sun/jdi/InternalException.java.i
data/src/share/classes/sun/text/normalizer/TrieIterator.java.i
-data/src/share/classes/com/sun/jdi/connect/spi/package.html.i
data/src/share/classes/org/openjdk/jigsaw/RemoteRepositoryList.java.i
data/src/share/classes/javax/management/MBeanException.java.i
-data/test/java/beans/PropertyEditor/TestFloatClassValue.java.i
data/test/sun/tools/jhat/minimal.bin.i
data/src/share/classes/java/awt/doc-files/BorderLayout-1.gif.i
data/src/share/classes/java/io/SequenceInputStream.java.i
data/src/share/demo/jvmti/gctest/gctest.c.i
data/test/java/lang/Class/getModifiers/StripACC_SUPER.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/GetName.java.i
-data/src/windows/npt/utf_md.h.i
data/test/java/net/URL/B4148751.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java.i
data/src/share/native/sun/management/management.h.i
@@ -4902,15 +4861,15 @@ data/src/share/classes/sun/security/util/Resources_de.java.i
data/make/tools/CharsetMapping/MacHebrew.map.i
data/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S32Func.c.i
+data/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java.i
+data/src/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java.i
data/make/tools/UnicodeData/UnicodeData.txt.i
-data/src/share/classes/sun/util/resources/CurrencyNames_nl_BE.properties.i
data/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java.i
data/make/tools/UnicodeData/UnicodeData.txt.d
data/src/share/classes/java/util/concurrent/ConcurrentHashMap.java.i
data/src/share/classes/java/sql/SQLData.java.i
data/src/share/classes/sun/security/provider/ByteArrayAccess.java.i
data/test/java/lang/instrument/BootClassPath/DummyMain.java.i
-data/test/javax/management/namespace/namespace.policy.i
data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono16.gif.i
data/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java.i
data/src/share/classes/sun/nio/cs/IBM855.java.i
@@ -4927,22 +4886,24 @@ data/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java.i
data/src/share/classes/com/sun/jndi/ldap/Obj.java.i
data/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java.i
data/src/share/native/sun/awt/image/cvutils/img_dcm.h.i
-data/src/share/demo/nbproject/jfc/Metalworks/build.properties.i
+data/test/java/net/URLConnection/GetLastModified.java.i
data/test/java/nio/file/Files/probeContentType/ForceLoad.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif.i
data/src/share/classes/sun/tools/java/ClassFile.java.i
-data/src/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java.i
+data/src/share/classes/javax/swing/colorchooser/SlidingSpinner.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java.i
data/src/share/classes/javax/swing/doc-files/groupLayout.3.gif.i
data/src/share/demo/jvmti/waiters/Monitor.hpp.i
data/src/share/native/sun/awt/image/awt_parseImage.c.i
data/src/share/classes/javax/xml/crypto/dsig/TransformException.java.i
+data/make/com/sun/servicetag/Makefile.i
data/test/java/net/URLClassLoader/sealing/checksealed.sh.i
data/src/share/classes/javax/management/monitor/CounterMonitor.java.i
data/test/javax/management/context/localizable/MBeanDescriptions_fr.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif.i
+data/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java.i
data/make/netbeans/jmx/nbproject/project.xml.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java.i
+data/src/share/classes/sun/reflect/misc/MethodUtil.java.i
data/src/share/native/sun/font/layout/HangulLayoutEngine.cpp.i
data/src/linux/doc/man/rmiregistry.1.i
data/test/com/sun/jdi/MethodEntryExitEvents.java.i
@@ -4954,26 +4915,25 @@ data/src/share/classes/sun/io/ByteToCharMacSymbol.java.i
data/src/solaris/doc/sun/man/man1/wsimport.1.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java.i
data/src/windows/classes/sun/java2d/d3d/D3DBufImgOps.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java.i
data/test/com/sun/jdi/redefineMethod/RedefineSetUp.sh.i
data/src/share/classes/sun/tools/tree/ThrowStatement.java.i
+data/src/share/classes/javax/net/ssl/SSLException.java.i
data/src/share/classes/java/util/Date.java.i
-data/src/share/classes/sun/text/resources/CollationData_lv.java.i
+data/src/share/classes/com/sun/script/util/BindingsImpl.java.i
data/make/com/sun/org/apache/Makefile.i
+data/test/java/net/Socket/RST.java.i
data/src/linux/doc/man/jstack.1.i
-data/test/java/lang/ProcessBuilder/FeelingLucky.java.i
data/src/share/back/EventRequestImpl.c.i
data/src/share/classes/com/sun/tools/jdi/ShortValueImpl.java.i
data/test/sun/management/windows/revokeall.exe.i
data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java.i
data/src/share/classes/javax/management/RuntimeMBeanException.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java.i
+data/test/com/sun/jdi/connect/spi/GeneratedConnectors.java.i
data/src/share/classes/java/net/StandardProtocolFamily.java.i
data/src/share/classes/java/io/WriteAbortedException.java.i
data/src/share/native/sun/java2d/loops/UshortIndexed.c.i
-data/make/tools/CharsetMapping/IBM943.map.i
data/src/share/classes/java/io/ObjectInputStream.java.i
-data/src/share/classes/sun/text/resources/FormatData_ar_BH.java.i
data/test/java/net/Inet6Address/B6206527.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionalArgumentOptionSpec.java.i
data/src/share/classes/javax/crypto/CipherSpi.java.i
@@ -4983,23 +4943,21 @@ data/test/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java.i
data/make/sun/jkernel/Makefile.i
data/src/share/classes/java/util/zip/Deflater.java.i
data/src/share/classes/sun/io/ByteToCharCp950.java.i
-data/src/share/classes/javax/swing/InputMap.java.i
-data/src/share/classes/com/sun/jndi/dns/DnsClient.java.i
-data/src/share/classes/sun/net/dns/ResolverConfiguration.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariInputMethodDescriptor.java.i
+data/src/share/classes/sun/jvmstat/monitor/VmIdentifier.java.i
+data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_2.java.i
+data/test/java/util/ResourceBundle/Test4318520RB_en.properties.i
data/make/tools/swing-beans/beaninfo/images/JPasswordFieldColor32.gif.i
data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubRequestHandler.java.i
-data/src/share/classes/java/nio/channels/MembershipKey.java.i
data/make/mksample/webservices/Makefile.i
data/src/share/classes/sun/dyn/util/BytecodeSignature.java.i
data/src/windows/native/sun/java2d/opengl/WGLSurfaceData.h.i
data/src/share/classes/javax/swing/text/html/package.html.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c.i
+data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/PrincipalImpl.java.i
data/src/share/classes/javax/management/relation/RoleInfoNotFoundException.java.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java.i
-data/src/share/classes/sun/misc/resources/Messages_zh_CN.java.i
-data/src/share/classes/sun/management/MemoryPoolImpl.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java.i
data/src/share/back/FrameID.h.i
data/test/java/lang/Runtime/exec/ExecEmptyString.java.i
data/test/java/beans/XMLDecoder/spec/TestBoolean.java.i
@@ -5007,14 +4965,13 @@ data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java.i
data/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java.i
data/src/share/classes/javax/management/remote/rmi/package.html.i
data/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java.i
-data/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java.i
+data/test/sun/net/www/http/HttpClient/ProxyFromCache.java.i
data/test/sun/tools/jhat/jmap.bin.d
-data/src/share/classes/javax/net/ssl/ManagerFactoryParameters.java.i
+data/src/share/native/sun/java2d/opengl/OGLMaskBlit.c.i
+data/test/java/net/URLConnection/GetResponseCode.java.i
data/src/share/classes/java/beans/Customizer.java.i
data/test/java/lang/ref/EnqueueNullRef.java.i
data/src/solaris/native/sun/awt/awt_xembed.h.i
-data/src/share/classes/javax/swing/text/html/ListView.java.i
-data/src/share/classes/sun/swing/PrintColorUIResource.java.i
data/src/share/classes/java/rmi/activation/ActivationInstantiator.java.i
data/src/share/classes/javax/naming/LimitExceededException.java.i
data/test/java/security/cert/CertPathValidator/OCSP/AIACheck.java.i
@@ -5022,37 +4979,35 @@ data/src/share/classes/javax/accessibility/AccessibleRelation.java.i
data/test/com/sun/jdi/PopAndInvokeTest.java.i
data/src/share/native/com/sun/java/util/jar/pack/utils.h.i
data/src/share/classes/java/rmi/server/LoaderHandler.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/p11-solaris.txt.i
+data/test/java/lang/annotation/Missing/Missing.java.i
data/src/share/native/sun/awt/medialib/mlib_image_types.h.i
data/src/share/classes/sun/java2d/StateTrackable.java.i
data/src/share/classes/javax/swing/text/html/IsindexView.java.i
data/test/java/beans/PropertyEditor/TestIntegerClassJava.java.i
-data/make/tools/swing-beans/beaninfo/images/JFrameColor32.gif.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.i
data/test/sun/misc/Encode/GetBytes.java.i
data/src/share/classes/java/lang/invoke/SpreadGeneric.java.i
data/src/share/classes/javax/management/relation/RelationException.java.i
-data/src/share/classes/sun/io/CharToByteCp437.java.i
+data/src/windows/native/sun/windows/awt_ole.h.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/FileMatch.java.i
-data/src/solaris/classes/sun/java2d/xr/XIDGenerator.java.i
+data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg.i
+data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java.i
data/src/share/classes/java/awt/dnd/DragSourceEvent.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java.i
-data/src/share/classes/sun/security/krb5/internal/rcache/CacheTable.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpEngineId.java.i
-data/src/share/native/sun/java2d/loops/IntArgb.c.i
-data/test/java/lang/reflect/Proxy/Basic1.java.i
+data/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Encoder.java.i
+data/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java.i
data/src/share/classes/sun/net/httpserver/Event.java.i
-data/test/java/rmi/transport/checkLeaseInfoLeak/security.policy.i
data/src/share/native/java/lang/fdlibm/src/s_lib_version.c.i
data/src/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java.i
-data/src/share/classes/javax/management/relation/RoleStatus.java.i
+data/src/solaris/native/java/io/FileDescriptor_md.c.i
data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java.i
+data/test/javax/management/ObjectName/ComparatorTest.java.i
data/test/java/util/Collections/NCopies.java.i
-data/src/share/classes/javax/imageio/ImageReadParam.java.i
+data/make/tools/CharsetMapping/IBM297.map.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java.i
data/make/tools/sharing/classlist.linux.i
-data/src/windows/native/sun/java2d/d3d/D3DContext.h.i
-data/test/sun/security/krb5/ParseCAPaths.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/NullTest.java.i
data/src/share/classes/java/lang/management/ThreadInfo.java.i
data/src/share/classes/sun/io/CharToByteMS874.java.i
data/src/share/native/sun/font/layout/MarkArrays.cpp.i
@@ -5060,29 +5015,32 @@ data/make/mkdemo/jfc/CodePointIM/Makefile.i
data/src/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java.i
data/make/mkdemo/scripting/Makefile.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.jibx.xml.i
-data/src/share/classes/sun/instrument/TransformerManager.java.i
+data/src/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java.i
data/src/share/classes/sun/text/resources/FormatData_zh.java.i
data/test/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java.i
data/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java.i
data/test/java/io/OutputStreamWriter/TestWrite.java.i
data/test/java/io/Serializable/NPEProvoker/NPEProvoker.java.i
+data/src/share/native/sun/font/layout/ContextualSubstSubtables.h.i
data/test/java/io/Serializable/evolution/AddedExternField/WriteAddedField.java.i
data/src/share/classes/sun/reflect/MethodAccessorImpl.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java.i
data/src/share/classes/sun/misc/MessageUtils.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java.i
-data/src/share/classes/java/awt/peer/TextAreaPeer.java.i
+data/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethodDescriptor.java.i
data/src/share/classes/sun/security/x509/PKIXExtensions.java.i
data/test/java/net/URL/UppercaseScheme.java.i
data/src/share/classes/javax/swing/text/rtf/charsets/NeXT.txt.i
data/src/windows/native/java/net/DualStackPlainSocketImpl.c.i
data/src/share/classes/javax/print/attribute/SupportedValuesAttribute.java.i
-data/src/share/classes/sun/management/snmp/util/JvmContextFactory.java.i
+data/test/java/nio/channels/FileChannel/MapAssertions.java.i
+data/src/windows/native/sun/nio/ch/SocketChannelImpl.c.i
data/make/java/nio/Makefile.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy.i
data/src/windows/native/sun/java2d/windows/dxCapabilities.h.i
data/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java.i
data/make/tools/swing-beans/beaninfo/images/JWindowColor32.gif.i
+data/test/java/lang/reflect/Method/InheritedMethods.java.i
data/test/sun/java2d/OpenGL/DrawBufImgOp.java.i
data/src/share/classes/java/awt/Paint.java.i
data/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java.i
@@ -5093,39 +5051,39 @@ data/test/java/io/Reader/ReadParams.java.i
data/src/share/classes/sun/awt/NativeLibLoader.java.i
data/src/windows/native/java/io/canonicalize_md.c.i
data/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java.i
+data/src/share/classes/sun/tools/jconsole/VMInternalFrame.java.i
data/src/share/classes/com/sun/nio/sctp/MessageInfo.java.i
data/src/solaris/doc/sun/man/man1/ja/servertool.1.i
data/src/share/classes/sun/tools/jconsole/SheetDialog.java.i
data/src/share/classes/sun/security/ssl/JsseJce.java.i
data/src/solaris/doc/sun/man/man1/jstatd.1.i
+data/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java.i
data/src/share/classes/java/awt/doc-files/Choice-1.gif.i
data/src/share/classes/sun/io/ByteToCharMS950.java.i
data/src/share/classes/sun/java2d/loops/MaskBlit.java.i
data/test/java/nio/channels/FileChannel/Release.java.i
data/src/share/classes/javax/management/DescriptorFields.java.i
-data/src/share/classes/sun/util/locale/LocaleUtils.java.i
data/src/share/classes/java/beans/beancontext/BeanContextContainerProxy.java.i
-data/make/sun/dcpr/Makefile.i
+data/src/share/classes/sun/text/normalizer/ReplaceableString.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/arabic.ut8.txt.i
data/src/share/native/sun/awt/medialib/mlib_SysMath.h.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java.i
data/src/share/classes/javax/imageio/event/IIOReadProgressListener.java.i
-data/test/java/net/URLConnection/GetXmlContentType.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnspr4.so.i
data/src/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java.i
data/make/tools/CharsetMapping/IBM1149.c2b.i
data/src/share/native/sun/awt/image/imageInitIDs.c.i
-data/src/share/classes/sun/awt/image/ImageDecoder.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/AlternativeLongOptionSpec.java.i
+data/test/java/util/Collections/EmptySortedSet.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java.i
-data/src/solaris/classes/sun/nio/fs/UnixFileSystem.java.i
data/make/tools/CharsetMapping/IBM874.map.i
data/test/org/openjdk/jigsaw/ConfigurationBuilder.java.i
data/src/share/native/com/sun/media/sound/DirectAudioDeviceProvider.c.i
data/src/share/classes/sun/tools/jconsole/TimeComboBox.java.i
+data/test/java/util/Collections/AsLifoQueue.java.i
data/test/sun/java2d/pipe/RegionOps.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java.i
-data/src/share/classes/java/lang/IllegalStateException.java.i
+data/src/share/classes/sun/print/resources/orientRevLandscape.png.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java.i
data/src/share/classes/sun/io/CharToByteCp863.java.i
data/make/sun/cmm/Makefile.i
@@ -5137,76 +5095,76 @@ data/test/sun/security/ec/pkcs12/sect193r1server-rsa1024ca.p12.i
data/src/share/classes/javax/management/Attribute.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java.i
data/test/sun/nio/cs/Test6392804.java.i
-data/src/share/classes/java/util/spi/LocaleServiceProvider.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java.i
-data/src/share/classes/com/sun/jmx/namespace/serial/RoutingOnlyProcessor.java.i
data/test/java/rmi/testlibrary/StreamPipe.java.i
data/src/share/classes/javax/management/loading/DefaultLoaderRepository.java.i
-data/src/share/classes/javax/naming/ldap/ExtendedResponse.java.i
+data/make/tools/src/build/tools/jdwpgen/AbstractSimpleTypeNode.java.i
data/src/share/classes/java/awt/GridBagConstraints.java.i
data/test/javax/crypto/Cipher/InOutBuffers.java.i
data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.h.i
data/make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java.i
-data/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java.i
+data/test/java/lang/String/Split.java.i
data/src/share/sample/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg.i
data/src/share/classes/java/security/Signature.java.i
data/src/share/classes/sun/text/resources/FormatData_sv.java.i
data/make/modules/Makefile.i
+data/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java.i
data/test/javax/swing/JComboBox/6607130/bug6607130.java.i
data/src/share/classes/com/sun/jdi/Bootstrap.java.i
-data/src/share/classes/javax/security/auth/RefreshFailedException.java.i
+data/src/share/classes/java/rmi/server/RMIClientSocketFactory.java.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java.i
-data/test/javax/management/mxbean/JMXServiceURLTest.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Hello.java.i
data/make/tools/dir_diff/Makefile.i
-data/src/share/native/sun/font/layout/KernTable.h.i
data/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java.i
data/src/share/classes/com/sun/pept/ept/ContactInfoList.java.i
data/src/share/classes/java/util/AbstractQueue.java.i
data/test/java/io/Serializable/readObjectNoData/Read.java.i
-data/src/share/classes/sun/io/CharToByteMacRomania.java.i
+data/test/java/util/ResourceBundle/Bug4083270Test.properties.i
data/make/mkdemo/jvmti/versionCheck/Makefile.i
data/src/share/classes/sun/nio/fs/MimeType.java.i
data/src/share/classes/sun/net/www/http/KeepAliveStream.java.i
+data/test/sun/security/krb5/auto/ok-as-delegate-xrealm.sh.i
data/src/share/classes/javax/swing/text/html/EditableView.java.i
-data/src/share/classes/javax/management/DescriptorAccess.java.i
-data/src/share/classes/java/sql/SQLTransactionRollbackException.java.i
+data/src/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java.i
data/src/share/classes/sun/launcher/LauncherHelper.java.i
data/test/java/lang/instrument/StressGetObjectSizeApp.java.i
data/src/share/classes/javax/swing/text/GlyphView.java.i
data/test/java/beans/PropertyChangeSupport/1.6.0.ser.i
-data/src/share/classes/com/sun/jmx/event/EventParams.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java.i
data/src/share/classes/java/util/package.html.i
+data/test/sun/net/TelnetTest.java.i
data/src/share/classes/sun/jkernel/BundleCheck.java.i
data/src/share/native/sun/awt/image/cvutils/img_alpha.h.i
-data/src/share/classes/com/sun/jndi/ldap/LdapURL.java.i
-data/src/share/classes/com/sun/media/sound/ModelOscillator.java.i
-data/src/share/classes/javax/swing/JCheckBoxMenuItem.java.i
-data/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain5.txt.i
+data/test/java/text/Format/MessageFormat/Bug7003643.java.i
+data/src/share/classes/java/util/prefs/NodeChangeListener.java.i
data/src/share/classes/com/sun/servicetag/Registry.java.i
data/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.spi.TransportService.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java.i
-data/src/share/classes/javax/swing/Painter.java.i
+data/src/share/classes/com/sun/jmx/namespace/NamespaceInterceptor.java.i
+data/src/share/classes/sun/tools/jstat/ExpressionResolver.java.i
data/src/share/classes/javax/swing/plaf/ViewportUI.java.i
data/test/com/sun/jndi/dns/CheckAccess.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java.i
-data/src/share/classes/javax/imageio/stream/ImageOutputStream.java.i
data/src/share/classes/java/security/PrivilegedAction.java.i
data/src/share/classes/sun/nio/fs/NativeBuffers.java.i
-data/src/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java.i
data/src/windows/native/sun/jkernel/graphics/warningmasthead.bmp.i
data/src/share/classes/com/sun/nio/sctp/package-info.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpBadSecurityLevelException.java.i
+data/src/share/classes/java/awt/BufferCapabilities.java.i
+data/test/org/openjdk/jigsaw/repocat.sh.i
data/make/sun/jawt/make.depend.i
data/test/java/util/ResourceBundle/Control/XmlRB.xml.i
data/src/share/classes/sun/management/snmp/util/MibLogger.java.i
+data/src/share/classes/com/sun/tools/jdi/BooleanValueImpl.java.i
data/test/java/nio/channels/Selector/Alias.java.i
-data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Decoder.java.i
+data/src/share/classes/javax/swing/event/RowSorterListener.java.i
+data/src/share/classes/sun/audio/AudioStream.java.i
+data/test/com/oracle/net/Sanity.java.i
data/test/java/awt/Focus/AutoRequestFocusTest/TestHelper.java.i
data/src/share/classes/sun/misc/JavaLangAccess.java.i
+data/src/solaris/classes/sun/awt/X11/security-icon-bw48.png.i
data/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java.i
data/make/mkdemo/jfc/TableExample/Makefile.i
data/test/com/sun/jdi/JdbReadTwiceTest.sh.i
-data/test/com/sun/jdi/RedefineImplementor.sh.i
data/src/share/native/java/lang/StrictMath.c.i
data/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c.i
data/make/common/Sanity.gmk.i
@@ -5225,17 +5183,15 @@ data/src/share/classes/javax/xml/crypto/XMLStructure.java.i
data/test/sun/security/tools/policytool/i18n.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java.i
data/src/solaris/hpi/export/path_md.h.i
-data/src/share/classes/org/openjdk/jigsaw/package-info.java.i
+data/src/share/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml.i
data/src/share/classes/javax/print/attribute/standard/JobPrioritySupported.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties.i
-data/test/javax/swing/JFileChooser/6868611/bug6868611.java.i
data/src/share/classes/java/lang/Number.java.i
data/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.h.i
-data/src/share/classes/sun/text/resources/FormatData_th_TH.java.i
data/test/javax/print/applet/AppletPrintLookup.html.i
data/src/share/classes/com/sun/jmx/event/EventClientFactory.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java.i
-data/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java.i
+data/test/java/util/Locale/data/deflocale.sol10.i
data/src/share/classes/java/util/EventListenerProxy.java.i
data/src/share/classes/sun/rmi/rmic/newrmic/Generator.java.i
data/test/sun/rmi/log/ReliableLog/Recovery.java.i
@@ -5260,14 +5216,14 @@ data/test/sun/nio/cs/SurrogateTestEUCTW.plane5.surrogates.i
data/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java.i
data/test/javax/swing/JColorChooser/Test4234761.java.i
data/make/java/util/Makefile.i
-data/make/sun/security/pkcs11/mapfile-vers.i
+data/test/java/lang/instrument/IsModifiableClassAgent.java.i
data/src/windows/resource/java.manifest.i
data/src/share/classes/sun/text/resources/FormatData_sr.java.i
-data/src/share/classes/javax/swing/border/StrokeBorder.java.i
+data/test/javax/sound/midi/Sequencer/SequencerImplicitSynthOpen.java.i
data/src/share/classes/java/security/InvalidParameterException.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java.i
data/src/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java.i
-data/src/share/classes/java/util/regex/Matcher.java.i
+data/src/windows/classes/sun/java2d/ScreenUpdateManager.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/Environment.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionContextImpl/Timeout.java.i
@@ -5275,26 +5231,28 @@ data/test/java/beans/PropertyEditor/TestIntegerClassValue.java.i
data/test/tools/launcher/UglyPrintVersion.java.i
data/test/java/lang/System/finalization/FinThreads.java.i
data/test/java/util/ResourceBundle/Bug4165815Test.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ko.properties.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java.i
+data/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java.i
data/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java.i
-data/src/share/classes/java/nio/channels/MulticastChannel.java.i
+data/src/share/classes/sun/text/resources/FormatData_ar_IQ.java.i
data/src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java.i
+data/test/java/beans/PropertyEditor/TestShortTypeValue.java.i
data/test/java/lang/RuntimePermission/ExitVM.java.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java.i
-data/test/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy.i
-data/src/share/classes/com/sun/media/sound/SoftFilter.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java.i
+data/test/java/nio/channels/AsynchronousSocketChannel/Basic.java.i
+data/test/javax/print/PrintSE/PrintSE.sh.i
+data/src/share/classes/sun/io/ByteToCharEUC2.java.i
data/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java.i
data/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java.i
-data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter.i
-data/src/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java.i
data/src/share/classes/sun/dyn/MemberName.java.i
-data/src/share/native/com/sun/media/sound/Platform.c.i
+data/test/java/io/Serializable/duplicateSerialFields/Setup.java.i
data/src/share/native/java/lang/fdlibm/src/w_asin.c.i
-data/src/share/classes/com/sun/tools/jdi/LongValueImpl.java.i
-data/src/share/classes/sun/text/resources/CollationData_sk.java.i
+data/make/sun/tracing/dtrace/mapfile-vers.i
+data/src/share/classes/sun/awt/image/ShortInterleavedRaster.java.i
+data/src/share/classes/javax/management/MBeanFeatureInfo.java.i
data/test/javax/management/descriptor/EqualsHashCodeTest.java.i
-data/src/share/classes/com/sun/rowset/internal/XmlResolver.java.i
+data/make/sun/rmi/rmi/Makefile.i
data/test/java/io/Serializable/illegalHandle/tooHighHandle.ser.i
data/test/java/nio/channels/DatagramChannel/Connect.java.i
data/src/share/demo/jfc/Metalworks/MetalworksHelp.java.i
@@ -5303,19 +5261,22 @@ data/test/java/security/cert/CertificateFactory/slowstream.sh.i
data/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java.i
data/src/share/classes/sun/nio/cs/ext/MacIceland.java.i
data/test/sun/net/www/protocol/http/6550798/TestCache.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java.i
data/src/share/classes/sun/nio/cs/ext/IBM869.java.i
data/src/solaris/doc/sun/man/man1/ja/policytool.1.i
data/src/share/classes/java/awt/image/renderable/ParameterBlock.java.i
+data/test/javax/crypto/spec/DESKeySpec/CheckParity.java.i
data/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java.i
data/test/sun/security/mscapi/SignUsingSHA2withRSA.java.i
-data/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_ko.properties.i
data/src/share/classes/sun/net/www/content/image/x_xbitmap.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_AR.properties.i
+data/test/javax/script/Test4.js.i
data/src/share/classes/sun/text/resources/FormatData_sr_RS.java.i
data/test/java/beans/VetoableChangeSupport/Test4425885.java.i
-data/src/share/classes/sun/tracing/dtrace/DTraceProbe.java.i
data/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java.i
data/src/share/classes/sun/tools/jar/ModuleInfo.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpSecurityException.java.i
data/src/share/classes/sun/awt/Graphics2Delegate.java.i
data/make/tools/src/build/tools/generatenimbus/UIDefault.java.i
data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/project.xml.i
@@ -5329,10 +5290,11 @@ data/test/java/beans/XMLEncoder/4741757/TestSecurityManager.java.i
data/test/java/net/URLClassLoader/closetest/test1/com/foo/Resource2.i
data/src/share/native/sun/font/layout/LookupTables.cpp.i
data/test/java/lang/invoke/InvokeGenericTest.java.i
-data/make/sun/rmi/oldtools/FILES_java.gmk.i
+data/src/share/classes/sun/net/NetProperties.java.i
data/src/share/classes/sun/nio/cs/ext/IBM970.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS932_Decoder.java.i
+data/src/share/classes/javax/management/ImmutableDescriptor.java.i
data/src/share/classes/java/util/spi/package.html.i
data/test/javax/swing/border/Test4247606.java.i
data/make/java/npt/mapfile-vers.i
@@ -5340,24 +5302,22 @@ data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java.i
data/src/share/classes/java/nio/charset/UnmappableCharacterException.java.i
data/src/share/classes/com/sun/media/sound/SF2Sample.java.i
data/src/windows/classes/sun/security/mscapi/KeyStore.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowRefs.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java.i
+data/src/share/native/java/lang/fdlibm/src/e_asin.c.i
+data/src/share/classes/javax/accessibility/AccessibleContext.java.i
data/src/share/classes/com/sun/jmx/namespace/ObjectNameRouter.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java.i
data/test/org/openjdk/jigsaw/_RemoteRepositoryList.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java.i
+data/test/sun/security/provider/certpath/speech2speech.i
data/src/share/classes/com/sun/media/sound/AuFileReader.java.i
data/test/sun/net/www/protocol/jar/B4957695.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java.i
-data/src/share/classes/javax/security/auth/login/AccountException.java.i
data/src/share/native/sun/font/layout/DeviceTables.cpp.i
data/src/share/classes/sun/dyn/anon/InvalidConstantPoolFormatException.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/PlatformModuleBuilder.java.i
-data/src/share/classes/java/util/StringTokenizer.java.i
data/src/share/classes/sun/nio/cs/ext/IBM297.java.i
data/test/java/rmi/activation/Activatable/restartLatecomer/group.security.policy.i
data/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java.i
-data/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java.i
+data/test/javax/swing/text/html/parser/Parser/7003777/bug7003777.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1124.java.i
data/src/share/classes/sun/io/ByteToCharCp1006.java.i
data/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template.i
@@ -5365,7 +5325,7 @@ data/src/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java.i
data/src/share/lib/images/cursors/motif_LinkNoDrop32x32.gif.i
data/make/com/sun/net/ssl/Makefile.i
data/test/sun/net/www/protocol/http/UserAuth.java.i
-data/make/tools/GenerateCharacter/Makefile.i
+data/test/javax/security/auth/Subject/Synch.java.i
data/src/share/classes/javax/swing/border/LineBorder.java.i
data/src/share/classes/java/util/IllegalFormatFlagsException.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStyle.java.i
@@ -5373,15 +5333,13 @@ data/src/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.
data/src/solaris/classes/sun/awt/motif/MToolkitThreadBlockedHandler.java.i
data/src/share/classes/sun/tools/asm/ClassConstantData.java.i
data/src/windows/lib/plugin.properties.i
-data/src/share/sample/nio/server/Content.java.i
+data/src/share/classes/sun/reflect/misc/ReflectUtil.java.i
data/src/share/classes/java/io/IOError.java.i
data/src/share/classes/javax/security/sasl/RealmCallback.java.i
data/src/share/native/sun/awt/image/BufImgSurfaceData.c.i
data/src/share/classes/javax/swing/JApplet.java.i
-data/test/sun/security/util/Debug/MultiOptions.java.i
data/src/share/classes/javax/swing/text/html/CommentView.java.i
data/src/solaris/classes/sun/awt/motif/X11Clipboard.java.i
-data/src/share/classes/sun/security/x509/GeneralNameInterface.java.i
data/src/share/classes/javax/net/ssl/HandshakeCompletedListener.java.i
data/src/share/classes/sun/reflect/generics/repository/ClassRepository.java.i
data/test/java/net/Socket/ProxyCons.java.i
@@ -5390,26 +5348,25 @@ data/test/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java.i
data/src/share/back/classTrack.c.i
data/make/tools/UnicodeData/Scripts.txt.i
data/src/solaris/native/sun/font/X11FontScaler.h.i
-data/src/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java.i
+data/test/java/util/jar/JarFile/SorryClosed.java.i
data/test/java/lang/Math/Log1pTests.java.i
data/src/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java.i
data/src/share/native/sun/awt/libpng/pngwutil.c.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java.i
+data/src/share/classes/org/ietf/jgss/GSSCredential.java.i
data/test/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy.i
data/src/share/classes/sun/reflect/generics/tree/ByteSignature.java.i
data/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java.i
data/src/share/classes/sun/nio/cs/ext/Big5_HKSCS.java.i
data/test/javax/management/eventService/AddRemoveListenerTest.java.i
-data/test/java/io/Serializable/ClassCastExceptionDetail/Read.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy13.i
data/src/share/classes/java/rmi/StubNotFoundException.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java.i
data/src/share/classes/java/security/AccessControlContext.java.i
-data/make/modules/tools/src/com/sun/classanalyzer/AnnotationParser.java.i
-data/src/share/classes/javax/swing/text/Document.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XTextField.java.i
+data/src/share/classes/sun/java2d/loops/GeneralRenderer.java.i
+data/src/share/classes/sun/tools/java/Scanner.java.i
+data/src/share/classes/java/awt/image/BufferedImageOp.java.i
data/src/share/classes/java/beans/beancontext/BeanContextServicesSupport.java.i
-data/src/share/classes/sun/tools/util/ModifierFilter.java.i
-data/src/share/classes/sun/nio/cs/ISO_8859_2.java.i
+data/test/java/math/BigInteger/CompareToTests.java.i
data/test/java/rmi/server/RMIClassLoader/spi/java.rmi.server.RMIClassLoaderSpi.i
data/src/share/classes/com/sun/script/javascript/ExternalScriptable.java.i
data/src/share/classes/sun/security/ssl/CipherSuiteList.java.i
@@ -5418,12 +5375,12 @@ data/src/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java.i
data/test/java/lang/reflect/Generics/getAnnotationTest.java.i
data/src/share/classes/sun/tools/jar/resources/jar_sv.properties.i
data/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh.i
-data/make/tools/CharsetMapping/GBK.map.i
-data/src/share/classes/java/lang/invoke/MethodType.java.i
+data/src/share/classes/sun/security/provider/VerificationProvider.java.i
+data/make/java/zip/mapfile-vers.i
data/src/share/classes/java/awt/image/ShortLookupTable.java.i
data/src/windows/native/java/net/InetAddressImplFactory.c.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1.h.i
-data/src/share/classes/java/io/Bits.java.i
+data/src/share/classes/javax/security/auth/login/LoginException.java.i
data/test/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java.i
data/test/sun/security/mscapi/access.policy.i
data/test/java/nio/charset/coders/BashStreams.java.i
@@ -5440,17 +5397,18 @@ data/src/share/classes/javax/crypto/CryptoPolicyParser.java.i
data/src/share/classes/javax/swing/plaf/nimbus/State.java.i
data/make/jpda/bdi/Makefile.i
data/test/java/util/AbstractMap/ToString.java.i
-data/test/java/lang/Thread/StackTraces.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMBean.java.i
-data/test/java/util/AbstractSequentialList/AddAll.java.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl.java.i
+data/test/sun/security/pkcs11/KeyStore/ClientAuthData/server.keystore.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java.i
+data/test/java/math/BigDecimal/ZeroScalingTests.java.i
data/src/share/classes/com/sun/tools/jdi/ThreadListener.java.i
-data/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java.i
data/src/share/classes/com/sun/crypto/provider/CipherCore.java.i
-data/src/share/classes/com/sun/media/sound/SF2LayerRegion.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c.i
-data/src/share/classes/javax/sql/rowset/spi/SyncResolver.java.i
+data/src/share/classes/javax/crypto/spec/DHPrivateKeySpec.java.i
+data/test/java/util/logging/LoggingDeadlock2.java.i
+data/test/java/beans/XMLEncoder/java_awt_Point.java.i
data/make/tools/swing-beans/beaninfo/images/JCheckBoxColor16.gif.i
+data/test/sun/net/www/http/HttpClient/IsKeepingAlive.java.i
data/test/java/beans/PropertyEditor/TestColorClassJava.java.i
data/src/solaris/back/exec_md.c.i
data/test/javax/naming/ldap/LdapName/NameTests.java.i
@@ -5462,8 +5420,9 @@ data/src/share/classes/java/dyn/Invokers.java.i
data/src/share/classes/sun/security/krb5/Asn1Exception.java.i
data/src/share/classes/com/sun/crypto/provider/DESCipher.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java.i
+data/src/share/classes/sun/rmi/registry/RegistryImpl.java.i
data/make/java/awt/Makefile.i
-data/src/share/classes/java/io/InputStream.java.i
+data/make/tools/CharsetMapping/IBM1147.map.i
data/test/sun/security/pkcs11/Secmod/GetPrivateKey.java.i
data/make/java/nio/mapfile-solaris.i
data/test/sun/security/ec/p12passwords.txt.i
@@ -5472,32 +5431,33 @@ data/src/share/classes/sun/nio/cs/ext/EUC_CN.java.i
data/src/windows/native/sun/windows/awt_Rectangle.cpp.i
data/src/share/classes/sun/security/pkcs11/P11KeyStore.java.i
data/test/com/sun/jdi/OnThrowTarget.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/ParseException.java.i
+data/test/com/sun/tools/attach/PermissionTests.sh.i
data/src/share/classes/com/sun/jdi/DoubleValue.java.i
data/src/share/classes/javax/swing/TablePrintable.java.i
data/make/tools/CharsetMapping/IBM937.map.i
-data/src/share/demo/jvmti/hprof/hprof_io.c.i
-data/src/share/classes/java/security/AlgorithmConstraints.java.i
-data/src/share/classes/sun/tools/jstat/OptionFinder.java.i
-data/src/share/classes/javax/naming/ldap/StartTlsResponse.java.i
+data/test/java/io/Serializable/oldTests/AnnotateClass.java.i
+data/src/solaris/classes/sun/awt/X11/XToolkit.java.i
+data/src/share/classes/javax/naming/ldap/StartTlsResponse.java.i
+data/src/share/classes/com/sun/security/auth/module/NTSystem.java.i
data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.java.i
data/src/solaris/native/sun/net/sdp/SdpSupport.c.i
data/make/tools/CharsetMapping/IBM875.c2b.i
data/src/share/classes/sun/nio/ch/Groupable.java.i
data/test/javax/management/mxbean/StandardMBeanOverrideTest.java.i
-data/src/share/classes/java/net/CookiePolicy.java.i
data/make/jpda/transport/shmem/mapfile-vers.i
data/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java.i
data/test/java/security/cert/X509Certificate/emptySubjectCert.i
data/make/sun/org/mozilla/javascript/Makefile.i
data/src/windows/native/sun/nio/ch/Iocp.c.i
-data/src/share/classes/java/awt/dnd/DropTargetAdapter.java.i
+data/src/share/classes/sun/security/krb5/Credentials.java.i
data/test/javax/script/Test1.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif.i
data/src/share/classes/sun/nio/ch/IOVecWrapper.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java.i
+data/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport2.java.i
+data/make/tools/swing-beans/beaninfo/images/JPanelColor16.gif.i
+data/src/solaris/doc/sun/man/man1/idlj.1.i
data/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java.i
data/src/windows/hpi/include/monitor_md.h.i
data/src/share/native/sun/security/jgss/wrapper/NativeUtil.h.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java.i
@@ -5507,13 +5467,9 @@ data/src/share/classes/javax/print/attribute/standard/MediaName.java.i
data/test/com/sun/tools/attach/Shutdown.java.i
data/src/share/classes/java/beans/IntrospectionException.java.i
data/src/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java.i
-data/src/windows/native/sun/windows/awt_MMStub.h.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_de.properties.i
+data/src/share/classes/java/awt/image/RasterFormatException.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java.i
-data/src/share/classes/java/rmi/server/RMIClientSocketFactory.java.i
data/src/share/classes/java/awt/image/BandedSampleModel.java.i
-data/src/share/classes/sun/text/resources/FormatData_vi_VN.java.i
-data/test/sun/security/pkcs11/ec/pkcs12/secp256r1server-secp384r1ca.p12.i
data/src/share/demo/scripting/jconsole-plugin/src/scripts/heapdump.js.i
data/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamClose.java.i
data/src/share/classes/sun/security/ssl/EngineArgs.java.i
@@ -5521,18 +5477,19 @@ data/src/share/classes/sun/util/resources/TimeZoneNames_ja.java.i
data/src/share/classes/sun/rmi/transport/ObjectTable.java.i
data/make/tools/swing-beans/beaninfo/images/JAppletColor16.gif.i
data/src/share/classes/sun/swing/plaf/synth/Paint9Painter.java.i
+data/src/share/classes/sun/java2d/pipe/OutlineTextRenderer.java.i
data/src/share/classes/sun/util/resources/CalendarData_it.properties.i
data/test/org/openjdk/jigsaw/TrivialWebServer.java.i
+data/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java.i
data/src/share/classes/sun/text/resources/CollationData_el.java.i
+data/test/java/nio/file/Files/walkFileTree/MaxDepth.java.i
data/src/share/classes/java/lang/AutoCloseable.java.i
data/test/java/nio/channels/Selector/WakeupEmpty.java.i
data/src/share/native/sun/java2d/loops/LineUtils.h.i
data/test/java/beans/XMLEncoder/java_lang_Character.java.i
-data/src/share/classes/com/sun/jdi/ThreadGroupReference.java.i
-data/test/java/lang/management/MemoryMXBean/PendingAllGC.sh.i
-data/src/share/classes/java/awt/MenuItem.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c.i
-data/src/share/classes/sun/tools/jstat/Arguments.java.i
+data/src/share/classes/sun/swing/SwingUtilities2.java.i
+data/src/share/classes/sun/util/resources/CalendarData_en_IE.properties.i
+data/test/javax/swing/JFileChooser/6520101/bug6520101.java.i
data/test/java/io/DataInputStream/ReadLinePushback.java.i
data/src/share/classes/javax/swing/plaf/synth/Region.java.i
data/src/share/classes/sun/misc/Unsafe.java.i
@@ -5540,14 +5497,13 @@ data/test/java/io/Serializable/nullArgExceptionOrder/Test.java.i
data/test/java/awt/font/TextLayout/TextLayoutBounds.java.i
data/src/share/classes/sun/net/ProgressListener.java.i
data/src/share/classes/java/text/BreakIterator.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/ColorConvertTest.java.i
+data/src/windows/native/sun/windows/awt_MenuBar.cpp.i
data/src/share/classes/sun/nio/cs/ThreadLocalCoders.java.i
-data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java.i
data/src/share/classes/sun/management/ClassLoadingImpl.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/AsyncSSLSocketClose.java.i
data/src/share/classes/sun/net/www/http/HttpCaptureOutputStream.java.i
data/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/ca2.cert.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif.i
data/src/share/classes/sun/tools/java/BinaryAttribute.java.i
data/src/solaris/bin/ergo.c.i
@@ -5559,13 +5515,15 @@ data/src/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java.i
data/src/share/classes/sun/launcher/LauncherHelp.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java.i
data/src/share/demo/nbproject/management/JTop/build.properties.i
-data/test/java/rmi/reliability/benchmark/bench/Util.java.i
+data/test/java/beans/XMLEncoder/4741757/TestStackOverflow.java.i
+data/src/solaris/native/sun/awt/awt_DrawingSurface.h.i
+data/src/share/classes/sun/text/resources/FormatData_nl.java.i
data/src/share/classes/java/util/zip/ZipCoder.java.i
data/test/javax/script/Test5.js.i
data/test/java/awt/Insets/CombinedTestApp1.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so.i
data/src/solaris/native/sun/security/smartcardio/pcsc_md.h.i
-data/test/java/net/URL/GetContent.java.i
data/src/share/classes/javax/security/auth/kerberos/KeyImpl.java.i
data/make/sun/jkernel/FILES_java.gmk.i
data/src/share/classes/sun/dyn/FilterGeneric.java.i
@@ -5575,7 +5533,6 @@ data/src/share/classes/javax/accessibility/AccessibleTextSequence.java.i
data/src/solaris/classes/sun/awt/X11/XAbstractMenuItem.java.i
data/src/share/classes/sun/management/snmp/jvminstr/README.i
data/src/solaris/classes/java/util/prefs/FileSystemPreferencesFactory.java.i
-data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml.i
data/src/share/native/java/lang/fdlibm/src/w_pow.c.i
data/src/share/classes/sun/misc/Queue.java.i
data/src/share/classes/sun/tools/tree/UplevelReference.java.i
@@ -5589,38 +5546,35 @@ data/src/share/classes/sun/management/RuntimeImpl.java.i
data/test/java/lang/System/Versions.java.i
data/src/share/classes/javax/xml/crypto/dsig/Transform.java.i
data/test/java/awt/Robot/ManualInstructions/ManualInstructions.java.i
+data/src/share/native/sun/security/ec/ec.c.i
data/src/share/classes/sun/io/CharToByteCp950.java.i
data/make/tools/swing-beans/beaninfo/images/JLabelColor32.gif.i
data/test/sun/security/pkcs11/nss/db/cert8.db.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java.i
-data/src/share/classes/java/security/URIParameter.java.i
data/src/share/classes/sun/nio/cs/UTF_16LE_BOM.java.i
-data/src/share/classes/sun/font/FontRunIterator.java.i
data/src/share/classes/com/sun/servicetag/resources/javase_7_swordfish.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java.i
-data/src/share/classes/java/awt/datatransfer/Clipboard.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/compress.c.i
data/test/com/sun/jdi/ConnectedVMs.java.i
data/src/share/sample/nio/chatserver/ChatServer.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java.i
+data/make/sun/nio/cs/Makefile.i
+data/test/java/util/Vector/IllegalConstructorArgs.java.i
data/make/sun/font/mapfile-vers.i
data/src/share/classes/com/sun/jdi/ThreadReference.java.i
+data/src/share/classes/sun/security/x509/X500Name.java.i
data/src/share/classes/sun/text/resources/CollationData_fi.java.i
-data/src/share/classes/sun/nio/ch/Invoker.java.i
-data/test/javax/swing/JFileChooser/6713352/bug6713352.java.i
data/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp.i
data/test/sun/net/www/protocol/http/Finalizer.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_nl.properties.i
-data/src/share/classes/java/awt/IllegalComponentStateException.java.i
+data/test/ProblemList.txt.i
+data/src/share/native/java/lang/fdlibm/src/s_rint.c.i
data/src/share/classes/java/net/Authenticator.java.i
data/test/java/nio/file/Files/walkFileTree/TerminateWalk.java.i
data/src/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java.i
-data/src/share/sample/nio/server/ChannelIOSecure.java.i
-data/src/share/classes/sun/swing/ImageCache.java.i
-data/src/share/classes/sun/java2d/DisposerRecord.java.i
-data/test/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java.i
+data/test/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java.i
+data/test/java/util/Timer/KillThread.java.i
data/test/java/util/ResourceBundle/Test4314141B_fr_CH.properties.i
-data/src/share/classes/java/net/Inet4Address.java.i
+data/src/share/demo/jvmti/hprof/hprof_tag.h.i
+data/src/share/classes/sun/text/resources/FormatData_vi_VN.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java.i
data/src/linux/doc/man/keytool.1.i
data/test/javax/swing/JSlider/6587742/bug6587742.java.i
@@ -5630,22 +5584,21 @@ data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java.i
data/test/java/util/ResourceBundle/Bug4168625Class.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ByteCalls.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java.i
data/src/solaris/instrument/FileSystemSupport_md.h.i
-data/make/sun/font/t2k/mapfile-vers.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/NullCases.java.i
+data/src/share/sample/nio/multicast/MulticastAddress.java.i
data/src/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java.i
data/test/java/util/ResourceBundle/Bug6190861.java.i
-data/src/share/classes/com/sun/media/sound/AiffFileReader.java.i
-data/src/share/classes/java/nio/file/attribute/AclEntryType.java.i
data/src/share/classes/sun/java2d/DestSurfaceProvider.java.i
data/src/share/classes/sun/security/ssl/CipherBox.java.i
data/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.java.i
data/src/share/classes/java/net/doc-files/net-properties.html.i
data/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java.i
data/src/solaris/native/sun/java2d/loops/vis_UshortGray.c.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java.i
-data/test/java/security/cert/CertPathBuilder/targetConstraints/BuildOddSel.java.i
+data/src/windows/native/sun/windows/awt_Scrollbar.cpp.i
+data/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java.i
+data/src/share/classes/sun/misc/FormattedFloatingDecimal.java.i
+data/test/sun/security/pkcs11/KeyStore/ClientAuth.java.i
data/src/solaris/native/java/io/RandomAccessFile_md.c.i
data/src/share/classes/sun/nio/cs/ext/MacCyrillic.java.i
data/test/sun/security/krb5/KrbCredSubKey.java.i
@@ -5660,23 +5613,24 @@ data/src/share/classes/javax/swing/event/PopupMenuEvent.java.i
data/make/sun/headless/Makefile.i
data/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java.i
data/test/sun/net/www/httptest/ClosedChannelList.java.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnClass.java.i
-data/src/share/javavm/export/jdwpTransport.h.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java.i
data/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java.i
data/test/javax/management/openmbean/ConstraintTest.java.i
data/src/windows/lib/content-types.properties.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java.i
-data/test/java/net/Socket/LinkLocal.java.i
data/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif.i
data/src/share/classes/com/sun/jdi/request/ClassUnloadRequest.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java.i
+data/src/share/classes/sun/text/CodePointIterator.java.i
data/test/demo/jvmti/HeapUser.java.i
data/make/common/shared/Sanity.gmk.i
+data/test/javax/print/StreamPrintingOrientation.java.i
data/src/share/back/bag.h.i
data/src/share/classes/sun/nio/ch/DirectBuffer.java.i
-data/src/share/classes/javax/management/namespace/VirtualEventManager.java.i
-data/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c.i
-data/src/share/classes/java/rmi/UnknownHostException.java.i
+data/test/java/beans/Introspector/Test5102804.java.i
+data/test/javax/management/ImplementationVersion/ImplVersionCommand.java.i
+data/test/java/beans/Introspector/Test4498236.java.i
data/src/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java.i
data/src/share/classes/sun/misc/VMSupport.java.i
data/src/windows/classes/sun/awt/Win32GraphicsConfig.java.i
@@ -5685,30 +5639,28 @@ data/make/tools/CharsetMapping/EUC_KR.map.i
data/src/share/classes/sun/jkernel/ByteArrayToFromHexDigits.java.i
data/src/solaris/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java.i
data/src/share/classes/sun/management/counter/Variability.java.i
-data/src/share/classes/java/lang/module/package-info.java.i
-data/src/windows/native/sun/jkernel/DownloadHelper.h.i
+data/src/share/back/standardHandlers.h.i
+data/src/linux/doc/man/javaws.1.i
data/src/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java.i
data/src/share/native/java/util/zip/ZipFile.c.i
-data/src/share/classes/java/awt/GraphicsEnvironment.java.i
data/src/share/classes/javax/swing/undo/StateEditable.java.i
data/test/sun/net/www/protocol/jar/bar.jar.i
-data/make/sun/jar/Makefile.i
-data/src/solaris/bin/arm/jvm.cfg.i
+data/make/tools/CharsetMapping/IBM420.c2b.i
+data/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java.i
data/test/com/sun/jdi/MethodCallsReflection.java.i
data/src/share/native/sun/font/layout/IndicRearrangement.h.i
data/src/share/classes/java/nio/channels/ServerSocketChannel.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl_Stub.java.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java.i
data/test/com/sun/jdi/VarargsTest.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassPath.java.i
-data/src/share/classes/javax/imageio/event/IIOReadWarningListener.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java.i
data/test/javax/crypto/Cipher/GetMaxAllowed.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java.i
-data/src/share/classes/java/util/jar/Manifest.java.i
data/src/share/classes/sun/io/CharToByteCp935.java.i
data/test/sun/security/pkcs11/Provider/Login.policy.i
data/src/share/classes/sun/management/snmp/jvminstr/NotificationTarget.java.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_sv.properties.i
-data/make/tools/CharsetMapping/MS1254.map.i
+data/src/share/demo/nio/zipfs/Demo.java.i
data/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup_Stub.java.i
data/test/java/lang/Math/RoundTests.java.i
data/src/share/instrument/JPLISAssert.c.i
@@ -5717,7 +5669,7 @@ data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass_S
data/test/java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java.i
data/src/windows/native/sun/java2d/opengl/OGLFuncs_md.h.i
data/test/javax/crypto/SecretKeyFactory/README.FailOverTest.i
-data/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java.i
+data/src/windows/native/sun/windows/awt_Window.cpp.i
data/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java.i
data/src/share/classes/sun/security/krb5/internal/AuthorizationData.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/SoftTestUtils.java.i
@@ -5731,7 +5683,8 @@ data/test/com/sun/jdi/RedefineTTYLineNumber.sh.i
data/src/share/classes/javax/naming/ldap/Control.java.i
data/src/share/classes/javax/sound/midi/ShortMessage.java.i
data/src/share/classes/sun/tools/jconsole/resources/disconnected24.png.i
-data/src/share/native/sun/java2d/loops/ByteIndexed.c.i
+data/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java.i
+data/test/javax/print/applet/applet2/Applet2.java.i
data/src/share/classes/sun/java2d/loops/FontInfo.java.i
data/test/java/beans/XMLEncoder/6777487/TestBox.java.i
data/src/share/classes/sun/misc/RegexpPool.java.i
@@ -5742,50 +5695,45 @@ data/src/share/native/sun/awt/image/cvutils/img_globals.h.i
data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java.i
data/src/share/demo/java2d/J2DBench/Makefile.i
data/test/com/sun/jdi/Vars.java.i
-data/src/share/classes/sun/tools/javac/BatchEnvironment.java.i
data/src/share/classes/com/sun/jdi/ByteType.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/AgentSupport.java.i
data/src/share/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz.i
data/src/share/classes/javax/swing/undo/CannotUndoException.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/PerInterface.java.i
-data/src/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java.i
data/src/share/classes/java/dyn/MethodTypeForm.java.i
data/src/share/classes/javax/naming/ldap/SortKey.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownMsgProcModelException.java.i
-data/src/share/classes/javax/sql/RowSetMetaData.java.i
+data/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c.i
+data/make/tools/swing-beans/beaninfo/images/JEditorPaneColor32.gif.i
data/src/share/classes/sun/security/x509/AccessDescription.java.i
-data/src/share/native/sun/awt/libpng/pngdebug.h.i
data/src/share/classes/com/sun/jdi/connect/AttachingConnector.java.i
data/src/share/classes/java/security/DigestInputStream.java.i
data/src/share/classes/java/net/MalformedURLException.java.i
data/src/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java.i
-data/src/solaris/classes/sun/nio/fs/UnixException.java.i
+data/test/com/sun/management/OperatingSystemMXBean/GetTotalSwapSpaceSize.java.i
data/src/windows/classes/sun/security/mscapi/SunMSCAPI.java.i
+data/make/common/Program.gmk.i
data/test/java/util/PluggableLocale/providersrc/Utils.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java.i
data/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java.i
data/src/share/classes/java/lang/invoke/ToGeneric.java.i
+data/test/sun/security/ssl/sanity/interop/JSSEServer.java.i
data/src/share/classes/java/security/cert/LDAPCertStoreParameters.java.i
data/src/share/classes/javax/print/event/PrintJobListener.java.i
-data/make/tools/UnicodeData/PropList.txt.i
+data/test/javax/print/attribute/SidesPageRangesTest.java.i
data/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak_Stub.java.i
data/test/sun/pisces/StrokeShapeTest.java.i
-data/src/solaris/doc/sun/man/man1/ja/serialver.1.i
+data/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java.i
data/src/share/classes/java/lang/module/ModuleId.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO_8859_3.java.i
data/test/java/lang/Class/forName/classes/hyphen.class.i
-data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties.i
-data/src/share/classes/java/awt/Rectangle.java.i
-data/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java.i
+data/src/share/classes/java/text/RuleBasedBreakIterator.java.i
+data/test/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/package.html.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c.i
data/make/tools/swing-beans/GenSwingBeanInfo.java.i
data/test/java/beans/VetoableChangeSupport/Test6630275.java.i
data/test/javax/management/namespace/LeadingSeparatorsTest.java.i
-data/src/windows/native/sun/font/lcdglyph.c.i
-data/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java.i
-data/test/com/oracle/net/sanity.sh.i
+data/src/share/native/sun/security/ec/impl/secoidt.h.i
data/src/share/classes/javax/naming/directory/BasicAttribute.java.i
data/src/solaris/classes/sun/awt/X11/XEventDispatcher.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_IQ.properties.i
@@ -5795,55 +5743,58 @@ data/test/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java.i
data/test/com/sun/jdi/BacktraceFieldTest.java.i
data/test/javax/swing/JPopupMenu/6694823/bug6694823.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java.i
+data/test/org/openjdk/jigsaw/remrepo.sh.i
data/src/share/classes/java/lang/UnsupportedClassVersionError.java.i
data/src/linux/doc/man/native2ascii.1.i
data/src/windows/classes/sun/nio/fs/WindowsFileStore.java.i
data/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java.i
+data/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c.i
data/src/share/classes/sun/reflect/generics/tree/CharSignature.java.i
data/src/share/classes/com/sun/jndi/dns/DnsName.java.i
data/make/common/shared/Sanity-Settings.gmk.i
data/test/java/rmi/server/useCustomRef/security.policy.i
data/src/share/classes/com/sun/java/browser/net/ProxyService.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XOperations.java.i
+data/src/share/classes/sun/tools/jconsole/Version.java.template.i
data/src/share/classes/java/nio/file/attribute/DosFileAttributes.java.i
-data/src/share/classes/java/sql/DatabaseMetaData.java.i
+data/make/sun/headless/reorder-i586.i
data/src/share/classes/java/security/cert/CertificateExpiredException.java.i
data/src/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java.i
data/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java.i
data/test/java/io/BufferedReader/BigMark.java.i
data/test/java/beans/PropertyEditor/TestBooleanTypeValue.java.i
-data/test/sun/security/ssl/sanity/pluggability/MySSLSocketFacImpl.java.i
data/test/java/lang/Enum/ValueOf.java.i
-data/src/share/classes/sun/nio/cs/ext/MS1255.java.i
-data/test/sun/net/www/protocol/jar/B5105410.sh.i
+data/src/share/classes/sun/misc/resources/Messages_es.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load7.java.i
+data/src/share/native/sun/java2d/loops/ByteIndexed.h.i
data/src/share/classes/java/dyn/DirectMethodHandle.java.i
-data/src/share/classes/javax/swing/text/PlainDocument.java.i
+data/src/windows/native/sun/security/smartcardio/pcsc_md.c.i
data/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.c.i
data/src/share/demo/nbproject/jfc/Font2DTest/build.xml.i
data/test/java/net/URLConnection/UnknownContentType.java.i
data/test/sun/security/tools/keytool/autotest.sh.i
data/src/share/classes/sun/nio/cs/IBM850.java.i
data/src/solaris/native/sun/nio/fs/genSolarisConstants.c.i
-data/src/share/classes/sun/text/resources/FormatData_ar_SA.java.i
-data/src/share/classes/sun/awt/ModalityListener.java.i
-data/test/java/io/Serializable/defaultDataEnd/DefaultDataEnd.java.i
+data/test/java/util/EnumMap/EnumMapBash.java.i
+data/test/javax/management/remote/mandatory/connection/AddressableTest.java.i
+data/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java.i
+data/src/windows/classes/sun/awt/windows/WFontMetrics.java.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java.i
data/src/share/classes/java/awt/image/Kernel.java.i
data/src/windows/native/java/lang/ProcessEnvironment_md.c.i
-data/src/windows/classes/sun/awt/windows/WingDings.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_et.properties.i
data/src/share/classes/sun/security/smartcardio/SunPCSC.java.i
+data/src/share/classes/sun/io/CharToByteISO8859_2.java.i
data/src/share/classes/java/sql/SQLNonTransientConnectionException.java.i
-data/test/com/sun/jndi/ldap/ReadTimeoutTest.java.i
+data/src/share/back/ClassLoaderReferenceImpl.h.i
data/src/share/classes/javax/print/SimpleDoc.java.i
data/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java.i
data/test/vm/verifier/VerifyStackForExceptionHandlers.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java.i
data/src/share/classes/javax/sql/rowset/sqlxml.xsd.i
-data/test/java/io/LineNumberReader/SkipInput.txt.i
+data/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java.i
data/test/tools/pack200/pack200-verifier/src/xmlkit/InstructionSyntax.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java.i
-data/src/share/classes/javax/management/remote/JMXProviderException.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/ImageTests.java.i
data/src/linux/doc/man/javac.1.i
data/make/tools/src/build/tools/jdwpgen/IntTypeNode.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java.i
@@ -5852,10 +5803,11 @@ data/test/java/io/Serializable/class/SerialA.java.i
data/test/java/nio/channels/SocketChannel/VectorIO.java.i
data/src/share/classes/sun/security/pkcs/ParsingException.java.i
data/test/sun/net/idn/nfsmxs.spp.i
-data/make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java.i
-data/make/tools/CharsetMapping/IBM860.map.i
+data/test/java/beans/PropertyEditor/TestLongClassJava.java.i
data/test/java/nio/channels/DatagramChannel/NoSender.java.i
data/src/share/classes/javax/swing/text/TableView.java.i
+data/src/share/classes/javax/swing/LayoutStyle.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java.i
data/src/share/classes/sun/security/x509/CertificatePolicyId.java.i
data/test/java/io/PrintWriter/FailingConstructors.java.i
data/test/sun/tools/jstatd/jstatdServerName.sh.i
@@ -5863,29 +5815,26 @@ data/src/share/classes/javax/crypto/MacSpi.java.i
data/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java.i
data/src/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java.i
data/test/javax/swing/JList/6823603/bug6823603.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocket.java.i
+data/test/javax/crypto/Mac/NullMacSpi.java.i
data/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh.i
-data/make/com/sun/tools/attach/FILES_java.gmk.i
data/src/share/classes/sun/misc/RequestProcessor.java.i
data/test/sun/pisces/ThinLineTest.java.i
data/src/share/classes/java/lang/invoke/VolatileCallSite.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java.i
data/src/share/demo/jvmti/hprof/sample.makefile.txt.i
-data/test/java/beans/XMLEncoder/java_util_Collections_CheckedList.java.i
data/test/tools/launcher/i18nTest.sh.i
+data/test/java/lang/instrument/PremainClass/InheritAgent0011.java.i
data/src/share/native/sun/awt/image/jpeg/jfdctflt.c.i
data/test/java/nio/file/WatchService/OverflowEventIsLoner.java.i
-data/src/share/classes/java/awt/image/TileObserver.java.i
data/src/windows/native/sun/windows/awt_KeyEvent.h.i
data/src/share/native/java/util/zip/zlib-1.1.3/doc/algorithm.doc.i
data/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java.i
-data/make/tools/src/build/tools/javazic/Mappings.java.i
+data/src/share/classes/sun/text/resources/FormatData_ko.java.i
data/make/tools/CharsetMapping/IBM918.c2b.i
data/test/java/net/InetAddress/IPv4Formats.java.i
-data/test/java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java.i
data/test/javax/management/namespace/NullObjectNameTest.java.i
data/src/share/classes/sun/tools/tree/BinaryCompareExpression.java.i
-data/src/share/classes/javax/print/URIException.java.i
+data/src/share/classes/sun/font/NullFontScaler.java.i
data/src/share/classes/sun/security/jca/ServiceId.java.i
data/src/solaris/classes/sun/awt/X11/XFramePeer.java.i
data/src/share/classes/javax/print/attribute/standard/MediaPrintableArea.java.i
@@ -5893,29 +5842,23 @@ data/src/share/classes/javax/naming/ldap/LdapName.java.i
data/src/share/classes/javax/crypto/IllegalBlockSizeException.java.i
data/make/mkdemo/jvmti/hprof/Makefile.i
data/src/share/classes/javax/swing/DefaultSingleSelectionModel.java.i
-data/src/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java.i
-data/src/share/classes/java/security/SecureRandomSpi.java.i
+data/test/java/net/URLEncoder/Decoder.java.i
data/src/share/classes/sun/net/util/URLUtil.java.i
data/src/share/classes/javax/naming/ServiceUnavailableException.java.i
data/src/share/transport/shmem/sysShmem.h.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html.i
-data/src/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java.i
-data/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java.i
data/src/share/classes/sun/io/ByteToCharCp921.java.i
data/src/share/classes/sun/security/jgss/krb5/InitialToken.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMeta.java.i
-data/test/java/io/File/Create.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java.i
-data/src/share/classes/javax/print/AttributeException.java.i
+data/src/share/classes/javax/xml/crypto/URIDereferencer.java.i
data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml.i
data/src/share/classes/java/security/KeyPairGenerator.java.i
-data/src/share/classes/javax/naming/directory/InvalidSearchControlsException.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserConstants.java.i
data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdParallelGC.sh.i
data/test/sun/security/krb5/etype/WeakCrypto.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_pt.properties.i
data/src/share/classes/com/sun/net/ssl/KeyManagerFactory.java.i
-data/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java.i
+data/src/share/demo/nio/zipfs/META-INF/services/java.nio.file.spi.FileSystemProvider.i
+data/test/java/security/SecureRandom/GetAlgorithm.java.i
data/src/share/classes/com/sun/jmx/snmp/package.html.i
data/test/javax/swing/MultiUIDefaults/4300666/bug4300666.html.i
data/src/share/native/sun/security/ec/impl/mpi-config.h.i
@@ -5924,31 +5867,33 @@ data/test/sun/net/www/http/HttpClient/GetProxyPort.java.i
data/test/sun/security/provider/PolicyFile/SelfWildcard.policy.i
data/test/sun/tools/jps/jps-Defaults.sh.i
data/src/share/classes/com/sun/tools/hat/build.xml.i
-data/test/sun/nio/cs/OLD/SimpleEUCDecoder.java.i
+data/src/windows/classes/java/io/FileDescriptor.java.i
data/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh.i
data/src/share/classes/javax/swing/plaf/basic/CenterLayout.java.i
data/make/mksample/dtrace/Makefile.i
data/src/share/classes/sun/nio/cs/ext/IBM1146.java.i
-data/src/share/demo/nbproject/README.txt.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingModel.java.i
+data/src/share/classes/sun/launcher/resources/launcher_fr.properties.i
data/src/share/classes/javax/print/DocFlavor.java.i
data/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties.i
data/test/java/beans/XMLDecoder/spec/TestFalse.java.i
data/test/java/lang/reflect/Field/Set.java.i
-data/src/share/demo/jfc/FileChooserDemo/resources/images/jpgIcon.jpg.i
+data/test/sun/java2d/loops/Bug7049339.java.i
data/src/share/demo/jvmti/hprof/hprof.h.i
data/src/share/classes/sun/security/smartcardio/TerminalImpl.java.i
-data/make/tools/swing-beans/SwingBeanInfo.template.i
+data/src/share/classes/sun/util/resources/CurrencyNames_be_BY.properties.i
+data/test/com/sun/net/httpserver/bugs/FixedLengthInputStream.java.i
data/src/solaris/native/sun/java2d/loops/vis_AlphaMaskFill.c.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_AU.properties.i
data/src/share/classes/java/awt/MultipleGradientPaint.java.i
data/src/share/classes/sun/misc/Resource.java.i
data/src/share/native/sun/java2d/loops/Blit.c.i
+data/src/solaris/native/sun/java2d/loops/vis_GlyphListXor.c.i
data/src/share/classes/java/io/OptionalDataException.java.i
data/test/javax/swing/JFormattedTextField/Test6462562.java.i
data/test/java/io/RandomAccessFile/skipBytes/SkipBytes.java.i
-data/test/java/io/FilterOutputStream/BoundsCheck.java.i
+data/test/java/util/zip/InterruptibleZip.java.i
data/make/sun/security/ec/mapfile-vers.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/RectangleShape.java.i
data/test/java/net/URL/TestPort.java.i
@@ -5956,31 +5901,26 @@ data/test/com/sun/net/httpserver/Test3.java.i
data/src/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java.i
data/test/java/awt/Mixing/MixingOnDialog.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java.i
-data/src/share/classes/java/awt/event/ItemEvent.java.i
+data/src/share/classes/sun/applet/AppletResourceLoader.java.i
data/src/share/classes/java/text/PatternEntry.java.i
-data/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.i
+data/test/java/awt/font/TextLayout/TestSinhalaChar.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java.i
data/src/solaris/doc/sun/man/man1/java.1.i
-data/src/solaris/doc/sun/man/man1/jps.1.i
data/test/java/lang/ClassLoader/defineClass/TestClass.java.i
-data/src/share/classes/sun/text/resources/FormatData_it_CH.java.i
data/test/java/security/cert/CertPathBuilder/StubProvider.java.i
-data/test/sun/security/tools/keytool/StartDateTest.java.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties.i
data/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java.i
data/src/solaris/classes/sun/awt/X11/XEmbedChildProxy.java.i
-data/test/java/nio/channels/FileChannel/ReadToLimit.java.i
+data/test/javax/swing/JLayer/6872503/bug6872503.java.i
data/make/sun/net/Makefile.i
data/test/java/lang/reflect/Generics/HashCodeTest.java.i
-data/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp.i
-data/src/share/classes/javax/naming/event/package.html.i
-data/make/sun/cmm/lcms/Makefile.i
+data/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.i
data/test/javax/management/remote/mandatory/subjectDelegation/jmxremote.password.i
data/test/java/lang/System/IHashCode.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pk2.key.i
data/test/java/rmi/activation/Activatable/checkRegisterInLog/rmid.security.policy.i
-data/src/share/classes/javax/xml/crypto/dom/package.html.i
-data/make/tools/GenerateCharacter/Character.c.template.i
+data/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c.i
data/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java.i
data/src/share/classes/sun/tools/tree/ThisExpression.java.i
@@ -5991,18 +5931,13 @@ data/make/java/jvm/Makefile.i
data/src/solaris/native/sun/awt/awt_XmDnD.h.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif.i
data/make/tools/swing-beans/beaninfo/images/JMenuMono32.gif.i
-data/src/share/classes/javax/swing/text/html/BlockView.java.i
data/src/share/classes/sun/rmi/runtime/Log.java.i
data/test/java/net/Socket/IDNTest.java.i
-data/src/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java.i
data/src/share/native/common/jni_util.c.i
data/src/solaris/native/sun/security/smartcardio/pcsc_md.c.i
data/test/java/awt/Mouse/MouseModifiersUnitTest/ModifierPermutation.java.i
-data/make/tools/src/build/tools/charsetmapping/DBCS.java.i
-data/test/java/util/ResourceBundle/Control/Chinese_zh.properties.i
+data/test/com/sun/security/auth/login/ConfigFile/Override.props.i
data/src/share/classes/sun/text/resources/FormatData_mt_MT.java.i
-data/test/javax/management/generified/ListTypeCheckTest.java.i
-data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_4.java.i
data/test/com/sun/nio/sctp/SctpServerChannel/Accept.java.i
data/test/java/util/zip/ZipFile/FinalizeZipFile.java.i
data/src/share/classes/javax/swing/tree/TreeCellRenderer.java.i
@@ -6010,46 +5945,50 @@ data/test/java/util/ResourceBundle/Bug6356571.properties.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java.i
data/src/solaris/native/java/io/io_util_md.c.i
data/src/share/native/com/sun/java/util/jar/pack/bytes.cpp.i
-data/src/share/classes/sun/io/ByteToCharUnicodeBigUnmarked.java.i
data/make/mkdemo/jvmti/mapfile-vers.i
data/src/share/classes/javax/swing/text/ViewFactory.java.i
data/test/sun/security/ssl/sanity/interop/JSSEClient.java.i
data/src/share/classes/javax/swing/text/html/parser/ContentModel.java.i
data/src/windows/native/sun/java2d/d3d/D3DBufImgOps.cpp.i
-data/test/java/beans/PropertyEditor/TestDoubleClass.java.i
+data/src/share/classes/java/io/UTFDataFormatException.java.i
+data/test/java/io/Serializable/ClassCastExceptionDetail/Write.java.i
data/src/share/classes/javax/crypto/KeyGeneratorSpi.java.i
data/src/share/classes/sun/security/pkcs11/P11KeyFactory.java.i
data/test/javax/management/Introspector/SqeDescriptorKey.java.i
data/src/share/classes/java/lang/CharacterData.java.i
+data/test/java/util/zip/ZipFile/crash.jar.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_es.properties.i
data/src/share/classes/sun/io/CharToByteCp037.java.i
data/make/tools/swing-beans/beaninfo/images/JTreeColor32.gif.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java.i
-data/test/java/util/jar/JarInputStream/EmptyJar.java.i
+data/test/java/net/URLClassLoader/closetest/build2.sh.i
+data/src/windows/classes/java/util/prefs/WindowsPreferences.java.i
data/test/java/net/URL/Constructor.java.i
data/make/sun/awt/CondenseRules.awk.i
data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java.i
data/src/share/classes/sun/io/ByteToCharJohab.java.i
data/test/sun/security/provider/PolicyParser/ExtDirsChange.java.i
data/src/share/classes/com/sun/jmx/snmp/UserAcl.java.i
-data/test/java/io/File/SetLastModified.java.i
+data/src/windows/native/sun/nio/ch/FileDispatcher.c.i
data/src/share/classes/com/sun/naming/internal/VersionHelper12.java.i
data/src/solaris/classes/sun/font/XRGlyphCacheEntry.java.i
data/src/share/native/sun/font/bidi/uchardir.c.i
-data/test/java/net/URLConnection/ChunkedEncoding.java.i
+data/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java.i
data/make/mksample/nio/server/Makefile.i
data/test/java/nio/channels/DatagramChannel/Receive.java.i
data/src/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java.i
+data/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java.i
data/src/share/classes/sun/net/www/http/PosterOutputStream.java.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_fr.properties.i
data/src/share/native/sun/awt/image/jpeg/jdmarker.c.i
-data/test/java/awt/PrintJob/EdgeTest/EdgeTest.java.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/generate.sh.i
data/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_stat.d.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIB.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java.i
-data/make/sun/rmi/rmic/Makefile.i
-data/src/solaris/classes/java/net/DefaultDatagramSocketImplFactory.java.i
+data/test/java/net/Socket/LinkLocal.java.i
+data/make/common/shared/Defs-windows.gmk.i
+data/test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java.i
+data/make/sun/rmi/rmic/Makefile.i
+data/test/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java.i
data/make/common/internal/Resources.gmk.i
data/src/share/classes/org/openjdk/jigsaw/Linker.java.i
data/test/sun/net/InetAddress/nameservice/chaining/Simple2NameServiceDescriptor.java.i
@@ -6059,17 +5998,15 @@ data/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Encoder.java.i
data/src/share/classes/sun/io/ByteToCharCp939.java.i
data/make/sun/usagetracker/Makefile.i
data/test/javax/security/auth/login/Configuration/GetInstance.configURI.i
-data/test/javax/swing/text/html/TableView/7030332/sample2.png.i
data/test/com/sun/jdi/EarlyReturnTest.java.i
data/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java.i
-data/src/share/classes/java/awt/RenderingHints.java.i
+data/src/share/bin/version_comp.c.i
data/make/com/sun/image/Makefile.i
-data/src/share/demo/jvmti/hprof/hprof_class.c.i
+data/src/share/lib/calendars.properties.i
data/src/share/classes/java/util/concurrent/Exchanger.java.i
-data/test/java/io/File/WinSpecialFiles.java.i
-data/src/share/classes/javax/net/ssl/SSLProtocolException.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java.i
data/test/java/io/ByteArrayInputStream/Skip.java.i
-data/src/share/classes/java/nio/file/FileSystem.java.i
+data/src/share/back/ClassObjectReferenceImpl.c.i
data/src/share/classes/java/util/ArrayList.java.i
data/src/share/native/sun/awt/splashscreen/splashscreen_impl.h.i
data/src/share/classes/java/nio/file/attribute/PosixFileAttributes.java.i
@@ -6078,54 +6015,53 @@ data/src/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java.i
data/src/share/classes/sun/security/ssl/HandshakeHash.java.i
data/src/share/classes/javax/management/timer/Timer.java.i
data/src/solaris/hpi/src/linker_md.c.i
+data/src/share/classes/sun/tools/tree/ConditionalExpression.java.i
data/test/sun/security/x509/equalNames/AltNamesEqualsTest.java.i
-data/src/share/classes/com/sun/tools/jdi/PacketStream.java.i
-data/src/share/native/sun/font/layout/OpenTypeUtilities.cpp.i
+data/make/tools/CharsetMapping/IBM424.map.i
+data/src/share/classes/java/sql/Driver.java.i
data/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java.i
data/test/sun/tools/jstat/jstatGcCauseOutput1.sh.i
data/src/solaris/doc/sun/man/man1/ja/jrunscript.1.i
data/src/solaris/classes/sun/awt/X11/XGlobalCursorManager.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java.i
data/test/java/nio/channels/SocketChannel/Connect.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDefault.java.i
+data/src/share/classes/javax/swing/text/html/default.css.i
data/src/solaris/native/sun/awt/awt_KeyboardFocusManager.h.i
data/make/common/shared/Defs-linux.gmk.i
data/src/share/native/com/sun/java/util/jar/pack/coding.cpp.i
data/src/share/classes/javax/sql/rowset/rowset.properties.i
+data/src/share/demo/java2d/J2DBench/resources/images/photo.jpg.i
+data/src/share/classes/org/openjdk/jigsaw/ModuleFile.java.i
+data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor32.gif.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties.i
-data/src/share/classes/java/dyn/BootstrapMethod.java.i
-data/src/share/classes/sun/security/provider/ConfigSpiFile.java.i
+data/test/javax/sound/sampled/AudioFormat/Matches_NOT_SPECIFIED.java.i
data/src/windows/native/java/net/icmp.h.i
data/test/java/net/InetSocketAddress/B4849451.java.i
-data/src/share/classes/java/awt/event/WindowStateListener.java.i
data/src/share/classes/javax/crypto/spec/DESKeySpec.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java.i
data/test/java/awt/Mixing/OverlappingButtons.java.i
data/test/sun/misc/URLClassPath/ClassnameCharTest.sh.i
data/src/share/classes/javax/naming/event/EventContext.java.i
data/src/solaris/classes/sun/awt/X11/XWM.java.i
+data/test/javax/management/remote/mandatory/version/ImplVersionCommand.java.i
data/test/javax/management/remote/mandatory/provider/provider/JMXConnectorProviderImpl.java.i
data/test/java/net/URL/share_file_urls.i
-data/test/com/sun/servicetag/TestLoadFromXML.java.i
+data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml.i
data/src/share/native/sun/java2d/cmm/lcms/icc34.h.i
data/test/javax/security/auth/login/Configuration/Synchronize.java.i
data/src/share/classes/java/nio/channels/FileLock.java.i
-data/src/share/native/java/lang/fdlibm/src/s_frexp.c.i
data/src/share/classes/sun/security/provider/certpath/Builder.java.i
-data/src/windows/native/sun/windows/awt_ScrollPane.h.i
data/test/sun/security/tools/keytool/console.sh.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java.i
data/test/javax/swing/JPopupMenu/6675802/bug6675802.java.i
data/src/share/back/stream.h.i
+data/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor16.gif.i
data/src/share/native/java/util/zip/zlib-1.1.3/inftrees.c.i
-data/src/share/classes/com/sun/media/sound/WaveFileReader.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.access.in.i
data/src/share/classes/java/lang/ref/package.html.i
data/src/share/classes/java/awt/doc-files/TextArea-1.gif.i
+data/test/java/security/cert/pkix/nameConstraintsMinMax/labs2isrg2.cer.i
data/src/share/classes/com/sun/media/sound/SoftInstrument.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java.i
-data/src/share/demo/jvmti/hprof/hprof_cpu.h.i
-data/src/share/sample/nio/server/ChannelIO.java.i
data/test/sun/security/pkcs11/rsa/KeyWrap.java.i
data/make/tools/swing-beans/beaninfo/images/JToolBarColor32.gif.i
data/src/share/classes/sun/net/httpserver/ExchangeImpl.java.i
@@ -6136,20 +6072,19 @@ data/src/share/demo/jvmti/hprof/hprof_site.h.i
data/test/javax/swing/plaf/synth/SynthToolBarUI/6739756/bug6739756.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java.i
data/src/windows/classes/sun/security/krb5/internal/tools/Klist.java.i
-data/src/share/bin/parse_manifest.c.i
+data/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownModelLcdException.java.i
data/src/share/classes/javax/sql/rowset/spi/SyncProviderException.java.i
data/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass.java.i
data/src/share/classes/java/util/prefs/InvalidPreferencesFormatException.java.i
data/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java.i
data/test/javax/print/applet/applet1/META-INF/services/javax.print.PrintServiceLookup.i
data/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java.i
data/src/share/classes/sun/text/resources/FormatData_en_CA.java.i
data/make/com/sun/tools/attach/Exportedfiles.gmk.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngineResult/Deserialize.java.i
-data/test/javax/swing/JLabel/6501991/bug6501991.java.i
+data/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java.i
data/src/share/classes/javax/management/BinaryRelQueryExp.java.i
data/src/share/classes/java/rmi/server/ServerRef.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif.i
@@ -6161,16 +6096,16 @@ data/test/java/io/Serializable/subclassGC/SubclassGC.java.i
data/src/share/classes/java/util/List.java.i
data/src/share/classes/javax/swing/text/PasswordView.java.i
data/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java.i
-data/make/com/sun/demo/jvmti/Makefile.i
+data/test/sun/pisces/JoinMiterTest.java.i
data/src/share/classes/com/sun/tracing/ProviderFactory.java.i
data/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java.i
-data/test/java/beans/PropertyEditor/TestColorClass.java.i
-data/src/share/back/SDE.h.i
+data/src/share/classes/sun/nio/cs/KOI8_R.java.i
data/test/java/io/Serializable/arraySuidConflict/Foo.java.i
data/src/share/native/sun/java2d/loops/Any3Byte.h.i
data/test/java/awt/font/TextLayout/CombiningPerf.java.i
data/src/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java.i
-data/src/share/classes/sun/io/CharToByteCp424.java.i
+data/test/java/util/Collections/AddAll.java.i
+data/make/com/sun/tracing/dtrace/Makefile.i
data/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java.i
data/src/share/classes/java/util/zip/package.html.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java.i
@@ -6181,8 +6116,9 @@ data/test/java/util/concurrent/DelayQueue/Stress.java.i
data/src/share/native/sun/font/layout/SubtableProcessor.h.i
data/src/share/classes/java/lang/invoke/AdapterMethodHandle.java.i
data/test/javax/management/context/ContextForwarderTest.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties.i
-data/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c.i
+data/test/java/lang/invoke/ClassValueTest.java.i
+data/src/share/back/ThreadGroupReferenceImpl.h.i
+data/src/share/native/sun/java2d/loops/AlphaMacros.c.i
data/test/sun/rmi/runtime/Log/4504153/Test4504153.java.i
data/src/share/back/log_messages.h.i
data/test/java/rmi/activation/log/LogTest.java.i
@@ -6194,55 +6130,56 @@ data/test/javax/crypto/spec/RC5ParameterSpec/RC5ParameterSpecEquals.java.i
data/test/java/util/Locale/Bug4316602.java.i
data/src/share/classes/java/awt/image/ImagingOpException.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtils.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/deflate.h.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java.i
+data/src/share/classes/com/sun/security/sasl/ClientFactoryImpl.java.i
data/src/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java.i
data/src/share/classes/javax/print/attribute/IntegerSyntax.java.i
-data/src/share/classes/sun/io/CharToByteISO8859_7.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java.i
+data/test/javax/swing/JComponent/4337267/bug4337267.java.i
+data/src/share/demo/applets/MoleculeViewer/models/water.xyz.i
+data/test/java/lang/reflect/Method/invoke/IllegalAccessInInvoke.java.i
data/src/share/demo/nbproject/jfc/TableExample/build.properties.i
-data/test/sun/management/jmxremote/bootstrap/management_test02_ok.properties.in.i
-data/src/share/classes/sun/awt/im/CompositionArea.java.i
+data/src/share/classes/sun/tools/jstat/Scale.java.i
+data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java.i
+data/test/java/io/Serializable/defaultReadObjectCNFException/DefaultReadObjectCNFException.java.i
data/test/java/util/ResourceBundle/Control/ExpirationTest.sh.i
data/test/java/lang/instrument/AppendToClassPathSetUp.sh.i
data/test/java/io/Reader/Skip.java.i
data/src/share/classes/com/sun/tools/jdi/TypeImpl.java.i
data/src/share/demo/management/MemoryMonitor/README.txt.i
-data/src/share/classes/java/nio/channels/package-info.java.i
data/src/share/classes/java/awt/image/RenderedImage.java.i
data/test/java/security/cert/CertPathBuilder/StubProviderImpl.java.i
data/make/tools/swing-beans/beaninfo/images/JRadioButtonMono32.gif.i
-data/src/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java.i
+data/src/share/demo/jfc/Metalworks/KhakiMetalTheme.java.i
data/src/share/classes/sun/nio/cs/ext/IBM964.java.d
data/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c.i
-data/src/solaris/classes/sun/awt/X11/XlibWrapper.java.i
+data/test/java/nio/file/spi/SetDefaultProvider.java.i
data/src/share/classes/sun/management/HotspotCompilationMBean.java.i
-data/src/share/classes/javax/swing/event/UndoableEditListener.java.i
+data/test/java/rmi/reliability/juicer/OrangeEcho.java.i
data/src/share/classes/com/sun/jndi/toolkit/url/Uri.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Traffic.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java.i
data/src/share/classes/javax/swing/text/GlyphPainter2.java.i
data/make/modules/ld.jdk.swing.i
data/test/java/nio/charset/RemovingSunIO/TestUnmappableForLength.java.i
+data/test/java/math/BigDecimal/StrippingZerosTest.java.i
data/src/share/classes/javax/swing/DefaultListCellRenderer.java.i
data/src/share/classes/com/sun/net/httpserver/Authenticator.java.i
-data/src/share/classes/javax/imageio/spi/IIORegistry.java.i
+data/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java.i
data/src/solaris/native/sun/nio/ch/Sctp.h.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasUIDefaults.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpec.java.i
-data/src/share/classes/java/util/concurrent/CopyOnWriteArraySet.java.i
+data/test/java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java.i
+data/test/sun/tools/jrunscript/jrunscript-argsTest.sh.i
data/src/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java.i
data/src/share/classes/sun/io/ByteToCharCp866.java.i
data/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMBean.java.i
-data/make/templates/gpl-header.i
+data/test/java/util/Arrays/CopyMethods.java.i
data/make/tools/spp/Makefile.i
data/src/share/classes/sun/io/ByteToCharMacDingbat.java.i
-data/test/java/net/URLConnection/xml/not-xml1.i
+data/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java.i
data/src/windows/classes/sun/io/Win32ErrorMode.java.i
data/src/share/classes/javax/sound/midi/Instrument.java.i
-data/test/sun/security/provider/PolicyFile/AliasExpansion.java.i
+data/test/java/rmi/reliability/juicer/Orange.java.i
data/src/solaris/native/sun/java2d/loops/mlib_ImageCopy.h.i
data/test/javax/management/Introspector/AnnotatedNotificationInfoTest.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java.i
@@ -6250,15 +6187,17 @@ data/src/share/classes/sun/text/resources/FormatData_es_MX.java.i
data/src/solaris/native/sun/awt/VDrawingArea.h.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.h.i
data/src/solaris/native/sun/java2d/loops/vis_IntArgbPre_Mask.c.i
-data/src/share/classes/sun/io/ByteToCharCp875.java.i
+data/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java.i
data/test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java.i
data/test/java/nio/channels/Selector/WakeupOverflow.java.i
data/src/share/classes/sun/management/resources/agent_sv.properties.i
-data/src/share/classes/sun/awt/image/ToolkitImage.java.i
-data/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java.i
+data/test/sun/security/krb5/auto/OkAsDelegate.java.i
data/test/sun/security/pkcs11/fips/truststore.i
data/test/java/rmi/activation/Activatable/unregisterInactive/security.policy.i
data/test/java/lang/ProcessBuilder/BigFork.java.i
+data/src/share/classes/javax/print/attribute/TextSyntax.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java.i
data/src/share/classes/sun/font/Decoration.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java.i
data/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java.i
@@ -6267,56 +6206,50 @@ data/src/share/native/java/lang/fdlibm/src/w_scalb.c.i
data/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java.i
data/test/sun/security/mscapi/PrngSlow.java.i
data/src/solaris/classes/sun/java2d/xr/MutableInteger.java.i
-data/src/share/classes/sun/java2d/pipe/SolidTextRenderer.java.i
data/src/share/classes/javax/swing/text/EditorKit.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java.i
data/src/share/native/sun/security/ec/impl/ecp_192.c.i
data/src/share/classes/sun/security/x509/CertificateIssuerExtension.java.i
-data/src/share/classes/java/awt/PopupMenu.java.i
-data/test/java/io/Serializable/primitiveClasses/PrimitiveClasses.java.i
data/src/share/classes/sun/text/resources/FormatData_hi_IN.java.i
-data/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java.i
data/src/share/classes/java/awt/dnd/DragGestureRecognizer.java.i
-data/src/share/classes/sun/io/CharToByteCp860.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_en_SG.properties.i
data/src/share/classes/java/util/TimeZone.java.i
data/src/share/native/sun/java2d/loops/Ushort4444Argb.c.i
data/make/modules/tools/src/com/sun/classanalyzer/Klass.java.i
data/src/solaris/classes/java/util/prefs/FileSystemPreferences.java.i
data/src/share/classes/java/beans/EventHandler.java.i
-data/test/java/util/Hashtable/HashCode.java.i
+data/test/java/util/ServiceLoader/FooProvider2.java.i
data/src/windows/native/java/lang/java_props_md.c.i
data/test/java/rmi/reliability/benchmark/bench/serial/Shorts.java.i
-data/src/share/classes/sun/tools/tree/AssignExpression.java.i
+data/test/sun/misc/Version/Version.java.i
data/make/com/sun/jndi/toolkit/Makefile.i
-data/src/share/sample/scripting/scriptpad/src/resources/Main.js.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java.i
data/test/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.html.i
data/test/java/io/Serializable/proxy/replace/Test.java.i
data/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java.i
data/test/javax/management/descriptor/DescriptorConstructorTest.java.i
-data/make/tools/CharsetMapping/MS936.map.i
-data/src/share/classes/com/sun/media/sound/DLSInfo.java.i
+data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java.i
data/src/share/classes/java/awt/print/Pageable.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_lt.properties.i
+data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java.i
data/src/share/classes/sun/tools/tree/BinaryBitExpression.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv.h.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java.i
data/src/share/classes/sun/reflect/UnsafeStaticObjectFieldAccessorImpl.java.i
-data/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template.i
data/src/linux/doc/man/ja/native2ascii.1.i
data/src/share/demo/jfc/SwingApplet/README.txt.i
data/test/sun/util/resources/TimeZone/Bug6377794.java.i
data/src/windows/classes/sun/java2d/d3d/D3DMaskBlit.java.i
data/test/sun/misc/ClassLoaderUtil/test.jar.i
-data/make/tools/CharsetMapping/IBM935.c2b.i
+data/test/sun/nio/cs/TestUTF8.java.i
data/src/solaris/classes/sun/awt/X11/XLayerProtocol.java.i
data/src/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java.i
-data/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java.i
+data/test/java/lang/instrument/RemoveTransformerTest.java.i
data/make/tools/classanalyzer/nbproject/project.properties.i
data/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java.i
data/test/sun/security/krb5/auto/TcpTimeout.java.i
data/src/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java.i
data/src/share/demo/jfc/FileChooserDemo/resources/images/gifIcon.gif.i
-data/src/share/classes/sun/security/pkcs11/TemplateManager.java.i
data/test/sun/management/jmxremote/bootstrap/linux-i586/launcher.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Decoder.java.i
data/make/Makefile.i
@@ -6325,132 +6258,133 @@ data/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java.i
data/test/sun/security/pkcs11/tls/TestMasterSecret.java.i
data/test/tools/pack200/pack200-verifier/src/xmlkit/XMLKit.java.i
data/src/share/classes/sun/text/normalizer/UTF16.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java.i
-data/src/share/classes/java/text/Collator.java.i
+data/src/share/classes/javax/swing/JSlider.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h.i
data/src/share/classes/sun/security/x509/CRLNumberExtension.java.i
-data/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java.i
data/test/org/openjdk/jigsaw/cli/ca-cert.pem.i
data/test/java/util/Random/DistinctSeeds.java.i
-data/test/javax/management/eventService/CustomForwarderTest.java.i
+data/test/com/oracle/net/sanity.sh.i
data/test/java/security/Provider/Equals.java.i
-data/test/java/rmi/Naming/legalRegistryNames/Legal.java.i
data/src/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java.i
-data/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509ExtendedKeyManager.java.i
data/src/share/classes/sun/reflect/generics/repository/FieldRepository.java.i
data/test/java/lang/ClassLoader/deadlock/Bob.java.i
data/src/share/classes/sun/awt/image/IntegerComponentRaster.java.i
data/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_es.java.i
-data/src/share/classes/java/util/concurrent/atomic/package-info.java.i
+data/src/share/sample/nio/chatserver/NameReader.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java.i
data/src/share/native/sun/font/layout/MultipleSubstSubtables.h.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties.i
data/make/tools/dtdbuilder/dtds/html32.dtd.i
+data/src/share/sample/scripting/scriptpad/build.xml.i
data/src/share/classes/javax/naming/spi/InitialContextFactory.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent1110.java.i
data/test/java/io/File/isDirectory/Applet.html.i
-data/test/java/util/Locale/serialized/java6locale__US.i
+data/test/java/io/Serializable/concurrentClassDescLookup/ConcurrentClassDescLookup.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java.i
data/test/javax/script/Test6.js.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaField.java.i
-data/src/share/demo/scripting/jconsole-plugin/src/resources/jconsole.js.i
-data/test/java/nio/channels/FileChannel/Read.java.i
+data/src/share/classes/sun/rmi/server/WeakClassHashMap.java.i
data/src/share/native/sun/font/layout/KhmerLayoutEngine.cpp.i
data/src/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav.i
data/src/share/native/java/lang/fdlibm/src/s_ceil.c.i
data/make/mksample/nio/chatserver/Makefile.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformCommunity.java.i
+data/test/java/beans/Introspector/TestTypeResolver.java.i
data/src/share/classes/com/sun/jndi/ldap/LdapNameParser.java.i
data/test/java/util/Collections/WrappedNull.java.i
data/test/java/beans/XMLDecoder/spec/AbstractTest.java.i
data/test/java/nio/Buffer/BasicFloat.java.i
data/src/share/classes/sun/io/CharToByteMacArabic.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java.i
-data/src/share/classes/sun/security/acl/WorldGroupImpl.java.i
-data/src/share/classes/sun/security/ssl/AppOutputStream.java.i
-data/src/share/classes/sun/text/normalizer/ICUBinary.java.i
+data/src/share/classes/sun/tools/jstat/ExpressionExecuter.java.i
+data/test/java/net/InetAddress/ptr/lookup.sh.i
+data/src/solaris/classes/sun/nio/ch/SctpAssocChange.java.i
data/src/windows/transport/shmem/shmem_md.h.i
data/test/javax/xml/crypto/dsig/data/sign-spec.xml.i
data/src/share/classes/sun/print/resources/orientLandscape.png.i
data/src/share/classes/java/security/ProtectionDomain.java.i
data/src/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java.i
-data/test/java/io/Serializable/maskSyntheticModifier/Foo.java.i
+data/test/java/nio/channels/SocketChannel/ConnectState.java.i
data/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java.i
data/src/solaris/native/sun/awt/awt_MenuComponent.c.i
-data/src/share/classes/java/text/BreakDictionary.java.i
+data/test/java/lang/Thread/GenerifyStackTraces.java.i
data/make/sun/audio/Makefile.i
-data/src/windows/native/sun/net/www/protocol/http/NTLMAuthSequence.c.i
+data/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java.i
data/test/sun/security/provider/DSA/TestKeyPairGenerator.java.i
data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Ports.c.i
data/src/share/classes/java/lang/Deprecated.java.i
data/src/windows/native/sun/windows/awt_DnDDS.h.i
data/src/share/back/eventHelper.c.i
-data/test/sun/security/pkcs11/Cipher/TestRawRSACipher.java.i
+data/test/java/net/Socket/ShutdownInput.java.i
data/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java.i
data/src/share/classes/sun/nio/cs/ext/ISCII91.java.i
+data/src/share/classes/sun/net/www/MimeLauncher.java.i
data/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java.i
data/src/share/classes/javax/script/ScriptEngine.java.i
data/make/tools/CharsetMapping/IBM1098.map.i
data/src/share/native/sun/font/layout/ContextualGlyphSubstProc.h.i
-data/src/share/classes/sun/misc/resources/Messages_fr.java.i
+data/src/solaris/classes/sun/awt/X11/XWindowAttributesData.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/zlib.h.i
data/src/linux/doc/man/unpack200.1.i
data/.jcheck/conf.i
+data/test/sun/tools/jrunscript/jrunscript-fTest.sh.i
data/src/share/classes/com/sun/tools/script/shell/init.js.i
+data/src/share/classes/com/sun/java/util/jar/pack/Attribute.java.i
data/make/java/main/Makefile.i
data/src/share/back/FieldImpl.h.i
data/src/share/classes/javax/sound/midi/MidiDevice.java.i
-data/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java.i
data/test/com/sun/security/auth/callback/TextCallbackHandler/NPE.java.i
data/src/share/native/java/lang/fdlibm/src/w_acosh.c.i
data/test/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl.java.i
data/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties.i
-data/make/tools/CharsetMapping/HKSCS2008.c2b.i
-data/src/share/classes/sun/text/resources/FormatData_de_LU.java.i
-data/src/share/classes/sun/security/validator/Validator.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html.i
+data/src/share/modules/jdk/module-info.java.i
+data/src/share/native/sun/security/ec/ec2_233.c.i
+data/src/windows/back/util_md.h.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c.i
data/src/share/native/common/jdk_util.h.i
data/test/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Disable.java.i
+data/test/javax/management/modelmbean/ExoticTargetTypeTest.java.i
data/src/share/classes/javax/swing/SortOrder.java.i
data/src/share/classes/sun/launcher/resources/launcher_ko.properties.i
data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemColor16.gif.i
data/src/share/demo/nbproject/jfc/SampleTree/nbproject/project.xml.i
data/test/sun/security/pkcs11/MessageDigest/DigestKAT.java.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Librarian.java.i
data/src/share/classes/sun/text/resources/FormatData_bg.java.i
data/make/java/text/bidi/Makefile.i
data/src/share/classes/java/lang/Class.java.i
data/src/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java.i
-data/make/java/java/mapfile-vers.i
+data/src/share/native/sun/nio/ch/nio.h.i
+data/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp.i
data/src/share/classes/java/rmi/dgc/DGC.java.i
data/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh.i
data/src/share/classes/javax/swing/plaf/multi/MultiSliderUI.java.i
data/test/java/awt/xembed/server/TesterClient.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java.i
-data/test/java/security/cert/CertPathValidator/OCSP/AIACert.pem.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java.i
-data/src/share/classes/sun/text/resources/FormatData_sk_SK.java.i
+data/test/java/awt/geom/CubicCurve2D/IntersectsTest.java.i
+data/src/share/classes/javax/sql/rowset/RowSetFactory.java.i
data/test/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass2.java.i
data/test/com/sun/jdi/ExceptionEvents.java.i
data/test/java/lang/instrument/BufferClassLoader.java.i
data/src/share/classes/sun/io/ByteToCharCp1251.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java.i
-data/make/tools/CharsetMapping/IBM970.c2b.i
-data/src/share/classes/java/lang/SuppressWarnings.java.i
+data/test/java/rmi/reliability/benchmark/bench/HtmlReporter.java.i
+data/make/tools/CharsetMapping/sjis0213.map.i
data/make/tools/GenerateCharacter/CharacterData0E.java.template.i
data/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java.i
data/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties.i
+data/test/java/util/TimeZone/OldIDMappingTest.sh.i
data/make/mkdemo/jpda/Makefile.i
data/test/java/beans/PropertyEditor/TestLongClassNull.java.i
data/test/java/nio/channels/Selector/SelectAfterRead.java.i
data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP.java.i
-data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java.i
+data/test/javax/swing/JEditorPane/4492274/bug4492274.java.i
data/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java.i
data/src/share/classes/sun/reflect/UnsafeIntegerFieldAccessorImpl.java.i
-data/test/com/sun/jdi/ShutdownDebuggee.java.i
+data/test/javax/management/descriptor/ImmutableArrayFieldTest.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java.i
data/test/java/util/regex/TestCases.txt.i
@@ -6463,66 +6397,62 @@ data/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java.i
data/src/share/classes/java/awt/doc-files/FontMetrics-1.gif.i
data/test/java/rmi/server/RMIClassLoader/spi/ServiceConfiguration.java.i
data/src/share/classes/com/sun/jdi/VoidValue.java.i
-data/src/share/classes/com/sun/imageio/stream/StreamCloser.java.i
data/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java.i
data/src/share/native/sun/awt/image/cvutils/img_opaque.h.i
data/src/share/native/java/util/zip/Inflater.c.i
data/test/java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java.i
-data/make/com/sun/jndi/rmi/Makefile.i
data/test/javax/management/monitor/ReflectionExceptionTest.java.i
data/src/share/classes/sun/reflect/generics/repository/AbstractRepository.java.i
-data/src/share/classes/java/lang/IllegalMonitorStateException.java.i
+data/make/tools/src/build/tools/automulti/README.txt.i
data/make/java/main/java/mapfile-i586.i
+data/test/sun/security/provider/certpath/ReverseBuilder/mgrMcrl.i
data/test/java/util/Currency/tablea1.txt.i
data/src/share/native/sun/security/ec/impl/ecp_256.c.i
data/src/share/classes/javax/sql/StatementEventListener.java.i
data/test/sun/security/provider/PolicyFile/Comparator.Comparator.Policy.i
-data/test/java/util/Formatter/Basic.java.i
-data/src/share/native/java/lang/fdlibm/src/e_lgamma_r.c.i
-data/test/com/sun/crypto/provider/Cipher/AES/Test4511676.java.i
data/src/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XTree.java.i
+data/test/sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java.i
data/test/java/net/URLClassLoader/closetest/serverRoot/Test.java.i
data/make/tools/swing-beans/beaninfo/images/JDesktopPaneColor16.gif.i
data/test/java/util/EnumSet/BogusEnumSet.java.i
-data/test/java/io/charStreams/LineSink.java.i
-data/src/share/classes/com/sun/security/auth/module/UnixSystem.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties.i
-data/src/share/classes/javax/xml/crypto/Data.java.i
+data/src/share/classes/java/io/ByteArrayInputStream.java.i
+data/test/java/io/Serializable/corruptedUTFConsumption/CorruptedUTFConsumption.java.i
+data/make/sun/launcher/Makefile.i
+data/test/sun/net/www/protocol/jar/jarbug/src/jar1/GetResource.java.i
+data/test/tools/launcher/ExecutionEnvironment.java.i
+data/src/solaris/classes/sun/awt/X11/XInputMethod.java.i
data/test/java/lang/ClassLoader/deadlock/Alice.java.i
data/test/javax/xml/crypto/dsig/data/signature-x509-sn.xml.i
data/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java.i
data/test/java/io/StringReader/Skip.java.i
data/test/java/io/PrintStream/OversynchronizedTest.java.i
-data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java.i
-data/src/share/classes/sun/management/counter/perf/PerfDataType.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java.i
+data/src/share/classes/sun/net/NetworkServer.java.i
data/src/share/classes/java/lang/ClassNotFoundException.java.i
-data/src/share/classes/sun/io/ByteToCharUTF16.java.i
-data/src/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java.i
-data/src/share/classes/javax/management/modelmbean/package.html.i
+data/src/share/classes/java/beans/SimpleBeanInfo.java.i
+data/test/javax/print/attribute/SupportedPrintableAreas.java.i
data/test/java/nio/Buffer/CopyDirectDoubleMemory.java.i
data/test/com/sun/jdi/CatchCaughtTest.sh.i
data/src/windows/classes/sun/print/services/javax.print.StreamPrintServiceFactory.i
-data/src/share/classes/javax/swing/text/TabStop.java.i
+data/test/java/net/URL/SpecifyHandler.java.i
+data/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java.i
data/src/share/classes/java/nio/channels/CompletionHandler.java.i
data/src/share/classes/sun/awt/VerticalBagLayout.java.i
-data/src/share/classes/javax/net/ssl/TrustManagerFactory.java.i
+data/test/javax/swing/JFileChooser/6868611/bug6868611.java.i
data/src/share/classes/com/sun/script/util/InterfaceImplementor.java.i
data/test/java/lang/Class/forName/classes/comma.class.i
-data/src/share/native/common/check_format.c.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java.i
data/test/java/rmi/server/RemoteServer/SetLogNull.java.i
data/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh.i
data/src/solaris/native/java/nio/MappedByteBuffer.c.i
data/src/share/classes/sun/tools/tree/LessOrEqualExpression.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java.i
data/src/share/classes/com/sun/tools/jdi/InternalEventHandler.java.i
data/test/com/sun/crypto/provider/Mac/HmacMD5.java.i
data/src/share/native/java/lang/fdlibm/src/e_jn.c.i
data/src/linux/doc/man/ja/wsgen.1.i
data/test/java/beans/XMLEncoder/java_awt_Component.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/patches/inflate.c.diff.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java.i
+data/src/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java.i
data/src/share/sample/nio/file/Chmod.java.i
data/src/share/classes/sun/rmi/server/resources/rmid_it.properties.i
data/src/share/back/inStream.h.i
@@ -6532,42 +6462,43 @@ data/test/java/lang/StringBuffer/GetCharsSrcEndLarger.java.i
data/test/sun/pisces/DashStrokeTest.java.i
data/test/com/sun/jdi/MethodExitReturnValuesTest.java.i
data/src/share/classes/com/sun/crypto/provider/Padding.java.i
-data/src/share/classes/java/security/interfaces/DSAParams.java.i
data/src/share/native/sun/java2d/loops/IntBgr.c.i
data/src/share/demo/applets/DrawTest/DrawTest.java.i
data/src/share/classes/java/awt/dnd/SerializationTester.java.i
data/src/share/classes/java/rmi/ConnectException.java.i
data/make/sun/javazic/tzdata/europe.i
+data/src/share/classes/sun/io/CharToByteUnicodeBig.java.i
data/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java.i
data/test/javax/management/loading/LibraryLoader/native.jar.i
-data/src/share/demo/jfc/Notepad/resources/new.gif.i
data/src/share/back/vm_interface.h.i
-data/src/share/classes/sun/security/x509/CertificateAlgorithmId.java.i
+data/src/share/classes/sun/misc/PerformanceLogger.java.i
data/src/share/demo/jfc/TransparentRuler/transparentruler/Ruler.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java.i
data/src/solaris/native/sun/tools/attach/SolarisVirtualMachine.c.i
+data/test/javax/management/Introspector/UnDescribed.java.i
data/src/share/classes/sun/security/util/ByteArrayTagOrder.java.i
-data/test/java/awt/Component/PaintAll/PaintAll.java.i
-data/src/share/classes/javax/swing/plaf/TreeUI.java.i
+data/test/org/openjdk/jigsaw/cli/prikey.pem.i
+data/test/java/awt/FontClass/CreateFont/DeleteFont.sh.i
data/src/share/classes/javax/management/OrQueryExp.java.i
data/src/share/classes/com/sun/script/javascript/JSAdapter.java.i
data/test/java/util/TreeMap/ContainsValue.java.i
-data/src/share/classes/javax/swing/text/html/parser/DTDConstants.java.i
data/test/java/io/SystemInAvailable.java.i
data/src/share/classes/com/sun/tools/example/doc/jdb.html.i
-data/src/share/native/java/lang/fdlibm/src/e_exp.c.i
+data/test/java/security/cert/CertificateFactory/openssl/open.i
data/src/share/classes/sun/nio/cs/ext/EUC_JP.java.i
data/make/sun/jdbc/Makefile.i
data/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java.i
data/test/java/net/URL/HandlerLoop.java.i
+data/src/share/classes/com/sun/media/sound/AbstractLine.java.i
data/test/java/util/ResourceBundle/Test4314141B_es_ES.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/ValueConverter.java.i
-data/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java.i
+data/test/java/io/Serializable/badSerialPersistentField/BadSerialPersistentField.java.i
+data/test/java/lang/ClassLoader/deadlock/Starter.java.i
data/test/java/math/BigInteger/UnicodeConstructor.java.i
data/test/javax/management/namespace/LazyDomainTest.java.i
-data/src/linux/doc/man/ja/jmap.1.i
+data/src/share/classes/java/util/EnumSet.java.i
data/src/share/classes/javax/naming/StringRefAddr.java.i
-data/src/share/classes/sun/nio/cs/MS1251.java.i
+data/src/share/classes/sun/management/MemoryImpl.java.i
+data/test/javax/swing/text/Utilities/bug7045593.java.i
data/make/sun/security/util/Makefile.i
data/src/share/demo/jvmti/hprof/hprof_ioname.c.i
data/test/sun/net/www/protocol/jar/B5105410.java.i
@@ -6579,9 +6510,10 @@ data/src/windows/native/sun/windows/awt_Palette.cpp.i
data/test/java/security/Security/CaseInsensitiveAlgNames.java.i
data/src/share/classes/com/sun/jdi/package.html.i
data/make/tools/CharsetMapping/Big5.c2b.i
-data/src/share/classes/java/nio/charset/CoderMalfunctionError.java.i
+data/src/solaris/classes/sun/awt/X11/XStateProtocol.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties.i
data/test/java/security/KeyPairGenerator/Failover.java.i
+data/src/share/classes/sun/security/krb5/KrbCryptoException.java.i
data/src/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java.i
data/test/java/lang/ClassLoader/deadlock/GetResource.java.i
data/src/solaris/native/sun/awt/awt_TextField.c.i
@@ -6592,7 +6524,8 @@ data/src/share/classes/sun/nio/cs/ext/ISO2022_KR.java.i
data/make/tools/swing-beans/beaninfo/images/JPanelMono32.gif.i
data/src/share/classes/java/security/cert/X509CRLEntry.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseEngineException.java.i
-data/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono32.gif.i
+data/src/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java.i
+data/test/sun/net/www/ftptest/FtpAuthHandler.java.i
data/test/java/nio/channels/Selector/BasicConnect.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_hr_HR.properties.i
data/test/java/lang/Class/EnumPoseur.class.i
@@ -6600,67 +6533,64 @@ data/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.html.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java.i
data/make/com/sun/security/auth/module/FILES_export_unix.gmk.i
data/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java.i
-data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java.i
data/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java.i
-data/src/share/classes/java/util/Observable.java.i
+data/src/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_ZA.properties.i
data/src/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java.i
-data/src/share/native/sun/security/ec/impl/ec2_aff.c.i
+data/test/java/nio/channels/AsynchronousChannelGroup/BadProperties.java.i
data/test/java/lang/Short/Decode.java.i
data/src/share/classes/java/awt/peer/SystemTrayPeer.java.i
data/src/share/classes/java/math/SignedMutableBigInteger.java.i
data/src/share/classes/javax/crypto/spec/PBEParameterSpec.java.i
-data/test/com/sun/crypto/provider/Cipher/PBE/DecryptWithoutParameters.java.i
+data/test/sun/net/idn/nfscss.spp.i
data/test/java/io/Serializable/evolution/AddedField/run.i
-data/src/share/demo/nbproject/management/MemoryMonitor/build.xml.i
+data/src/share/classes/javax/naming/ldap/PagedResultsResponseControl.java.i
data/test/java/net/URL/TestIPv6Addresses.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/Token.java.i
-data/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java.i
+data/test/java/lang/Character/Scripts.txt.i
data/src/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav.i
data/make/netbeans/common/java-data-no-native.ent.i
data/src/share/native/sun/awt/giflib/gifalloc.c.i
data/src/share/classes/sun/awt/image/GifImageDecoder.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasPath.java.i
-data/src/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/Destinations.java.i
data/src/share/native/sun/awt/image/cvutils/img_output24.h.i
data/src/share/classes/sun/io/ByteToCharMacRoman.java.i
data/src/share/classes/com/sun/crypto/provider/ai.java.i
-data/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_BH.properties.i
data/src/share/classes/sun/io/CharToByteCp284.java.i
data/src/windows/classes/sun/nio/ch/PipeImpl.java.i
data/test/java/io/Serializable/enum/basic/Test.java.i
data/src/windows/classes/sun/security/mscapi/PRNG.java.i
data/test/java/lang/Class/getEnclosingClass/T4992170.java.i
data/src/share/classes/sun/io/CharToByteCp1256.java.i
-data/src/share/classes/java/text/spi/NumberFormatProvider.java.i
+data/src/share/classes/java/awt/image/BufferedImage.java.i
data/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java.i
data/src/windows/native/sun/windows/ThemeReader.cpp.i
-data/src/share/classes/sun/util/resources/CalendarData_es_US.properties.i
+data/test/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java.i
data/src/share/classes/javax/swing/text/Position.java.i
data/src/solaris/classes/sun/nio/ch/SctpSocketDispatcher.java.i
-data/src/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java.i
+data/src/share/classes/sun/net/httpserver/HttpContextImpl.java.i
data/src/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java.i
data/src/share/classes/sun/security/ssl/KerberosPreMasterSecret.java.i
data/src/share/classes/java/security/Identity.java.i
data/make/tools/src/build/tools/jdwpgen/TaggedObjectTypeNode.java.i
data/test/java/io/readBytes/MemoryLeak.java.i
-data/make/sun/motif12/reorder-i586.i
data/src/solaris/classes/java/io/FileDescriptor.java.i
data/test/java/io/Serializable/defaulted/GetFieldRead.java.i
data/test/java/util/Currency/PropertiesTest.java.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java.i
+data/test/com/sun/jdi/ExclusiveBind.java.i
data/src/share/classes/java/awt/geom/RoundRectIterator.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java.i
-data/src/share/native/java/lang/fdlibm/src/s_matherr.c.i
+data/test/java/lang/instrument/BootClassPath/Agent.java.i
data/test/javax/security/auth/x500/X500Principal/OIDMap.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Handler.java.i
data/src/share/native/sun/java2d/loops/ProcessPath.c.i
data/src/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java.i
data/src/share/classes/javax/crypto/spec/SecretKeySpec.java.i
-data/src/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java.i
+data/src/share/classes/org/openjdk/jigsaw/ModuleFileWriter.java.i
data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml.i
data/src/share/classes/sun/jkernel/StandaloneMessageDigest.java.i
-data/src/share/classes/com/sun/beans/decoder/FieldElementHandler.java.i
+data/src/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java.i
data/src/share/native/sun/awt/libpng/png.c.i
data/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java.i
data/src/share/classes/sun/nio/cs/ext/IBM921.java.i
@@ -6668,31 +6598,31 @@ data/src/share/classes/java/nio/file/ClosedFileSystemException.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png.i
data/src/solaris/classes/sun/awt/motif/X11Johab.java.i
data/src/share/classes/javax/swing/text/Style.java.i
-data/make/mkdemo/management/MemoryMonitor/Makefile.i
-data/src/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java.i
+data/test/java/net/Socks/SocksServer.java.i
data/test/sun/security/smartcardio/apdu.log.i
-data/src/share/classes/javax/print/attribute/standard/Copies.java.i
+data/src/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java.i
data/src/share/classes/sun/audio/AudioDevice.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java.i
-data/test/java/io/File/GetXSpace.sh.i
+data/src/share/classes/javax/management/AttributeChangeNotification.java.i
data/src/share/classes/java/util/Currency.java.i
data/src/share/classes/sun/security/pkcs11/P11Cipher.java.i
-data/src/share/classes/javax/swing/event/MenuEvent.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties.i
+data/test/java/awt/font/FontNames/LocaleFamilyNames.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_SY.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sl_SI.properties.i
data/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java.i
+data/src/share/classes/sun/tools/jinfo/JInfo.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java.i
data/src/share/classes/javax/swing/colorchooser/DefaultRGBChooserPanel.java.i
data/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c.i
data/src/share/native/sun/security/ec/impl/ecl-exp.h.i
data/src/share/classes/com/sun/jndi/dns/DnsUrl.java.i
-data/src/share/classes/sun/tools/tree/Context.java.i
+data/test/java/nio/channels/Selector/TemporarySelector.java.i
data/src/share/classes/sun/security/util/Resources_ko.java.i
data/src/share/classes/sun/dyn/Invokers.java.i
data/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java.i
data/src/share/classes/javax/swing/plaf/UIResource.java.i
data/src/share/classes/sun/management/counter/AbstractCounter.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/README.update.i
data/make/sun/javazic/javatz/java_11_ids.txt.i
data/test/java/lang/instrument/BootClassPath/Cleanup.java.i
data/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt.i
@@ -6701,28 +6631,29 @@ data/test/com/sun/jdi/TargetAdapter.java.i
data/test/javax/script/Test1.js.i
data/test/java/beans/PropertyEditor/TestByteTypeValue.java.i
data/src/share/classes/java/io/DataOutputStream.java.i
-data/src/share/classes/sun/text/resources/FormatData_en_IE.java.i
+data/src/share/lib/images/cursors/motif_MoveDrop32x32.gif.i
data/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java.i
data/src/share/classes/java/security/KeyPair.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java.i
data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.gif.i
-data/make/common/Rules-SCCS.gmk.i
+data/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java.i
data/src/share/classes/sun/tools/jmap/JMap.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java.i
-data/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java.i
data/make/tools/CharsetMapping/IBM278.c2b.i
-data/src/solaris/native/sun/awt/awt_motif21.c.i
+data/src/share/instrument/JarFacade.c.i
data/make/java/management/mapfile-vers.i
+data/test/java/nio/file/Files/walkFileTree/WalkWithSecurity.java.i
data/src/share/classes/javax/management/StringValueExp.java.i
data/src/share/classes/sun/tools/jconsole/Worker.java.i
data/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java.i
+data/test/java/security/SecureRandom/Serialize.java.i
data/src/share/back/JDWP.h.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java.i
-data/test/java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h.i
data/src/share/classes/javax/imageio/spi/package.html.i
-data/src/share/classes/sun/net/smtp/SmtpProtocolException.java.i
-data/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java.i
+data/src/share/classes/sun/management/snmp/util/JvmContextFactory.java.i
+data/src/share/classes/sun/management/Util.java.i
data/src/share/classes/com/sun/jndi/ldap/pool/Connections.java.i
data/test/java/util/jar/JarFile/bogus-signerinfo-attr.jar.i
data/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java.i
@@ -6732,129 +6663,128 @@ data/test/sun/security/pkcs11/KeyStore/BasicData/p11-nss.txt.i
data/src/share/classes/javax/swing/text/doc-files/View-flexibility.jpg.i
data/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java.i
data/src/share/classes/javax/swing/event/MouseInputListener.java.i
-data/test/com/sun/net/httpserver/bugs/6725892/Test.java.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_Ports.c.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIState.java.i
+data/src/solaris/doc/sun/man/man1/jps.1.i
+data/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java.i
data/src/share/classes/javax/print/attribute/standard/SheetCollate.java.i
-data/src/share/classes/sun/reflect/generics/parser/SignatureParser.java.i
+data/test/sun/security/pkcs11/Provider/Absolute.cfg.i
data/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java.i
data/src/share/classes/sun/text/normalizer/VersionInfo.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java.i
data/test/java/lang/reflect/Method/Equals.java.i
-data/src/share/classes/java/lang/reflect/Member.java.i
data/test/java/nio/charset/Charset/Contains.java.i
data/src/share/classes/java/awt/Insets.java.i
data/test/com/sun/jdi/AccessSpecifierTest.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java.i
+data/src/share/native/sun/security/ec/mpprime.h.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/config.i
data/src/share/classes/sun/tools/asm/Cover.java.i
data/src/share/classes/java/dyn/Switcher.java.i
data/src/share/classes/javax/sql/rowset/spi/SyncFactory.java.i
data/src/share/classes/java/awt/FocusTraversalPolicy.java.i
data/test/java/lang/reflect/Proxy/NullClassLoader.java.i
data/test/java/nio/channels/AsynchronousFileChannel/Basic.java.i
-data/src/share/classes/java/util/jar/JarOutputStream.java.i
+data/test/javax/naming/spi/DirectoryManager/DummyContext.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1381.java.i
data/src/share/classes/com/sun/jmx/namespace/serial/JMXNamespaceContext.java.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h.i
+data/src/share/classes/sun/tools/jconsole/manifest.i
data/src/solaris/hpi/native_threads/src/threads_solaris.c.i
data/test/com/sun/jdi/CountEvent.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java.i
-data/test/javax/swing/plaf/synth/7032791/bug7032791.java.i
-data/src/share/native/sun/awt/medialib/mlib.h.i
+data/src/share/classes/sun/reflect/MethodAccessor.java.i
+data/src/share/classes/java/util/concurrent/ForkJoinTask.java.i
+data/src/share/native/sun/java2d/loops/IntDcm.h.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyAuthTest.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk.i
+data/src/share/classes/java/sql/DataTruncation.java.i
data/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java.i
data/src/solaris/classes/sun/awt/motif/MInputMethodControl.java.i
data/src/share/native/sun/awt/image/cvutils/img_input8_32.h.i
-data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor32.gif.i
data/src/share/classes/sun/java2d/pipe/AATextRenderer.java.i
+data/test/java/net/CookieHandler/NullUriCookieTest.java.i
data/src/share/native/sun/security/ec/impl/ecl.c.i
data/test/sun/management/jmxremote/bootstrap/TestApplication.java.i
data/src/windows/classes/sun/nio/ch/SocketDispatcher.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java.i
data/test/java/util/TimSort/ArrayBuilder.java.i
+data/src/share/classes/sun/applet/AppletEvent.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java.i
+data/test/java/lang/instrument/RedefineSetUp.sh.i
data/src/share/classes/sun/io/ByteToCharCp870.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_zh_CN.properties.i
+data/test/java/io/PushbackReader/Skip.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_zh_HK.java.i
-data/test/com/sun/jndi/cosnaming/CNNameParser.java.i
+data/src/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java.i
data/src/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java.i
data/src/share/classes/sun/util/logging/LoggingProxy.java.i
+data/test/java/lang/ClassLoader/Assert.java.i
data/make/tools/CharsetMapping/IBM933.c2b.i
data/test/java/lang/reflect/Proxy/CharType.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/access.properties.i
+data/src/share/classes/com/sun/jmx/remote/internal/package.html.i
data/test/sun/net/www/httptest/HttpTransaction.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/LValue.java.i
-data/src/share/transport/socket/socketTransport.h.i
-data/src/share/demo/applets/DrawTest/example1.html.i
-data/src/share/classes/sun/util/resources/CurrencyNames_fr_CA.properties.i
+data/test/java/io/CharArrayReader/Constructor.java.i
+data/test/java/io/Reader/OpsAfterClose.java.i
data/test/sun/text/resources/Format/Bug4685470.java.i
data/src/share/classes/java/dyn/MutableCallSite.java.i
-data/src/linux/doc/man/jinfo.1.i
-data/test/java/text/Format/DateFormat/Bug6683975.java.i
+data/src/solaris/doc/sun/man/man1/native2ascii.1.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html.i
data/test/java/beans/Introspector/Test4168833.java.i
-data/test/sun/management/jmxremote/bootstrap/management_ssltest13_ko.properties.in.i
-data/src/share/classes/java/awt/AlphaComposite.java.i
+data/test/java/lang/Class/getEnclosingMethod/EnclosingMethodTests.java.i
data/test/java/util/Locale/LocaleTestFmwk.java.i
data/src/share/classes/sun/misc/resources/Messages_ja.java.i
data/src/share/classes/java/lang/doc-files/chi.gif.i
data/test/sun/security/pkcs11/Secmod/AddPrivateKey.java.i
-data/test/java/lang/Long/Decode.java.i
+data/test/java/net/URLConnection/xml/xml3.i
data/test/javax/rmi/ssl/SocketFactoryTest.java.i
-data/make/tools/CharsetMapping/IBM930.nr.i
data/src/solaris/sample/dtrace/hotspot/hotspot_calls_tree.d.i
-data/make/netbeans/common/standard-bindings.ent.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java.i
+data/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java.i
data/src/share/classes/sun/security/rsa/SunRsaSignEntries.java.i
data/src/share/classes/com/sun/jndi/ldap/Connection.java.i
data/src/share/classes/sun/security/provider/Sun.java.i
data/src/windows/native/sun/windows/ObjectList.cpp.i
-data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorServerProvider.i
data/src/share/classes/sun/security/jgss/krb5/Krb5Context.java.i
data/test/sun/management/HotspotClassLoadingMBean/ClassToLoad0.java.i
data/test/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java.i
-data/src/share/classes/javax/management/Query.java.i
+data/make/tools/src/build/tools/jdwpgen/TypeNode.java.i
+data/src/share/lib/security/java.policy.i
data/test/javax/management/descriptor/SerializedInfo.java.i
-data/src/share/classes/com/sun/tools/script/shell/Main.java.i
-data/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java.i
+data/test/java/util/EnumSet/AllOf.java.i
+data/src/share/classes/javax/accessibility/Accessible.java.i
+data/src/share/classes/sun/font/CoreMetrics.java.i
data/test/java/nio/channels/SocketChannel/Open.java.i
-data/test/java/net/MulticastSocket/TestInterfaces.java.i
-data/src/share/native/java/lang/fdlibm/src/w_log10.c.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java.i
data/test/javax/management/descriptor/DefaultDescriptorTest.java.i
-data/src/share/classes/java/awt/geom/QuadIterator.java.i
-data/src/share/classes/javax/sound/midi/MidiUnavailableException.java.i
-data/src/share/classes/com/sun/java/browser/net/ProxyInfo.java.i
+data/src/share/classes/sun/security/acl/OwnerImpl.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java.i
data/src/share/classes/sun/print/PeekGraphics.java.i
data/test/javax/management/mxbean/customtypes/CustomLongMXBean.java.i
data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-0-attack.xml.i
data/src/share/classes/sun/text/resources/FormatData_es_NI.java.i
data/src/windows/native/sun/java2d/d3d/D3DMaskFill.h.i
-data/test/javax/management/namespace/SourceNamespaceTest.java.i
+data/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java.i
-data/test/java/util/WeakHashMap/GCDuringIteration.java.i
-data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter.i
+data/make/java/hpi/windows/Makefile.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java.i
+data/test/sun/security/tools/keytool/file-in-help.sh.i
data/src/share/classes/sun/dyn/MethodTypeImpl.java.i
data/test/javax/print/applet/applet2/Applet2PrintService.java.i
-data/src/share/classes/sun/text/resources/FormatData_ga_IE.java.i
-data/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties.i
+data/src/share/classes/java/security/CryptoPrimitive.java.i
data/test/java/util/WeakHashMap/Iteration.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java.i
data/src/share/classes/com/sun/java/browser/dom/DOMAccessor.java.i
-data/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh.i
+data/test/java/lang/ThreadLocal/TLRemoveTest.java.i
data/test/java/io/pathNames/win32/DriveOnly.java.i
-data/make/com/sun/security/sasl/Makefile.i
+data/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java.i
data/test/com/sun/net/httpserver/Test9a.java.i
-data/src/share/demo/jvmti/gctest/README.txt.i
-data/src/share/classes/sun/security/x509/CertException.java.i
+data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java.i
+data/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties.i
data/test/sun/management/jmxremote/bootstrap/management_test05_ko.properties.in.i
-data/src/share/classes/com/sun/pept/presentation/MessageStruct.java.i
data/src/solaris/npt/utf_md.c.i
data/test/javax/management/Introspector/DescribedMXBean.java.i
data/src/share/classes/com/sun/rowset/internal/InsertRow.java.i
-data/make/tools/CharsetMapping/IBM937.c2b.i
-data/test/java/util/LinkedList/Clone.java.i
+data/src/share/classes/sun/text/resources/FormatData_sr_CS.java.i
+data/test/java/util/zip/ZipFile/ManyZipFiles.java.i
data/src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/Server.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_in_ID.properties.i
@@ -6863,184 +6793,174 @@ data/src/share/classes/sun/management/VMOptionCompositeData.java.i
data/src/windows/instrument/EncodingSupport_md.c.i
data/test/java/io/InputStream/ReadParams.java.i
data/test/java/net/ProxySelector/B6563259.java.i
-data/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so.i
+data/test/java/lang/ThreadGroup/NullThreadName.java.i
data/test/java/nio/channels/Selector/SelectorLimit.java.i
data/src/windows/native/java/net/Inet4AddressImpl.c.i
-data/test/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup.i
data/src/share/classes/java/awt/FileDialog.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java.i
data/test/java/beans/PropertyEditor/TestShortClassValue.java.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface1.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java.i
data/make/sun/javazic/javatz/fullset.txt.i
-data/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c.i
data/test/java/util/ResourceBundle/Bug4396021.java.i
data/src/share/classes/com/sun/tracing/package-info.java.i
data/test/sun/tools/jmap/Basic.sh.i
data/src/share/classes/java/lang/Runnable.java.i
data/make/tools/CharsetMapping/ISO_8859_9.map.i
-data/test/java/beans/PropertyEditor/TestLongClass.java.i
-data/src/share/classes/sun/io/ByteToCharCp420.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.policy.i
data/test/java/lang/Class/forName/InvalidNameWithSlash.java.i
data/src/share/classes/com/sun/java/util/jar/pack/Constants.java.i
-data/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java.i
+data/test/java/io/Serializable/class/run.sh.i
+data/test/java/util/Locale/serialized/java6locale_ROOT.i
data/src/solaris/hpi/src/system_md.c.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvCopyEdge.c.i
data/src/share/classes/java/awt/Window.java.i
data/src/share/classes/sun/security/provider/DSAPublicKeyImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html.i
-data/src/share/classes/com/sun/jarsigner/ContentSigner.java.i
+data/test/java/nio/channels/FileChannel/AtomicAppend.java.i
data/src/share/classes/java/lang/String.java.i
data/test/sun/tools/native2ascii/resources/ImmutableResourceTest.java.i
data/test/java/lang/instrument/RedefineMethodAddInvoke.sh.i
-data/src/share/classes/javax/swing/event/MenuListener.java.i
+data/src/share/native/sun/awt/medialib/mlib_sys.h.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java.i
data/src/share/native/sun/java2d/loops/ProcessPath.h.i
data/src/share/classes/sun/misc/REException.java.i
data/test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java.i
data/src/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java.i
-data/test/sun/security/provider/KeyStore/CaseSensitiveAliases.java.i
-data/src/solaris/classes/com/sun/management/OSMBeanFactory.java.i
+data/make/tools/CharsetMapping/MS1250.map.i
data/src/share/classes/javax/accessibility/AccessibleTableModelChange.java.i
data/src/share/classes/sun/awt/SunToolkit.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_CO.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionParserState.java.i
data/src/share/classes/java/lang/doc-files/javalang.doc.anc40.gif.i
data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException2.java.i
data/src/share/classes/java/nio/X-Buffer.java.template.i
data/test/java/text/Bidi/Bug6665028.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java.i
+data/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java.i
data/test/sun/nio/cs/TestJIS0212Decoder.java.i
data/src/share/classes/sun/util/resources/CalendarData_sk.properties.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java.i
data/src/share/classes/sun/net/ProgressSource.java.i
-data/test/java/util/logging/ParentLoggersTest.java.i
+data/src/windows/native/sun/windows/awt_PrintJob.cpp.i
data/src/share/classes/sun/management/snmp/jvminstr/NotificationTargetImpl.java.i
data/make/tools/swing-beans/beaninfo/images/JTabbedPaneMono16.gif.i
+data/src/share/classes/javax/swing/event/ListDataListener.java.i
data/src/share/classes/java/awt/image/PackedColorModel.java.i
data/src/solaris/doc/sun/man/man1/ja/java.1.i
-data/src/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java.i
-data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java.i
data/src/windows/classes/sun/tools/attach/WindowsVirtualMachine.java.i
data/test/java/beans/VetoableChangeSupport/1.5.0_10.ser.i
data/src/share/classes/sun/management/GarbageCollectorImpl.java.i
-data/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties.i
data/src/share/native/sun/font/layout/TibetanLayoutEngine.cpp.i
data/src/share/native/sun/security/ec/ec2.h.i
-data/test/java/util/concurrent/BlockingQueue/LastElement.java.i
+data/src/windows/native/sun/windows/awt_Panel.h.i
+data/make/tools/CharsetMapping/IBM855.map.i
data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownMonitor.java.i
data/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java.i
-data/src/share/native/sun/awt/image/jpeg/jdapistd.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java.i
-data/test/java/nio/channels/SocketChannel/OutOfBand.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/Question.gif.i
data/src/linux/doc/man/jvisualvm.1.i
data/test/sun/security/krb5/auto/BadKdc1.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMBean.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1147.java.i
-data/src/share/classes/javax/swing/text/JTextComponent.java.i
+data/src/share/classes/java/text/RuleBasedCollator.java.i
data/make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_TN.properties.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java.i
-data/src/share/classes/javax/imageio/ImageWriteParam.java.i
data/make/tools/swing-beans/beaninfo/images/JFrameMono16.gif.i
data/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html.i
data/test/java/nio/file/Files/CheckPermissions.java.i
data/test/java/awt/im/JTextFieldTest.java.i
+data/src/share/classes/sun/security/krb5/internal/AuthContext.java.i
data/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java.i
data/src/share/classes/javax/crypto/KeyAgreementSpi.java.i
data/src/share/classes/sun/tools/jconsole/BorderedComponent.java.i
-data/src/share/classes/java/beans/AppletInitializer.java.i
data/test/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.java.i
data/src/share/classes/java/nio/charset/CoderResult.java.i
data/src/solaris/hpi/export/io_md.h.i
-data/src/share/classes/sun/management/ThreadImpl.java.i
-data/test/java/io/File/ToURI.java.i
+data/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup_Stub.java.i
+data/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Decoder.java.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/CallbackInterface.java.i
data/test/java/security/UnresolvedPermission/Equals.java.i
-data/src/share/classes/java/lang/management/package.html.i
-data/src/share/classes/sun/text/resources/FormatData_lt_LT.java.i
+data/test/com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java.i
+data/make/tools/CharsetMapping/MS932.nr.i
data/src/share/classes/sun/security/x509/InvalidityDateExtension.java.i
data/src/share/classes/java/text/RBTableBuilder.java.i
data/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java.i
-data/src/share/classes/sun/awt/image/ImageFetcher.java.i
-data/src/share/classes/sun/security/tools/JarSignerResources_ja.java.i
+data/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh.i
data/src/windows/native/sun/windows/awt_FileDialog.cpp.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle.properties.i
-data/src/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java.i
+data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h.i
data/src/windows/native/java/net/SocketOutputStream.c.i
data/src/share/classes/sun/security/krb5/internal/KRBError.java.i
-data/src/share/classes/sun/security/util/ByteArrayLexOrder.java.i
+data/src/share/classes/com/sun/jarsigner/ContentSigner.java.i
data/src/share/classes/sun/util/resources/LocaleNames_be.properties.i
-data/src/share/native/java/lang/reflect/Proxy.c.i
-data/src/share/classes/sun/management/Agent.java.i
-data/make/java/java_crw_demo/Makefile.i
+data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/rmid.security.policy.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest12_ok.ssl.in.i
+data/src/share/classes/java/net/SocksConsts.java.i
data/test/com/sun/jdi/WatchFramePop.sh.i
-data/src/share/classes/sun/util/resources/LocaleNames_sq.properties.i
-data/make/mkdemo/applets/SpreadSheet/Makefile.i
-data/src/share/classes/javax/management/remote/JMXPrincipal.java.i
+data/src/solaris/classes/sun/awt/X11/XException.java.i
data/test/sun/tools/jstat/gcNewOutput1.awk.i
data/src/share/classes/com/sun/net/ssl/X509TrustManager.java.i
data/make/tools/src/build/tools/charsetmapping/SBCS.java.i
-data/test/com/sun/net/httpserver/Test13.java.i
-data/test/sun/misc/Cleaner/ExitOnThrow.java.i
+data/src/share/classes/java/awt/peer/TrayIconPeer.java.i
+data/src/solaris/native/java/net/linux_close.c.i
data/src/solaris/sample/dtrace/README.txt.i
-data/test/com/sun/servicetag/FindServiceTags.java.i
-data/test/com/sun/jdi/PopAndStepTest.java.i
+data/src/solaris/classes/sun/java2d/xr/XRBackend.java.i
+data/test/java/util/PluggableLocale/providersrc/CollatorProviderImpl.java.i
data/src/share/classes/sun/audio/NativeAudioStream.java.i
-data/src/share/native/sun/awt/image/cvutils/README.i
-data/src/share/classes/sun/security/tools/KeyStoreUtil.java.i
+data/src/share/classes/javax/print/FlavorException.java.i
data/test/sun/security/pkcs11/KeyStore/Basic.java.i
data/src/share/classes/javax/naming/directory/Attribute.java.i
data/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java.i
-data/src/share/instrument/Reentrancy.h.i
-data/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java.i
-data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml.i
+data/make/tools/swing-beans/beaninfo/images/JToolBarColor16.gif.i
+data/test/sun/net/www/protocol/http/UserCookie.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java.i
-data/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp.i
+data/src/share/classes/sun/tools/jar/JarException.java.i
data/test/sun/nio/cs/TestSJIS0213.java.i
-data/src/share/classes/sun/util/resources/CalendarData_vi.properties.i
-data/src/share/classes/java/lang/InstantiationException.java.i
+data/src/share/classes/sun/text/resources/FormatData_fr_BE.java.i
+data/make/netbeans/common/windows-sources.ent.i
data/test/java/lang/ClassLoader/findSystemClass/Loadee.resource.i
data/src/windows/classes/sun/java2d/windows/Win32SurfaceData.java.i
data/src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java.i
-data/src/share/classes/sun/awt/image/OffScreenImageSource.java.i
+data/src/share/classes/java/nio/file/CopyMoveHelper.java.i
data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java.i
data/src/share/native/sun/font/layout/LEInsertionList.cpp.i
-data/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java.i
data/src/share/classes/java/nio/file/AccessDeniedException.java.i
data/src/share/classes/java/lang/management/ManagementPermission.java.i
data/src/solaris/doc/sun/man/man1/ja/xjc.1.i
data/src/share/classes/java/nio/file/FileAction.java.i
-data/test/sun/security/krb5/auto/basic.sh.i
data/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties.i
data/test/java/io/Serializable/classDescHooks/Foo.ser.i
-data/src/share/classes/com/sun/security/jgss/GSSUtil.java.i
+data/src/share/native/sun/font/layout/StateTableProcessor.cpp.i
data/make/netbeans/swing/build.xml.i
-data/src/share/classes/javax/swing/event/ListDataListener.java.i
+data/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java.i
+data/test/java/util/Vector/SimpleSerialization.java.i
data/test/java/util/TimeZone/ListTimeZones.java.i
data/src/solaris/native/sun/awt/awt_DrawingSurface.c.i
data/src/share/classes/java/text/CharacterIteratorFieldDelegate.java.i
-data/src/share/demo/scripting/jconsole-plugin/src/scripts/verbose.js.i
-data/src/share/classes/sun/text/normalizer/Utility.java.i
-data/test/tools/launcher/UnicodeTest.jar.i
+data/src/share/classes/javax/management/openmbean/TabularType.java.i
+data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java.i
+data/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html.i
+data/test/tools/launcher/UnicodeTest.jar.i
data/test/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java.i
data/src/windows/classes/sun/awt/windows/WCanvasPeer.java.i
data/test/java/io/pathNames/General.java.i
-data/test/java/net/ipv6tests/UdpTest.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/Package.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es.properties.i
data/src/share/classes/sun/security/krb5/ServiceName.java.i
-data/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java.i
-data/test/java/beans/Beans/Test4080522.java.i
-data/test/java/beans/PropertyEditor/TestIntegerClassNull.java.i
+data/test/sun/tools/jstat/jstatSnap2.sh.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h.i
+data/test/sun/security/x509/AVA/AVAEqualsHashCode.java.i
data/src/share/classes/sun/util/LocaleServiceProviderPool.java.i
-data/test/java/util/concurrent/FutureTask/Customized.java.i
+data/test/java/net/Inet6Address/IPv6Numeric.java.i
+data/test/java/io/Serializable/oldTests/ArrayFields.java.i
+data/src/share/classes/sun/security/jgss/krb5/SubjectComber.java.i
data/test/sun/net/www/protocol/http/StreamingOutputStream.java.i
data/src/share/classes/javax/net/ssl/KeyManagerFactory.java.i
-data/src/share/native/sun/java2d/loops/ByteBinary1Bit.c.i
-data/src/share/classes/java/util/NavigableSet.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/report/IIOComparator.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathTableMetaImpl.java.i
-data/test/java/io/OutputStreamWriter/NullCreate.java.i
data/src/share/native/sun/awt/image/cvutils/img_fscolor.h.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so.i
data/test/java/util/Timer/DelayOverflow.java.i
data/src/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java.i
@@ -7049,62 +6969,62 @@ data/test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameSer
data/test/javax/swing/JTable/Test6888156.java.i
data/test/java/io/File/SymLinks.java.i
data/test/java/nio/channels/ServerSocketChannel/AcceptAddress.java.i
-data/test/java/lang/instrument/GetObjectSizeTest.java.i
-data/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java.i
-data/src/share/classes/sun/security/x509/CRLDistributionPointsExtension.java.i
+data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader.i
+data/test/java/util/ResourceBundle/RB4353454_en.properties.i
data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.jar.i
-data/src/solaris/doc/sun/man/man1/ja/jdb.1.i
+data/src/windows/native/sun/windows/awt_Cursor.h.i
+data/src/share/classes/sun/awt/GlobalCursorManager.java.i
+data/test/tools/pack200/MemoryAllocatorTest.java.i
data/src/share/native/sun/misc/GC.c.i
-data/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java.i
data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_ASCII_Encoder.java.i
data/src/share/classes/sun/net/www/content/audio/wav.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java.i
-data/src/solaris/native/sun/awt/awt_Component.h.i
+data/test/java/io/RandomAccessFile/skipBytes/input.txt.i
data/src/windows/classes/sun/java2d/SurfaceManagerFactory.java.i
data/src/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java.i
data/make/mkdemo/applets/ArcTest/Makefile.i
data/test/java/beans/PropertyEditor/TestEnumClass.java.i
-data/src/share/classes/sun/text/resources/FormatData_no_NO_NY.java.i
+data/src/share/classes/sun/security/smartcardio/PCSC.java.i
data/src/share/classes/com/sun/jdi/Type.java.i
-data/test/java/io/FileInputStream/OpsAfterClose.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java.i
+data/src/share/classes/sun/management/snmp/util/SnmpCachedData.java.i
+data/src/share/native/com/sun/media/sound/Utilities.h.i
data/src/share/classes/sun/security/krb5/internal/KrbErrException.java.i
-data/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java.i
+data/src/share/classes/sun/nio/cs/ext/MS932DB.java.i
data/src/windows/native/sun/awt/utility/rect.h.i
data/src/share/lib/management/snmp.acl.template.i
data/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java.i
data/src/share/classes/java/io/NotActiveException.java.i
data/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ClientHelloRead.java.i
-data/src/share/classes/java/lang/reflect/InvocationHandler.java.i
+data/src/share/classes/sun/misc/Compare.java.i
+data/test/tools/launcher/VerifyExceptions.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest13_ok.ssl.in.i
data/test/java/security/Permission/NullName.java.i
-data/src/share/classes/sun/tools/jstat/resources/jstat_unsupported_options.i
+data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIProperty.java.i
-data/src/share/classes/javax/swing/DebugGraphics.java.i
+data/src/share/classes/javax/print/attribute/standard/MediaSize.java.i
data/src/share/classes/javax/naming/PartialResultException.java.i
-data/src/solaris/hpi/native_threads/src/threads_linux.c.i
+data/test/TEST.ROOT.i
data/src/share/classes/sun/security/pkcs/PKCS10.java.i
data/test/com/sun/jdi/JDIScaffold.java.i
data/test/java/util/zip/Available.java.i
data/src/share/classes/sun/io/CharToByteEUC_TW.java.i
-data/src/share/classes/sun/rmi/server/ActivatableRef.java.i
+data/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java.i
data/test/com/sun/jdi/ProcessAttachDebugger.java.i
data/src/share/classes/sun/io/CharToByteISO8859_15.java.i
data/test/com/sun/net/httpserver/Test6a.java.i
+data/src/share/native/sun/font/DrawGlyphList.c.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U16Func.c.i
-data/src/share/classes/sun/print/ProxyGraphics.java.i
data/test/java/beans/PropertyEditor/TestIntegerType.java.i
-data/src/windows/lib/tzmappings.i
data/src/share/classes/com/sun/nio/sctp/ShutdownNotification.java.i
data/src/share/classes/javax/sound/sampled/Mixer.java.i
-data/src/share/classes/sun/awt/ScrollPaneWheelScroller.java.i
-data/src/solaris/back/util_md.h.i
-data/src/share/classes/sun/tools/java/IdentifierToken.java.i
+data/src/share/classes/java/security/cert/CertStoreParameters.java.i
+data/src/share/classes/sun/management/MemoryUsageCompositeData.java.i
data/test/java/io/pathNames/win32/RenameDelete.java.i
data/test/java/lang/ref/Basic.java.i
data/test/java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java.i
data/src/share/native/sun/java2d/opengl/OGLRenderQueue.h.i
-data/make/tools/src/build/tools/javazic/Gen.java.i
+data/make/tools/swing-beans/beaninfo/images/JMenuMono16.gif.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/OriginServer.java.i
data/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java.i
data/test/javax/swing/JInternalFrame/Test6325652.java.i
@@ -7112,140 +7032,144 @@ data/test/javax/xml/crypto/dsig/data/certs/test.jks.i
data/make/javax/accessibility/Makefile.i
data/src/share/classes/java/security/spec/KeySpec.java.i
data/test/java/util/PluggableLocale/CurrencyNameProviderTest.java.i
+data/src/share/classes/sun/jvmstat/monitor/StringMonitor.java.i
data/make/tools/winver/src/StdAfx.h.i
-data/src/share/classes/sun/font/CompositeFont.java.i
data/test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameServiceDescriptor.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java.i
data/src/solaris/classes/sun/awt/X11/XScrollbarClient.java.i
-data/test/java/lang/Runtime/exec/Space.java.i
+data/src/share/classes/java/security/cert/X509CertSelector.java.i
data/test/java/security/AccessControlContext/CheckNullPermission.java.i
-data/src/share/native/sun/awt/image/jpeg/jmemsys.h.i
+data/make/tools/src/build/tools/charsetmapping/Utils.java.i
data/src/solaris/lib/images/cursors/cursors.properties.i
data/src/share/classes/java/net/UnknownHostException.java.i
-data/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java.i
+data/src/share/demo/scripting/jconsole-plugin/src/resources/jconsole.js.i
data/src/share/classes/sun/io/ByteToCharMacCentralEurope.java.i
data/src/share/classes/java/rmi/AlreadyBoundException.java.i
data/src/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java.i
data/src/windows/native/sun/jkernel/kernel_es.rc.i
+data/test/com/sun/security/sasl/pw.properties.i
data/test/java/io/charStreams/UTF16.java.i
data/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java.i
data/make/tools/swing-beans/beaninfo/images/JDialogMono32.gif.i
-data/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java.i
-data/src/share/demo/applets/SortDemo/example1.html.i
+data/test/java/util/ResourceBundle/Control/StressOut_ko.properties.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Doubles.java.i
+data/test/java/nio/channels/Selector/ReadAfterConnect.java.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnssckbi.so.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EmptyExtensionData.java.i
data/test/java/util/logging/LoggerResourceBundleRace.java.i
data/test/sun/security/ssl/javax/net/ssl/Fix5070632.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java.i
+data/src/share/classes/sun/util/logging/resources/logging_de.properties.i
data/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java.i
data/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java.i
-data/src/share/classes/sun/util/locale/AsciiUtil.java.i
-data/src/share/classes/sun/reflect/ClassFileAssembler.java.i
-data/test/java/io/File/WinDeviceName.java.i
-data/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java.i
+data/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java.i
+data/src/share/classes/com/sun/jdi/event/ExceptionEvent.java.i
+data/src/share/classes/java/sql/Types.java.i
+data/test/java/lang/Thread/NullStackTrace.java.i
data/test/javax/management/openmbean/ArrayTypeTest.java.i
+data/test/java/net/DatagramPacket/CheckBoundaries.java.i
data/src/share/classes/java/util/InputMismatchException.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_it_IT.properties.i
-data/src/share/classes/sun/reflect/FieldAccessorImpl.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapCtx.java.i
+data/src/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/Apple.java.i
data/test/java/util/zip/ZipFile/ReadAfterClose.java.i
data/src/windows/native/sun/windows/awt_ole.cpp.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassListReader.java.i
data/test/java/net/Socket/Timeout.java.i
-data/make/tools/swing-beans/beaninfo/images/JDialogColor16.gif.i
-data/src/solaris/native/sun/jdga/dgalock.c.i
-data/src/share/classes/sun/security/provider/PolicySpiFile.java.i
+data/src/share/classes/java/nio/file/StandardCopyOption.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java.i
data/src/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java.i
data/src/share/classes/java/security/interfaces/RSAKey.java.i
data/src/share/classes/java/nio/StringCharBuffer.java.i
-data/src/solaris/classes/sun/awt/X11/Native.java.i
-data/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval_Stub.java.i
+data/make/com/sun/crypto/provider/Makefile.i
+data/src/share/classes/com/sun/net/ssl/X509KeyManager.java.i
data/test/sun/text/resources/LocaleData.i
-data/src/share/classes/javax/sql/package.html.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModel.java.i
data/test/sun/security/mscapi/PublicKeyInterop.sh.i
data/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java.i
data/test/sun/java2d/DirectX/SwingOnScreenScrollingTest/SwingOnScreenScrollingTest.java.i
-data/src/share/classes/sun/io/CharToByteMacCentralEurope.java.i
-data/test/java/util/Collections/T5078378.java.i
+data/test/sun/nio/cs/FindASCIIRangeCodingBugs.java.i
+data/src/share/native/sun/java2d/opengl/OGLMaskFill.c.i
data/src/share/classes/javax/security/sasl/SaslServer.java.i
data/test/java/nio/channels/FileChannel/Force.java.i
-data/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java.i
+data/src/share/classes/javax/sound/midi/Track.java.i
data/test/org/openjdk/jigsaw/cli/keystore.jks.i
-data/make/tools/CharsetMapping/IBM921.map.i
+data/src/share/classes/java/awt/CardLayout.java.i
data/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java.i
data/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java.i
data/make/netbeans/j2se/build.properties.i
-data/src/share/demo/nbproject/project.xml.i
-data/test/com/sun/servicetag/servicetag3.properties.i
+data/src/share/native/java/util/zip/zlib-1.1.3/inffast.h.i
+data/test/java/security/cert/CertificateFactory/invalidEncodedCerts/invalidcert.pem.i
+data/src/share/classes/java/awt/geom/Point2D.java.i
data/src/share/native/com/sun/media/sound/DirectAudio.h.i
-data/src/solaris/doc/sun/man/man1/ja/jhat.1.i
+data/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive_Stub.java.i
data/src/share/classes/com/sun/media/sound/FastShortMessage.java.i
data/src/share/classes/java/security/cert/X509CRL.java.i
data/src/share/classes/java/rmi/server/LogStream.java.i
-data/src/share/classes/javax/imageio/plugins/jpeg/package.html.i
-data/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java.i
+data/make/sun/security/jgss/wrapper/mapfile-vers.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileSystem.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java.i
-data/src/share/demo/jvmti/heapViewer/heapViewer.c.i
-data/test/java/util/zip/ZipEntry/input.jar.i
-data/src/share/classes/java/rmi/activation/ActivationGroupID.java.i
-data/src/share/classes/javax/swing/JFrame.java.i
+data/src/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java.i
+data/test/java/beans/VetoableChangeSupport/Test4092906.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java.i
+data/src/linux/doc/man/ja/xjc.1.i
data/make/sun/rmi/registry/Makefile.i
data/test/java/security/cert/CertPathValidator/targetConstraints/sun2labs1.cer.i
data/test/java/util/Formatter/BasicByteObject.java.i
-data/src/share/classes/javax/management/StandardMBean.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformInterestedHost.java.i
data/src/share/classes/sun/text/resources/FormatData_en_US.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif.i
data/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt.i
+data/test/com/sun/jdi/ArrayRangeTest.java.i
data/src/share/classes/com/sun/jdi/Field.java.i
data/src/share/demo/applets/WireFrame/models/cube.obj.i
data/test/java/awt/Focus/NonFocusableWindowTest/Test.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMBean.java.i
+data/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.java.i
data/test/java/io/Serializable/GetField/Write.java.i
data/src/share/classes/javax/management/NotificationFilter.java.i
+data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorProvider.i
data/src/share/classes/sun/print/resources/serviceui_fr.properties.i
data/make/tools/CharsetMapping/MacThai.map.i
-data/test/java/util/ResourceBundle/Test4300693RB.java.i
+data/test/sun/security/util/DerOutputStream/LocaleInTime.java.i
data/test/java/io/Serializable/proxy/replace/Resolved.java.i
data/src/solaris/classes/sun/awt/X11FontManager.java.i
-data/test/java/util/Locale/data/deflocale.rhel4.i
-data/src/share/classes/javax/swing/colorchooser/SlidingSpinner.java.i
+data/test/java/lang/instrument/ilib/ClassDump.java.i
+data/src/share/classes/com/sun/tools/jdi/ConnectorImpl.java.i
data/src/share/classes/sun/java2d/opengl/OGLRenderer.java.i
data/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Close.java.i
data/test/sun/net/www/protocol/jar/foo2.jar.i
data/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy34.i
+data/test/java/security/KeyRep/RSA.pre.1.5.key.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java.i
data/test/java/util/ResourceBundle/Bug6287579.java.i
data/test/javax/management/modelmbean/ModelMBeanInfoSupport/logging.properties.i
-data/src/share/classes/javax/sql/ConnectionEvent.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java.i
+data/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.h.i
data/test/java/util/TimeZone/TimeZoneDatePermissionCheck.java.i
+data/test/java/io/Serializable/superclassDataLoss/A.java.i
data/test/javax/swing/JComboBox/6632953/bug6632953.java.i
data/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java.i
data/test/java/nio/charset/Charset/NullCharsetName.java.i
-data/make/tools/CharsetMapping/MacGreek.map.i
-data/make/modules/tools/src/com/sun/classanalyzer/Module.java.i
+data/src/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java.i
data/test/java/rmi/reliability/benchmark/bench/TextReporter.java.i
-data/src/share/classes/java/text/DontCareFieldPosition.java.i
-data/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java.i
-data/make/java/net/Makefile.i
-data/src/share/native/sun/security/ec/ecp_384.c.i
-data/src/share/classes/java/awt/dnd/DropTarget.java.i
+data/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java.i
+data/src/share/classes/sun/util/resources/CalendarData_zh.properties.i
data/src/share/classes/java/security/cert/PKIXCertPathChecker.java.i
data/make/java/hpi/hpi_common.gmk.i
data/test/javax/swing/SwingWorker/6432565/bug6432565.java.i
-data/test/java/awt/Graphics2D/DrawString/EmptyAttrString.java.i
-data/test/java/util/Locale/Bug4152725.java.i
-data/test/java/net/ipv6tests/TcpTest.java.i
+data/test/java/beans/Introspector/Test4144543.java.i
+data/src/share/classes/sun/text/resources/CollationData_de.java.i
data/src/share/classes/javax/crypto/CryptoPermission.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java.i
+data/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java.i
data/src/windows/native/sun/java2d/d3d/D3DVertexCacher.h.i
data/src/share/classes/sun/awt/SunGraphicsCallback.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java.i
-data/src/share/classes/javax/naming/InitialContext.java.i
-data/make/tools/CharsetMapping/EUC_CN.map.i
+data/src/solaris/native/sun/awt/Xrandr.h.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ja.properties.i
+data/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java.i
+data/test/java/util/WeakHashMap/ZeroInitCap.java.i
+data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java.i
data/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java.i
data/src/share/demo/nbproject/jfc/SwingApplet/build.properties.i
data/src/share/native/java/lang/fdlibm/src/e_scalb.c.i
@@ -7256,95 +7180,87 @@ data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.propertie
data/test/java/nio/file/WatchService/grantDirAndTree.policy.i
data/test/java/beans/PropertyEditor/TestShortType.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM864.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageRowTable.h.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java.i
data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java.i
data/make/sun/cmm/lcms/FILES_c_unix.gmk.i
data/src/share/classes/java/awt/image/renderable/RenderedImageFactory.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java.i
data/make/netbeans/common/jtreg-sources.ent.i
data/src/share/classes/sun/nio/cs/HistoricallyNamedCharset.java.i
data/test/java/net/URL/RestoreURL.java.i
data/src/share/classes/com/sun/jdi/LocalVariable.java.i
data/src/share/classes/sun/text/resources/FormatData_ro.java.i
data/test/java/awt/Graphics2D/DrawString/DrawStrSuper.java.i
-data/src/share/classes/sun/tools/jconsole/Version.java.template.i
-data/test/java/lang/management/ThreadMXBean/ThreadExecutionSynchronizer.java.i
+data/src/share/native/sun/java2d/loops/IntArgbBm.c.i
+data/src/share/classes/java/lang/NoSuchFieldException.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_KW.properties.i
-data/src/share/native/sun/awt/image/jpeg/jpeglib.h.i
data/test/javax/management/MBeanServerFactory/NamedMBeanServerTest.java.i
-data/test/demo/jvmti/hprof/HeapAllTest.java.i
+data/make/java/util/FILES_java.gmk.i
data/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java.i
data/make/sun/jpeg/FILES_c.gmk.i
data/src/solaris/classes/sun/awt/X11GraphicsDevice.java.i
data/src/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java.i
data/test/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java.i
data/src/share/classes/com/sun/beans/decoder/JavaElementHandler.java.i
-data/test/javax/management/openmbean/MBeanFeatureInfoSerialStore.java.i
data/src/share/native/sun/security/ec/impl/mp_gf2m.c.i
data/test/java/lang/String/RegionMatches.java.i
data/src/share/classes/com/sun/crypto/provider/BlowfishCipher.java.i
-data/test/java/io/PrintStream/ClearErrorStream.java.i
-data/src/share/native/java/lang/Shutdown.c.i
-data/test/sun/invoke/util/ValueConversionsTest.java.i
-data/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh.i
+data/test/java/io/Serializable/evolution/RenamePackage/run.sh.i
data/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java.i
data/test/java/math/BigInteger/TestValueExact.java.i
-data/src/share/classes/java/awt/Shape.java.i
-data/src/share/classes/javax/swing/text/LayoutQueue.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.i
+data/test/java/beans/XMLEncoder/java_awt_MenuShortcut.java.i
data/src/share/classes/java/rmi/activation/package.html.i
data/test/java/security/BasicPermission/MixedBasicPermissions.java.i
-data/test/sun/security/pkcs11/tls/masterdata.txt.i
-data/src/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java.i
+data/src/share/classes/javax/print/attribute/standard/JobKOctets.java.i
+data/src/share/classes/sun/io/CharToByteJIS0208_Solaris.java.i
data/test/sun/tools/jstat/lineCounts3.awk.i
-data/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java.i
-data/src/share/classes/javax/swing/table/JTableHeader.java.i
-data/make/mkdemo/jvmti/heapViewer/Makefile.i
+data/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BezierControlPoint.java.i
+data/src/share/classes/sun/applet/AppletImageRef.java.i
data/src/share/classes/com/sun/jdi/VirtualMachine.java.i
-data/src/share/native/sun/java2d/cmm/lcms/lcms2.h.i
-data/src/share/classes/sun/text/resources/FormatData_fr_BE.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Basics.java.i
-data/test/com/sun/crypto/provider/TLS/TestPRF12.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java.i
+data/src/share/classes/com/sun/servicetag/SunConnection.java.i
+data/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java.i
+data/src/share/native/sun/java2d/loops/IntArgbBm.h.i
data/src/share/classes/sun/io/ByteToCharMS936.java.i
data/src/share/classes/javax/swing/text/AttributeSet.java.i
data/src/share/classes/sun/misc/Regexp.java.i
data/test/javax/management/MBeanServer/MBeanExceptionTest.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames.properties.i
+data/make/tools/src/build/tools/generatenimbus/SynthModel.java.i
data/test/java/awt/font/Threads/FontThread.java.i
data/src/share/classes/java/util/logging/Filter.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties.i
-data/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java.i
+data/make/jpda/Makefile.i
data/src/windows/native/sun/java2d/d3d/D3DContext.cpp.i
-data/src/share/classes/sun/util/resources/LocaleNames_pl.properties.i
data/make/sun/jdga/mapfile-vers.i
data/src/share/classes/javax/swing/text/StyledEditorKit.java.i
data/make/tools/CharsetMapping/MacUkraine.map.i
data/src/share/classes/javax/management/openmbean/ArrayType.java.i
data/src/share/classes/javax/sound/midi/spi/MidiFileWriter.java.i
-data/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java.i
-data/src/share/classes/sun/jvmstat/monitor/StringMonitor.java.i
+data/make/tools/src/build/tools/javazic/GenDoc.java.i
data/src/share/classes/sun/security/ssl/ProtocolVersion.java.i
-data/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/BitFile.java.i
+data/test/java/util/Locale/Bug4184873_id.i
data/make/netbeans/j2se/README.i
-data/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java.i
+data/src/share/classes/sun/io/CharToByteUnicodeBigUnmarked.java.i
data/test/java/io/Serializable/survivePrematureClose/SurvivePrematureClose.java.i
data/make/tools/CharsetMapping/ISO_8859_5.map.i
-data/src/solaris/native/common/jdk_util_md.h.i
-data/src/share/classes/java/util/zip/CRC32.java.i
+data/src/share/classes/java/lang/AssertionStatusDirectives.java.i
data/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html.i
+data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties.i
data/src/share/classes/java/nio/charset/CodingErrorAction.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/crc32.java.i
-data/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java.i
data/src/share/classes/com/sun/crypto/provider/OutputFeedback.java.i
data/test/java/awt/List/ScrollOutside/ScrollOut.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/ByteArrayCalls.java.i
data/make/tools/CharsetMapping/IBM1142.c2b.i
data/src/windows/native/sun/windows/awt_DrawingSurface.h.i
-data/src/share/classes/java/security/spec/ECFieldF2m.java.i
+data/src/share/classes/sun/misc/JarIndex.java.i
data/src/share/native/java/lang/fdlibm/src/e_atan2.c.i
-data/src/windows/native/sun/windows/awt.h.i
+data/src/share/classes/sun/nio/cs/ext/IBM1122.java.i
data/make/tools/CharsetMapping/IBM280.nr.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java.i
-data/src/share/classes/sun/text/resources/FormatData_be.java.i
data/src/share/classes/java/nio/charset/spi/package.html.i
data/src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java.i
data/src/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java.i
@@ -7352,86 +7268,83 @@ data/src/windows/classes/sun/nio/ch/Iocp.java.i
data/src/share/classes/com/sun/jmx/snmp/ThreadContext.java.i
data/src/share/classes/java/security/Certificate.java.i
data/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java.i
+data/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java.i
data/test/java/nio/file/Path/delete_on_close.sh.i
data/src/share/classes/sun/security/ssl/MAC.java.i
-data/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java.i
+data/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html.i
data/test/com/sun/jdi/sde/onion/pickle/Mangle.java.i
data/src/share/native/sun/awt/medialib/mlib_image_blend_proto.h.i
-data/src/share/classes/java/sql/ParameterMetaData.java.i
-data/test/java/net/ResponseCache/file2.1.i
+data/src/share/classes/com/sun/jdi/ShortType.java.i
+data/test/java/lang/reflect/Method/InheritedInterfaceMethods.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmsio1.c.i
-data/src/share/classes/sun/applet/AppletViewerFactory.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java.i
-data/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java.i
+data/test/javax/security/auth/kerberos/ServicePermissionTest.java.i
data/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties.i
+data/test/java/awt/dnd/URIListBetweenJVMsTest/SourceFileListFrame.java.i
data/test/java/io/Serializable/classDescFlagConflict/Foo.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Encoder.java.i
+data/src/share/classes/com/oracle/net/Sdp.java.i
data/src/share/native/java/lang/fdlibm/include/fdlibm.h.i
data/src/share/classes/sun/font/PhysicalStrike.java.i
+data/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java.i
data/src/share/classes/sun/jkernel/DownloadManager.java.i
data/src/share/native/java/net/Inet6Address.c.i
-data/src/share/classes/sun/font/FontUtilities.java.i
+data/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java.i
data/test/java/nio/channels/DatagramChannel/SRTest.java.i
-data/src/share/classes/sun/swing/AccessibleMethod.java.i
data/src/solaris/doc/sun/man/man1/jvisualvm.1.i
data/src/share/classes/javax/swing/BoxLayout.java.i
-data/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java.i
-data/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
-data/src/share/classes/com/sun/imageio/stream/StreamFinalizer.java.i
+data/src/share/classes/sun/io/ByteToCharMacTurkish.java.i
+data/make/java/nio/addNotices.sh.i
+data/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.html.i
data/src/share/classes/java/security/spec/AlgorithmParameterSpec.java.i
-data/src/share/native/sun/awt/medialib/mlib_sys.c.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java.i
data/src/share/demo/jfc/Metalworks/Metalworks.java.i
-data/test/sun/util/resources/Locale/Bug4965260.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ServerIdentityTest.java.i
data/make/tools/CharsetMapping/IBM500.nr.i
data/test/java/util/zip/DeflateIn_InflateOut.java.i
data/test/sun/security/provider/PolicyFile/CanonPath.java.i
data/src/share/classes/java/security/MessageDigestSpi.java.i
-data/src/solaris/classes/sun/awt/motif/MMenuPeer.java.i
+data/test/sun/security/provider/SecureRandom/SelfSeed.java.i
data/src/share/classes/sun/font/CreatedFontTracker.java.i
-data/src/share/native/java/lang/fdlibm/src/s_tan.c.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java.i
+data/src/share/classes/sun/tools/jconsole/InternalDialog.java.i
data/test/javax/management/notification/BroadcasterSupportDeadlockTest.java.i
data/src/share/native/sun/awt/debug/debug_mem.c.i
-data/src/share/classes/sun/io/CharToByteJIS0212.java.i
+data/test/java/net/Socket/TestClose.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java.i
+data/test/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java.i
data/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java.i
-data/src/share/classes/sun/io/ByteToCharCp1025.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java.i
data/src/solaris/classes/sun/awt/X11/XMenuPeer.java.i
data/src/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java.i
data/src/share/classes/sun/tools/tree/AssignMultiplyExpression.java.i
data/src/share/native/sun/java2d/loops/TransformHelper.c.i
-data/src/share/demo/jvmti/hprof/hprof_frame.c.i
data/test/com/sun/jdi/connect/spi/ListConnectors.java.i
data/test/sun/java2d/cmm/ColorConvertOp/SRGB555.png.i
-data/test/java/lang/instrument/IsModifiableClassApp.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java.i
+data/src/share/classes/sun/nio/cs/Unicode.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java.i
data/src/windows/native/java/net/SocketInputStream.c.i
data/src/share/classes/com/sun/tracing/dtrace/NameAttributes.java.i
data/src/share/classes/java/security/SignatureSpi.java.i
-data/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine.i
-data/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java.i
+data/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java.i
+data/src/share/classes/javax/sound/sampled/AudioFileFormat.java.i
data/src/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java.i
data/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java.i
-data/test/java/nio/file/Files/Links.java.i
data/src/share/native/sun/awt/image/jpeg/jfdctfst.c.i
data/src/share/classes/javax/management/InvalidAttributeValueException.java.i
+data/test/java/util/Locale/data/deflocale.input.i
data/src/share/classes/javax/print/attribute/standard/package.html.i
-data/src/share/classes/java/lang/reflect/package-info.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java.i
data/test/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java.i
data/src/share/classes/com/sun/java/util/jar/pack/Fixups.java.i
data/test/java/awt/regtesthelpers/process/ProcessCommunicator.java.i
data/src/share/native/java/util/zip/zip_util.h.i
data/src/share/classes/javax/smartcardio/TerminalFactory.java.i
-data/test/java/nio/channels/FileChannel/Lock.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.c.i
+data/src/share/classes/java/security/AllPermission.java.i
data/src/share/classes/java/lang/management/RuntimeMXBean.java.i
-data/src/share/classes/javax/security/auth/login/AccountLockedException.java.i
-data/src/share/demo/jfc/Metalworks/GreenMetalTheme.java.i
+data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java.i
+data/src/windows/native/sun/net/www/protocol/http/NTLMAuthSequence.c.i
data/src/share/back/StackFrameImpl.h.i
data/src/share/classes/com/sun/beans/decoder/ShortElementHandler.java.i
-data/src/solaris/classes/sun/awt/X11/XWrapperBase.java.i
data/src/share/classes/com/sun/media/sound/SoftAudioPusher.java.i
data/make/tools/classanalyzer/nbproject/project.xml.i
data/src/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java.i
@@ -7440,125 +7353,118 @@ data/make/tools/swing-beans/beaninfo/images/JFrameMono32.gif.i
data/src/share/classes/java/awt/datatransfer/DataFlavor.java.i
data/test/java/util/Collections/ReplaceAll.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java.i
-data/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java.i
+data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.c.i
+data/test/java/lang/Class/forName/classes/right-square.class.i
data/test/com/sun/jdi/MonitorFrameInfo.java.i
+data/test/java/nio/channels/SocketChannel/Open.sh.i
data/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventListener.java.i
data/test/sun/security/tools/keytool/KeyToolTest.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_43.c.i
data/src/share/classes/sun/reflect/AccessorGenerator.java.i
data/src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java.i
-data/src/share/classes/javax/print/event/PrintEvent.java.i
data/test/sun/net/www/http/HttpClient/OpenServer.policy.i
data/src/share/native/java/util/zip/zlib-1.2.3/zconf.h.i
-data/test/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java.i
data/test/com/sun/jdi/ZZZcleanup.sh.i
-data/src/share/classes/com/sun/beans/decoder/ValueObjectImpl.java.i
+data/test/java/lang/reflect/Proxy/returnTypes/GetCloneable.java.i
data/src/share/classes/javax/swing/text/html/HTML.java.i
data/make/java/zip/FILES_c.gmk.i
-data/src/share/classes/javax/swing/plaf/nimbus/ImageCache.java.i
+data/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java.i
data/src/solaris/classes/sun/awt/X11/XConstants.java.i
-data/src/share/classes/sun/java2d/pisces/Dasher.java.i
-data/src/share/classes/sun/dyn/package-info.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java.i
-data/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java.i
-data/src/share/classes/javax/swing/table/TableCellRenderer.java.i
-data/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java.i
+data/test/java/lang/Runtime/exec/ConcurrentRead.java.i
+data/make/docs/Makefile.i
+data/src/linux/doc/man/ja/serialver.1.i
data/src/share/classes/javax/swing/event/HyperlinkListener.java.i
-data/test/java/lang/invoke/ThrowExceptionsTest.java.i
data/src/solaris/doc/sun/man/man1/ja/javah.1.i
+data/make/sun/font/reorder-sparcv9.i
data/src/share/classes/java/util/EmptyStackException.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c.i
-data/test/java/io/Serializable/enum/missingConstant/Read.java.i
-data/src/share/classes/sun/io/MalformedInputException.java.i
+data/src/share/classes/java/awt/doc-files/modal-example3.gif.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java.i
data/src/share/classes/javax/print/PrintService.java.i
-data/src/share/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml.i
-data/src/share/classes/java/awt/event/FocusEvent.java.i
-data/src/share/classes/com/sun/awt/SecurityWarning.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html.i
+data/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java.i
+data/src/share/classes/com/sun/jndi/ldap/SimpleClientId.java.i
data/make/tools/swing-beans/beaninfo/images/JColorChooserColor32.gif.i
-data/src/solaris/native/sun/security/smartcardio/MUSCLE/COPYING.i
+data/src/share/demo/nbproject/jfc/TransparentRuler/build.xml.i
data/src/share/classes/com/sun/beans/finder/MethodFinder.java.i
-data/make/tools/src/build/tools/automulti/TestALFLookAndFeel.java.i
data/src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java.i
-data/src/share/classes/sun/tools/java/BinaryMember.java.i
+data/src/share/classes/sun/management/ThreadImpl.java.i
data/src/share/native/sun/font/layout/OpenTypeLayoutEngine.h.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Signer.java.i
+data/test/java/net/ResponseCache/file2.1.i
+data/test/java/io/charStreams/StringConvert.java.i
data/src/share/classes/sun/tools/jconsole/ThreadTab.java.i
-data/src/share/native/sun/font/layout/ICUFeatures.h.i
+data/test/java/net/URLConnection/RedirectLimit.java.i
data/make/mkdemo/jfc/Java2D/Makefile.i
-data/test/java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java.i
+data/src/share/classes/sun/tools/jstat/SyntaxException.java.i
data/test/sun/java2d/cmm/ColorConvertOp/ColorSpaceCvtCrashTest/ColorSpaceCvtCrashTest.java.i
data/test/java/math/BigInteger/ExtremeShiftingTests.java.i
data/src/share/demo/applets/MoleculeViewer/models/benzene.xyz.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ko_KR.properties.i
-data/src/solaris/classes/sun/awt/X11/java-icon32.png.i
+data/src/share/native/java/lang/fdlibm/src/w_acos.c.i
+data/src/linux/doc/man/ja/jinfo.1.i
+data/src/share/classes/com/sun/media/sound/SimpleSoundbank.java.i
data/src/share/classes/com/sun/jndi/ldap/LdapRequest.java.i
data/src/share/classes/java/awt/font/TextLayout.java.i
-data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.i
data/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c.i
data/src/share/classes/java/io/Serializable.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java.i
+data/test/java/util/ResourceBundle/Control/ExpirationTest.java.i
data/src/share/classes/sun/management/counter/LongArrayCounter.java.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c.i
+data/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java.i
data/test/sun/java2d/DirectX/InfiniteValidationLoopTest/InfiniteValidationLoopTest.java.i
data/src/share/classes/sun/awt/resources/awt_zh_CN.properties.i
data/src/share/classes/sun/text/resources/FormatData_es_DO.java.i
+data/test/java/beans/XMLEncoder/java_sql_Time.java.i
data/src/share/classes/java/rmi/MarshalException.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java.i
+data/src/share/classes/javax/crypto/spec/package.html.i
data/src/share/classes/java/util/ServiceConfigurationError.java.i
-data/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java.i
+data/src/share/classes/sun/management/CompilerThreadStat.java.i
data/src/share/classes/sun/io/CharToByteCp1122.java.i
data/src/share/classes/sun/net/www/protocol/https/Handler.java.i
data/make/tools/swing-beans/beaninfo/images/BorderColor16.gif.i
+data/src/share/classes/javax/imageio/spi/ImageReaderSpi.java.i
data/src/share/classes/sun/security/pkcs11/Session.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/Des.java.i
data/test/com/sun/crypto/provider/KeyAgreement/DHGenSecretKey.java.i
-data/test/java/util/zip/pkware123456789012345.zip.i
+data/test/java/lang/ThreadLocal/Basic.java.i
data/src/windows/native/java/io/WinNTFileSystem_md.c.i
-data/src/share/classes/javax/swing/DefaultDesktopManager.java.i
data/test/java/rmi/server/serverStackTrace/Impl1_Stub.java.i
-data/test/java/nio/file/spi/SetDefaultProvider.java.i
data/src/share/classes/java/beans/Introspector.java.i
data/test/java/util/concurrent/locks/ReentrantReadWriteLock/Bug6571733.java.i
data/test/java/net/URLConnection/ZeroContentLength.java.i
data/test/javax/swing/JColorChooser/Test6559154.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/UnrecognizedOptionException.java.i
+data/test/sun/security/mscapi/KeyStoreCompatibilityMode.java.i
+data/test/javax/script/ProviderTest.java.i
data/src/share/classes/java/io/StringReader.java.i
-data/src/share/back/eventFilter.c.i
data/src/share/classes/sun/io/ByteToCharJIS0201.java.i
data/test/com/sun/jdi/RepStep.java.i
-data/src/share/classes/sun/jvmstat/monitor/VmIdentifier.java.i
+data/src/share/classes/javax/swing/InputMap.java.i
data/src/share/classes/javax/management/MBeanAttributeInfo.java.i
data/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java.i
data/src/share/native/sun/awt/image/jpeg/jdtrans.c.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java.i
+data/src/share/classes/sun/misc/resources/Messages_zh_CN.java.i
data/src/share/classes/javax/sql/DataSource.java.i
data/src/share/classes/javax/swing/text/doc-files/paragraph.gif.i
-data/src/share/classes/sun/beans/editors/ColorEditor.java.i
+data/src/share/classes/javax/net/ssl/ManagerFactoryParameters.java.i
data/src/share/classes/sun/awt/image/ImageFetchable.java.i
-data/src/windows/native/sun/windows/awt_ole.h.i
-data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java.i
-data/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Encoder.java.i
+data/src/share/classes/sun/io/CharToByteCp437.java.i
+data/src/solaris/classes/sun/java2d/xr/XIDGenerator.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpEngineId.java.i
data/test/sun/security/provider/certpath/CertId/interCA.der.i
-data/make/tools/CharsetMapping/IBM297.map.i
+data/src/share/classes/javax/imageio/ImageReadParam.java.i
data/src/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java.i
-data/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp.i
+data/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java.i
data/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass.java.i
data/test/java/beans/XMLDecoder/spec/TestJava.java.i
data/src/share/classes/com/sun/tools/jconsole/package.html.i
-data/test/sun/nio/cs/OLD/X11GB2312_OLD.java.i
-data/src/share/classes/com/sun/media/sound/AiffFileWriter.java.i
+data/test/java/io/Serializable/oldTests/ArrayOpsTest.java.i
data/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java.i
data/test/sun/security/pkcs11/PKCS11Test.java.i
data/make/sun/text/FILES_java.gmk.i
data/test/java/awt/dnd/ImageDecoratedDnDInOut/DnDSource.java.i
data/test/javax/management/eventService/PublishTest.java.i
-data/test/java/io/Serializable/subclass/Allow.policy.i
+data/src/windows/native/sun/windows/awt_Brush.cpp.i
data/src/share/classes/sun/io/ByteToCharCp1383.java.i
+data/test/java/awt/Component/isLightweightCrash/StubPeerCrash.java.i
data/test/sun/misc/Cleaner/exitOnThrow.sh.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif.i
data/test/com/sun/jdi/ModificationWatchpoints.java.i
data/test/java/lang/management/ManagementFactory/StateTest.java.i
data/src/share/classes/java/awt/geom/EllipseIterator.java.i
@@ -7574,105 +7480,110 @@ data/src/share/classes/com/sun/jndi/ldap/LdapAttribute.java.i
data/src/share/classes/com/sun/nio/sctp/Association.java.i
data/test/sun/security/tools/jarsigner/AlgOptions.jar.i
data/test/java/lang/Runtime/shutdown/ShutdownHooks.java.i
-data/src/share/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml.i
+data/src/share/classes/org/openjdk/jigsaw/package-info.java.i
data/test/sun/security/pkcs11/rsa/TestKeyFactory.java.i
+data/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java.i
data/test/java/beans/PropertyChangeSupport/TestEquals.java.i
+data/src/share/native/sun/awt/image/jpeg/jidctfst.c.i
data/src/solaris/classes/sun/awt/X11/XAWTLookAndFeel.java.i
-data/src/share/sample/scripting/scriptpad/nbproject/file-targets.xml.i
data/test/javax/management/ObjectName/ValueOfTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_ar_IQ.java.i
-data/make/netbeans/common/shared.xml.i
-data/make/sun/tracing/dtrace/mapfile-vers.i
-data/make/sun/rmi/rmi/Makefile.i
-data/make/docs/CORE_PKGS.gmk.i
+data/src/share/classes/java/nio/channels/MulticastChannel.java.i
+data/src/share/classes/com/sun/tools/jdi/LongValueImpl.java.i
+data/src/share/classes/com/sun/rowset/internal/XmlResolver.java.i
+data/src/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java.i
data/test/java/nio/charset/Charset/RegisteredCharsets.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/DimensionMapper.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_ko.properties.i
+data/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java.i
data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread_Stub.java.i
data/src/share/classes/javax/sql/ConnectionPoolDataSource.java.i
data/src/share/native/sun/security/ec/impl/mpi.h.i
-data/src/share/classes/sun/net/NetProperties.java.i
+data/make/sun/rmi/oldtools/FILES_java.gmk.i
+data/src/share/classes/sun/misc/ExtensionInstallationException.java.i
data/src/share/classes/java/awt/event/HierarchyBoundsListener.java.i
data/make/java/redist/Makefile.i
data/src/share/demo/applets/SortDemo/SortItem.java.i
data/src/share/classes/com/sun/media/sound/RealTimeSequencer.java.i
-data/test/javax/security/auth/Subject/Synch.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java.i
+data/make/tools/GenerateCharacter/Makefile.i
+data/test/java/io/DataInputStream/ReadFully.java.i
+data/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy.i
data/test/java/io/Serializable/illegalHandle/Test.java.i
-data/src/share/classes/org/ietf/jgss/GSSCredential.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java.i
data/test/javax/management/notification/NotifInfoTest.java.i
data/test/java/security/KeyRep/RSA.1.5.key.i
-data/test/java/math/BigInteger/CompareToTests.java.i
+data/src/share/classes/sun/nio/cs/ISO_8859_2.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java.i
data/src/share/classes/javax/swing/text/Segment.java.i
-data/src/share/classes/sun/util/resources/CalendarData_zh.properties.i
+data/test/sun/nio/cs/ISCIITest.java.i
+data/test/java/nio/file/Path/FileAttributes.java.i
+data/test/sun/util/calendar/Bug6653944.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/Token.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java.i
data/test/com/sun/net/httpserver/bugs/B6529200.java.i
-data/src/share/classes/javax/crypto/spec/DHPrivateKeySpec.java.i
+data/src/share/classes/com/sun/media/sound/SF2LayerRegion.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/sortDown.png.i
-data/test/com/sun/tools/attach/PermissionTests.sh.i
-data/make/tools/CharsetMapping/IBM1383.map.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/ParseException.java.i
+data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy.i
data/src/share/native/java/lang/fdlibm/src/s_finite.c.i
-data/src/share/classes/com/sun/tracing/ProbeName.java.i
+data/src/share/classes/javax/print/event/package.html.i
+data/src/solaris/classes/sun/nio/fs/UnixPath.java.i
data/src/share/demo/jfc/TableExample/JDBCAdapter.java.i
-data/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java.i
data/src/share/classes/javax/swing/BorderFactory.java.i
data/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java.i
data/make/common/Defs-windows.gmk.i
data/test/java/lang/instrument/RuntimeConstants.java.i
-data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh.i
+data/src/share/classes/sun/management/GcInfoBuilder.java.i
data/make/tools/src/build/tools/dtdbuilder/DTDParser.java.i
data/src/share/classes/sun/io/CharToByteMS950_HKSCS.java.i
data/src/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java.i
data/src/share/classes/sun/nio/cs/ext/IBM930.java.i
-data/src/share/classes/sun/util/resources/CalendarData_en_IE.properties.i
+data/src/share/classes/java/awt/MenuItem.java.i
data/test/java/nio/channels/SocketChannel/Write.java.i
data/make/tools/CharsetMapping/IBM1097.map.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java.i
-data/test/java/rmi/activation/Activatable/restartCrashedService/security.policy.i
+data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java.i
data/src/share/classes/sun/nio/cs/ext/IBM284.java.i
data/src/share/native/sun/font/layout/SubstitutionLookups.cpp.i
data/test/com/sun/jdi/sde/TemperatureTable.sde.i
data/src/share/classes/java/awt/MultipleGradientPaintContext.java.i
data/test/sun/security/x509/AVA/BadName.java.i
data/src/share/classes/javax/naming/Name.java.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java.i
+data/test/sun/management/windows/README.i
data/src/share/demo/jvmti/hprof/hprof_monitor.h.i
-data/src/share/demo/java2d/J2DBench/README.i
-data/src/share/classes/javax/swing/text/rtf/RTFAttributes.java.i
+data/test/org/openjdk/jigsaw/ModuleInfoBuilder.java.i
+data/test/java/lang/Throwable/LocalizedMessage.java.i
data/src/share/classes/javax/swing/JTextArea.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_de.properties.i
+data/test/com/sun/jdi/RefTypes.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer.java.i
data/test/java/beans/Introspector/4520754/FooBar.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java.i
-data/src/share/classes/java/rmi/package.html.i
+data/src/share/native/sun/awt/libpng/pngwio.c.i
+data/src/share/classes/sun/java2d/DisposerRecord.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png.i
data/test/javax/swing/JPopupMenu/6495920/bug6495920.java.i
data/src/share/demo/jvmti/compiledMethodLoad/compiledMethodLoad.c.i
-data/src/share/classes/com/sun/jdi/event/MethodExitEvent.java.i
+data/test/com/sun/servicetag/TestLoadFromXML.java.i
data/test/javax/swing/JViewport/6953396/bug6953396.java.i
data/src/share/classes/com/sun/crypto/provider/PBEParameters.java.i
data/src/share/classes/javax/crypto/KeyGenerator.java.i
+data/src/share/classes/sun/misc/ProxyGenerator.java.i
data/src/share/classes/sun/security/provider/SystemSigner.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java.i
data/test/java/nio/channels/DatagramChannel/IsBound.java.i
data/test/java/awt/Component/F10TopToplevel/F10TopToplevel.html.i
data/src/share/classes/javax/security/auth/login/LoginContext.java.i
-data/make/tools/CharsetMapping/IBM420.c2b.i
-data/test/java/util/Vector/LastIndexOf.java.i
+data/make/sun/jar/Makefile.i
+data/src/share/classes/javax/swing/event/PopupMenuListener.java.i
data/src/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java.i
data/src/share/classes/sun/util/resources/CalendarData_sv.properties.i
-data/test/com/sun/jdi/SuspendNoFlagTest.sh.i
+data/test/sun/security/provider/PolicyParser/ExtDirs1.policy.i
+data/make/tools/CharsetMapping/IBM856.map.i
data/test/java/security/AccessControlContext/FailureDebugOption.java.i
-data/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java.i
-data/src/share/classes/sun/dyn/ToGeneric.java.i
data/src/solaris/classes/sun/awt/X11/XDataTransferer.java.i
data/test/com/sun/crypto/provider/Cipher/PBE/PBEParametersTest.java.i
data/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java.i
data/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java.i
data/make/org/ietf/jgss/FILES_java.gmk.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java.i
-data/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java.i
+data/src/solaris/doc/sun/man/man1/ja/serialver.1.i
data/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java.i
data/test/javax/security/auth/SubjectDomainCombiner/Regression.policy.i
data/test/sun/nio/cs/OLD/X11GBK_OLD.java.i
@@ -7683,413 +7594,427 @@ data/src/share/classes/sun/awt/AWTAutoShutdown.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c.i
data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2steve.cer.i
data/test/java/beans/Introspector/Test4896879.java.i
-data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form.i
-data/test/com/sun/jdi/PopSynchronousTest.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_US.properties.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java.i
data/src/share/classes/sun/java2d/opengl/OGLDrawImage.java.i
+data/test/sun/tools/jstat/lineCounts2.awk.i
data/test/com/sun/net/httpserver/Test11.java.i
data/test/sun/security/provider/PolicyParser/BogusGrants.java.i
-data/test/com/sun/crypto/provider/TLS/prfdata.txt.i
-data/src/windows/native/sun/java2d/d3d/D3DPaints.cpp.i
-data/test/javax/management/mxbean/CustomTypeTest.java.i
+data/src/share/demo/applets/SortDemo/example1.html.i
+data/test/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java.i
data/test/java/util/Locale/data/deflocale.jds3.i
data/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java.i
-data/make/tools/src/build/tools/jdwpgen/ValueTypeNode.java.i
-data/src/share/classes/javax/accessibility/AccessibleRole.java.i
+data/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java.i
+data/src/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java.i
data/src/share/classes/java/dyn/ConstantCallSite.java.i
data/src/share/classes/sun/text/resources/FormatData_es_SV.java.i
data/test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java.i
data/src/share/classes/java/rmi/RMISecurityException.java.i
data/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_be_BY.properties.i
+data/make/tools/swing-beans/SwingBeanInfo.template.i
data/make/tools/swing-beans/beaninfo/images/JRootPaneColor32.gif.i
-data/test/java/io/Serializable/available/Available.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy31.i
data/test/sun/security/tools/jarsigner/checkusage.sh.i
-data/src/share/classes/sun/java2d/Surface.java.i
+data/src/share/native/sun/awt/libpng/pngrutil.c.i
data/test/java/lang/Double/NaNInfinityParsing.java.i
-data/test/java/awt/Component/isLightweightCrash/StubPeerCrash.java.i
+data/src/share/classes/com/sun/jmx/namespace/serial/RoutingOnlyProcessor.java.i
data/test/java/security/ProtectionDomain/Recursion.java.i
-data/src/share/classes/javax/management/event/EventReceiver.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java.i
data/test/java/net/MulticastSocket/TestDefaults.java.i
-data/src/share/classes/sun/rmi/rmic/IndentingWriter.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/GoodProvider.java.i
data/test/com/sun/security/auth/login/ConfigFile/IllegalURL.java.i
-data/src/share/classes/sun/security/util/DerInputBuffer.java.i
+data/test/java/lang/String/IndexOfEmptyInEmpty.java.i
data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keystore.i
-data/src/linux/doc/man/schemagen.1.i
-data/src/windows/native/sun/nio/ch/FileDispatcher.c.i
+data/src/share/classes/java/util/concurrent/CancellationException.java.i
+data/test/java/io/File/SetLastModified.java.i
data/src/share/classes/sun/print/BackgroundServiceLookup.java.i
-data/test/com/sun/java/swing/plaf/gtk/Test6635110.java.i
+data/src/share/classes/javax/swing/text/rtf/package.html.i
data/test/javax/xml/crypto/dsig/data/signature-x509-crt.xml.i
-data/test/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java.i
+data/src/solaris/classes/java/net/DefaultDatagramSocketImplFactory.java.i
data/src/windows/classes/sun/font/NativeFont.java.i
+data/test/javax/xml/crypto/dsig/data/signature-external-b64-dsa.xml.i
data/src/share/classes/javax/management/namespace/JMXNamespaceMBean.java.i
data/test/java/nio/channels/SocketChannel/CloseRegisteredChannel.java.i
data/make/tools/swing-beans/beaninfo/images/JColorChooserColor16.gif.i
data/test/java/security/ProtectionDomain/CheckWhatYouGet.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppOutputStream/NoExceptionOnClose.java.i
-data/src/share/classes/java/nio/file/WatchEvent.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java.i
-data/src/solaris/classes/sun/awt/motif/MGlobalCursorManager.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java.i
+data/src/share/classes/java/net/Inet4AddressImpl.java.i
+data/test/java/awt/PrintJob/Text/StringWidth.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java.i
+data/src/solaris/classes/sun/awt/motif/MGlobalCursorManager.java.i
data/make/sun/jpeg/reorder-i586.i
-data/src/share/native/sun/security/ec/mp_gf2m.h.i
-data/src/share/classes/sun/io/ConversionBufferFullException.java.i
+data/test/java/awt/FullScreen/SetFSWindow/FSFrame.java.i
+data/make/com/sun/jndi/rmi/Makefile.i
data/test/java/math/BigDecimal/EqualsTests.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathTableMeta.java.i
+data/test/java/security/Security/removing/RemoveStaticProvider.java.i
data/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh.i
data/src/share/classes/sun/util/resources/LocaleNames_pt_BR.properties.i
-data/test/java/lang/instrument/RemoveTransformerTest.java.i
data/src/solaris/classes/sun/awt/motif/MChoicePeer.java.i
-data/test/sun/pisces/JoinMiterTest.java.i
-data/test/java/lang/System/Available.java.i
-data/test/java/util/Collections/AddAll.java.i
+data/make/com/sun/demo/jvmti/Makefile.i
+data/test/javax/xml/crypto/dsig/data/envelope.xml.i
+data/src/share/classes/sun/io/CharToByteCp424.java.i
data/test/java/io/Serializable/oldTests/ArrayTest.java.i
-data/src/share/native/sun/java2d/loops/AlphaMacros.c.i
+data/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c.i
data/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java.i
+data/src/share/bin/defines.h.i
data/src/share/classes/sun/security/util/AuthResources_zh_TW.java.i
data/src/share/native/org/openjdk/jigsaw/BootLoader.c.i
-data/src/share/classes/sun/nio/cs/ext/IBM1144.java.i
+data/src/share/demo/jfc/Font2DTest/resources/resource.data.i
data/src/share/classes/sun/net/TelnetOutputStream.java.i
data/src/share/classes/sun/net/www/protocol/netdoc/Handler.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/RemoteObjArrayCalls.java.i
-data/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java.i
+data/src/share/classes/javax/imageio/spi/IIORegistry.java.i
data/src/share/classes/java/util/jar/JarInputStream.java.i
-data/test/java/io/Serializable/oldTests/WritePrimitive.java.i
data/src/share/demo/jvmti/hprof/hprof_frame.h.i
-data/test/sun/security/krb5/auto/OkAsDelegate.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java.i
data/src/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java.i
data/test/java/text/BreakIterator/MirroredBreakIterator.java.i
data/src/solaris/classes/sun/awt/windows/ThemeReader.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_en_SG.properties.i
-data/test/com/sun/jdi/connect/spi/NullTransportService.java.i
-data/src/windows/native/sun/windows/awt_Unicode.h.i
-data/test/sun/nio/cs/StrCodingBenchmark.java.i
+data/src/share/classes/sun/io/CharToByteCp860.java.i
+data/src/share/sample/scripting/scriptpad/src/resources/Main.js.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest08_ko.properties.in.i
-data/test/sun/nio/cs/TestUTF8.java.i
+data/make/tools/CharsetMapping/IBM935.c2b.i
data/test/javax/naming/ldap/LdapName/CompareToEqualsTests.java.i
data/src/share/classes/java/awt/doc-files/AWTThreadIssues.html.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h.i
-data/make/modules/modules.config.i
+data/src/share/classes/java/text/Collator.java.i
+data/src/solaris/classes/sun/awt/motif/MWindowPeer.java.i
data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor_Stub.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileSystemProvider.java.i
-data/make/sun/cmm/kcms/Makefile.i
-data/make/tools/swing-beans/beaninfo/images/JLabelMono32.gif.i
+data/src/share/classes/sun/security/ssl/AppOutputStream.java.i
data/test/com/sun/jdi/LineNumberOnBraceTest.java.i
data/test/sun/security/provider/certpath/ReverseBuilder/prjMcrl.i
-data/test/sun/tools/jhat/jmap.bin.i
+data/test/javax/management/remote/mandatory/notif/RMINotifTest.java.i
+data/src/share/native/sun/java2d/SurfaceData.c.i
data/test/javax/management/mxbean/GenericArrayTypeTest.java.i
data/src/share/classes/sun/awt/im/InputMethodPopupMenu.java.i
data/make/sun/rmi/oldtools/Makefile.i
data/src/share/classes/java/awt/TexturePaintContext.java.i
data/test/java/nio/charset/coders/Util.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpGauge.java.i
-data/src/share/native/sun/nio/ch/nio.h.i
+data/test/java/io/File/GetParent.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java.i
data/test/demo/jvmti/gctest/Gctest.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c.i
+data/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png.i
-data/src/share/classes/sun/swing/SwingUtilities2.java.i
-data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall_Stub.java.i
-data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java.i
+data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java.i
+data/src/share/native/sun/awt/libpng/pngdebug.h.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecuritySubSystem.java.i
data/src/share/classes/javax/xml/crypto/dsig/Reference.java.i
-data/test/sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java.i
+data/test/java/nio/channels/DatagramChannel/Sender.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XTree.java.i
data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassWriter.java.i
-data/src/share/classes/sun/reflect/annotation/AnnotationParser.java.i
-data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono32.gif.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java.i
-data/test/java/net/URL/SpecifyHandler.java.i
+data/test/sun/security/tools/jarsigner/Test4431684.java.i
+data/src/windows/native/sun/windows/security_warning_bw.ico.i
+data/src/share/classes/javax/swing/text/TabStop.java.i
data/test/org/openjdk/jigsaw/_PublishedRepository.java.i
data/test/java/rmi/reliability/juicer/ApplicationServer.java.i
data/src/linux/doc/man/ja/appletviewer.1.i
data/src/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif.i
-data/test/sun/security/krb5/auto/BadKdc.java.i
data/test/java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java.i
data/test/java/nio/charset/CharsetEncoder/CanEncode.java.i
data/test/java/lang/Integer/BitTwiddle.java.i
data/make/com/sun/nio/sctp/FILES_c.gmk.i
-data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.i
+data/test/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java.i
+data/make/tools/generate_break_iterator/Makefile.i
data/test/java/io/Serializable/resolveClass/deserializeButton/Test.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/PerThreadGroupPool.java.i
data/test/sun/security/krb5/auto/IgnoreChannelBinding.java.i
-data/src/windows/classes/java/net/PlainSocketImpl.java.i
-data/src/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java.i
+data/src/share/classes/java/util/Observable.java.i
data/test/java/awt/Focus/ChoiceFocus/ChoiceFocus.java.i
data/make/com/sun/net/httpserver/Makefile.i
-data/test/java/lang/Character/Scripts.txt.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_BH.properties.i
+data/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java.i
+data/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/memory.bat.i
-data/test/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java.i
+data/src/share/classes/sun/util/resources/CalendarData_es_US.properties.i
data/test/sun/nio/cs/X11CNS11643P1.java.i
data/test/java/lang/annotation/package-info.java.i
-data/test/com/sun/jdi/ExclusiveBind.java.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java.i
data/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java.i
-data/src/share/classes/java/util/Queue.java.i
-data/src/windows/resource/icons/awt.ico.i
-data/test/java/security/cert/X509CertSelector/SetNameConstraintsEmptySequence.java.i
+data/src/share/classes/javax/swing/event/EventListenerList.java.i
+data/src/share/classes/java/rmi/server/Unreferenced.java.i
+data/src/share/classes/sun/rmi/transport/Endpoint.java.i
data/test/com/sun/jdi/EarlyReturnNegativeTest.java.i
+data/src/share/classes/sun/misc/SharedSecrets.java.i
data/src/share/classes/javax/swing/JLayeredPane.java.i
data/test/sun/security/util/HostnameMatcher/cert1.crt.i
data/src/share/classes/sun/security/ssl/HandshakeOutStream.java.i
data/test/java/util/prefs/RemoveReadOnlyNode.java.i
+data/src/windows/native/java/net/net_util_md.h.i
data/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java.i
data/src/share/classes/javax/swing/plaf/TableUI.java.i
data/src/linux/doc/man/jar.1.i
+data/test/java/security/cert/CertificateFactory/GenerateCertificatesEmptyCollection.java.i
data/src/share/classes/sun/security/krb5/internal/KDCReqBody.java.i
data/src/share/classes/java/awt/color/ICC_Profile.java.i
data/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskFill.c.i
data/src/share/classes/com/sun/tools/jdi/DoubleValueImpl.java.i
data/make/tools/GenerateCharacter/CharacterData01.java.template.i
-data/src/share/native/sun/java2d/loops/IntDcm.h.i
-data/test/com/sun/crypto/provider/Cipher/CTR/CounterMode.java.i
+data/src/share/classes/java/util/jar/Pack200.java.i
+data/test/javax/swing/plaf/synth/7032791/bug7032791.java.i
+data/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java.i
data/test/java/awt/font/TextLayout/TestTibetan.java.i
-data/src/share/native/java/lang/fdlibm/src/w_fmod.c.i
+data/src/share/classes/sun/util/resources/CurrencyNames_zh_CN.properties.i
data/src/share/classes/sun/nio/cs/ext/IBM424.java.i
-data/src/solaris/doc/sun/man/man1/native2ascii.1.i
-data/test/java/lang/Class/getEnclosingMethod/EnclosingMethodTests.java.i
+data/src/linux/doc/man/jinfo.1.i
+data/src/share/classes/java/awt/AlphaComposite.java.i
data/src/share/classes/com/sun/crypto/provider/CounterMode.java.i
data/src/share/classes/sun/net/www/MimeTable.java.i
-data/src/share/classes/sun/font/CoreMetrics.java.i
-data/src/share/classes/sun/security/acl/OwnerImpl.java.i
-data/src/share/classes/sun/java2d/loops/CustomComponent.java.i
+data/test/sun/security/krb5/ParseConfig.java.i
+data/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java.i
+data/src/share/classes/java/awt/geom/QuadIterator.java.i
+data/make/tools/CharsetMapping/IBM933.map.i
data/test/sun/tools/jps/vmflags.i
-data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java.i
+data/src/share/demo/jvmti/gctest/README.txt.i
data/src/share/native/sun/awt/medialib/mlib_ImageClipping.c.i
data/make/tools/CharsetMapping/IBM948.map.i
-data/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java.i
+data/src/share/classes/javax/print/attribute/Attribute.java.i
data/src/share/classes/sun/tools/tree/DeclarationStatement.java.i
-data/src/solaris/demo/jni/Poller/PollingServer.java.i
data/src/share/classes/javax/management/QueryParser.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/CountInterface.java.i
-data/src/share/classes/javax/swing/AbstractListModel.java.i
-data/test/java/beans/PropertyEditor/TestDoubleClassValue.java.i
+data/src/share/classes/sun/text/resources/FormatData_sl.java.i
+data/make/java/math/Makefile.i
data/test/java/lang/ClassLoader/GetDotResource.java.i
data/src/share/classes/com/sun/media/sound/SoftResampler.java.i
-data/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java.i
+data/test/sun/security/pkcs11/Cipher/ReinitCipher.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java.i
data/src/share/classes/sun/misc/Service.java.i
data/test/sun/nio/cs/StrCodingBenchmarkUTF8.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmsopt.c.i
data/src/share/classes/sun/misc/JavaNetAccess.java.i
-data/test/java/lang/instrument/ParallelTransformerLoader.sh.i
-data/src/share/back/ObjectReferenceImpl.h.i
-data/src/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java.i
+data/test/java/security/Security/Nulls.java.i
data/src/share/classes/sun/nio/ch/SocketAdaptor.java.i
data/src/share/demo/nbproject/jfc/SampleTree/nbproject/jdk.xml.i
-data/src/share/classes/sun/security/x509/CertificatePolicySet.java.i
+data/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh.i
data/test/javax/management/modelmbean/DefaultDescriptorFieldTest.java.i
-data/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java.i
+data/src/share/demo/nbproject/scripting/jconsole-plugin/build.xml.i
data/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java.i
data/test/java/net/Inet6Address/B6214234.java.i
data/src/share/demo/nbproject/jfc/FileChooserDemo/build.xml.i
data/src/share/classes/javax/swing/text/package.html.i
-data/src/share/classes/javax/script/ScriptContext.java.i
-data/src/share/native/sun/font/layout/StateTableProcessor.cpp.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/ca.key.i
+data/src/share/classes/com/sun/security/jgss/GSSUtil.java.i
data/src/share/classes/javax/security/auth/callback/ChoiceCallback.java.i
data/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java.i
data/src/share/classes/java/text/spi/package.html.i
data/src/share/classes/sun/security/tools/TimestampedSigner.java.i
-data/test/java/io/RandomAccessFile/skipBytes/input.txt.i
+data/test/sun/security/provider/PolicyFile/nullDomain.java.i
+data/src/share/classes/com/sun/media/sound/SoftLimiter.java.i
+data/src/solaris/native/sun/awt/awt_Component.h.i
data/test/java/io/Serializable/evolution/AddedSuperClass/WriteAddedSuperClass.java.i
-data/src/share/native/com/sun/media/sound/Utilities.h.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java.i
data/src/share/classes/sun/util/resources/CalendarData_ar.properties.i
+data/test/java/lang/Double/ToHexString.java.i
data/src/share/classes/java/util/regex/MatchResult.java.i
data/test/sun/security/krb5/ServiceNameClone.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/DoubleCalls.java.i
data/test/java/nio/Buffer/Basic-X.java.i
-data/src/share/classes/com/sun/jmx/snmp/BerEncoder.java.i
+data/src/share/classes/javax/swing/plaf/ScrollBarUI.java.i
data/make/com/sun/rowset/Makefile.i
data/src/solaris/classes/sun/awt/motif/MFramePeer.java.i
-data/src/share/classes/sun/dyn/util/VerifyAccess.java.i
data/src/solaris/classes/sun/print/UnixPrintService.java.i
data/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp.i
+data/make/common/shared/Defs-versions.gmk.i
data/src/share/classes/sun/util/resources/LocaleNames_hi.properties.i
-data/src/share/classes/javax/swing/text/doc-files/Document-remove.gif.i
-data/src/share/classes/sun/rmi/server/resources/rmid_sv.properties.i
+data/test/java/lang/System/SecurityRace.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_LB.properties.i
data/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java.i
data/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java.i
-data/make/tools/CharsetMapping/IBM949.map.i
-data/src/share/classes/java/awt/CardLayout.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java.i
+data/make/tools/CharsetMapping/IBM921.map.i
data/src/share/native/sun/java2d/loops/AlphaMath.h.i
data/test/java/security/Policy/GetInstance/GetInstance.java.i
-data/src/share/classes/sun/io/ByteToCharJIS0212_Solaris.java.i
+data/test/java/io/Serializable/superclassDataLoss/B.java.i
data/src/share/classes/sun/tools/jconsole/resources/disconnected16.png.i
data/src/solaris/classes/sun/java2d/jules/JulesTile.java.i
data/test/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java.i
data/test/java/net/NetworkInterface/Equals.java.i
data/src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c.i
data/src/share/classes/sun/io/ByteToCharMacUkraine.java.i
-data/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java.i
+data/src/share/classes/sun/io/CharToByteHKSCS.java.i
data/test/java/net/ProxySelector/SystemProxies.java.i
-data/src/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/Module.java.i
data/src/share/classes/javax/management/monitor/GaugeMonitor.java.i
-data/src/solaris/native/sun/awt/awt_FileDialog.c.i
-data/test/java/beans/XMLEncoder/Test6852574.java.i
+data/src/share/demo/jfc/Notepad/resources/open.gif.i
data/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java.i
+data/src/share/classes/javax/print/attribute/standard/RequestingUserName.java.i
data/src/share/classes/javax/sound/midi/MidiFileFormat.java.i
data/test/sun/security/provider/PolicyFile/getinstance/TwoArgPermission.java.i
-data/src/share/classes/sun/io/CharToByteJIS0208_Solaris.java.i
+data/src/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java.i
data/test/sun/net/InetAddress/nameservice/simple/SimpleNameServiceDescriptor.java.i
data/src/windows/native/sun/jkernel/kernel_de.rc.i
data/src/share/native/sun/font/layout/LigatureSubstitution.h.i
data/test/java/util/Map/LockStep.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/patches/crc32.c.diff.i
-data/src/share/classes/sun/security/krb5/Realm.java.i
-data/src/share/classes/sun/misc/JarIndex.java.i
-data/make/tools/CharsetMapping/IBM864.map.i
-data/test/tools/launcher/unresolvedExceptions.sh.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties.i
+data/test/java/beans/PropertyEditor/TestFloatType.java.i
+data/src/share/classes/java/security/spec/ECFieldF2m.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java.i
+data/src/share/classes/javax/naming/spi/package.html.i
data/test/demo/zipfs/PathOps.java.i
-data/src/share/classes/javax/sound/midi/MidiSystem.java.i
data/src/windows/classes/sun/awt/windows/WColor.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ServerIdentityTest.java.i
+data/test/sun/util/resources/Locale/Bug4965260.java.i
data/test/com/sun/net/httpserver/TestLogging.java.i
-data/test/java/net/Socket/TestClose.java.i
+data/src/share/classes/sun/io/CharToByteJIS0212.java.i
data/test/org/openjdk/jigsaw/install-files.sh.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java.i
data/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java.i
+data/test/java/security/KeyRep/SerialDSAPubKey.java.i
data/src/share/classes/sun/awt/image/ShortComponentRaster.java.i
-data/src/share/classes/java/dyn/ToGeneric.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapEntry.java.i
+data/test/demo/jvmti/hprof/HelloWorld.java.i
data/test/sun/net/www/ParseUtil_4922813.java.i
data/src/share/classes/sun/io/ByteToCharMS949.java.i
data/src/solaris/classes/sun/java2d/jules/TrapezoidList.java.i
data/src/share/classes/sun/jkernel/Bundle.java.i
data/test/java/lang/Math/Log10Tests.java.i
-data/src/share/classes/java/security/AuthProvider.java.i
-data/test/javax/swing/Security/6657138/bug6657138.java.i
+data/test/java/lang/Throwable/NewChainedExceptions.java.i
+data/src/share/classes/org/openjdk/jigsaw/ModuleFileFormat.java.i
data/src/share/classes/sun/jvmstat/monitor/event/HostEvent.java.i
-data/test/java/net/URLConnection/RedirectLimit.java.i
-data/src/share/native/java/lang/fdlibm/src/w_acos.c.i
+data/src/share/native/sun/font/layout/ICUFeatures.h.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ko_KR.properties.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java.i
-data/src/share/classes/java/util/IllegalFormatWidthException.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java.i
+data/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java.i
data/src/share/classes/java/lang/module/VersionQuery.java.i
data/src/share/classes/java/lang/module/Version.java.i
-data/src/share/classes/sun/font/GlyphDisposedListener.java.i
-data/test/javax/script/ProviderTest.java.i
+data/src/share/classes/sun/net/www/protocol/http/NegotiateCallbackHandler.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/UnrecognizedOptionException.java.i
data/src/share/classes/javax/print/attribute/package.html.i
data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java.i
data/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java.i
+data/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJobHeadless.java.i
data/src/share/classes/sun/security/pkcs12/MacData.java.i
-data/test/java/io/Serializable/arraySuidConflict/Write.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.i
data/src/share/classes/sun/security/x509/certAttributes.html.i
data/make/tools/GenerateCharacter/check_class.c.template.i
data/src/share/classes/sun/text/resources/FormatData_sr_Latn_RS.java.i
+data/test/java/io/LineNumberReader/Read.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java.i
-data/src/share/classes/sun/security/pkcs11/JarVerifier.java.i
data/src/share/classes/com/sun/media/sound/SimpleInstrument.java.i
-data/src/linux/doc/man/jstatd.1.i
+data/test/java/beans/XMLDecoder/spec/TestNew.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java.i
data/src/share/classes/java/awt/image/AreaAveragingScaleFilter.java.i
-data/test/javax/swing/JColorChooser/Test4461329.java.i
data/src/share/classes/sun/invoke/anon/ConstantPoolParser.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XSheet.java.i
data/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java.i
-data/make/tools/src/build/tools/javazic/BackEnd.java.i
+data/src/share/native/sun/font/layout/MorphTables.cpp.i
data/test/java/net/InetAddress/B6296240.java.i
-data/test/sun/management/windows/README.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SourceListener.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java.i
-data/make/tools/CharsetMapping/IBM856.map.i
+data/test/com/sun/jdi/SuspendNoFlagTest.sh.i
+data/test/java/lang/Class/forName/classes/Z.class.i
data/src/solaris/native/sun/nio/fs/LinuxWatchService.c.i
data/src/solaris/doc/sun/man/man1/orbd.1.i
-data/src/share/classes/java/awt/Font.java.i
+data/src/share/classes/com/sun/security/ntlm/Client.java.i
data/src/share/native/sun/font/bidi/ubidiln.c.i
+data/make/tools/CharsetMapping/IBM1144.map.i
data/test/tools/launcher/TestHelper.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java.i
data/src/share/classes/sun/text/resources/FormatData_pl_PL.java.i
-data/test/java/awt/PrintJob/Text/StringWidth.java.i
+data/src/share/classes/java/nio/file/WatchEvent.java.i
data/src/share/native/sun/security/ec/impl/ecp_384.c.i
-data/test/javax/xml/crypto/dsig/data/envelope.xml.i
-data/src/share/native/sun/awt/image/jpeg/jdcolor.c.i
+data/test/java/lang/System/Available.java.i
data/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/uncompr.c.i
-data/src/solaris/classes/sun/awt/motif/MWindowPeer.java.i
+data/make/modules/modules.config.i
data/src/share/classes/com/sun/tools/jdi/ValueContainer.java.i
data/src/share/classes/sun/text/normalizer/NormalizerImpl.java.i
-data/src/share/classes/sun/text/resources/FormatData_fr_LU.java.i
-data/make/tools/src/build/tools/jdwpgen/GroupNode.java.i
-data/src/share/classes/sun/reflect/UnsafeLongFieldAccessorImpl.java.i
+data/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java.i
+data/test/sun/security/ssl/sanity/pluggability/MySSLSocketFacImpl.java.i
+data/test/java/io/Reader/NullLock.java.i
data/test/sun/security/krb5/auto/BadKdc2.java.i
data/src/share/sample/vm/jvm-clr/invoked.cs.i
data/src/windows/native/sun/windows/security_warning.ico.i
-data/make/netbeans/common/share-view.ent.i
-data/src/solaris/native/sun/awt/VDrawingAreaP.h.i
+data/test/com/sun/net/httpserver/bugs/B6433018.java.i
data/src/share/classes/javax/swing/Popup.java.i
-data/src/share/classes/javax/swing/event/EventListenerList.java.i
+data/src/share/classes/java/util/Queue.java.i
data/test/java/security/KeyFactory/GenerateRSAPrivateCrtKey.java.i
data/src/share/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/IntArrayCalls.java.i
data/src/share/classes/sun/io/CharToByteKOI8_R.java.i
-data/src/share/classes/sun/text/resources/FormatData_sl.java.i
+data/test/java/rmi/activation/Activatable/restartCrashedService/ActivateMe.java.i
+data/src/share/classes/javax/swing/AbstractListModel.java.i
data/src/share/classes/sun/tools/tree/AssignBitOrExpression.java.i
-data/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java.i
+data/src/share/classes/sun/io/ByteToCharCp420.java.i
data/make/modules/tools/src/com/sun/classanalyzer/BootAnalyzer.java.i
data/src/share/classes/java/util/IllegalFormatConversionException.java.i
data/src/linux/doc/man/java.1.i
data/src/share/classes/sun/io/CharToByteISO8859_4.java.i
-data/test/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java.i
-data/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java.i
-data/test/java/io/Serializable/superclassDataLoss/B.java.i
+data/test/java/util/EnumMap/DistinctEntrySetElements.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java.i
+data/make/tools/CharsetMapping/IBM949.map.i
+data/src/share/classes/sun/io/ByteToCharJIS0212_Solaris.java.i
data/test/java/util/Locale/data/deflocale.win7.i
data/test/com/sun/jdi/ImmutableResourceTest.sh.i
+data/test/java/security/Provider/CertStoreConstructorParam.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif.i
-data/test/java/beans/PropertyEditor/TestFloatType.java.i
+data/src/share/classes/sun/security/krb5/Realm.java.i
data/test/java/beans/PropertyEditor/TestIntegerTypeJava.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapEntry.java.i
+data/src/share/classes/java/dyn/ToGeneric.java.i
data/src/share/demo/jvmti/heapTracker/heapTracker.c.i
data/src/share/classes/sun/security/smartcardio/CardImpl.java.i
data/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/security.policy.i
data/src/share/classes/java/awt/event/NativeLibLoader.java.i
-data/test/java/io/FileOutputStream/FileOpenPos.java.i
-data/src/solaris/bin/java_md.h.i
+data/test/java/nio/channels/SelectionKey/AtomicAttachTest.java.i
+data/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java.i
+data/test/javax/swing/JInternalFrame/6725409/bug6725409.java.i
data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html.i
+data/src/share/classes/sun/reflect/UnsafeLongFieldAccessorImpl.java.i
data/test/java/rmi/transport/checkFQDN/TellServerName.java.i
data/src/share/native/sun/font/layout/KernTable.cpp.i
+data/make/tools/swing-beans/beaninfo/images/JTextPaneMono32.gif.i
data/test/sun/security/pkcs11/sslecc/keystore.i
-data/test/java/nio/channels/SelectionKey/AtomicAttachTest.java.i
+data/src/share/classes/java/awt/font/OpenType.java.i
+data/test/java/io/FileOutputStream/FileOpenPos.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthComboPopup.java.i
data/make/sun/rmi/Makefile.i
data/src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java.i
-data/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java.i
+data/src/share/classes/javax/swing/plaf/multi/package.html.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PaintedShape.java.i
-data/src/share/classes/java/awt/ComponentOrientation.java.i
+data/src/share/classes/sun/text/resources/thai_dict.d
data/src/share/classes/sun/text/SupplementaryCharacterData.java.i
data/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java.i
data/test/sun/security/provider/certpath/ReverseBuilder/mgrM2mgrM.i
+data/test/java/util/PriorityQueue/RemoveContains.java.i
data/src/windows/native/sun/security/krb5/WindowsDirectory.c.i
data/src/share/classes/javax/imageio/event/IIOReadUpdateListener.java.i
-data/src/share/classes/sun/net/httpserver/ContextList.java.i
+data/src/share/javavm/export/jvmticmlr.h.i
data/test/sun/security/krb5/PAData.java.i
-data/src/share/classes/java/io/CharArrayWriter.java.i
+data/test/java/rmi/MarshalledObject/compare/Compare.java.i
data/make/tools/swing-beans/beaninfo/images/JScrollPaneMono16.gif.i
data/src/solaris/classes/sun/awt/X11/XProtocolConstants.java.i
-data/src/share/classes/sun/security/acl/AllPermissionsImpl.java.i
data/src/share/classes/sun/security/krb5/KerberosSecrets.java.i
data/src/windows/native/sun/windows/awt_Choice.cpp.i
-data/src/share/classes/org/openjdk/jigsaw/LoaderPool.java.i
data/make/java/verify/Makefile.i
data/src/share/classes/java/awt/peer/ChoicePeer.java.i
data/make/com/oracle/net/Makefile.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/OuterGlowEffect.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java.i
-data/src/share/classes/sun/text/resources/thai_dict.i
data/test/tools/launcher/deleteI18n.sh.i
data/make/tools/src/build/tools/generatenimbus/ObjectFactory.java.i
data/src/share/classes/sun/nio/cs/ext/IBM037.java.i
-data/test/sun/security/mscapi/PublicKeyInterop.java.i
+data/src/share/classes/java/awt/im/spi/InputMethodContext.java.i
+data/test/sun/rmi/rmic/manifestClassPath/run.sh.i
data/test/demo/jvmti/heapTracker/HeapTrackerTest.java.i
-data/src/share/classes/javax/swing/text/html/parser/Parser.java.i
data/src/share/classes/java/beans/PersistenceDelegate.java.i
data/test/com/sun/security/sasl/digest/names.properties.i
data/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c.i
data/src/share/classes/sun/awt/WindowIDProvider.java.i
-data/test/java/util/ResourceBundle/Bug4177489_Resource.java.i
+data/test/javax/script/DummyScriptEngineFactory.java.i
+data/src/share/classes/java/util/LinkedHashSet.java.i
data/make/com/sun/script/Makefile.i
data/src/share/classes/sun/security/provider/MD2.java.i
data/test/java/beans/XMLEncoder/java_awt_Font.java.i
-data/src/share/native/java/lang/Thread.c.i
+data/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java.i
+data/test/java/net/MulticastSocket/JoinGroup.java.i
data/src/share/classes/sun/security/x509/GeneralSubtree.java.i
+data/src/share/classes/sun/security/util/DerInputStream.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.password.in.i
data/test/tools/pack200/pack200-verifier/make/build.xml.i
data/test/java/util/Formatter/Close.java.i
@@ -8099,46 +8024,49 @@ data/src/share/classes/java/rmi/server/Operation.java.i
data/src/share/native/sun/security/ec/impl/logtab.h.i
data/src/share/classes/sun/net/idn/StringPrep.java.i
data/src/share/classes/sun/io/CharToBytePCK.java.i
-data/test/java/nio/channels/SocketChannel/UnboundSocketTests.java.i
+data/test/javax/management/modelmbean/SimpleModelMBean/logging.properties.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif.i
data/test/java/security/Policy/Root/Root.java.i
data/src/share/classes/com/sun/jndi/url/dns/dnsURLContext.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java.i
data/test/sun/java2d/cmm/ColorConvertOp/SRGB565.png.i
data/test/java/util/ResourceBundle/Bug4179766Getter.java.i
data/src/share/classes/sun/reflect/UnsafeStaticDoubleFieldAccessorImpl.java.i
+data/test/java/util/ResourceBundle/Test4314141A_de_.properties.i
data/test/java/beans/XMLEncoder/java_awt_BorderLayout.java.i
+data/test/javax/management/namespace/VirtualMBeanNotifTest.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_QA.java.i
+data/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java.i
data/src/windows/native/sun/nio/ch/FileKey.c.i
data/test/java/security/cert/CertPathValidator/trustAnchor/labs2isrg2.cer.i
-data/src/share/classes/sun/util/resources/LocaleNames_th.properties.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java.i
data/src/share/classes/sun/swing/MenuItemLayoutHelper.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpMask.java.i
data/src/share/native/com/sun/java/util/jar/pack/coding.h.i
data/src/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java.i
data/src/share/classes/sun/io/CharToByteCp1006.java.i
-data/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic_proto.h.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java.i
data/test/com/sun/jdi/NoLocInfoTest.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java.i
+data/test/java/nio/channels/FileChannel/TransferToChannel.java.i
data/src/share/classes/javax/naming/directory/package.html.i
-data/src/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java.i
+data/src/windows/native/sun/windows/awt_Unicode.h.i
data/test/java/lang/reflect/Field/4498653/StaticInitializerTest.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java.i
data/src/share/classes/java/awt/Checkbox.java.i
data/src/share/classes/sun/font/StandardGlyphVector.java.i
data/make/tools/swing-beans/beaninfo/images/JTabbedPaneColor16.gif.i
data/src/share/classes/javax/management/openmbean/OpenDataException.java.i
-data/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java.i
-data/src/share/classes/java/dyn/AdapterMethodHandle.java.i
+data/src/share/classes/javax/management/AttributeList.java.i
data/src/share/classes/sun/jkernel/StandaloneSHA.java.i
data/src/share/classes/sun/nio/cs/IBM862.java.i
-data/make/java/java/reorder-sparc.i
data/test/java/util/Locale/serialized/java6locale_en_US.i
data/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties.i
+data/test/java/util/Collections/RotateEmpty.java.i
data/test/java/rmi/reliability/juicer/security.policy.i
data/make/sun/javazic/javatz/java_win_ids.txt.i
data/src/windows/native/sun/windows/awt_InputTextInfor.h.i
data/src/share/native/sun/java2d/cmm/lcms/cmsps2.c.i
data/src/share/classes/org/openjdk/jigsaw/PublishedRepository.java.i
+data/src/windows/native/sun/windows/img_util_md.h.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Question.gif.i
data/src/share/classes/javax/crypto/spec/DHGenParameterSpec.java.i
data/src/share/classes/sun/nio/cs/IBM775.java.i
@@ -8154,7 +8082,6 @@ data/test/java/util/zip/DataDescriptor.java.i
data/test/java/util/jar/JarFile/VerifySignedJar.java.i
data/src/share/classes/java/awt/print/Book.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/GradientStop.java.i
-data/src/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java.i
data/src/share/classes/java/util/UnknownFormatConversionException.java.i
data/src/share/classes/sun/nio/cs/ext/EUC_TW.java.d
data/make/tools/src/build/tools/javazic/Zone.java.i
@@ -8163,42 +8090,45 @@ data/src/share/classes/java/lang/package-info.java.i
data/src/share/demo/jfc/Metalworks/MetalworksFrame.java.i
data/test/java/net/Socket/SetReceiveBufferSize.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/DependencyConfig.java.i
-data/src/share/classes/sun/nio/cs/MS1257.java.i
-data/test/java/util/Formatter/BasicBigDecimal.java.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.d
data/src/share/demo/java2d/J2DBench/src/j2dbench/ui/EnableButton.java.i
data/src/share/classes/javax/xml/crypto/dsig/SignatureProperties.java.i
data/test/java/lang/management/ThreadMXBean/FindDeadlocks.java.i
data/src/share/classes/sun/text/resources/FormatData_pt_PT.java.i
-data/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java.i
+data/src/share/classes/javax/swing/text/MaskFormatter.java.i
data/src/share/lib/management/jmxremote.access.i
data/src/share/classes/sun/awt/ComponentAccessor.java.i
data/src/share/native/sun/font/bidi/ubidiimp.h.i
data/src/share/classes/sun/text/resources/FormatData_ar_AE.java.i
data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java.i
+data/src/share/classes/javax/management/openmbean/TabularDataSupport.java.i
data/make/tools/src/build/tools/generatecharacter/PrintCharacterRanges.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java.i
-data/src/share/classes/sun/tools/jstat/resources/jstat_options.i
+data/test/java/net/MulticastSocket/B6427403.java.i
data/src/share/classes/sun/tools/asm/Instruction.java.i
data/src/share/classes/com/sun/security/auth/UserPrincipal.java.i
-data/src/share/classes/java/lang/Exception.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif.i
+data/test/java/lang/StrictMath/HyperbolicTests.java.i
data/test/java/util/PluggableLocale/barprovider.jar.i
+data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/Dummy.java.i
data/src/share/classes/java/nio/channels/Pipe.java.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java.i
+data/test/tools/launcher/Test7029048.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c.i
-data/src/share/javavm/export/jawt.h.i
+data/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java.i
data/test/java/awt/Mixing/ValidBounds.java.i
data/src/solaris/classes/sun/print/services/javax.print.StreamPrintServiceFactory.i
data/src/share/classes/sun/management/VMManagementImpl.java.i
data/src/share/classes/java/nio/file/FileStore.java.i
+data/src/share/classes/sun/tools/java/Environment.java.i
data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Foo.java.i
data/src/share/native/java/lang/reflect/Array.c.i
data/test/java/lang/String/IsEmpty.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent1111.java.i
data/src/share/classes/javax/crypto/spec/OAEPParameterSpec.java.i
data/src/share/classes/sun/nio/cs/ext/Johab.java.i
+data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly_Stub.java.i
data/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java.i
-data/make/sun/util/Makefile.i
+data/test/java/nio/file/WatchService/WithSecurityManager.java.i
data/test/sun/security/krb5/tools/onlythree.conf.i
data/src/share/classes/sun/security/x509/GeneralNames.java.i
data/src/windows/native/sun/windows/awt_Clipboard.h.i
@@ -8206,39 +8136,34 @@ data/src/share/classes/java/util/NoSuchElementException.java.i
data/make/javax/sound/jsoundds/Makefile.i
data/test/javax/management/monitor/NullAttributeValueTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java.i
-data/src/share/classes/sun/swing/WindowsPlacesBar.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c.i
data/make/tools/CharsetMapping/sbcs.i
data/src/share/native/sun/awt/image/jpeg/jcmainct.c.i
-data/src/share/classes/javax/swing/KeyboardManager.java.i
-data/src/share/classes/sun/applet/AppletEvent.java.i
+data/make/tools/classanalyzer/Makefile.i
data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java.i
data/src/share/classes/java/nio/file/FileSystemLoopException.java.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java.i
data/src/solaris/native/java/net/Inet4AddressImpl.c.i
-data/src/solaris/doc/sun/man/man1/jinfo.1.i
+data/src/share/classes/javax/sound/sampled/BooleanControl.java.i
data/test/java/util/PluggableLocale/GenericTest.java.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedList.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java.i
-data/test/java/util/IdentityHashMap/ToArray.java.i
-data/src/share/classes/com/sun/beans/decoder/AccessorElementHandler.java.i
+data/test/java/util/logging/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
+data/test/sun/security/util/DerValue/EmptyValue.java.i
data/src/solaris/classes/sun/nio/ch/FileDispatcher.java.i
data/test/java/io/Serializable/getSuidClinitError/GetSuidClinitError.java.i
data/test/java/beans/XMLEncoder/javax_swing_Box.java.i
data/src/share/native/java/lang/fdlibm/src/s_fabs.c.i
data/test/com/sun/jdi/CommandCommentDelimiter.sh.i
-data/test/javax/management/Introspector/DescribedMX.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/Agent.java.i
data/src/share/classes/java/io/FilterOutputStream.java.i
data/test/sun/security/krb5/ConfPlusProp.java.i
-data/src/share/native/sun/awt/image/cvutils/img_util.h.i
data/src/share/classes/java/lang/EnumConstantNotPresentException.java.i
data/src/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.README.i
data/src/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java.i
data/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java.i
data/make/tools/CharsetMapping/IBM861.map.i
-data/src/share/classes/com/sun/jndi/ldap/LdapName.java.i
-data/src/share/classes/javax/naming/ConfigurationException.java.i
-data/src/share/classes/java/lang/Readable.java.i
+data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml.i
data/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java.i
data/test/java/security/cert/CertPathValidator/trustAnchor/sun2labs2.cer.i
data/src/share/native/java/lang/String.c.i
@@ -8250,22 +8175,21 @@ data/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java.i
data/test/javax/swing/JSlider/6794836/bug6794836.java.i
data/src/windows/classes/sun/net/www/protocol/http/NTLMAuthentication.java.i
data/test/java/io/Serializable/enum/unshared/Test.java.i
-data/test/javax/script/DummyScriptEngineFactory.java.i
+data/test/java/net/URLConnection/RequestProperties.java.i
data/test/java/awt/event/InvocationEvent/InvocationEventTest.java.i
-data/src/solaris/native/sun/nio/ch/EPollPort.c.i
+data/test/com/sun/crypto/provider/Cipher/AES/Test4511676.java.i
data/src/share/classes/javax/swing/border/EmptyBorder.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c.i
-data/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java.i
-data/src/share/classes/sun/text/UCompactIntArray.java.i
+data/test/javax/script/Test4.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/package.html.i
data/make/tools/swing-beans/beaninfo/images/JCheckBoxMono32.gif.i
data/test/java/nio/file/Files/FileAttributes.java.i
-data/test/com/sun/jdi/FieldWatchpoints.java.i
+data/src/solaris/native/common/jdk_util_md.h.i
data/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java.i
data/src/share/classes/java/text/RuleBasedCollationKey.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/package.html.i
+data/src/share/classes/sun/tools/tree/ShortExpression.java.i
+data/test/sun/tools/jstat/timeStamp1.awk.i
data/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy.i
-data/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java.i
+data/src/solaris/classes/sun/awt/motif/X11Selection.java.i
data/test/javax/crypto/JceSecurity/MyCertificateFactory.java.i
data/src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java.i
data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/PoisonPill.java.i
@@ -8273,41 +8197,39 @@ data/src/share/classes/java/nio/file/attribute/UserPrincipal.java.i
data/src/share/classes/sun/java2d/pisces/PiscesTileGenerator.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so.i
data/test/java/rmi/reliability/benchmark/bench/serial/CustomDefaultObjTrees.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHost.java.i
+data/test/java/rmi/reliability/benchmark/bench/Util.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine.c.i
data/test/java/io/Serializable/unresolvedClassDesc/Read.java.i
data/src/windows/native/sun/nio/ch/SocketDispatcher.c.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelTableMeta.java.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java.i
data/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java.i
+data/test/sun/security/mscapi/RSAEncryptDecrypt.sh.i
data/src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java.i
-data/src/windows/native/sun/windows/awt_Event.cpp.i
-data/src/share/native/java/util/zip/zlib-1.1.3/inftrees.h.i
-data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy.i
+data/src/share/classes/javax/crypto/SecretKeyFactorySpi.java.i
data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/config.i
data/src/share/classes/sun/io/CharToByteCp1146.java.i
-data/test/com/sun/net/httpserver/bugs/B6431193.java.i
data/src/share/classes/sun/text/resources/CollationData_pt.java.i
-data/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp.i
+data/src/windows/back/proc_md.h.i
data/src/share/classes/sun/io/ByteToCharCp1254.java.i
data/make/tools/CharsetMapping/MS1255.map.i
data/src/share/classes/java/nio/file/FileSystems.java.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties.i
+data/src/share/native/sun/awt/libpng/README.i
data/src/share/classes/com/sun/jdi/Accessible.java.i
-data/src/share/native/sun/security/ec/impl/ec2_193.c.i
+data/src/solaris/classes/sun/java2d/xr/XRMaskFill.java.i
data/src/share/classes/java/lang/NoSuchFieldError.java.i
-data/src/share/classes/sun/tools/tree/SubtractExpression.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_HN.properties.i
data/test/sun/tools/jstat/jstatLineCounts4.sh.i
-data/test/javax/swing/JSlider/4252173/bug4252173.java.i
-data/test/java/beans/XMLEncoder/java_io_File.java.i
data/test/java/lang/Class/getDeclaredClasses/Sanity.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c.i
+data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/Receiver.java.i
data/test/java/beans/XMLEncoder/java_awt_GridBagConstraints.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java.i
-data/src/share/native/sun/awt/giflib/gif_err.c.i
-data/src/share/classes/javax/swing/plaf/FileChooserUI.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java.i
+data/src/share/classes/sun/net/www/protocol/http/Negotiator.java.i
+data/test/java/rmi/activation/ActivationSystem/unregisterGroup/Callback_Stub.java.i
data/test/sun/security/krb5/auto/HttpNegotiateServer.java.i
data/src/share/classes/javax/net/ssl/SSLContextSpi.java.i
data/test/com/sun/jdi/NativeInstanceFilterTarg.java.i
@@ -8315,40 +8237,40 @@ data/test/java/beans/Introspector/6380849/beans/FirstBeanBeanInfo.java.i
data/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html.i
data/make/tools/src/build/tools/generatebreakiteratordata/CharSet.java.i
data/src/share/classes/sun/nio/ch/OptionAdaptor.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java.i
+data/test/java/util/Collections/Enum.java.i
data/src/share/native/sun/java2d/loops/Ushort555Rgbx.c.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java.i
-data/src/share/classes/java/lang/module/RequireOptionalModule.java.i
data/test/tools/launcher/UnresolvedExceptions.java.i
data/test/java/nio/file/DirectoryStream/Filters.java.i
data/test/com/sun/jdi/LaunchCommandLine.java.i
-data/make/sun/xawt/Makefile.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java.i
data/make/tools/CharsetMapping/IBM950.c2b.i
data/test/java/util/TimSort/SortPerf.java.i
data/src/share/classes/sun/io/ByteToCharCp1148.java.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnUnmarshal.java.i
-data/src/windows/native/sun/java2d/d3d/D3DBufImgOps.h.i
+data/test/javax/management/loading/LibraryLoader/UseNativeLib1.html.i
+data/test/java/util/ResourceBundle/Bug4177489_Resource.java.i
data/src/share/classes/javax/sound/sampled/AudioPermission.java.i
data/src/share/classes/com/sun/pept/encoding/Encoder.java.i
data/src/windows/native/com/sun/security/auth/module/nt.c.i
data/src/share/classes/com/sun/media/sound/SunCodec.java.i
data/test/javax/management/eventService/MyFetchingEventForwarder.java.i
-data/src/share/classes/org/ietf/jgss/GSSName.java.i
data/test/java/beans/README.i
-data/test/java/lang/Boolean/GetBoolean.java.i
+data/test/java/awt/Component/PaintAll/PaintAll.java.i
data/test/sun/nio/cs/OLD/IBM1383_OLD.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/browse.js.i
+data/src/share/classes/sun/nio/fs/AbstractWatchService.java.i
data/src/share/classes/com/sun/jndi/ldap/Filter.java.i
+data/make/tools/CharsetMapping/SingleByte-X.java.i
data/test/java/beans/XMLEncoder/Test6963811.java.i
data/test/sun/net/www/http/HttpClient/MultiThreadTest.java.i
data/src/share/classes/java/awt/font/NumericShaper.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_da_DK.properties.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif.i
-data/src/share/classes/java/util/zip/DeflaterInputStream.java.i
+data/src/windows/classes/java/lang/ProcessImpl.java.i
+data/src/share/demo/jfc/Font2DTest/resources/TextResources_en.properties.i
data/src/share/classes/javax/accessibility/package.html.i
data/test/com/sun/security/sasl/digest/PropertiesFileCallbackHandler.java.i
data/test/sun/security/mscapi/noaccess.policy.i
+data/test/sun/tools/jstat/printCompilationOutput1.awk.i
data/test/java/nio/Buffer/AllocateDirectInit.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/RehandshakeFinished.java.i
data/test/sun/tools/jps/jps-v_1.sh.i
@@ -8357,17 +8279,15 @@ data/src/share/classes/sun/io/CharToByteUTF16.java.i
data/test/java/lang/instrument/ASimpleInstrumentationTestCase.java.i
data/make/tools/swing-beans/beaninfo/images/JTreeMono16.gif.i
data/src/windows/native/sun/jkernel/kernel.cpp.i
-data/src/share/classes/sun/awt/resources/awt_pt_BR.properties.i
-data/make/sun/awt/Depend.sed.i
data/test/tools/launcher/Arrrghs.java.i
-data/src/share/lib/audio/soundbank.gm.d
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.c.i
data/src/share/classes/sun/io/ByteToCharISO2022JP.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java.i
data/src/share/classes/javax/sql/rowset/serial/SerialRef.java.i
data/src/share/classes/com/sun/media/sound/ModelDirector.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java.i
data/src/share/classes/sun/io/ByteToCharEUC_TW.java.i
data/src/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java.i
+data/src/windows/javavm/export/jni_md.h.i
data/test/org/openjdk/jigsaw/cli/ModuleFormatTestLeftOverBytes.java.i
data/test/java/beans/beancontext/Test4233980.java.i
data/make/sun/jawt/Depend.sed.i
@@ -8375,68 +8295,71 @@ data/src/share/classes/javax/swing/border/Border.java.i
data/test/java/lang/Class/getModifiers/ForInnerClass.java.i
data/src/solaris/native/sun/nio/ch/FileChannelImpl.c.i
data/src/share/classes/java/security/acl/Acl.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_ro.properties.i
-data/test/sun/security/krb5/auto/W83.java.i
-data/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c.i
+data/src/share/demo/nbproject/jfc/Notepad/nbproject/jdk.xml.i
+data/src/share/native/sun/security/ec/impl/ecl-curve.h.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy.i
data/src/share/classes/java/nio/file/spi/AbstractPath.java.i
data/test/java/beans/PropertyEditor/6380849/editors/ThirdBeanEditor.java.i
data/test/java/beans/XMLDecoder/spec/TestMethod.java.i
data/src/share/classes/javax/naming/spi/ObjectFactory.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c.i
+data/test/javax/script/MyContext.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1025.java.i
+data/src/windows/native/sun/windows/jawt.cpp.i
data/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java.i
data/make/tools/CharsetMapping/IBM950.map.i
data/src/share/classes/sun/security/acl/AclEntryImpl.java.i
-data/src/share/native/sun/awt/image/jpeg/jidctfst.c.i
+data/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh.i
data/make/tools/CharsetMapping/IBM1124.map.i
data/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c.i
data/src/share/demo/jfc/Notepad/resources/Notepad_sv.properties.i
-data/src/share/classes/javax/net/ssl/SSLEngineResult.java.i
+data/src/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java.i
data/src/share/classes/java/util/LinkedList.java.i
data/src/share/classes/javax/management/relation/package.html.i
data/test/com/sun/security/sasl/ClientCallbackHandler.java.i
data/src/share/classes/sun/io/CharToByteCp852.java.i
data/src/share/native/java/util/zip/Adler32.c.i
data/src/share/classes/sun/tools/javac/ErrorMessage.java.i
-data/test/sun/security/smartcardio/TestDefault.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java.i
-data/src/share/classes/java/awt/geom/CubicCurve2D.java.i
+data/src/share/classes/java/io/InvalidObjectException.java.i
+data/src/share/native/sun/java2d/loops/ByteBinary1Bit.c.i
data/test/java/net/URLConnection/HttpContinueStackOverflow.java.i
data/test/javax/swing/JColorChooser/Test6524757.java.i
data/src/share/native/sun/security/ec/ecp_521.c.i
data/test/sun/nio/cs/TestISO2022JPEncoder.java.i
data/test/com/sun/security/sasl/digest/AuthOnly.java.i
data/src/share/classes/sun/tools/java/Type.java.i
+data/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java.i
data/src/share/classes/sun/net/ftp/FtpReplyCode.java.i
data/test/com/sun/jdi/RunToExit.java.i
data/src/share/classes/sun/security/jgss/spi/GSSNameSpi.java.i
-data/src/share/classes/java/nio/channels/ScatteringByteChannel.java.i
+data/src/share/classes/sun/io/ByteToCharCp1112.java.i
data/src/share/classes/com/sun/jmx/interceptor/package.html.i
data/src/share/native/sun/security/ec/ec2_mont.c.i
data/test/javax/management/MBeanInfo/EqualExceptionTest.java.i
data/src/share/classes/sun/font/ScriptRunData.java.i
data/test/sun/net/www/protocol/file/FileMap.java.i
+data/test/com/sun/net/httpserver/bugs/B6424196.java.i
data/test/demo/zipfs/ZipFSTester.java.i
data/test/java/util/Formatter/BasicFloat.java.i
data/src/share/classes/sun/security/krb5/KrbServiceLocator.java.i
data/test/sun/security/pkcs11/rsa/rsakeys.ks.i
data/make/javax/crypto/Makefile.i
+data/test/sun/nio/cs/LeftOverSurrogate.java.i
data/src/share/native/sun/java2d/loops/Ushort565Rgb.c.i
data/test/sun/tools/jstat/options2.out.i
data/src/solaris/native/java/util/TimeZone_md.c.i
data/src/share/classes/sun/misc/ClassLoaderUtil.java.i
-data/src/share/classes/sun/util/resources/CalendarData_be.properties.i
data/test/java/beans/PropertyChangeSupport/Test4353056.java.i
data/src/windows/native/sun/windows/CmdIDList.cpp.i
-data/src/share/demo/applets/WireFrame/models/hughes_500.obj.i
-data/src/windows/native/common/gdefs_md.h.i
+data/test/sun/security/pkcs11/KeyStore/Basic.policy.i
+data/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so.i
data/make/java/java/localegen.sh.i
data/src/share/classes/javax/swing/plaf/InternalFrameUI.java.i
data/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor32.gif.i
data/src/share/classes/java/awt/geom/RoundRectangle2D.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java.i
data/src/share/classes/com/sun/crypto/provider/RC2Parameters.java.i
-data/src/share/classes/sun/reflect/ClassFileConstants.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ClassLoading.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java.i
data/src/share/classes/sun/io/ByteToCharASCII.java.i
@@ -8451,11 +8374,12 @@ data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java.i
data/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java.i
data/src/share/classes/sun/security/pkcs11/P11Util.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/Trace.java.i
+data/test/java/util/TreeMap/EmptyMapAndNulls.java.i
data/src/share/classes/sun/security/krb5/internal/APOptions.java.i
-data/src/share/classes/sun/tracing/MultiplexProviderFactory.java.i
+data/test/java/lang/instrument/PremainClass/DummyMain.java.i
data/src/share/classes/java/lang/NoClassDefFoundError.java.i
+data/test/java/util/concurrent/DelayQueue/Iterate.java.i
data/test/java/rmi/activation/Activatable/checkAnnotations/MyRMI.java.i
-data/src/share/classes/com/sun/pept/encoding/Decoder.java.i
data/test/javax/sound/sampled/FileWriter/WriterCloseInput.java.i
data/test/java/math/BigDecimal/PrecisionTests.java.i
data/src/share/classes/com/sun/jmx/event/LeaseRenewer.java.i
@@ -8481,27 +8405,24 @@ data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientMode
data/test/sun/net/www/protocol/http/spnegoReadme.i
data/src/share/classes/sun/text/resources/FormatData_es_PY.java.i
data/src/share/classes/javax/swing/text/doc-files/Document-notification.gif.i
-data/test/java/beans/EventHandler/Test6179222.java.i
data/src/share/classes/sun/io/ByteToCharJIS0208_Solaris.java.i
data/test/java/nio/file/Path/InterruptCopy.java.i
data/test/sun/security/krb5/tools/ktarg.sh.i
data/src/share/classes/sun/security/ec/ECParameters.java.i
-data/src/windows/native/sun/windows/awt_new.cpp.i
data/src/share/classes/sun/management/resources/agent_ko.properties.i
data/test/javax/management/namespace/JMXNamespaceTest.java.i
data/test/java/util/UUID/Serial.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java.i
-data/src/share/classes/java/awt/peer/package.html.i
-data/src/share/classes/sun/io/CharToByteCp943.java.i
+data/src/solaris/classes/sun/awt/X11/XListPeer.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c.i
-data/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java.i
+data/test/com/sun/jdi/redefine/SchemaChange_RedefineSubTarg.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ms_MY.properties.i
data/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java.i
data/src/share/classes/sun/security/ssl/RSASignature.java.i
-data/src/share/native/sun/awt/image/jpeg/jcmarker.c.i
data/src/share/classes/com/sun/crypto/provider/RSACipher.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java.i
data/test/javax/management/mxbean/MiscTest.java.i
+data/src/share/native/java/lang/fdlibm/src/k_sin.c.i
data/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java.i
data/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java.i
data/src/share/native/sun/java2d/loops/LoopMacros.h.i
@@ -8511,6 +8432,7 @@ data/test/java/awt/Frame/FrameLocation/FrameLocation.java.i
data/src/share/classes/java/util/WeakHashMap.java.i
data/src/share/classes/sun/reflect/UnsafeFloatFieldAccessorImpl.java.i
data/test/javax/management/Introspector/UnDescribedMBean.java.i
+data/test/java/io/Serializable/InvalidClassException/noargctor/DefaultPackage.java.i
data/test/com/sun/jdi/UTF8Test.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageCreate.c.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMeta.java.i
@@ -8519,7 +8441,7 @@ data/src/share/classes/sun/security/krb5/KrbTgsRep.java.i
data/test/java/beans/XMLEncoder/Test6505888.java.i
data/src/share/sample/nio/server/Request.java.i
data/make/tools/CharsetMapping/IBM278.map.i
-data/src/share/classes/sun/tools/tree/IdentifierExpression.java.i
+data/src/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java.i
data/test/java/awt/font/Rotate/TranslatedOutlineTest.java.i
data/src/share/native/java/lang/System.c.i
data/test/javax/crypto/JceSecurity/MyX509CertImpl.java.i
@@ -8527,23 +8449,23 @@ data/src/solaris/native/sun/java2d/x11/X11Renderer.c.i
data/src/share/classes/javax/swing/event/UndoableEditEvent.java.i
data/src/share/classes/sun/awt/ModalExclude.java.i
data/src/share/classes/com/sun/jmx/remote/internal/RMIExporter.java.i
+data/src/share/classes/com/sun/net/httpserver/HttpsExchange.java.i
data/test/java/nio/channels/Selector/WakeupNow.java.i
data/src/share/classes/sun/nio/ByteBuffered.java.i
data/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport1.java.i
data/test/java/util/jar/JarFile/thawjar.jar.i
data/src/share/classes/com/sun/jdi/ClassNotPreparedException.java.i
-data/src/share/classes/javax/sound/midi/Track.java.i
data/test/sun/net/www/protocol/jar/foo1.jar.d
-data/src/share/classes/javax/imageio/ImageReader.java.i
+data/src/linux/doc/man/apt.1.i
data/src/share/native/com/sun/java/util/jar/pack/utils.cpp.i
data/src/solaris/classes/sun/awt/motif/X11CNS11643.java.i
data/src/share/classes/javax/swing/event/TreeExpansionListener.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiTextUI.java.i
-data/src/share/classes/sun/invoke/empty/Empty.java.i
-data/src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java.i
+data/src/share/classes/sun/nio/cs/ext/HKSCS.java.i
+data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java.i
data/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java.i
data/test/sun/tools/native2ascii/A2N_4701617.expected.i
-data/src/share/classes/sun/io/ByteToCharCp942C.java.i
+data/src/share/classes/sun/io/ByteToCharEUC_KR.java.i
data/test/java/lang/invoke/MethodTypeTest.java.i
data/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java.i
data/src/share/classes/java/lang/management/MonitorInfo.java.i
@@ -8555,7 +8477,6 @@ data/src/solaris/classes/java/lang/ProcessImpl.java.i
data/test/java/util/Collections/Rotate.java.i
data/src/share/classes/java/util/concurrent/TransferQueue.java.i
data/src/share/demo/applets/ArcTest/ArcTest.java.i
-data/src/share/classes/java/awt/peer/PanelPeer.java.i
data/src/share/classes/sun/management/resources/agent_ja.properties.i
data/src/share/classes/javax/print/attribute/standard/PrinterName.java.i
data/src/share/classes/java/nio/X-Buffer.java.i
@@ -8563,86 +8484,80 @@ data/make/common/shared/Platform.gmk.i
data/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java.i
data/src/share/classes/com/sun/tools/jdi/VMModifiers.java.i
data/src/share/classes/javax/swing/colorchooser/ColorModel.java.i
-data/src/share/classes/java/awt/KeyEventDispatcher.java.i
+data/src/share/classes/sun/reflect/generics/parser/SignatureParser.java.i
data/test/sun/security/pkcs11/KeyAgreement/TestShort.java.i
data/test/sun/security/provider/PolicyFile/TokenStore.keystore.i
data/src/share/classes/javax/script/package.html.i
data/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.i
data/src/share/transport/socket/socketTransport.c.i
data/test/javax/print/applet/AppletPrintLookup.sh.i
-data/src/share/classes/sun/awt/NullComponentPeer.java.i
+data/src/share/demo/jfc/FileChooserDemo/ExampleFileView.java.i
data/make/tools/swing-beans/beaninfo/images/JMenuColor32.gif.i
data/test/sun/net/www/protocol/file/GetLastModified.java.i
data/src/solaris/classes/sun/nio/fs/LinuxFileStore.java.i
-data/test/org/openjdk/jigsaw/ContextBuilder.java.i
data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh.i
+data/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java.i
data/src/share/classes/sun/nio/cs/ext/DBCSDecoderMapping.java.i
-data/src/share/classes/sun/font/FontAccess.java.i
data/src/share/classes/sun/security/util/AuthResources_es.java.i
-data/src/share/classes/java/security/spec/RSAPrivateKeySpec.java.i
+data/src/share/classes/com/sun/media/sound/SoftShortMessage.java.i
data/src/share/classes/sun/management/NotificationEmitterSupport.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java.i
-data/src/share/classes/sun/net/TransferProtocolClient.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-interim16.png.i
data/make/tools/CharsetMapping/IBM280.map.i
data/src/share/classes/sun/audio/InvalidAudioFormatException.java.i
-data/src/share/classes/java/awt/image/VolatileImage.java.i
+data/test/sun/rmi/rmic/oldjavacRemoved/Foo.java.i
data/test/java/net/DatagramPacket/Offset.java.i
data/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh.i
-data/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java.i
+data/src/share/classes/sun/java2d/loops/DrawRect.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java.i
-data/src/solaris/hpi/include/largefile.h.i
+data/src/solaris/native/sun/awt/awt_mgrsel.c.i
data/test/java/lang/StrictMath/Expm1Tests.java.i
data/test/com/sun/jdi/redefine/RedefineSetUp.sh.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java.i
+data/test/com/sun/jdi/PopAndStepTest.java.i
data/src/share/classes/java/awt/image/WritableRaster.java.i
-data/src/share/classes/java/net/CookieManager.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java.i
-data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java.i
+data/src/share/classes/sun/print/ServiceDialog.java.i
data/src/share/classes/sun/security/jgss/TokenTracker.java.i
data/src/share/classes/javax/naming/OperationNotSupportedException.java.i
data/make/tools/swing-beans/beaninfo/images/JCheckBoxMono16.gif.i
data/test/sun/security/tools/policytool/ChangeUI.sh.i
data/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java.i
-data/src/share/classes/com/sun/jdi/ObjectCollectedException.java.i
-data/test/com/sun/security/auth/callback/TextCallbackHandler/Default.java.i
-data/test/java/beans/XMLEncoder/Test5023559.java.i
-data/src/share/demo/jvmti/waiters/Agent.hpp.i
+data/src/solaris/native/sun/net/spi/SdpProvider.c.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java.i
data/src/share/classes/sun/tools/tree/PostIncExpression.java.i
data/test/java/io/LineNumberInputStream/Available.java.i
data/test/sun/nio/cs/EncodingNothing.java.i
data/src/share/native/sun/java2d/loops/IntArgbPre.h.i
-data/src/share/classes/java/rmi/registry/LocateRegistry.java.i
data/test/java/nio/channels/Pipe/SelectPipe.java.i
data/make/jpda/back/mapfile-vers.i
data/src/share/native/java/util/zip/zlib-1.2.3/patches/zlib.h.diff.i
-data/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java.i
+data/test/java/util/ResourceBundle/Test4314141.java.i
+data/src/share/classes/java/nio/charset/StandardCharset.java.i
data/test/sun/nio/cs/CheckHistoricalNames.java.i
data/src/share/classes/sun/security/util/Resources_sv.java.i
data/test/sun/tools/jps/jps-Vvm.sh.i
data/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java.i
-data/make/sun/text/FILES_properties.gmk.i
+data/src/share/classes/sun/io/ByteToCharUnicodeBig.java.i
data/src/share/native/sun/java2d/loops/IntArgb.h.i
-data/src/share/classes/java/awt/Transparency.java.i
+data/test/sun/java2d/OpenGL/GradientPaints.java.i
data/src/share/classes/sun/misc/VM.java.i
-data/make/java/util/FILES_properties.gmk.i
+data/make/common/Defs-embedded.gmk.i
data/test/java/security/cert/CertPathValidator/indirectCRL/openssl.cnf.i
data/test/java/rmi/activation/Activatable/extLoadedImpl/rmid.security.policy.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_S16.c.i
data/make/tools/CharsetMapping/IBM1143.c2b.i
data/make/netbeans/jconsole/build.properties.i
-data/test/java/beans/XMLEncoder/4741757/TestStackOverflow.java.i
data/src/share/classes/sun/security/provider/JavaKeyStore.java.i
data/test/java/dyn/InvokeDynamicPrintArgs.java.i
data/src/solaris/classes/sun/awt/motif/X11CNS11643P1.java.i
data/src/share/classes/sun/swing/plaf/GTKKeybindings.java.i
data/src/windows/classes/sun/awt/windows/WBufferStrategy.java.i
+data/test/java/lang/InheritableThreadLocal/ITLRemoveTest.java.i
data/test/java/awt/GraphicsDevice/CloneConfigsTest.java.i
data/test/java/lang/Math/HypotTests.java.i
+data/make/sun/net/spi/nameservice/Makefile.i
data/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java.i
data/test/javax/swing/text/html/TableView/7030332/sample3.png.i
-data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml.i
data/make/netbeans/jdwpgen/nbproject/findbugs.settings.i
data/make/com/sun/tools/attach/mapfile-linux.i
data/src/share/native/sun/java2d/Disposer.h.i
@@ -8656,13 +8571,11 @@ data/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java.i
data/src/share/classes/sun/io/CharToByteCp933.java.i
data/src/share/classes/sun/net/httpserver/ServerConfig.java.i
data/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java.i
-data/src/share/classes/java/util/prefs/PreferenceChangeListener.java.i
data/src/share/classes/java/rmi/ServerRuntimeException.java.i
data/test/sun/security/provider/PolicyFile/TokenStore.pwd.i
data/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java.i
-data/src/share/classes/javax/sound/midi/Sequence.java.i
data/src/share/classes/sun/applet/AppletViewer.java.i
-data/make/java/sql/Makefile.i
+data/test/sun/security/x509/X500Name/AllAttribs.java.i
data/src/share/classes/sun/nio/cs/ext/PCK.java.i
data/test/java/net/ProxySelector/LoopbackAddresses.java.i
data/src/share/classes/sun/awt/CharsetString.java.i
@@ -8673,9 +8586,7 @@ data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java.i
data/make/javax/crypto/Defs-jce.gmk.i
data/src/linux/doc/man/ja/jarsigner.1.i
data/test/java/rmi/activation/Activatable/extLoadedImpl/CheckLoader.java.i
-data/src/share/classes/sun/text/normalizer/RangeValueIterator.java.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties.i
-data/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d.i
+data/src/share/classes/javax/swing/plaf/basic/ComboPopup.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMBean.java.i
data/src/share/classes/sun/tools/java/Package.java.i
data/src/windows/classes/sun/java2d/windows/WinBackBufferSurfaceData.java.i
@@ -8684,29 +8595,33 @@ data/src/share/classes/javax/management/remote/TargetedNotification.java.i
data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav.i
data/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/project.xml.i
data/test/com/sun/security/sasl/gsskerb/runwjaas.csh.i
+data/test/java/beans/Introspector/Test6963811.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/deflate.c.i
data/test/javax/swing/border/Test4247606.html.i
-data/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java.i
+data/src/share/classes/java/util/HashSet.java.i
data/test/java/io/Writer/WriteFromString.java.i
data/test/java/lang/reflect/Generics/Probe.java.i
-data/src/share/demo/nbproject/management/VerboseGC/nbproject/file-targets.xml.i
+data/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c.i
data/src/share/native/sun/java2d/SurfaceData.h.i
+data/make/mkdemo/management/README.txt.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ComURLNulls.java.i
data/src/share/classes/javax/management/modelmbean/DescriptorSupport.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicBorders.java.i
data/test/org/openjdk/jigsaw/maze.sh.i
data/src/share/lib/images/cursors/win32_CopyDrop32x32.gif.i
data/make/tools/CharsetMapping/Johab.map.d
-data/make/org/jcp/Makefile.i
data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java.i
data/test/java/util/zip/InfoZip.java.i
+data/src/share/classes/java/awt/TexturePaint.java.i
data/test/java/nio/Buffer/LimitDirectMemory.sh.i
data/src/share/classes/org/openjdk/jigsaw/JigsawVersionQuery.java.i
-data/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java.i
+data/src/share/classes/org/openjdk/jigsaw/Trace.java.i
data/src/share/classes/javax/swing/plaf/RootPaneUI.java.i
data/make/tools/CharsetMapping/Johab.map.i
data/test/javax/swing/SwingTest.java.i
data/test/java/security/UnresolvedPermission/DebugPermission0.java.i
+data/test/com/sun/crypto/provider/Cipher/RSA/TestRSA.java.i
+data/test/lib/security/java.policy/Ext_AllPolicy.sh.i
data/src/share/classes/sun/java2d/pipe/RenderingEngine.java.i
data/test/com/sun/servicetag/JavaServiceTagTest1.java.i
data/src/share/classes/java/nio/file/FileSystemException.java.i
@@ -8715,11 +8630,11 @@ data/test/java/net/Authenticator/B4933582.sh.i
data/src/solaris/hpi/native_threads/include/np.h.i
data/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java.i
data/test/javax/script/NullUndefinedVarTest.java.i
-data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono32.gif.i
-data/src/share/classes/sun/net/TelnetInputStream.java.i
+data/src/share/classes/sun/java2d/pipe/RegionIterator.java.i
+data/test/java/security/KeyRep/Blowfish.pre.1.5.key.i
data/test/javax/swing/JColorChooser/Test6541987.java.i
data/test/java/util/EnumSet/JumboRange.java.i
-data/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java.i
+data/src/share/demo/management/FullThreadDump/Deadlock.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java.i
data/src/share/classes/javax/management/relation/RelationSupportMBean.java.i
data/test/javax/management/relation/RelationTypeTest.java.i
@@ -8730,13 +8645,14 @@ data/test/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java.i
data/src/share/classes/sun/invoke/util/package-info.java.i
data/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java.i
data/test/java/lang/annotation/Missing/MissingWrapper.java.i
-data/src/solaris/hpi/native_threads/src/condvar_md.c.i
-data/src/share/classes/sun/net/InetAddressCachePolicy.java.i
+data/src/share/classes/sun/nio/fs/BasicFileAttributesHolder.java.i
+data/src/share/native/sun/awt/image/jpeg/jinclude.h.i
data/src/share/classes/sun/util/resources/CalendarData_de.properties.i
data/src/share/classes/sun/io/ByteToCharCp1381.java.i
data/src/share/classes/java/net/URI.java.i
data/src/windows/native/sun/jkernel/graphics/cautionshield32.bmp.i
data/src/share/classes/javax/swing/table/TableCellEditor.java.i
+data/src/share/classes/sun/tools/serialver/SerialVer.java.i
data/test/java/beans/Introspector/Test6660539.java.i
data/src/share/classes/javax/smartcardio/ATR.java.i
data/src/share/classes/java/util/prefs/Preferences.java.i
@@ -8744,25 +8660,27 @@ data/test/java/beans/Introspector/memory/Bean3.java.i
data/src/share/classes/com/sun/inputmethods/internal/thaiim/java.awt.im.spi.InputMethodDescriptor.i
data/src/share/classes/sun/text/normalizer/NormalizerDataReader.java.i
data/src/share/classes/sun/util/resources/CalendarData_pt_PT.properties.i
-data/src/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java.i
+data/src/share/classes/sun/swing/ImageCache.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java.i
-data/src/share/native/java/lang/fdlibm/src/k_standard.c.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Strings.java.i
data/src/share/classes/sun/security/provider/SunEntries.java.i
+data/src/share/classes/com/sun/net/ssl/TrustManager.java.i
data/src/share/classes/sun/nio/cs/ext/MS50221.java.i
data/test/java/net/Inet4Address/isSiteLocalAddress.java.i
-data/src/share/classes/javax/management/NotificationEmitter.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png.i
data/test/sun/security/pkcs11/KeyAgreement/TestDH.java.i
data/make/tools/sharing/tests/Hello.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java.i
-data/src/share/classes/java/security/KeyStoreException.java.i
+data/test/sun/security/tools/jarsigner/oldsig.sh.i
data/test/com/sun/jdi/MethodCalls.java.i
-data/src/share/classes/com/sun/beans/decoder/ClassElementHandler.java.i
+data/src/share/classes/javax/swing/text/Caret.java.i
+data/test/java/beans/PropertyEditor/TestColorClass.java.i
data/src/share/demo/jfc/Notepad/resources/Notepad_fr.properties.i
data/src/share/classes/sun/io/ByteToCharCp949.java.i
data/test/sun/rmi/transport/tcp/blockAccept/TestIface.java.i
data/test/java/io/StringReader/NegativeMarkLimit.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/Icons.java.i
+data/src/share/classes/sun/misc/JavaIODeleteOnExitAccess.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java.i
data/src/share/classes/java/io/SerialCallbackContext.java.i
data/src/share/classes/javax/print/attribute/DocAttribute.java.i
@@ -8770,14 +8688,12 @@ data/src/solaris/classes/sun/net/sdp/SdpProvider.java.i
data/src/share/classes/com/sun/jdi/event/Event.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java.i
data/test/javax/crypto/spec/RC5ParameterSpec/InvalidIV.java.i
-data/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java.i
-data/test/javax/management/openmbean/NullConstructorParamsTest.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties.i
+data/src/share/classes/sun/java2d/pipe/TextRenderer.java.i
+data/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java.i
data/src/share/classes/sun/io/ByteToCharCp838.java.i
data/test/javax/rmi/ssl/keystore.i
data/src/share/native/java/lang/fdlibm/src/w_j0.c.i
data/src/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java.i
data/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java.i
data/src/share/classes/java/nio/X-Buffer-bin.java.i
data/src/share/classes/sun/util/xml/XMLUtils.java.i
@@ -8788,42 +8704,46 @@ data/src/share/classes/javax/swing/SizeRequirements.java.i
data/src/share/classes/sun/management/HotspotThread.java.i
data/make/modules/image.rest.ls.i
data/src/linux/doc/man/ja/rmiregistry.1.i
-data/src/solaris/classes/sun/misc/FileURLMapper.java.i
-data/make/tools/src/build/tools/jdwpgen/Context.java.i
+data/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java.i
+data/src/share/classes/javax/sound/midi/MidiSystem.java.i
data/src/share/native/sun/java2d/loops/ThreeByteBgr.h.i
-data/src/share/demo/applets/WireFrame/example4.html.i
-data/test/java/io/BufferedInputStream/CountUpdate.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/zutil.h.i
data/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java.i
-data/make/java/beans/Makefile.i
+data/test/javax/swing/JFileChooser/4252173/bug4252173.java.i
+data/test/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java.i
data/src/share/classes/sun/security/jgss/GSSCredentialImpl.java.i
-data/src/share/classes/javax/swing/tree/AbstractLayoutCache.java.i
data/make/sun/awt/mapfile-vers-linux.i
data/src/share/classes/java/util/prefs/AbstractPreferences.java.i
data/src/share/classes/com/sun/tools/jdi/ValueImpl.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java.i
data/src/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java.i
-data/src/share/classes/javax/swing/text/html/OptionComboBoxModel.java.i
+data/test/java/rmi/transport/checkFQDN/CheckFQDN.java.i
data/make/tools/CharsetMapping/IBM1006.map.i
data/test/java/lang/instrument/appendToClassLoaderSearch/B.2.i
data/test/java/util/ResourceBundle/ReferencesTestBundle.properties.i
data/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java.i
data/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif.i
+data/src/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java.i
data/src/share/classes/sun/text/normalizer/UnicodeSet.java.i
-data/src/windows/native/sun/jkernel/kernel_pt_BR.rc.i
+data/src/solaris/classes/sun/awt/X11/XAtom.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java.i
data/test/java/lang/Math/HyperbolicTests.java.i
+data/src/share/classes/java/awt/geom/FlatteningPathIterator.java.i
data/test/javax/management/remote/mandatory/version/JMXSpecVersionTest.java.i
data/src/share/classes/com/sun/media/sound/DLSSample.java.i
-data/src/share/classes/java/security/SecureClassLoader.java.i
+data/test/java/nio/channels/AsyncCloseAndInterrupt.java.i
data/make/tools/CharsetMapping/IBM285.map.i
data/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java.i
data/test/java/util/Collections/CheckedMapBash.java.i
data/make/tools/src/build/tools/jdwpgen/ConstantNode.java.i
+data/src/share/classes/javax/naming/ldap/ExtendedRequest.java.i
data/test/java/lang/instrument/NullGetObjectSizeTest.java.i
data/src/share/classes/java/rmi/server/package.html.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init5.java.i
data/src/solaris/classes/sun/nio/ch/SctpNotification.java.i
data/make/common/Demo.gmk.i
+data/make/tools/fontchecker/Makefile.i
data/src/share/classes/sun/beans/editors/BooleanEditor.java.i
data/test/java/awt/Graphics2D/RenderClipTest/6766342.tests.i
data/test/java/nio/BufferPoolMXBean/Basic.java.i
@@ -8837,23 +8757,26 @@ data/src/share/classes/sun/dyn/MethodHandleNatives.java.i
data/src/share/classes/javax/swing/doc-files/JLayeredPane-1.gif.i
data/src/share/native/sun/font/layout/ScriptAndLanguage.cpp.i
data/src/share/classes/com/sun/media/sound/AutoConnectSequencer.java.i
+data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java.i
data/src/share/classes/javax/swing/doc-files/JRootPane-1.gif.i
data/test/javax/swing/JButton/6604281/bug6604281.java.i
-data/src/share/classes/sun/management/counter/StringCounter.java.i
+data/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java.i
+data/test/java/io/File/Cons.java.i
+data/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java.i
data/src/share/classes/sun/nio/cs/IBM874.java.i
-data/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunities.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h.i
data/test/java/lang/ClassLoader/findSystemClass/java/lang/Object.class.i
data/src/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png.i
data/src/share/classes/java/lang/reflect/Executable.java.i
-data/test/java/security/IdentityScope/NoDefaultSystemScope.java.i
+data/test/java/nio/channels/SocketChannel/BufferSize.java.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java.i
data/src/share/classes/com/sun/media/sound/SoftTuning.java.i
data/test/javax/swing/JColorChooser/Test4222508.html.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.access.in.i
data/src/share/classes/sun/security/ssl/SSLSocketImpl.java.i
-data/src/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java.i
+data/src/share/native/sun/font/layout/GlyphIterator.h.i
data/src/share/demo/jfc/Metalworks/resources/HelpFiles/credits.html.i
data/src/share/classes/sun/security/jgss/GSSManagerImpl.java.i
data/src/share/classes/sun/reflect/DelegatingConstructorAccessorImpl.java.i
@@ -8861,24 +8784,28 @@ data/src/share/classes/java/awt/image/DataBufferUShort.java.i
data/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java.i
data/src/share/sample/jmx/jmx-scandir/docfiles/connect-local.jpg.i
data/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java.i
-data/src/share/classes/com/sun/jdi/request/package.html.i
+data/test/java/net/URLEncoder/URLEncodeDecode.java.i
data/make/sun/management/Makefile.i
+data/test/java/util/Arrays/Sorting.java.i
data/src/share/native/sun/font/layout/Features.cpp.i
data/test/java/lang/System/finalization/FinExit.sh.i
-data/src/share/native/sun/font/layout/SimpleArrayProcessor.cpp.i
+data/src/share/classes/sun/security/ssl/ClientHandshaker.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif.i
-data/test/java/net/Socket/asyncClose/BrokenPipe.java.i
-data/test/java/nio/channels/SocketChannel/Stream.java.i
+data/make/tools/src/build/tools/automulti/TestALFLookAndFeel.java.i
+data/test/sun/java2d/DirectX/NonOpaqueDestLCDAATest/NonOpaqueDestLCDAATest.java.i
data/src/share/classes/java/net/ResponseCache.java.i
data/src/share/classes/java/awt/SplashScreen.java.i
-data/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java.i
-data/src/share/classes/javax/swing/DelegatingDefaultFocusManager.java.i
+data/src/share/classes/sun/io/ByteToCharCp1123.java.i
+data/test/java/lang/ThreadLocal/ImmutableLocal.java.i
data/make/java/hpi/native/reorder-i586.i
data/test/ModulesProblemList.txt.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java.i
+data/test/javax/swing/JDialog/6639507/bug6639507.java.i
data/test/java/lang/management/ThreadMXBean/ThreadUserTime.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java.i
+data/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh.i
+data/test/java/io/Serializable/classDescFlagConflict/Read.java.i
data/src/windows/native/sun/windows/awt_Debug.cpp.i
+data/test/sun/security/util/BitArray/NamedBitList.java.i
data/src/share/classes/java/lang/management/MemoryUsage.java.i
data/src/share/classes/sun/io/ByteToCharCp942.java.i
data/test/java/nio/channels/SocketChannel/FinishConnect.java.i
@@ -8887,27 +8814,25 @@ data/test/javax/xml/crypto/dsig/data/certs/macha.crt.i
data/src/share/classes/java/util/zip/ZipEntry.java.i
data/src/share/back/stepControl.c.i
data/test/sun/security/pkcs11/KeyStore/Solaris.sh.i
-data/src/share/classes/javax/swing/FocusManager.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties.i
data/test/java/io/File/CreateNewFile.java.i
data/src/share/classes/sun/io/CharToByteSingleByte.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/NullTest.java.i
+data/src/share/classes/java/rmi/server/RemoteCall.java.i
data/src/share/classes/javax/security/auth/DestroyFailedException.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.ssl.in.i
data/src/share/classes/sun/security/krb5/internal/KRBSafe.java.i
-data/src/share/classes/java/net/PasswordAuthentication.java.i
data/src/solaris/native/sun/nio/ch/Net.c.i
data/src/share/classes/com/sun/media/sound/WaveFileWriter.java.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html.i
data/src/share/classes/javax/swing/tree/RowMapper.java.i
-data/src/share/classes/sun/security/krb5/KdcComm.java.i
data/src/share/native/sun/awt/medialib/mlib_image_proto.h.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/error.png.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMeta.java.i
-data/src/share/classes/com/sun/security/auth/PolicyParser.java.i
+data/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/CipherSuite/SSL_NULL.java.i
data/test/sun/java2d/DirectX/OpaqueImageToSurfaceBlitTest/OpaqueImageToSurfaceBlitTest.java.i
data/src/share/native/sun/java2d/loops/UshortGray.h.i
+data/src/solaris/classes/sun/awt/X11/XTextTransferHelper.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/zconf.h.i
data/make/common/shared/Defs-java.gmk.i
data/src/share/classes/java/awt/AWTError.java.i
@@ -8915,12 +8840,13 @@ data/src/share/classes/org/openjdk/internal/joptsimple/internal/AbbreviationMap.
data/make/tools/swing-beans/beaninfo/images/JOptionPaneMono16.gif.i
data/test/com/sun/jdi/PopAsynchronousTest.java.i
data/src/share/classes/java/awt/color/ProfileDataException.java.i
-data/make/tools/src/build/tools/jdwpgen/StringObjectTypeNode.java.i
+data/src/solaris/doc/sun/man/man1/ja/keytool.1.i
data/make/com/sun/security/auth/module/Makefile.i
data/src/share/classes/javax/swing/colorchooser/DiagramComponent.java.i
data/test/java/lang/StringBuffer/Capacity.java.i
data/src/windows/native/sun/java2d/d3d/D3DMaskFill.cpp.i
data/src/share/classes/javax/security/auth/login/ConfigurationSpi.java.i
+data/src/share/classes/sun/awt/resources/awt_zh_TW.properties.i
data/src/share/classes/javax/management/MatchQueryExp.java.i
data/src/share/classes/sun/tools/jstat/Expression.java.i
data/src/share/classes/java/util/prefs/XmlSupport.java.i
@@ -8933,22 +8859,20 @@ data/make/THIRD_PARTY_README.i
data/src/share/classes/sun/misc/ConditionLock.java.i
data/test/javax/management/eventService/ListenerTest.java.i
data/test/java/lang/instrument/ATransformerManagementTestCase.java.i
-data/src/solaris/classes/sun/awt/X11/XMSelectionListener.java.i
data/src/share/native/sun/awt/image/jpeg/jdhuff.c.i
data/test/com/sun/security/auth/login/ConfigFile/EmptyOption.config.i
+data/src/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav.i
data/src/share/classes/java/awt/CheckboxGroup.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java.i
data/src/share/classes/java/util/concurrent/BrokenBarrierException.java.i
data/src/share/classes/sun/tools/serialver/serialver_ja.properties.i
data/src/share/classes/sun/tools/jstat/AscendingMonitorComparator.java.i
data/test/java/net/URLClassLoader/AddURLTest.java.i
-data/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java.i
data/src/share/native/sun/font/layout/GlyphIterator.cpp.i
data/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh.i
data/test/sun/management/jmxremote/RunTest.sh.i
data/test/sun/security/tools/policytool/OpenPolicy.html.i
-data/test/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c.i
data/src/share/bin/wildcard.c.i
data/src/share/classes/sun/text/resources/FormatData_mt.java.i
data/src/share/native/java/lang/fdlibm/src/e_j1.c.i
@@ -8956,6 +8880,7 @@ data/src/share/classes/sun/security/ssl/InputRecord.java.i
data/test/java/beans/PropertyEditor/Test6397609.java.i
data/src/share/demo/applets/DitherTest/example1.html.i
data/test/java/util/IdentityHashMap/DistinctEntrySetElements.java.i
+data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java.i
data/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java.i
data/test/sun/tools/jstat/jstatOptions1.sh.i
data/test/java/security/Policy/GetInstance/GetInstanceSecurity.policy.i
@@ -8963,10 +8888,12 @@ data/test/javax/management/notification/NotifExecutorTest.java.i
data/test/sun/tools/jconsole/ImmutableResourceTest.java.i
data/src/windows/classes/sun/print/Win32MediaTray.java.i
data/src/share/classes/java/security/interfaces/ECPublicKey.java.i
+data/test/sun/security/provider/PolicyFile/getinstance/GetInstance.policy.i
data/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java.i
data/src/solaris/native/sun/awt/awt_GraphicsEnv.c.i
data/src/share/classes/java/awt/GraphicsConfiguration.java.i
data/src/share/classes/sun/tools/java/Constants.java.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/password.properties.i
data/test/java/util/Locale/serialized/java6locale_iw_IL.i
data/test/java/lang/management/ManagementFactory/GetObjectName.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerThread.java.i
@@ -8975,10 +8902,9 @@ data/src/share/classes/javax/management/remote/JMXAuthenticator.java.i
data/src/share/classes/java/util/DuplicateFormatFlagsException.java.i
data/test/sun/security/util/DerValue/NegInt.java.i
data/src/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java.i
-data/test/java/io/InputStreamReader/One.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/Bytes.java.i
data/src/solaris/native/sun/security/smartcardio/MUSCLE/winscard.h.i
-data/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c.i
+data/test/java/awt/print/PrinterJob/ExceptionTest.java.i
data/test/javax/management/Introspector/AnnotatedMBeanTest.java.i
data/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java.i
data/src/share/classes/sun/io/CharToByteISO8859_8.java.i
@@ -8986,20 +8912,19 @@ data/src/share/classes/sun/rmi/transport/Connection.java.i
data/test/sun/nio/cs/OLD/DBCS_ONLY_IBM_EBCDIC_Decoder.java.i
data/src/share/native/sun/java2d/opengl/OGLVertexCache.c.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java.i
-data/src/share/classes/java/io/ExpiringCache.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseStart.java.i
data/src/share/classes/sun/audio/AudioTranslatorStream.java.i
data/test/java/util/BitSet/And.java.i
data/test/sun/net/InetAddress/nameservice/dns/Lookup.java.i
data/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsxform.c.i
+data/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java.i
-data/src/share/classes/java/rmi/server/RemoteRef.java.i
data/src/solaris/native/sun/nio/ch/InheritedChannel.c.i
data/src/share/classes/sun/security/krb5/internal/KdcErrException.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/gzio.c.i
data/src/share/javavm/include/opcodes.list.i
data/test/java/lang/instrument/InstrumentationHandoff.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java.i
+data/test/java/beans/Introspector/Test6194788.java.i
data/test/java/lang/reflect/ReflectPermission/Exceptions.java.i
data/src/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java.i
data/test/org/openjdk/jigsaw/preinstall.sh.i
@@ -9007,11 +8932,11 @@ data/test/com/sun/servicetag/InvalidRegistrationData.java.i
data/src/share/classes/sun/tools/tree/FloatExpression.java.i
data/src/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java.i
data/src/solaris/classes/sun/awt/X11/XWindowPeer.java.i
-data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_RS.properties.i
data/src/share/classes/java/lang/instrument/UnmodifiableClassException.java.i
data/src/share/classes/sun/io/CharToByteCp949.java.i
-data/src/share/classes/java/net/SdpSocketImpl.java.i
-data/test/tools/launcher/Makefile.SolarisRunpath.i
+data/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java.i
+data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/FileListTransferable.java.i
+data/src/solaris/native/sun/awt/VDrawingAreaP.h.i
data/src/share/classes/sun/text/resources/FormatData_ar_LB.java.i
data/src/share/classes/sun/io/ByteToCharCp284.java.i
data/src/share/classes/com/sun/jndi/dns/Resolver.java.i
@@ -9025,13 +8950,13 @@ data/src/solaris/native/sun/awt/awt_xembed.c.i
data/src/share/classes/java/io/FilterWriter.java.i
data/src/share/classes/com/sun/jdi/ObjectReference.java.i
data/src/share/classes/com/sun/media/sound/FFT.java.i
-data/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java.i
data/src/share/classes/javax/swing/CellEditor.java.i
data/test/java/security/Policy/GetPermissions/JarURL.java.i
data/test/java/lang/instrument/AppendToClassPathTest.java.i
data/src/share/classes/java/nio/file/Files.java.i
data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java.i
-data/src/share/classes/sun/print/PageableDoc.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java.i
+data/test/sun/nio/cs/TestX11JIS0201.java.i
data/src/share/classes/javax/accessibility/AccessibleExtendedTable.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Warn.gif.i
data/make/com/sun/jmx/Makefile.i
@@ -9041,7 +8966,7 @@ data/test/javax/management/query/QueryExpStringTest.java.i
data/src/share/classes/java/security/spec/EncodedKeySpec.java.i
data/src/share/classes/sun/misc/CharacterDecoder.java.i
data/test/javax/management/Introspector/AnnotationSecurityTest.policy.i
-data/src/share/instrument/JavaExceptions.c.i
+data/test/sun/security/pkcs11/Secmod/keystore.jks.i
data/src/share/classes/sun/audio/AudioSecurityAction.java.i
data/src/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java.i
data/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java.i
@@ -9050,7 +8975,7 @@ data/test/java/net/Socket/TestTcpNoDelay.java.i
data/src/share/classes/sun/beans/editors/DoubleEditor.java.i
data/src/share/classes/java/security/cert/CertificateFactory.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java.i
-data/make/tools/swing-beans/beaninfo/images/JPanelMono16.gif.i
+data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.h.i
data/src/share/classes/java/security/cert/CertificateNotYetValidException.java.i
data/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml.i
data/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService_Stub.java.i
@@ -9067,44 +8992,45 @@ data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java.i
data/test/java/io/Serializable/6559775/SerialVictim.java.i
data/src/share/classes/sun/io/CharToByteCp871.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1140.java.i
-data/src/share/classes/sun/io/CharToByteCp937.java.i
data/src/share/sample/vm/jvm-clr/README.txt.i
data/src/share/native/com/sun/media/sound/MidiOutDevice.c.i
+data/src/share/native/java/util/zip/zlib-1.2.3/inffast.h.i
data/test/java/lang/instrument/RedefineClassesTests.java.i
data/src/windows/native/sun/windows/awt_IconCursor.cpp.i
-data/src/share/classes/javax/swing/LayoutComparator.java.i
-data/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java.i
+data/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java.i
data/src/share/classes/com/sun/tools/jdi/StackFrameImpl.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh.i
data/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java.i
+data/src/share/classes/java/awt/image/BandCombineOp.java.i
data/test/java/nio/channels/Selector/OpRead.java.i
data/src/share/classes/java/lang/module/ModuleNotPresentException.java.i
data/test/java/awt/font/TextLayout/UnderlinePositionTest.java.i
data/src/share/classes/java/awt/event/MouseMotionListener.java.i
+data/src/solaris/transport/socket/socket_md.h.i
data/src/share/classes/javax/imageio/spi/ImageInputStreamSpi.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c.i
data/test/java/rmi/transport/httpSocket/security.policy.i
data/src/share/classes/java/awt/geom/RectIterator.java.i
data/test/demo/jvmti/waiters/WaitersTest.java.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c.i
-data/src/share/classes/sun/tools/jconsole/resources/connected16.png.i
data/src/share/classes/java/util/PriorityQueue.java.i
data/test/sun/misc/Encode/Encode.java.i
data/test/sun/security/provider/PolicyParser/p001.policy.i
data/test/sun/security/provider/PolicyFile/Alias.policy.i
data/src/share/classes/java/awt/image/SampleModel.java.i
data/test/java/rmi/reliability/benchmark/bench/BenchInfo.java.i
-data/src/solaris/native/sun/awt/awt_Insets.h.i
-data/src/solaris/classes/sun/awt/X11/XContentWindow.java.i
+data/src/solaris/doc/sun/man/man1/rmic.1.i
+data/src/share/classes/sun/util/resources/LocaleNames_fi.properties.i
data/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java.i
data/src/windows/classes/sun/security/mscapi/JarVerifier.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c.i
data/src/share/classes/java/security/spec/PSSParameterSpec.java.i
-data/test/javax/management/openmbean/CompositeDataStringTest.java.i
-data/src/share/classes/javax/print/attribute/PrintJobAttribute.java.i
-data/src/share/classes/sun/tools/tree/CommaExpression.java.i
-data/test/java/beans/PropertyEditor/TestFloatClassJava.java.i
+data/src/share/classes/java/awt/font/GlyphMetrics.java.i
+data/src/share/classes/com/sun/beans/decoder/AccessorElementHandler.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/package.html.i
data/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav.i
data/src/share/classes/javax/management/monitor/MonitorSettingException.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/BorderMapper.java.i
@@ -9116,63 +9042,60 @@ data/test/java/util/concurrent/ThreadPoolExecutor/Custom.java.i
data/test/javax/swing/JColorChooser/Test4177735.java.i
data/test/sun/security/provider/MessageDigest/TestSHAClone.java.i
data/src/linux/doc/man/ja/servertool.1.i
-data/src/solaris/classes/sun/awt/XSettings.java.i
+data/src/share/classes/sun/security/x509/SerialNumber.java.i
data/test/java/util/zip/ZipFile/input.zip.i
-data/src/share/classes/sun/security/action/GetLongAction.java.i
-data/src/share/classes/com/sun/jmx/event/LeaseManager.java.i
+data/test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/ObjTrees.java.i
data/src/share/classes/com/sun/jmx/snmp/mpm/SnmpMsgTranslator.java.i
-data/src/solaris/hpi/native_threads/src/monitor_md.c.i
+data/make/tools/CharsetMapping/MacGreek.map.i
+data/src/share/classes/javax/naming/TimeLimitExceededException.java.i
data/make/jpda/front/Makefile.i
-data/src/share/classes/java/io/ObjectInputValidation.java.i
+data/src/share/classes/java/nio/file/PathMatcher.java.i
data/src/share/classes/sun/io/ByteToCharMS950_HKSCS.java.i
data/test/java/lang/String/ToUpperCase.java.i
-data/src/share/classes/sun/net/www/http/HttpClient.java.i
data/src/share/classes/javax/accessibility/AccessibleText.java.i
data/src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.c.i
-data/src/share/native/java/util/zip/zlib-1.1.3/ChangeLog.i
+data/test/java/util/Formatter/Basic.java.i
data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java.i
data/src/share/classes/javax/swing/DefaultListSelectionModel.java.i
data/src/share/classes/sun/text/resources/FormatData_en_AU.java.i
data/src/share/classes/sun/util/resources/LocaleNames_ko.properties.i
data/test/sun/security/krb5/auto/TwoPrinces.java.i
-data/src/windows/native/sun/jkernel/resource.h.i
+data/test/java/lang/invoke/ThrowExceptionsTest.java.i
data/src/share/classes/javax/swing/text/StringContent.java.i
data/test/java/io/PipedReader/ReadToArray.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-40.xml.i
data/src/share/classes/com/sun/tools/hat/internal/oql/OQLException.java.i
data/src/share/classes/com/sun/jarsigner/package.html.i
data/src/share/classes/javax/swing/text/DefaultTextUI.java.i
data/src/share/classes/sun/font/GlyphLayout.java.i
data/src/share/classes/java/sql/Timestamp.java.i
-data/test/javax/naming/ldap/LdapName/RdnToAttrsTest.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so.i
data/src/share/classes/java/nio/exceptions.i
data/src/share/native/sun/awt/medialib/mlib_image_get.h.i
data/test/java/lang/instrument/ilib/Options.java.i
data/src/share/classes/sun/util/resources/LocaleNames_ms.properties.i
-data/src/share/demo/management/FullThreadDump/ThreadMonitor.java.i
data/src/share/classes/sun/io/CharToByteMacGreek.java.i
data/src/solaris/native/java/util/logging.c.i
data/make/sun/applet/Makefile.i
data/test/java/util/Calendar/Bug6645263.java.i
data/src/share/classes/javax/swing/plaf/SpinnerUI.java.i
data/src/solaris/classes/sun/awt/motif/MEmbeddedFrame.java.i
-data/test/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java.i
data/src/share/classes/java/util/TreeSet.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java.i
-data/src/share/demo/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin.i
+data/src/solaris/native/sun/awt/color.h.i
data/src/share/classes/sun/reflect/FieldInfo.java.i
data/src/share/demo/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml.i
data/test/java/text/Bidi/BidiBug.java.i
data/test/java/net/URI/Test.java.i
data/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java.i
-data/src/share/classes/sun/tools/jconsole/OverviewPanel.java.i
data/test/java/lang/management/ThreadMXBean/DisableTest.java.i
data/test/sun/security/pkcs11/tls/TestPremaster.java.i
data/test/sun/nio/ch/SelProvider.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/StackFrame.java.i
data/src/share/classes/sun/net/httpserver/TimeSource.java.i
data/src/share/classes/sun/security/krb5/internal/EncKDCRepPart.java.i
-data/src/solaris/native/sun/awt/initIDs.c.i
data/src/share/classes/javax/swing/plaf/multi/MultiListUI.java.i
data/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandard.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java.i
@@ -9180,27 +9103,27 @@ data/src/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java.i
data/test/java/beans/XMLDecoder/spec/TestChar.java.i
data/make/tools/src/build/tools/jdwpgen/RootNode.java.i
data/test/java/beans/XMLDecoder/spec/TestByte.java.i
-data/src/share/classes/sun/misc/VMNotification.java.i
-data/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir.i
-data/src/share/classes/sun/text/resources/CollationData_es.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java.i
+data/src/share/demo/management/JTop/JTop.java.i
+data/src/share/classes/sun/text/resources/FormatData_be.java.i
+data/src/share/classes/sun/applet/AppletViewerFactory.java.i
data/test/sun/security/krb5/auto/LoginModuleOptions.java.i
data/make/tools/swing-beans/beaninfo/images/JSeparatorMono16.gif.i
-data/make/sun/jawt/mapfile-vers.i
data/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclBlock.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressInputStream.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java.i
data/test/java/awt/Graphics/LCDTextAndGraphicsState.java.i
data/src/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java.i
data/src/share/classes/java/lang/NumberFormatException.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_MT.properties.i
-data/test/com/sun/crypto/provider/TLS/TestPremaster.java.i
+data/src/share/classes/javax/swing/JRadioButtonMenuItem.java.i
data/src/share/classes/sun/io/CharToByteCp1255.java.i
-data/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java.i
+data/src/share/native/sun/nio/ch/genSocketOptionRegistry.c.i
data/test/java/io/StreamTokenizer/NullConstruct.java.i
data/test/javax/management/Introspector/LegacyIntrospectorTest.java.i
data/src/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java.i
-data/src/share/classes/sun/io/CharToByteSJIS.java.i
+data/src/share/classes/sun/tools/tree/ShiftLeftExpression.java.i
+data/src/share/classes/javax/swing/DebugGraphicsFilter.java.i
data/src/share/classes/sun/misc/CEStreamExhausted.java.i
data/make/netbeans/common/sample-view.ent.i
data/test/com/sun/jdi/TargetListener.java.i
@@ -9209,40 +9132,41 @@ data/test/sun/nio/cs/TestIllegalSJIS.java.i
data/THIRD_PARTY_README.i
data/src/share/classes/com/sun/jmx/snmp/SnmpAckPdu.java.i
data/test/java/util/ResourceBundle/Control/StressOut_zh_CN.properties.i
-data/src/share/classes/sun/swing/UIClientPropertyKey.java.i
data/src/share/classes/java/lang/reflect/WildcardType.java.i
+data/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java.i
data/test/sun/security/tools/jarsigner/a%b/percent.keystore.i
data/src/share/native/sun/font/layout/IndicRearrangementProcessor.h.i
data/src/share/classes/java/awt/dnd/DragSourceContext.java.i
data/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiRules.java.i
+data/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java.i
data/make/jpda/tty/Makefile.i
-data/test/demo/jvmti/gctest/BigHello.java.i
+data/test/java/beans/Beans/Test4067824.java.i
data/src/linux/doc/man/wsimport.1.i
data/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java.i
data/src/share/classes/java/text/RBCollationTables.java.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init1.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/japanese.ut8.txt.i
data/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java.i
-data/src/share/demo/applets/SimpleGraph/example1.html.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java.i
+data/test/javax/management/MBeanServer/MBeanServerNotificationTest.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java.i
data/src/share/demo/jvmti/waiters/README.txt.i
-data/src/share/native/java/lang/fdlibm/src/w_gamma.c.i
data/src/share/classes/sun/util/resources/CurrencyNames.properties.i
data/test/java/nio/channels/SocketChannel/OpenLeak.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/PrematureLoadTest.java.i
data/src/share/classes/org/ietf/jgss/Oid.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java.i
data/src/solaris/native/sun/awt/awt_xembed_server.h.i
-data/src/share/classes/javax/management/SendNotification.java.i
+data/test/java/lang/Thread/StackTraces.java.i
data/test/java/util/ResourceBundle/Test4314141B_fr_CH.java.i
data/test/java/nio/file/Files/DeleteOnClose.java.i
-data/src/solaris/native/sun/awt/awt_Font.c.i
+data/test/sun/tools/jstatd/jstatdUsage1.sh.i
data/src/share/sample/nio/server/Server.java.i
-data/make/java/redist/FILES.gmk.i
data/src/share/classes/sun/swing/text/CountingPrintable.java.i
-data/src/share/classes/javax/security/cert/CertificateEncodingException.java.i
+data/src/share/native/sun/awt/image/jpeg/jctrans.c.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java.i
data/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/Foo.java.i
-data/src/share/native/sun/security/ec/impl/ec2_233.c.i
-data/make/sun/security/pkcs11/Makefile.i
+data/test/java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java.i
data/test/java/io/Serializable/PutField/Read2.java.i
data/src/share/classes/sun/io/CharToByteISO2022KR.java.i
data/src/share/lib/sound.properties.i
@@ -9253,41 +9177,37 @@ data/src/share/classes/javax/sound/midi/Synthesizer.java.i
data/test/java/lang/reflect/Generics/exceptionCauseTest.java.i
data/src/share/classes/sun/io/CharToByteCp1141.java.i
data/test/java/nio/file/Path/DeleteOnClose.java.i
-data/src/share/classes/sun/io/ByteToCharISO2022CN.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java.i
+data/src/share/classes/sun/util/ResourceBundleEnumeration.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java.i
data/src/windows/native/sun/java2d/d3d/D3DMaskBlit.cpp.i
data/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java.i
data/test/java/nio/charset/CharsetDecoder/AverageMax.java.i
data/src/share/classes/java/lang/module/ModuleClassLoader.java.i
data/test/java/lang/Integer/GetInteger.java.i
-data/src/share/classes/sun/java2d/pipe/BufferedBufImgOps.java.i
+data/src/share/classes/sun/io/CharToByteCp937.java.i
data/src/share/classes/java/nio/file/ProviderMismatchException.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_CU.properties.i
data/src/share/classes/java/security/spec/RSAKeyGenParameterSpec.java.i
data/test/java/security/Policy/GetInstance/GetInstanceProvider.java.i
-data/src/share/classes/javax/swing/text/ChangedCharSetException.java.i
data/src/share/classes/sun/management/MonitorInfoCompositeData.java.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java.i
-data/test/java/beans/XMLEncoder/java_awt_ScrollPane.java.i
data/test/java/lang/Class/getDeclaredField/Exceptions.java.i
data/src/share/classes/javax/xml/crypto/dom/DOMStructure.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java.i
-data/test/sun/net/www/protocol/http/RelativeRedirect.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/package.html.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthContext.java.i
-data/test/sun/security/tools/jarsigner/emptymanifest.sh.i
+data/src/share/native/java/util/zip/zlib-1.1.3/infblock.c.i
+data/test/javax/swing/JSlider/4252173/bug4252173.java.i
data/test/java/lang/String/CaseConvertSameInstance.java.i
-data/src/share/classes/java/nio/charset/Charset-X-Coder.java.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java.i
data/src/share/classes/sun/java2d/loops/FillSpans.java.i
data/src/share/classes/sun/font/CharToGlyphMapper.java.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy.i
data/src/share/native/sun/awt/image/cvutils/img_replscale.h.i
data/test/sun/security/krb5/canonicalize/Test.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java.i
data/src/share/classes/java/security/spec/RSAOtherPrimeInfo.java.i
data/src/share/classes/sun/net/httpserver/ChunkedOutputStream.java.i
data/src/share/classes/javax/swing/text/html/ObjectView.java.i
-data/test/java/security/cert/CertPathValidator/nameConstraints/openssl.cnf.i
data/src/share/classes/javax/security/cert/CertificateException.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/SmallObjTreeCalls.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java.i
@@ -9302,65 +9222,62 @@ data/src/share/native/sun/security/ec/ecp.h.i
data/src/share/classes/javax/sound/midi/Transmitter.java.i
data/test/sun/net/www/protocol/http/spnegoLogin.conf.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/UIPropertyMapper.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties.i
-data/src/share/classes/java/awt/CompositeContext.java.i
data/test/java/rmi/activation/Activatable/nonExistentActivatable/rmid.security.policy.i
-data/src/share/classes/sun/management/GcInfoCompositeData.java.i
-data/make/mksample/nio/Makefile.i
+data/src/share/classes/sun/nio/cs/ISO_8859_9.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/RequiredArgumentOptionSpec.java.i
data/src/share/classes/com/sun/management/GcInfo.java.i
-data/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java.i
+data/src/solaris/native/sun/nio/ch/EPollPort.c.i
+data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.html.i
data/src/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java.i
data/test/java/util/Locale/Bug4518797.java.i
-data/test/com/sun/jdi/RedefineFinal.sh.i
-data/src/share/classes/sun/font/FileFontStrike.java.i
-data/test/sun/security/pkcs11/ec/p12passwords.txt.i
+data/test/javax/accessibility/6986385/bug6986385.java.i
data/test/java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java.i
data/src/share/classes/sun/java2d/pisces/Curve.java.i
-data/test/java/util/PluggableLocale/providersrc/java.text.spi.NumberFormatProvider.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c.i
data/make/tools/swing-beans/beaninfo/images/JDesktopPaneMono32.gif.i
data/src/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java.i
data/test/java/security/KeyRep/DH.pre.1.5.key.i
data/test/java/awt/PrintJob/PrintArcTest/PrintArcTest.java.i
data/src/share/classes/java/security/cert/CertPathValidatorSpi.java.i
-data/src/share/classes/javax/swing/ScrollPaneConstants.java.i
data/src/share/classes/java/rmi/MarshalledObject.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java.i
-data/test/java/lang/String/ToLowerCase.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_de.properties.i
+data/src/share/classes/sun/misc/Sort.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java.i
data/test/javax/crypto/SecretKeyFactory/P1SecretKeyFactory.java.i
data/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java.i
data/src/share/classes/sun/util/resources/LocaleNames_sk.properties.i
data/src/share/native/sun/java2d/loops/FillRect.c.i
data/test/java/nio/file/Files/ForceLoad.java.i
+data/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java.i
data/src/share/classes/sun/awt/image/OffScreenImage.java.i
data/test/sun/security/krb5/krb5-capaths.conf.i
data/test/java/lang/reflect/Module/module-annotation.sh.i
-data/test/java/util/ResourceBundle/Control/XmlRB_ja.xml.i
+data/test/javax/swing/JScrollBar/6924059/bug6924059.java.i
data/src/share/demo/jvmti/hprof/hprof_error.c.i
-data/src/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java.i
+data/test/java/net/SocketPermission/NoAction.java.i
data/src/share/classes/sun/io/ByteToCharCp297.java.i
-data/test/com/sun/tools/attach/redefineagent.mf.i
+data/test/javax/management/namespace/DomainCreationTest.java.i
data/make/java/nio/Exportedfiles.gmk.i
data/test/sun/tools/jhat/HatHeapDump1Test.java.i
data/test/javax/swing/UIManager/Test6657026.java.i
data/src/share/sample/scripting/scriptpad/nbproject/project.xml.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java.i
+data/test/javax/imageio/plugins/bmp/TopDownTest.java.i
data/src/share/classes/java/lang/SafeVarargs.java.i
-data/src/share/classes/sun/tools/tree/UnaryExpression.java.i
+data/test/sun/security/tools/keytool/CloneKeyAskPassword.sh.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassFileParser.java.i
data/src/share/classes/javax/swing/text/html/CSSParser.java.i
+data/test/sun/security/rsa/TestKeyPairGenerator.java.i
data/test/com/sun/crypto/provider/Cipher/DES/Sealtest.java.i
data/src/share/demo/applets/NervousText/example1.html.i
-data/src/share/classes/sun/java2d/cmm/lcms/LCMS.java.i
+data/src/share/classes/com/sun/tools/script/shell/messages.properties.i
+data/src/share/classes/sun/nio/cs/ISO_8859_4.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.java.i
-data/src/share/native/sun/font/FontInstanceAdapter.h.i
+data/test/com/sun/jdi/FieldWatchpoints.java.i
+data/test/javax/crypto/SealedObject/NullKeySealedObject.java.i
data/test/sun/security/krb5/auto/SPNEGO.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthArrowButton.java.i
data/test/javax/swing/JFileChooser/6945316/bug6945316.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U16Func.c.i
-data/make/tools/reorder/tools/util-i586.il.i
data/test/java/lang/instrument/RedefineMethodAddInvokeTarget.java.i
data/src/windows/native/sun/windows/colordata.h.i
data/test/javax/management/eventService/FetchingTest.java.i
@@ -9368,38 +9285,37 @@ data/test/java/net/URL/B5086147.java.i
data/src/share/classes/javax/security/auth/login/FailedLoginException.java.i
data/src/share/classes/java/lang/invoke/MethodHandle.java.i
data/src/share/classes/sun/util/resources/CalendarData_tr.properties.i
-data/test/javax/management/loading/MLetCLR/policy.i
-data/src/share/classes/sun/text/resources/CollationData_sr_Latn.java.i
+data/src/share/transport/socket/socketTransport.h.i
data/test/java/io/PipedInputStream/Constructors.java.i
+data/test/java/util/Collections/CheckedQueue.java.i
data/src/share/classes/javax/swing/SwingConstants.java.i
data/src/share/classes/javax/swing/ComboBoxModel.java.i
data/test/javax/swing/JColorChooser/Test6348456.html.i
-data/test/javax/sound/midi/Gervill/DLSSoundbankReader/ding.dls.i
data/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java.i
data/test/javax/management/remote/mandatory/connection/DeadLockTest.java.i
-data/src/share/classes/javax/swing/event/InternalFrameAdapter.java.i
+data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy.i
data/test/sun/security/tools/jarsigner/oldsig/A.jar.i
data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubNextRequestHandler.java.i
-data/test/javax/management/loading/MLetCLR/MLetCommand.java.i
+data/test/java/lang/StringBuffer/Supplementary.java.i
+data/src/solaris/classes/sun/awt/X11/XMSelectionListener.java.i
data/test/java/beans/Introspector/4520754/Foo.java.i
data/make/sun/cmm/lcms/FILES_c_windows.gmk.i
-data/src/share/classes/javax/swing/event/PopupMenuListener.java.i
-data/src/share/demo/applets/SortDemo/QSortAlgorithm.java.i
-data/src/share/classes/sun/tools/jstat/Literal.java.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Repositor.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java.i
data/src/windows/native/sun/windows/awt_Unicode.cpp.i
data/make/modules/image.awt.ls.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_CL.properties.i
data/make/sun/awt/mapfile-vers.i
-data/src/share/classes/sun/security/x509/CRLExtensions.java.i
+data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java.i
data/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java.i
data/make/tools/src/build/tools/jdwpgen/ErrorNode.java.i
-data/src/share/classes/java/net/DatagramSocketImpl.java.i
+data/src/share/classes/sun/applet/AppletMessageHandler.java.i
data/test/java/util/ResourceBundle/KeySetMessages.java.i
data/src/share/classes/javax/print/attribute/EnumSyntax.java.i
data/src/solaris/native/sun/java2d/opengl/J2D_GL/glx.h.i
data/test/java/util/ResourceBundle/TestResource_fr_CH.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/Node.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.README.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java.i
data/make/tools/swing-beans/beaninfo/images/JCheckBoxColor32.gif.i
data/src/share/classes/java/awt/im/InputSubset.java.i
@@ -9409,15 +9325,19 @@ data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c.i
data/src/share/classes/sun/awt/image/ImageRepresentation.java.i
data/src/solaris/classes/sun/security/provider/NativeSeedGenerator.java.i
data/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.c.i
-data/src/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java.i
+data/src/share/classes/javax/print/AttributeException.java.i
data/test/java/net/ipv6tests/Tests.java.i
data/test/com/sun/jdi/ListenAddress.java.i
-data/src/share/classes/sun/awt/dnd/SunDropTargetEvent.java.i
+data/test/java/security/BasicPermission/SerialVersion.java.i
data/src/share/classes/java/nio/file/FileVisitResult.java.i
+data/test/sun/security/tools/jarsigner/emptymanifest.sh.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html.i
data/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java.i
data/src/share/classes/java/security/KeyStoreSpi.java.i
data/src/share/native/sun/java2d/opengl/OGLFuncs.c.i
+data/make/tools/CharsetMapping/IBM037.nr.i
data/src/share/classes/sun/awt/geom/Edge.java.i
+data/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java.i
data/src/share/demo/nbproject/jfc/Metalworks/build.xml.i
data/src/share/classes/sun/security/util/Cache.java.i
data/src/share/classes/sun/net/ftp/FtpLoginException.java.i
@@ -9426,9 +9346,8 @@ data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.prop
data/src/share/classes/java/sql/CallableStatement.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java.i
data/src/solaris/hpi/export/hpi_md.h.i
-data/src/share/classes/sun/tools/jar/resources/jar_fr.properties.i
+data/test/java/io/FileOutputStream/AtomicAppend.java.i
data/src/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java.i
-data/src/windows/native/sun/jkernel/kernel.def.i
data/test/java/nio/channels/Selector/CloseInvalidatesKeys.java.i
data/src/windows/transport/socket/socket_md.h.i
data/src/share/classes/java/lang/invoke/FilterGeneric.java.i
@@ -9438,7 +9357,7 @@ data/test/sun/security/util/Resources/NewResourcesNames.java.i
data/test/javax/swing/plaf/nimbus/Test6919629.java.i
data/test/java/util/IdentityHashMap/EntrySetIteratorRemoveInvalidatesEntry.java.i
data/src/share/classes/com/sun/media/sound/SoftControl.java.i
-data/src/share/classes/java/rmi/activation/UnknownGroupException.java.i
+data/test/java/nio/Buffer/CopyDirect-X-Memory.java.template.i
data/make/mksample/scripting/scriptpad/Makefile.i
data/src/share/native/java/util/zip/zlib-1.1.3/trees.c.i
data/src/share/classes/java/math/BigInteger.java.i
@@ -9448,32 +9367,30 @@ data/test/java/util/zip/ZipEntry/Clone.java.i
data/src/share/classes/java/util/concurrent/ScheduledFuture.java.i
data/make/tools/src/build/tools/jdwpgen/NameValueNode.java.i
data/src/share/classes/java/awt/peer/RobotPeer.java.i
+data/src/share/classes/sun/java2d/SunCompositeContext.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif.i
data/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java.i
data/test/javax/swing/plaf/synth/6771547/SynthTest.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiTableUI.java.i
data/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Decoder.java.i
-data/src/share/classes/java/lang/CloneNotSupportedException.java.i
data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListTransferable.java.i
data/test/sun/nio/cs/X11CNS11643P2.java.i
-data/src/share/classes/java/dyn/MethodHandleImpl.java.i
+data/test/java/security/cert/CertPathValidatorException/cert_file.i
data/src/share/classes/java/nio/file/Watchable.java.i
data/test/java/util/ResourceBundle/Bug6356571.java.i
-data/test/java/net/URLConnection/UNCTest.java.i
data/test/java/util/ResourceBundle/KeySetResources.properties.i
data/src/share/demo/jvmti/hprof/hprof_loader.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java.i
data/src/share/classes/sun/management/ManagementFactory.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java.i
data/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java.i
+data/src/solaris/classes/sun/awt/X11/XAtomList.java.i
data/src/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java.i
-data/src/share/classes/sun/io/ByteToCharCp1145.java.i
+data/src/share/native/sun/reflect/Reflection.c.i
data/src/share/classes/javax/management/MBeanServerFactory.java.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties.i
-data/make/tools/swing-beans/beaninfo/images/JScrollBarMono32.gif.i
+data/src/solaris/classes/sun/java2d/xr/XRMaskImage.java.i
+data/test/sun/security/ssl/sanity/pluggability/MySSLContextImpl.java.i
data/src/solaris/demo/jni/Poller/Poller.c.i
-data/test/sun/nio/cs/TestISO2022CNDecoder.java.i
-data/src/solaris/doc/sun/man/man1/ja/rmic.1.i
data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java.i
data/src/share/classes/sun/tools/tree/DivRemExpression.java.i
data/test/com/sun/jdi/SimulResumerTest.java.i
@@ -9493,7 +9410,6 @@ data/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java.i
data/test/java/lang/Thread/HoldsLock.java.i
data/test/java/io/BufferedReader/EOL.java.i
data/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java.i
-data/src/share/classes/sun/io/CharToByteCp1097.java.i
data/test/java/lang/Runtime/exec/ExitValue.java.i
data/src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java.i
data/src/solaris/native/sun/awt/awt_MenuItem.h.i
@@ -9504,56 +9420,62 @@ data/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java.i
data/src/share/classes/javax/swing/ListSelectionModel.java.i
data/src/share/classes/javax/print/attribute/standard/MediaSizeName.java.i
data/src/share/classes/sun/awt/image/SurfaceManager.java.i
-data/make/mksample/nbproject/Makefile.i
+data/src/share/native/sun/java2d/opengl/OGLContext.c.i
+data/src/windows/native/sun/windows/awt_DataTransferer.h.i
data/test/java/lang/instrument/PremainClass/NoPremainAgent.sh.i
-data/test/java/lang/instrument/PremainClass/InheritAgent1010.java.i
+data/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java.i
+data/src/solaris/classes/sun/java2d/x11/X11VolatileSurfaceManager.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.access.in.i
data/make/sun/security/krb5/FILES_c_windows.gmk.i
data/src/share/classes/java/awt/dnd/DragGestureListener.java.i
-data/test/java/io/Serializable/unshared/Read.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionSet.java.i
data/src/share/classes/com/sun/tools/attach/AttachNotSupportedException.java.i
+data/src/share/classes/com/sun/tools/hat/MANIFEST.mf.i
data/src/share/classes/sun/misc/CRC16.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java.i
+data/src/share/classes/com/sun/jdi/InvalidStackFrameException.java.i
data/src/windows/hpi/include/mutex_md.h.i
data/make/tools/reorder/tests/IntToString.java.i
-data/src/share/instrument/PathCharsValidator.h.i
-data/src/share/classes/javax/swing/plaf/ScrollBarUI.java.i
+data/src/windows/native/java/net/net_util_md.c.i
+data/src/share/classes/sun/awt/resources/awt_pt_BR.properties.i
data/src/share/classes/com/sun/media/sound/MidiOutDevice.java.i
data/src/share/classes/java/awt/Conditional.java.i
data/test/sun/management/jmxremote/bootstrap/launcher.c.i
data/src/share/classes/com/sun/jndi/dns/ZoneNode.java.i
+data/src/share/classes/sun/io/CharToByteTIS620.java.i
data/src/share/classes/java/lang/management/CompilationMXBean.java.i
-data/src/share/classes/javax/smartcardio/CardException.java.i
-data/src/windows/hpi/src/monitor_md.c.i
+data/test/java/net/MulticastSocket/TestInterfaces.java.i
+data/test/java/awt/xembed/server/TestXEmbedServerJava.java.i
data/src/share/classes/java/nio/file/FileSystemNotFoundException.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java.i
data/src/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java.i
-data/src/share/native/sun/font/layout/LEFontInstance.h.i
+data/test/java/lang/ClassLoader/GetPackage.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC.c.i
data/src/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java.i
-data/src/solaris/doc/sun/man/man1/ja/appletviewer.1.i
+data/src/share/classes/sun/net/TelnetInputStream.java.i
data/src/share/classes/java/awt/Toolkit.java.i
data/src/share/classes/sun/nio/ch/IOUtil.java.i
+data/test/java/io/Serializable/arraySuidConflict/Read.java.i
data/src/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java.i
data/test/sun/security/krb5/edu.mit.Kerberos.i
-data/test/java/nio/file/Files/walkFileTree/denyAll.policy.i
-data/make/tools/src/build/tools/javazic/Rule.java.i
+data/test/java/util/Collections/FindSubList.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIComponent.java.i
data/src/share/classes/sun/awt/datatransfer/TransferableProxy.java.i
data/src/share/classes/javax/script/CompiledScript.java.i
data/test/sun/net/www/protocol/ftp/HandlerEquals.java.i
-data/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java.i
data/test/sun/security/ssl/sun/net/www/http/ChunkedOutputStream/Test.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageFilters.h.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties.i
data/test/javax/management/MBeanServer/DynamicWrapperMBeanTest.java.i
-data/make/common/internal/NativeCompileRules.gmk.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java.i
+data/src/solaris/classes/sun/awt/X11/XMenuWindow.java.i
data/src/solaris/native/sun/awt/awt_Event.h.i
data/src/share/classes/javax/swing/event/HyperlinkEvent.java.i
data/src/share/classes/sun/launcher/resources/launcher_it.properties.i
-data/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java.i
+data/make/tools/swing-beans/beaninfo/images/JSpinnerMono32.gif.i
data/src/share/classes/sun/font/TextLabel.java.i
data/src/share/classes/sun/awt/im/InputMethodContext.java.i
+data/src/share/classes/sun/tools/tree/BinaryShiftExpression.java.i
data/make/jpda/gui/Makefile.i
data/test/java/security/cert/CertPathBuilder/selfIssued/README.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java.i
@@ -9562,75 +9484,78 @@ data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java.i
data/make/tools/swing-beans/beaninfo/images/JListColor32.gif.i
data/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java.i
data/src/share/classes/javax/swing/Icon.java.i
+data/src/share/classes/sun/tools/tree/IdentifierExpression.java.i
+data/src/share/classes/com/sun/tools/jdi/VoidValueImpl.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/ca.cert.i
data/test/com/sun/jdi/PrivateTransportTest.sh.i
+data/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java.i
data/src/share/classes/javax/print/attribute/standard/Compression.java.i
data/test/java/net/URLConnection/xml/xml2.xml.i
data/test/java/beans/Introspector/6976577/Test6976577.java.i
-data/test/javax/management/eventService/SharingThreadTest.java.i
+data/src/share/classes/org/openjdk/jigsaw/BaseContext.java.i
data/src/share/classes/sun/nio/cs/ext/MacUkraine.java.i
data/src/share/native/java/lang/fdlibm/src/s_asinh.c.i
data/src/share/back/eventHelper.h.i
data/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java.i
-data/make/netbeans/jdwpgen/nbproject/project.xml.i
+data/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c.i
+data/make/tools/swing-beans/beaninfo/images/JPanelColor32.gif.i
data/test/com/sun/servicetag/registration.xml.i
data/src/windows/classes/sun/java2d/d3d/D3DRenderer.java.i
-data/src/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java.i
+data/src/share/classes/sun/tracing/dtrace/DTraceProbe.java.i
data/src/share/classes/com/sun/jdi/BooleanValue.java.i
-data/test/sun/security/ssl/etc/unknown_keystore.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java.i
-data/src/share/classes/java/awt/peer/TextComponentPeer.java.i
-data/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java.i
+data/test/java/util/concurrent/Phaser/Basic.java.i
+data/make/netbeans/jconsole/build.xml.i
+data/src/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java.i
+data/test/com/sun/servicetag/servicetag3.properties.i
+data/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java.i
data/test/tools/launcher/UnicodeCleanup.java.i
-data/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java.i
-data/src/share/classes/sun/text/normalizer/UProperty.java.i
data/src/share/classes/com/sun/jmx/interceptor/DomainDispatchInterceptor.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java.i
data/src/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java.i
-data/src/share/native/sun/awt/image/jpeg/jcphuff.c.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMBean.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java.i
data/src/share/demo/management/VerboseGC/PrintGCStat.java.i
-data/test/javax/swing/border/Test4760089.java.i
-data/src/share/classes/com/sun/tools/extcheck/ExtCheck.java.i
+data/src/share/classes/javax/imageio/ImageWriter.java.i
+data/test/sun/nio/cs/OLD/IBM949_OLD.java.i
+data/src/windows/native/sun/java2d/d3d/D3DShaders.h.i
data/src/share/classes/javax/management/namespace/JMXNamespaceView.java.i
data/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh.i
data/src/share/classes/sun/tools/jconsole/resources/collapse-winlf.png.i
data/test/java/awt/image/LookupOp/SingleArrayTest.java.i
-data/make/tools/CharsetMapping/IBM1025.c2b.i
-data/src/share/classes/sun/reflect/generics/tree/BaseType.java.i
+data/make/com/sun/java/browser/net/Makefile.i
+data/test/java/lang/StringCoding/CheckEncodings.sh.i
data/test/javax/swing/text/html/TableView/7030332/bug7030332.html.i
data/make/tools/CharsetMapping/HKSCS2008.map.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java.i
-data/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html.i
+data/src/share/classes/sun/security/pkcs/PKCS7.java.i
data/src/share/classes/javax/print/attribute/standard/PrinterResolution.java.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html.i
+data/test/javax/management/Introspector/ImmutableNotificationInfoTest.java.i
data/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java.i
data/test/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java.i
data/test/java/lang/management/BufferPoolMXBean/Basic.java.i
-data/src/share/classes/java/awt/HeadlessException.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java.i
-data/test/java/util/concurrent/locks/ReentrantReadWriteLock/LoopHelpers.java.i
+data/test/sun/security/krb5/auto/DynamicKeytab.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_PA.java.i
data/src/share/classes/com/sun/tools/jdi/FloatTypeImpl.java.i
data/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java.i
-data/test/java/util/logging/LoggerWeakRefLeak.java.i
data/src/share/classes/javax/print/StreamPrintService.java.i
data/src/share/classes/sun/security/jgss/GSSCaller.java.i
-data/src/share/native/java/lang/java_props.h.i
+data/test/java/lang/instrument/GetObjectSizeTest.java.i
data/src/solaris/bin/amd64/jvm.cfg.i
data/src/share/classes/java/awt/List.java.i
data/make/com/sun/java/Makefile.i
-data/src/share/classes/sun/security/ec/ECPublicKeyImpl.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java.i
data/src/share/classes/com/sun/jdi/CharType.java.i
-data/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java.i
+data/src/share/classes/javax/print/attribute/standard/Copies.java.i
data/src/share/classes/com/sun/jmx/remote/util/EventClientConnection.java.i
data/src/share/classes/sun/beans/editors/ShortEditor.java.i
data/src/share/classes/java/lang/Object.java.i
data/src/share/classes/com/sun/jdi/event/VMStartEvent.java.i
-data/src/share/classes/javax/sound/midi/MetaMessage.java.i
-data/test/java/lang/annotation/Missing/A.java.i
+data/test/java/lang/Math/CubeRootTests.java.i
+data/test/java/beans/XMLEncoder/Test6921644.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html.i
+data/src/share/classes/sun/text/resources/FormatData_th_TH_TH.java.i
data/src/share/classes/java/lang/ProcessBuilder.java.i
data/src/share/classes/sun/awt/RequestFocusController.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/inflate.c.i
@@ -9638,43 +9563,45 @@ data/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java.i
data/test/sun/nio/cs/OLD/DBCSDecoderMapping.java.i
data/src/share/classes/javax/swing/JInternalFrame.java.i
data/test/java/lang/String/ContentEquals.java.i
-data/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_es.properties.i
data/src/share/classes/sun/tools/jconsole/VariableGridLayout.java.i
data/test/java/lang/StringBuffer/Exceptions.java.i
data/src/share/classes/javax/swing/ComboBoxEditor.java.i
data/src/share/classes/javax/swing/plaf/ColorChooserUI.java.i
data/test/java/nio/charset/Charset/IllegalCharsetName.java.i
+data/src/share/classes/sun/security/provider/DSAParameters.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/SimpleStandard.java.i
data/src/share/classes/com/sun/jmx/snmp/defaults/package.html.i
data/test/java/lang/Runtime/exec/ExecWithInput.java.i
data/src/share/hpi/include/hpi_impl.h.i
data/test/java/security/cert/CertPathValidator/OCSP/RootCert.pem.i
data/src/share/classes/sun/tools/jstat/ParserException.java.i
-data/test/com/sun/java/swing/plaf/windows/Test6824600.java.i
data/test/java/util/ServiceLoader/Basic.java.i
-data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java.i
-data/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJobHeadless.java.i
+data/test/java/io/Serializable/explicitCNFException/ExplicitCNFException.java.i
+data/src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java.i
data/test/java/beans/XMLEncoder/java_awt_Color.java.i
+data/test/org/openjdk/jigsaw/cli/tsa-prikey.pem.i
data/src/share/classes/javax/swing/text/html/HTMLDocument.java.i
data/src/share/classes/java/io/PrintWriter.java.i
data/src/windows/native/common/jni_util_md.c.i
data/src/share/classes/java/beans/IndexedPropertyDescriptor.java.i
-data/src/share/classes/java/awt/peer/FileDialogPeer.java.i
-data/src/share/classes/sun/text/resources/FormatData_en_IN.java.i
+data/src/windows/classes/sun/awt/windows/WingDings.java.i
+data/test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java.i
data/test/sun/security/provider/PolicyFile/EmailAddress.java.i
data/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java.i
data/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java.i
data/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java.i
data/test/javax/swing/JTableHeader/6884066/bug6884066.java.i
+data/src/share/native/sun/font/layout/LayoutEngine.cpp.i
data/src/share/classes/com/sun/nio/sctp/NotificationHandler.java.i
data/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java.i
data/src/share/classes/java/sql/SQLSyntaxErrorException.java.i
data/src/share/classes/javax/swing/DebugGraphicsObserver.java.i
+data/src/share/back/threadControl.c.i
data/test/java/security/KeyRep/DSA.pre.1.5.key.i
-data/src/share/classes/java/awt/doc-files/DesktopProperties.html.i
+data/test/sun/security/tools/keytool/StartDateTest.java.i
data/test/java/awt/print/PrinterJob/Collate2DPrintingTest.java.i
+data/test/javax/management/ImplementationVersion/policy.i
data/src/share/classes/java/util/LocaleISOData.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/zutil.h.i
@@ -9683,41 +9610,48 @@ data/src/share/classes/sun/net/www/protocol/http/AuthCache.java.i
data/src/share/classes/com/sun/jmx/namespace/serial/SerialRewritingProcessor.java.i
data/src/share/classes/sun/font/TrueTypeFont.java.i
data/test/sun/security/krb5/auto/NoAddresses.java.i
-data/test/com/sun/jdi/JdbMissStep.sh.i
+data/src/share/classes/sun/security/jgss/ProviderList.java.i
data/test/java/rmi/activation/Activatable/checkImplClassLoader/MyRMI.java.i
data/src/share/classes/java/text/CalendarBuilder.java.i
data/src/share/demo/applets/WireFrame/ThreeD.java.i
+data/test/java/rmi/server/RMIClassLoader/noSecurityManager/LocalDummy.java.i
data/test/java/net/ResponseCache/file1.cache.i
data/src/share/classes/sun/awt/HorizBagLayout.java.i
-data/src/share/classes/java/security/SecurityPermission.java.i
+data/src/windows/native/sun/jkernel/stdafx.cpp.i
data/test/javax/management/remote/mandatory/threads/ExecutorTest.java.i
-data/test/javax/security/auth/login/Configuration/Synchronize.config.i
-data/make/java/java/FILES_java.gmk.i
+data/make/tools/reorder/tests/LoadJFrame.java.i
+data/make/tools/src/build/tools/jdwpgen/ValueTypeNode.java.i
data/src/share/classes/javax/print/attribute/PrintRequestAttribute.java.i
-data/src/linux/doc/man/rmic.1.i
data/src/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java.i
data/src/share/classes/sun/nio/cs/ext/SimpleEUCDecoder.java.i
data/src/share/classes/sun/security/krb5/internal/ETypeInfo.java.i
-data/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c.i
-data/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java.i
+data/test/java/security/cert/CertPathBuilder/targetConstraints/ee.cer.i
data/src/share/classes/sun/security/x509/AlgorithmId.java.i
data/test/javax/swing/JSlider/6742358/bug6742358.java.i
data/test/java/nio/file/Files/WalkWithSecurity.java.i
data/src/share/classes/java/util/IllegalFormatException.java.i
-data/test/java/nio/channels/Selector/LotsOfCancels.java.i
+data/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh.i
+data/src/windows/native/sun/jkernel/kernel.def.i
data/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html.i
data/test/java/beans/VetoableChangeSupport/Test4994635.java.i
-data/test/java/io/Serializable/stopCustomDeserialization/Read.java.i
data/src/share/classes/javax/net/ssl/SSLHandshakeException.java.i
data/src/share/classes/sun/misc/NativeSignalHandler.java.i
+data/src/share/classes/sun/io/CharToByteCp949C.java.i
data/src/share/classes/sun/applet/AppletClassLoader.java.i
data/src/share/classes/javax/accessibility/AccessibleComponent.java.i
data/src/share/classes/sun/tools/java/BinaryClass.java.i
+data/test/javax/management/modelmbean/DescriptorSupportXMLTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java.i
data/test/java/awt/Focus/InputVerifierTest3/InputVerifierTest3.java.i
-data/test/java/lang/StringBuffer/InsertMaxValue.java.i
+data/src/windows/classes/sun/security/mscapi/RSAPrivateKey.java.i
+data/src/share/classes/java/awt/Polygon.java.i
+data/src/share/classes/sun/tools/jar/resources/jar_de.properties.i
+data/test/sun/security/pkcs11/tls/TestPRF.java.i
data/test/java/beans/PropertyEditor/TestDoubleType.java.i
-data/src/share/classes/sun/io/CharToByteCp277.java.i
+data/src/share/classes/sun/io/ByteToCharJIS0208.java.i
+data/make/mkdemo/jvmti/minst/Makefile.i
+data/test/java/io/FileInputStream/FinalizeShdCallClose.java.i
data/src/share/lib/cmm/lcms/CIEXYZ.pf.i
data/src/share/classes/java/lang/ClassValue.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html.i
@@ -9727,45 +9661,49 @@ data/src/share/classes/sun/misc/JavaUtilJarAccess.java.i
data/test/java/util/ResourceBundle/Bug6359330.java.i
data/test/java/lang/Class/getEnclosingClass/build.sh.i
data/src/share/classes/javax/swing/event/TreeModelListener.java.i
-data/test/sun/nio/cs/TestUTF_16.java.i
-data/src/share/classes/com/sun/java/browser/dom/DOMAccessException.java.i
+data/test/java/lang/String/ToLowerCase.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java.i
+data/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java.i
data/src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java.i
-data/src/share/classes/javax/management/MBeanFeatureInfo.java.i
+data/src/share/native/sun/awt/image/jpeg/jpeglib.h.i
+data/test/java/lang/Class/IsAnnotationType.java.i
data/src/share/classes/javax/security/auth/Refreshable.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_MA.java.i
+data/src/share/classes/javax/accessibility/AccessibleResourceBundle.java.i
data/make/tools/CharsetMapping/MacTurkish.map.i
data/test/sun/tools/jstack/Basic.sh.i
data/src/share/classes/java/security/AccessControlException.java.i
+data/test/java/io/Externalizable/definesWriteObject/DefinesWriteObject.java.i
data/test/javax/management/standardmbean/DeadlockTest.java.i
data/test/javax/naming/RefAddr/NullContent.java.i
data/src/solaris/bin/ppc/jvm.cfg.i
-data/src/share/classes/sun/io/CharToByteISO2022CN_GB.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html.i
+data/src/share/demo/nbproject/README.txt.i
data/src/share/classes/org/openjdk/jigsaw/Resolver.java.i
data/test/com/sun/jdi/RepStepTarg.java.i
-data/src/share/native/java/lang/fdlibm/src/w_hypot.c.i
+data/src/windows/native/sun/jkernel/kernel_it.rc.i
data/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java.i
-data/src/share/classes/javax/accessibility/AccessibleStreamable.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties.i
data/src/share/classes/java/awt/font/GraphicAttribute.java.i
data/src/share/classes/java/awt/ColorPaintContext.java.i
data/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/ByteArrayCalls.java.i
+data/test/java/io/File/ListNull.java.i
data/test/sun/net/InetAddress/nameservice/deadlock/Hang.java.i
data/src/share/classes/com/sun/media/sound/ModelPerformer.java.i
data/src/share/classes/javax/management/remote/JMXServerErrorException.java.i
data/test/java/io/charStreams/BufferedReaderMark.java.i
data/src/share/classes/javax/net/ssl/KeyManagerFactorySpi.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageFilters.c.i
-data/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.i
+data/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasResources.java.i
data/src/share/classes/java/awt/geom/QuadCurve2D.java.i
-data/src/share/classes/javax/swing/event/TreeModelEvent.java.i
-data/src/share/classes/sun/util/calendar/ImmutableGregorianDate.java.i
+data/src/windows/native/sun/java2d/d3d/D3DRenderer.h.i
+data/test/java/io/Serializable/oldTests/SimpleArrays.java.i
+data/test/sun/security/pkcs11/ec/pkcs12/secp256r1server-secp384r1ca.p12.i
data/src/share/classes/java/net/SocketTimeoutException.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh.i
data/src/share/classes/sun/security/timestamp/TSRequest.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.java.i
data/src/share/classes/sun/net/www/protocol/http/HttpLogFormatter.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/zadler32.c.i
data/src/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java.i
data/test/com/sun/jmx/snmp/TimeTicksWrapping.java.i
data/src/share/classes/javax/naming/AuthenticationNotSupportedException.java.i
@@ -9774,85 +9712,85 @@ data/make/mksample/jmx/Makefile.i
data/src/share/classes/java/util/zip/DataFormatException.java.i
data/src/share/classes/java/security/AccessController.java.i
data/src/windows/native/java/io/io_util_md.h.i
-data/src/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif.i
+data/test/java/nio/channels/SocketChannel/UnboundSocketTests.java.i
data/test/java/lang/System/IgnoreNullSecurityManager.java.i
+data/test/java/io/Serializable/GetField/Read2.java.i
data/src/share/classes/java/awt/font/TextAttribute.java.i
-data/make/java/java/reflect/Makefile.i
+data/test/com/sun/net/httpserver/Test6.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208.java.i
data/test/java/rmi/testlibrary/RemoteExiter.java.i
data/test/java/lang/annotation/ParameterAnnotations.java.i
-data/src/share/classes/javax/swing/table/package.html.i
-data/src/share/classes/com/sun/servicetag/ServiceTag.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/JavaShort.java.i
data/test/java/net/MulticastSocket/B6425815.java.i
data/test/java/lang/ToString.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java.i
-data/src/share/classes/java/util/concurrent/RejectedExecutionHandler.java.i
+data/src/windows/native/sun/java2d/d3d/D3DBufImgOps.h.i
data/src/share/classes/com/sun/crypto/provider/RC2Crypt.java.i
data/src/share/classes/sun/io/ByteToCharCp850.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java.i
-data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml.i
+data/src/share/classes/sun/text/resources/CollationData_lv.java.i
+data/src/share/classes/org/openjdk/jigsaw/Launcher.java.i
+data/test/java/io/SequenceInputStream/ConstructorNull.java.i
data/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java.i
-data/make/tools/swing-beans/beaninfo/images/JScrollPaneMono32.gif.i
+data/test/java/lang/Long/Decode.java.i
data/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java.i
-data/src/share/classes/java/awt/doc-files/Scrollbar-2.gif.i
-data/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html.i
+data/src/share/classes/sun/text/resources/CollationData_es.java.i
data/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduRequest.java.i
+data/test/java/util/Vector/ComodifiedRemoveAllElements.java.i
data/src/linux/doc/man/tnameserv.1.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java.i
data/test/java/lang/management/CompilationMXBean/Basic.java.i
-data/test/sun/net/www/http/HttpClient/ImplicitFileName.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipPath.java.i
data/src/share/classes/sun/util/EmptyListResourceBundle.java.i
data/src/share/classes/java/lang/doc-files/capiota.gif.i
data/test/sun/util/resources/TimeZone/Bug4640234.java.i
data/test/java/rmi/reliability/juicer/AppleEvent.java.i
-data/src/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java.i
data/src/share/classes/sun/awt/CustomCursor.java.i
data/src/windows/classes/java/util/prefs/WindowsPreferencesFactory.java.i
+data/src/share/classes/sun/security/x509/X509CertImpl.java.i
data/src/windows/native/sun/java2d/d3d/D3DRenderer.cpp.i
data/test/java/util/Currency/CheckDataVersion.java.i
data/test/java/util/concurrent/BlockingQueue/LoopHelpers.java.i
-data/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh.i
+data/src/solaris/classes/sun/awt/X11/java-icon32.png.i
data/src/share/classes/com/sun/beans/decoder/ElementHandler.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html.i
-data/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java.i
data/src/share/classes/javax/crypto/JceSecurityManager.java.i
data/src/solaris/classes/sun/awt/X11/XProtocol.java.i
data/make/tools/src/build/tools/charsetmapping/HKSCS.java.i
data/test/tools/launcher/Settings.java.i
data/src/share/classes/java/lang/doc-files/javalang.doc.anc21.gif.i
-data/src/share/classes/javax/swing/undo/UndoableEdit.java.i
-data/src/share/classes/sun/io/ByteToCharBig5_Solaris.java.i
data/src/share/native/sun/security/ec/mpi-config.h.i
data/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java.i
data/src/share/classes/java/util/JapaneseImperialCalendar.java.i
data/test/java/nio/channels/DatagramChannel/Refused.java.i
data/src/share/classes/javax/swing/plaf/ComboBoxUI.java.i
data/src/share/classes/sun/tools/jar/CommandLine.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethodImpl.java.i
+data/src/share/classes/sun/java2d/pipe/BufferedTextPipe.java.i
+data/test/sun/security/provider/X509Factory/BigCRL.java.i
+data/make/docs/Notes.html.i
data/src/share/native/sun/awt/image/jpeg/jpegint.h.i
data/src/share/classes/javax/net/ssl/SSLSessionContext.java.i
data/test/sun/security/krb5/canonicalize/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
data/test/javax/swing/JColorChooser/Test4887836.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java.i
-data/src/share/classes/sun/tracing/dtrace/JVM.java.i
+data/test/java/io/Serializable/enum/badResolve/Read.java.i
data/test/sun/net/www/protocol/file/Equals.java.i
data/src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java.i
data/src/share/classes/java/util/zip/DeflaterOutputStream.java.i
-data/src/solaris/doc/sun/man/man1/jsadebugd.1.i
+data/src/share/classes/java/sql/PreparedStatement.java.i
data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java.i
+data/src/share/classes/sun/util/resources/CalendarData_cs.properties.i
data/src/share/classes/java/dyn/InvokeDynamicBootstrapError.java.i
+data/src/share/classes/com/sun/media/sound/DLSRegion.java.i
data/make/tools/swing-beans/beaninfo/images/JListMono32.gif.i
data/src/share/classes/sun/util/resources/CurrencyNames_sq_AL.properties.i
data/test/java/io/Serializable/badSerialVersionUID/BadSerialVersionUID.java.i
data/test/java/io/File/NullArgs.java.i
data/test/sun/security/smartcardio/TestConnectAgain.java.i
data/src/share/classes/javax/xml/crypto/dsig/SignatureMethod.java.i
-data/test/java/util/ResourceBundle/Test4314141A___EURO.properties.i
-data/test/java/net/HttpURLConnection/getResponseCode.java.i
+data/src/share/classes/sun/security/ssl/ByteBufferInputStream.java.i
data/src/windows/native/sun/windows/MouseInfo.cpp.i
-data/test/java/lang/instrument/ManifestTestAgent.java.i
+data/make/sun/util/Makefile.i
data/test/javax/security/auth/login/Configuration/GetInstance.config.i
data/src/share/classes/sun/security/provider/SecureRandom.java.i
data/test/java/lang/instrument/RemoveAbsentTransformerTest.java.i
@@ -9860,31 +9798,28 @@ data/src/share/classes/javax/management/QueryExp.java.i
data/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java.i
data/make/tools/CharsetMapping/extsbcs.i
-data/src/share/lib/security/java.security-solaris.i
+data/test/sun/tools/jhat/jmap.bin.i
data/src/share/classes/sun/tools/tree/BitXorExpression.java.i
data/src/solaris/javavm/export/jawt_md.h.i
-data/src/solaris/bin/java-rmi.cgi.sh.i
+data/src/share/demo/jvmti/hprof/hprof_cpu.c.i
data/test/sun/net/www/protocol/file/EncodedMultiByteChar.java.i
-data/src/share/native/sun/font/layout/SubtableProcessor.cpp.i
data/src/share/classes/sun/net/httpserver/FixedLengthInputStream.java.i
-data/test/java/awt/Modal/NpeOnClose/NpeOnCloseTest.java.i
-data/make/sun/org/Makefile.i
+data/src/share/classes/sun/tools/tree/PreDecExpression.java.i
data/src/share/classes/javax/naming/NameParser.java.i
data/make/sun/javazic/tzdata/leapseconds.i
-data/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java.i
data/src/share/classes/java/nio/file/attribute/BasicFileAttributeView.java.i
data/src/share/classes/java/awt/peer/ContainerPeer.java.i
data/test/java/lang/instrument/Different_ExampleRedefine.java.i
data/src/share/native/sun/security/ec/impl/ecp_jm.c.i
-data/src/share/classes/javax/imageio/metadata/package.html.i
+data/make/tools/reorder/tools/mcount.c.i
data/src/share/classes/sun/text/resources/CollationData_ro.java.i
data/src/windows/native/sun/windows/UnicowsLoader.cpp.i
data/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c.i
data/src/share/classes/sun/java2d/pipe/AlphaPaintPipe.java.i
data/test/javax/management/ObjectName/RepositoryWildcardTest.java.i
-data/src/share/classes/com/sun/jdi/request/BreakpointRequest.java.i
+data/src/share/classes/sun/security/pkcs11/TemplateManager.java.i
data/src/windows/native/sun/windows/awt_DCHolder.cpp.i
-data/make/modules/jdk.swing.ls.i
+data/src/share/classes/javax/swing/plaf/DimensionUIResource.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java.i
data/test/sun/net/ftp/FtpGetContent.java.i
data/src/share/back/ObjectReferenceImpl.c.i
@@ -9894,13 +9829,15 @@ data/src/solaris/demo/jigsaw/basic/src/org/hello/Main.java.i
data/src/share/classes/sun/util/resources/CalendarData_sr.properties.i
data/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties.i
data/src/share/classes/sun/text/resources/CollationData_et.java.i
-data/src/share/classes/java/io/StringBufferInputStream.java.i
+data/make/netbeans/world/nbproject/project.xml.i
+data/test/java/util/ResourceBundle/Control/LoadingStrategiesTest.java.i
data/src/share/classes/java/security/MessageDigest.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h.i
data/test/sun/nio/cs/TestJIS0208Decoder.java.i
data/src/share/classes/com/sun/security/sasl/CramMD5Client.java.i
-data/test/javax/print/applet/applet0/Applet0.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java.i
data/make/tools/src/build/tools/jdwpgen/StringTypeNode.java.i
+data/src/share/classes/sun/java2d/SurfaceData.java.i
data/src/share/classes/javax/naming/Binding.java.i
data/src/share/classes/sun/io/ByteToCharCp833.java.i
data/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java.i
@@ -9909,52 +9846,52 @@ data/src/share/classes/javax/print/attribute/standard/JobMediaSheets.java.i
data/src/share/classes/javax/crypto/NullCipherSpi.java.i
data/src/share/classes/sun/io/CharToByteCp1257.java.i
data/src/solaris/classes/sun/print/AttributeClass.java.i
+data/test/java/rmi/activation/Activatable/nestedActivate/security.policy.i
data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java.i
data/src/share/classes/sun/io/CharToByteCp875.java.i
data/src/solaris/demo/jni/Poller/LinkedQueue.java.i
data/test/javax/management/remote/mandatory/connectorServer/CloseConnectionTest.java.i
+data/src/share/classes/sun/tools/tree/ReturnStatement.java.i
data/src/share/classes/com/sun/jndi/ldap/EventSupport.java.i
data/test/java/beans/PropertyChangeSupport/Test4092905.java.i
data/src/share/classes/com/sun/jdi/InvalidLineNumberException.java.i
-data/src/solaris/back/linker_md.c.i
+data/test/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java.i
data/src/share/classes/sun/net/ftp/FtpClient.java.i
data/test/java/util/ResourceBundle/KeySetTest.java.i
-data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java.i
+data/src/share/demo/jvmti/hprof/hprof_string.c.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java.i
-data/src/share/native/sun/awt/image/jpeg/jcapistd.c.i
-data/make/tools/src/build/tools/generatecharacter/CharacterName.java.i
-data/src/share/lib/images/cursors/motif_CopyDrop32x32.gif.i
+data/test/tools/launcher/Makefile.SolarisRunpath.i
+data/src/share/classes/sun/management/LazyCompositeData.java.i
+data/make/tools/swing-beans/beaninfo/images/JListColor16.gif.i
data/src/share/hpi/export/hpi.h.i
-data/src/share/classes/javax/management/event/EventConsumer.java.i
+data/src/share/classes/java/awt/event/FocusEvent.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/altroot/Node.java.i
-data/src/share/classes/sun/java2d/Spans.java.i
+data/test/sun/misc/EscapePath.java.i
data/test/sun/security/util/Oid/SerialTest.java.i
data/make/tools/src/build/tools/javazic/DayOfWeek.java.i
data/test/sun/security/krb5/auto/BasicKrb5Test.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java.i
data/src/share/classes/javax/crypto/CipherOutputStream.java.i
-data/test/java/lang/ProcessBuilder/Basic.java.i
+data/test/javax/swing/JFileChooser/6342301/bug6342301.java.i
data/src/share/classes/java/util/RegularEnumSet.java.i
data/src/solaris/native/sun/awt/awt_MenuItem.c.i
data/src/share/classes/sun/dyn/anon/ConstantPoolPatch.java.i
-data/src/share/classes/sun/tools/tree/BinaryExpression.java.i
data/test/java/io/Serializable/superclassDataLoss/Test.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/PermissionImpl.java.i
data/test/java/util/Locale/data/deflocale.c.i
data/src/share/classes/sun/rmi/transport/ObjectEndpoint.java.i
data/src/solaris/classes/sun/awt/X11/genhash.awk.i
-data/src/share/classes/sun/awt/geom/Order0.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageRowTable.h.i
data/src/linux/doc/man/ja/jstat.1.i
data/src/share/demo/jvmti/hprof/hprof_reference.c.i
+data/test/java/io/File/WinMaxPath.java.i
data/src/share/classes/javax/sql/rowset/Predicate.java.i
data/src/share/classes/java/nio/channels/WritableByteChannel.java.i
-data/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java.i
-data/src/share/classes/sun/net/www/protocol/http/Handler.java.i
+data/src/share/classes/sun/nio/cs/FastCharsetProvider.java.i
data/make/tools/swing-beans/beaninfo/images/JWindowMono32.gif.i
data/test/sun/security/pkcs11/fips/key3.db.i
-data/test/tools/launcher/ChangeDataModel.sh.i
-data/test/java/util/PluggableLocale/providersrc/java.util.spi.LocaleNameProvider.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java.i
data/src/share/classes/java/awt/AWTPermission.java.i
+data/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties.i
data/src/share/classes/com/sun/tools/example/debug/bdi/OutputListener.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh.i
@@ -9963,24 +9900,25 @@ data/test/java/net/Socket/OldImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java.i
data/test/java/dyn/JavaDocExamplesTest.java.i
+data/test/sun/net/www/protocol/http/B6518816.java.i
data/src/share/classes/javax/swing/JDesktopPane.java.i
data/src/share/classes/javax/management/monitor/CounterMonitorMBean.java.i
data/src/share/native/sun/security/ec/impl/ecl-priv.h.i
data/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java.i
-data/test/com/sun/tools/extcheck/TestExtcheckArgs.java.i
-data/src/share/classes/javax/swing/text/rtf/RTFAttribute.java.i
+data/test/java/rmi/Naming/LookupNameWithColon.java.i
data/src/share/classes/java/nio/file/InvalidPathException.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c.i
-data/src/share/classes/sun/tools/tree/CheckContext.java.i
data/src/share/classes/sun/security/ssl/EphemeralKeyManager.java.i
data/src/solaris/classes/sun/awt/motif/MWindowAttributes.java.i
-data/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency_Stub.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/ProxyArrayCalls.java.i
+data/test/sun/security/tools/policytool/UsePolicy.html.i
data/make/mksample/webservices/EbayClient/Makefile.i
data/src/share/classes/javax/swing/plaf/nimbus/skin.laf.i
data/test/java/net/URLClassLoader/jars/class_path_test_classpath.jar.i
-data/src/share/native/sun/security/ec/impl/secitem.c.i
+data/src/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java.i
data/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java.i
data/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java.i
+data/src/share/demo/jfc/Metalworks/resources/HelpFiles/javalogo.gif.i
data/src/windows/classes/sun/awt/windows/WPageDialogPeer.java.i
data/src/share/classes/sun/font/StandardTextSource.java.i
data/src/share/classes/com/sun/beans/decoder/ByteElementHandler.java.i
@@ -9988,13 +9926,14 @@ data/test/sun/net/www/protocol/http/CloseOptionHeader.java.i
data/src/share/classes/javax/management/timer/TimerMBean.java.i
data/src/share/classes/sun/swing/UIAction.java.i
data/src/share/classes/java/util/Scanner.java.i
-data/src/share/classes/java/awt/Scrollbar.java.i
+data/src/share/classes/java/awt/image/DataBufferShort.java.i
data/src/share/native/sun/java2d/ShaderList.c.i
data/src/share/classes/javax/swing/JRadioButton.java.i
data/test/javax/swing/JFileChooser/6738668/bug6738668.java.i
data/src/share/classes/javax/swing/text/rtf/charsets/mac.txt.i
-data/test/java/rmi/server/RMIClassLoader/spi/Property.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/CustomUIDefault.java.i
+data/test/java/net/InetSocketAddress/ToString.java.i
+data/src/share/classes/javax/swing/tree/TreeSelectionModel.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/I18NImpl.java.i
data/src/share/classes/sun/io/CharToByteCp1112.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/DayTimeServerImpl.java.i
data/src/solaris/classes/sun/awt/X11/XLabelPeer.java.i
@@ -10002,42 +9941,43 @@ data/src/share/native/sun/security/pkcs11/wrapper/p11_general.c.i
data/test/com/sun/jdi/sde/SourceDebugExtensionTest.java.i
data/src/share/classes/sun/security/util/AuthResources_sv.java.i
data/src/share/classes/javax/swing/DefaultRowSorter.java.i
-data/src/share/classes/sun/util/resources/LocaleNames.properties.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowRefs.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy.i
data/test/java/nio/file/Path/CopyAndMove.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif.i
+data/test/sun/security/krb5/IPv6.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/package.html.i
data/src/share/classes/javax/swing/SizeSequence.java.i
-data/src/share/classes/sun/jvmstat/monitor/event/package.html.i
+data/test/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf.i
data/src/share/classes/java/awt/doc-files/Modality.html.i
-data/test/java/io/Serializable/wrongReturnTypes/Write.java.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/services/com.message.spi.MessageService.i
data/src/share/classes/java/dyn/NoAccessException.java.i
data/src/share/classes/sun/io/ByteToCharEUC_JP.java.i
data/src/share/classes/javax/crypto/SecretKeyFactory.java.i
data/src/share/classes/sun/util/resources/LocaleNames_mt.properties.i
data/src/share/classes/sun/nio/cs/ext/IBM942C.java.i
-data/src/share/classes/javax/swing/tree/TreeNode.java.i
+data/test/com/sun/crypto/provider/Mac/MacKAT.java.i
data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_2.java.i
-data/src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java.i
data/test/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java.i
data/src/windows/classes/sun/awt/windows/WDropTargetContextPeer.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java.i
data/test/sun/security/provider/PolicyParser/ExtDirsB.java.i
data/src/windows/native/sun/windows/awt_KeyboardFocusManager.h.i
-data/src/share/classes/com/sun/jdi/event/package.html.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties.i
data/src/solaris/doc/sun/man/man1/rmid.1.i
data/src/share/demo/jfc/Font2DTest/Font2DTestApplet.java.i
-data/src/share/classes/javax/security/auth/callback/ConfirmationCallback.java.i
+data/test/sun/net/www/http/HttpClient/ImplicitFileName.java.i
data/src/share/classes/java/util/IllegalFormatCodePointException.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/Util.java.i
data/src/share/classes/com/sun/media/sound/DirectAudioDevice.java.i
-data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor16.gif.i
+data/src/share/classes/java/awt/event/ActionListener.java.i
data/src/share/classes/javax/swing/text/BadLocationException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java.i
data/src/share/native/java/io/io_util.h.i
+data/src/share/classes/javax/management/Description.java.i
data/test/java/io/RandomAccessFile/EOF.java.i
-data/src/solaris/native/sun/awt/swing_GTKStyle.c.i
-data/src/share/classes/sun/tools/tree/ConditionVars.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageClipping.h.i
+data/make/javax/rmi/ssl/Makefile.i
+data/src/windows/classes/sun/java2d/d3d/D3DRenderQueue.java.i
data/src/share/classes/sun/security/x509/URIName.java.i
data/src/share/sample/jmx/jmx-scandir/docfiles/remote-connection.jpg.i
data/src/share/classes/java/beans/IndexedPropertyChangeEvent.java.i
@@ -10047,15 +9987,18 @@ data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineD
data/test/java/util/ResourceBundle/Control/DefaultControlTest.java.i
data/test/java/beans/XMLEncoder/javax_swing_JLayeredPane.java.i
data/test/java/lang/StringBuilder/Supplementary.java.i
+data/src/share/classes/sun/io/ByteToCharCp865.java.i
data/test/java/nio/file/Files/grantAll.policy.i
data/src/windows/hpi/src/threads_md.c.i
data/test/com/sun/jdi/redefine/RedefineTest.java.i
data/src/share/classes/java/awt/im/package.html.i
+data/src/windows/native/sun/windows/awt_Color.h.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll.i
-data/src/share/classes/java/util/ServiceLoader.java.i
+data/src/share/classes/sun/tools/serialver/serialver.properties.i
+data/src/share/classes/javax/swing/DelegatingDefaultFocusManager.java.i
data/src/share/classes/sun/io/CharToByteCp868.java.i
data/src/share/classes/sun/io/ByteToCharBig5.java.i
-data/src/share/classes/sun/security/provider/certpath/X509CertPath.java.i
+data/src/share/demo/jfc/Metalworks/GreenMetalTheme.java.i
data/src/solaris/classes/sun/java2d/x11/X11PMBlitLoops.java.i
data/src/share/classes/com/sun/jdi/StackFrame.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java.i
@@ -10067,113 +10010,111 @@ data/test/javax/management/monitor/CounterMonitorInitThresholdTest.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_fr_FR.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java.i
data/test/tools/pack200/pack200-verifier/src/xmlkit/TokenList.java.i
+data/test/sun/security/x509/X500Name/NullX500Name.java.i
data/test/javax/swing/JMenuItem/7036148/bug7036148.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c.i
-data/test/java/rmi/activation/Activatable/restartService/security.policy.i
+data/test/java/lang/annotation/Missing/A.java.i
data/test/java/net/Socket/SetSoLinger.java.i
-data/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java.i
data/make/tools/classanalyzer/classanalyzer.html.i
data/src/share/native/sun/font/layout/LEFontInstance.cpp.i
-data/src/share/native/sun/security/ec/ecl.h.i
data/test/sun/rmi/rmic/newrmic/equivalence/ComputeServerImpl.java.i
data/src/share/classes/javax/swing/text/html/FrameSetView.java.i
-data/src/share/classes/javax/crypto/spec/PBEKeySpec.java.i
+data/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java.i
data/src/share/classes/javax/management/ObjectInstance.java.i
data/src/share/classes/java/awt/ScrollPaneAdjustable.java.i
-data/src/share/classes/javax/swing/border/AbstractBorder.java.i
+data/test/java/util/Locale/PrintDefaultLocale.java.i
+data/src/share/demo/jfc/SampleTree/resources/images/expanded.gif.i
data/src/share/classes/sun/nio/cs/ext/MacRoman.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so.i
-data/src/share/sample/scripting/scriptpad/README.txt.i
+data/src/share/sample/scripting/scriptpad/src/META-INF/manifest.mf.i
+data/src/solaris/classes/sun/nio/ch/FileKey.java.i
data/src/share/classes/javax/management/ObjectNameTemplate.java.i
data/src/share/classes/javax/swing/text/PlainView.java.i
data/src/share/sample/jmx/jmx-scandir/index.html.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/GroupImpl.java.i
data/test/java/nio/charset/coders/Check.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java.i
+data/src/windows/classes/sun/awt/windows/WMenuBarPeer.java.i
data/src/share/classes/sun/awt/AppContext.java.i
data/test/java/beans/XMLDecoder/spec/TestLong.java.i
-data/src/solaris/doc/sun/man/man1/rmiregistry.1.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java.i
+data/test/javax/security/auth/Subject/Synch2.policy.i
+data/src/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java.i
+data/src/share/classes/javax/management/relation/RoleStatus.java.i
data/test/javax/management/MBeanServer/OldMBeanServerTest.java.i
data/src/windows/native/sun/windows/Hashtable.h.i
data/src/share/classes/java/rmi/activation/Activatable.java.i
data/src/share/classes/javax/swing/RepaintManager.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java.i
data/src/share/classes/com/sun/crypto/provider/BlowfishCrypt.java.i
data/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java.i
-data/test/java/util/jar/JarEntry/test.jar.i
+data/src/share/classes/java/awt/doc-files/RadialGradientPaint-3.png.i
data/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c.i
data/src/share/native/java/lang/Object.c.i
-data/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java.i
-data/src/windows/classes/sun/awt/windows/WTrayIconPeer.java.i
+data/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp.i
data/make/sun/security/jgss/wrapper/FILES_c.gmk.i
-data/src/share/classes/sun/tools/asm/StringExpressionConstantData.java.i
+data/src/share/classes/com/sun/jdi/Mirror.java.i
data/test/java/util/Locale/serialized/java6locale_no_NO_NY.i
-data/src/share/classes/javax/management/BetweenQueryExp.java.i
-data/src/share/classes/java/awt/geom/Arc2D.java.i
-data/src/share/classes/org/openjdk/jigsaw/PathLinker.java.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java.i
-data/test/java/util/Locale/PrintDefaultLocale.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java.i
data/src/solaris/transport/socket/socket_md.c.i
data/src/share/classes/javax/swing/MenuElement.java.i
data/src/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java.i
data/src/share/classes/sun/io/CharToByteCp922.java.i
data/test/java/lang/instrument/ManifestTestApp.java.i
-data/test/java/beans/XMLDecoder/spec/TestNull.java.i
+data/src/solaris/hpi/native_threads/include/condvar_md.h.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ExportObjs.java.i
-data/test/java/util/jar/JarFile/SorryClosed.java.i
-data/src/share/classes/sun/security/action/GetBooleanAction.java.i
-data/test/com/sun/tools/extcheck/TestExtcheckArgs.sh.i
-data/test/java/util/ResourceBundle/Control/Bug6530694.java.i
+data/src/solaris/classes/sun/awt/X11GraphicsConfig.java.i
+data/src/share/classes/java/awt/dnd/DropTargetDragEvent.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedMap.java.i
+data/src/windows/classes/sun/net/NetHooks.java.i
+data/test/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java.i
data/make/tools/swing-beans/beaninfo/images/JDialogColor32.gif.i
data/test/java/lang/StrictMath/Tests.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java.i
-data/src/share/classes/javax/sound/midi/Patch.java.i
-data/src/share/classes/sun/text/resources/FormatData_ja_JP_JP.java.i
+data/src/share/classes/javax/management/event/FetchingEventForwarder.java.i
+data/src/share/classes/sun/rmi/transport/Transport.java.i
data/src/share/classes/java/sql/SQLOutput.java.i
-data/src/windows/classes/sun/awt/windows/fontconfig.98.properties.i
+data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java.i
data/src/solaris/native/sun/awt/awt_TopLevel.h.i
-data/src/share/classes/java/lang/VerifyError.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmssm.c.i
-data/test/sun/rmi/runtime/Log/6409194/logging.properties.i
+data/src/share/classes/javax/management/MXBean.java.i
data/src/share/classes/javax/net/ssl/SSLPermission.java.i
data/src/share/classes/sun/swing/MenuItemCheckIconFactory.java.i
data/test/java/lang/instrument/FakeTestDriver.java.i
data/src/solaris/classes/sun/awt/X11/XErrorHandler.java.i
-data/test/lib/security/java.policy/Ext_AllPolicy.java.i
-data/test/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java.i
data/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent1001.java.i
data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_3.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c.i
data/test/com/sun/jdi/StringConvertTest.sh.i
-data/test/sun/security/x509/AlgorithmId/TurkishRegion.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM861.java.i
+data/src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES.i
data/src/share/classes/sun/io/ByteToCharMacIceland.java.i
+data/src/share/sample/scripting/scriptpad/src/scripts/memory.js.i
data/src/windows/native/sun/windows/awt_MenuItem.h.i
data/test/com/sun/jdi/RedefineException.sh.i
data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.8.properties.i
-data/src/share/classes/java/lang/invoke/MethodHandleProxies.java.i
-data/test/sun/net/www/httptest/AbstractCallback.java.i
-data/src/share/classes/sun/java2d/pipe/Region.java.i
+data/test/java/util/Locale/bug4122700.java.i
+data/make/tools/swing-beans/beaninfo/images/JFileChooserColor16.gif.i
+data/make/tools/swing-beans/beaninfo/SwingBeanInfoBase.java.i
data/src/share/classes/java/awt/peer/CheckboxMenuItemPeer.java.i
data/test/java/lang/String/ICCBasher.java.i
data/src/share/native/sun/awt/image/cvutils/img_dirdither.h.i
-data/test/sun/security/provider/PolicyParser/ExtDirsA.java.i
-data/test/java/beans/PropertyEditor/TestByteType.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthConstants.java.i
+data/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java.i
+data/src/share/classes/java/awt/event/WindowStateListener.java.i
+data/src/share/classes/java/math/BigDecimal.java.i
data/src/share/classes/java/security/ProviderException.java.i
data/src/share/classes/java/nio/file/attribute/AclEntry.java.i
-data/src/windows/bin/amd64/jvm.cfg.i
+data/test/java/io/Serializable/wrongReturnTypes/Write.java.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/kidpr.ttf.i
data/src/share/classes/sun/security/x509/Extension.java.i
-data/test/java/util/BitSet/StickySize.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c.i
+data/src/share/classes/sun/tools/tree/Statement.java.i
data/src/solaris/classes/sun/awt/X11/XDialogPeer.java.i
-data/src/share/classes/com/sun/jdi/InvalidTypeException.java.i
+data/src/share/classes/sun/util/locale/LocaleObjectCache.java.i
data/src/share/native/sun/java2d/pipe/SpanClipRenderer.c.i
data/test/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions_Disable.java.i
data/test/java/awt/dnd/URIListBetweenJVMsTest/FileListTransferable.java.i
@@ -10183,58 +10124,52 @@ data/src/share/classes/sun/awt/OSInfo.java.i
data/make/com/oracle/Makefile.i
data/test/sun/text/resources/Format/Bug4395196.java.i
data/src/solaris/native/sun/nio/fs/UnixCopyFile.c.i
-data/test/sun/tools/jstat/gcOldCapacityOutput1.awk.i
+data/src/solaris/classes/sun/nio/fs/SolarisFileStore.java.i
data/src/share/classes/sun/tools/jstatd/RemoteVmImpl.java.i
data/src/share/classes/sun/io/CharToByteJohab.java.i
-data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password-alt.i
+data/test/sun/security/krb5/auto/Context.java.i
data/src/share/classes/javax/imageio/IIOParam.java.i
data/src/share/classes/sun/audio/ContinuousAudioDataStream.java.i
data/src/windows/native/sun/java2d/d3d/D3DGlyphCache.cpp.i
data/src/share/classes/sun/security/krb5/EncryptedData.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java.i
data/src/share/classes/java/awt/event/ComponentAdapter.java.i
-data/src/share/classes/java/awt/doc-files/RadialGradientPaint-2.png.i
+data/make/tools/README.txt.i
data/src/share/classes/com/sun/jdi/BooleanType.java.i
data/src/solaris/classes/sun/awt/X11/XComponentPeer.java.i
-data/src/share/classes/javax/swing/text/Keymap.java.i
data/src/share/classes/sun/util/resources/CalendarData_en_GB.properties.i
data/src/solaris/classes/sun/awt/X11/java-icon16.png.i
data/src/share/classes/java/sql/SQLInput.java.i
-data/test/java/security/KeyStore/KeyStoreBuilder.java.i
-data/test/java/nio/file/attribute/PosixFileAttributeView/Basic.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_pt.properties.i
+data/src/share/classes/sun/text/resources/CollationData_bg.java.i
data/src/share/classes/com/sun/jmx/snmp/mpm/package.html.i
data/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.java.i
data/test/java/lang/StringBuffer/GetCharsOverLength.java.i
+data/src/share/classes/sun/text/resources/CollationData_pl.java.i
data/test/sun/tools/native2ascii/Native2AsciiTests.sh.i
-data/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java.i
+data/test/sun/net/www/protocol/http/WebGet.java.i
data/src/solaris/classes/sun/awt/X11/java-icon24.png.i
-data/src/share/classes/com/sun/tools/attach/VirtualMachine.java.i
-data/src/windows/native/sun/windows/awt_DrawingSurface.cpp.i
-data/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java.i
data/src/share/classes/javax/swing/text/rtf/MockAttributeSet.java.i
data/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java.i
data/test/com/sun/jmx/snmp/SnmpOidHashCode.java.i
-data/src/share/classes/javax/swing/KeyStroke.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM500.java.i
+data/src/windows/native/java/io/FileSystem_md.c.i
data/test/com/sun/net/httpserver/bugs/B6886436.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c.i
data/test/javax/management/generified/GenericTest.java.i
data/test/tools/jar/UpdateManifest.java.i
-data/test/java/lang/management/MemoryMXBean/LowMemoryTestConcMarkSweepGC.sh.i
-data/make/tools/CharsetMapping/IBM1144.map.i
+data/src/share/classes/com/sun/media/sound/FastSysexMessage.java.i
+data/make/sun/cmm/lcms/mapfile-vers.i
data/src/share/classes/com/sun/jmx/snmp/SnmpCounter.java.i
-data/src/share/classes/com/sun/media/sound/ReferenceCountingDevice.java.i
data/make/java/hpi/native/reorder-sparc.i
data/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c.i
data/src/share/classes/sun/audio/AudioPlayer.java.i
-data/make/sun/management/jmxremote/Makefile.i
+data/test/sun/security/tools/jarsigner/JarSigningNonAscii.java.i
data/test/java/net/URLClassLoader/B7050028.java.i
-data/test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java.i
-data/make/tools/CharsetMapping/IBM273.c2b.i
-data/test/javax/swing/JFileChooser/4252173/bug4252173.java.i
+data/src/share/classes/javax/crypto/CryptoPermissions.java.i
+data/src/windows/classes/java/net/PlainSocketImpl.java.i
data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2jane.cer.i
-data/src/share/classes/java/math/package-info.java.i
-data/make/java/main/java/mapfile-amd64.i
+data/test/java/awt/Mixing/MixingOnShrinkingHWButton.java.i
+data/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy.i
data/test/java/io/PipedInputStream/FasterWriter.java.i
data/src/share/classes/javax/print/attribute/HashAttributeSet.java.i
data/src/share/classes/sun/security/x509/CertificatePoliciesExtension.java.i
@@ -10242,95 +10177,96 @@ data/make/tools/src/build/tools/dtdbuilder/DTDBuilder.java.i
data/src/windows/native/sun/java2d/windows/DDBlitLoops.cpp.i
data/test/java/rmi/activation/Activatable/shutdownGracefully/RegisteringActivatable.java.i
data/src/share/classes/java/awt/GradientPaintContext.java.i
-data/src/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java.i
+data/test/java/beans/Introspector/Test4984912.java.i
data/src/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java.i
data/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog_Stub.java.i
data/src/share/classes/java/lang/Runtime.java.i
data/src/solaris/doc/sun/man/man1/ja/extcheck.1.i
-data/src/solaris/classes/sun/print/UnixPrintJob.java.i
+data/src/windows/native/sun/jkernel/DownloadDialog.cpp.i
data/src/share/classes/sun/tools/java/ClassDeclaration.java.i
-data/test/java/util/Locale/LocaleEnhanceTest.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java.i
+data/src/share/native/sun/java2d/loops/ByteBinary1Bit.h.i
+data/src/share/classes/java/lang/annotation/package-info.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/Token.java.i
+data/test/javax/management/notification/SupportClearTest.java.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java.i
data/make/sun/cmm/kcms/FILES_c_windows.gmk.i
data/src/share/javavm/export/jni.h.i
data/src/share/classes/java/net/HttpURLConnection.java.i
data/src/solaris/native/sun/java2d/x11/X11SurfaceData.c.i
data/test/java/util/TimSort/Sorter.java.i
-data/test/com/sun/jdi/sde/TemperatureTable.jsp.i
data/src/share/classes/sun/rmi/rmic/newrmic/Resources.java.i
data/src/share/classes/javax/swing/JButton.java.i
-data/test/javax/management/mxbean/OperationImpactTest.java.i
-data/src/share/native/sun/font/sunFont.c.i
-data/src/share/classes/sun/security/ssl/EngineWriter.java.i
-data/test/javax/management/namespace/ExportNamespaceTest.java.i
-data/src/share/demo/jfc/SampleTree/SampleTree.java.i
+data/src/share/classes/javax/swing/plaf/SeparatorUI.java.i
+data/make/java/main/java/Makefile.i
+data/src/share/classes/sun/security/ssl/EngineWriter.java.i
+data/test/com/sun/net/httpserver/bugs/B6431193.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/RGBColorConvertTest.java.i
data/test/java/net/PlainSocketImpl/BigBacklog.java.i
data/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java.i
data/src/share/classes/sun/security/krb5/internal/KDCOptions.java.i
data/src/share/native/sun/awt/debug/debug_util.c.i
data/test/java/beans/PropertyEditor/TestStringClassJava.java.i
data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java.i
-data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java.i
-data/test/java/io/PushbackInputStream/Available.java.i
+data/src/share/classes/com/sun/beans/finder/ConstructorFinder.java.i
+data/src/share/sample/nio/server/Reply.java.i
+data/src/share/classes/sun/io/ByteToCharHKSCS_2001.java.i
data/test/javax/swing/JInternalFrame/Test6505027.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_zh_SG.java.i
data/src/solaris/classes/sun/nio/ch/DatagramDispatcher.java.i
data/test/javax/management/standardmbean/RegistrationTest.java.i
data/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.c.i
-data/test/com/sun/security/sasl/digest/pw.properties.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_TW.properties.i
data/src/share/classes/javax/swing/Action.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain2.txt.i
-data/src/share/classes/sun/tools/java/Identifier.java.i
+data/test/java/security/UnresolvedPermission/DebugPermissionBad.java.i
+data/test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java.i
data/test/sun/nio/cs/MalformedSurrogates.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java.i
+data/test/java/util/jar/Attributes/PutAndPutAll.java.i
data/src/share/classes/sun/net/www/protocol/mailto/Handler.java.i
-data/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_in.properties.i
-data/src/share/classes/javax/naming/NameAlreadyBoundException.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java.i
+data/test/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy.i
+data/src/share/classes/java/lang/Readable.java.i
+data/src/share/classes/java/awt/CompositeContext.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java.i
-data/src/share/native/sun/font/layout/GXLayoutEngine.cpp.i
+data/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java.i
data/test/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.html.i
data/src/share/classes/javax/swing/text/html/HTMLEditorKit.java.i
-data/src/share/classes/java/net/SocketPermission.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif.i
data/src/share/classes/javax/sound/midi/MidiEvent.java.i
-data/src/share/classes/sun/io/CharToByteMacTurkish.java.i
+data/src/share/classes/javax/management/JMException.java.i
data/src/share/classes/java/beans/beancontext/BeanContextMembershipListener.java.i
+data/make/tools/CharsetMapping/MacArabic.map.i
data/src/share/native/java/util/zip/zlib-1.1.3/infutil.c.i
+data/src/windows/native/common/locale_str.h.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_it.properties.i
data/src/share/classes/sun/security/provider/X509Factory.java.i
-data/src/share/classes/sun/security/util/DerOutputStream.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_fr.java.i
+data/src/share/classes/sun/rmi/transport/TransportConstants.java.i
data/src/share/native/sun/font/layout/HebrewShaping.cpp.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java.i
data/test/com/sun/crypto/provider/TLS/TestPRF.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java.i
-data/src/share/native/sun/misc/VMSupport.c.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties.i
data/src/share/classes/javax/security/auth/x500/X500PrivateCredential.java.i
data/test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java.i
-data/src/share/classes/com/sun/naming/internal/NamedWeakReference.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy21.i
+data/src/share/classes/sun/security/tools/PathList.java.i
data/test/java/awt/dnd/FileListBetweenJVMsTest/TargetFileListFrame.java.i
-data/test/sun/security/pkcs11/SecureRandom/Basic.java.i
+data/src/share/classes/com/sun/media/sound/SoftPointResampler.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/log4j.properties.i
-data/test/sun/security/tools/policytool/SaveAs.sh.i
-data/make/tools/CharsetMapping/IBM1123.map.i
+data/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java.i
+data/test/java/nio/channels/SocketChannel/Bind.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java.i
data/test/javax/management/openmbean/GenericMBeanExceptionTest.java.i
-data/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpEngineParameters.java.i
data/src/share/classes/sun/jvmstat/monitor/package.html.i
data/src/share/classes/sun/font/Font2D.java.i
data/src/share/classes/java/beans/Beans.java.i
-data/test/javax/management/notification/SupportClearTest.java.i
+data/src/share/classes/sun/reflect/ConstructorAccessor.java.i
+data/test/java/rmi/registry/interfaceHash/ReferenceRegistryStub.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java.i
data/src/share/classes/sun/management/snmp/util/package.html.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java.i
data/test/java/util/IdentityHashMap/ToString.java.i
-data/test/javax/swing/text/Utilities/bug7045593.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java.i
data/test/java/awt/print/Dialog/PaperSizeError.java.i
data/src/linux/doc/man/javadoc.1.i
@@ -10342,83 +10278,79 @@ data/src/share/classes/javax/imageio/metadata/IIOMetadataController.java.i
data/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java.i
data/src/share/classes/sun/jvmstat/monitor/event/VmEvent.java.i
data/test/java/lang/Class/forName/classes/left-square.class.i
-data/src/share/classes/com/sun/jdi/event/ExceptionEvent.java.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Commands.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericObjectServer.java.i
-data/src/share/classes/sun/text/resources/FormatData_el.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BlendingMode.java.i
data/make/java/java_hprof_demo/Makefile.i
-data/test/java/io/Serializable/wrongReturnTypes/Read.java.i
+data/src/windows/native/sun/font/lcdglyph.c.i
data/make/tools/freetypecheck/Makefile.i
data/src/share/sample/jmx/jmx-scandir/nbproject/file-targets.xml.i
data/test/java/nio/file/Path/CheckPermissions.java.i
-data/make/tools/CharsetMapping/IBM284.c2b.i
+data/src/share/classes/javax/swing/ComponentInputMap.java.i
data/test/java/rmi/testlibrary/JavaVM.java.i
data/test/sun/management/jmxremote/bootstrap/management_test06_ok.properties.in.i
data/src/share/classes/javax/naming/event/NamingListener.java.i
-data/src/share/classes/javax/security/auth/login/LoginException.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM278.java.i
+data/src/share/classes/java/sql/Statement.java.i
+data/src/share/classes/javax/swing/text/PlainDocument.java.i
+data/test/java/awt/FileDialog/MultipleMode/MultipleMode.java.i
data/src/share/classes/sun/io/CharToByteJIS0212_Solaris.java.i
-data/src/share/classes/com/sun/jmx/snmp/tasks/Task.java.i
+data/src/share/classes/sun/nio/cs/UTF_16BE.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/PainterBorder.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_PY.properties.i
+data/test/java/nio/channels/Selector/CloseThenRegister.java.i
data/test/java/io/BufferedInputStream/SkipTest.java.i
data/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java.i
-data/src/linux/doc/man/ja/jstack.1.i
data/src/share/classes/java/lang/SecurityManager.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicReference.java.i
-data/test/java/beans/Introspector/Test6528714.java.i
+data/src/share/native/java/security/AccessController.c.i
data/test/sun/rmi/rmic/covariantReturns/G5Impl.java.i
data/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java.i
data/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.Connector.i
data/src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java.i
data/src/share/demo/jfc/TableExample/TableExample4.java.i
data/test/sun/net/www/EncDec.doc.i
-data/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java.i
-data/src/share/native/sun/java2d/loops/Index8Gray.c.i
data/src/share/classes/sun/util/resources/CurrencyNames_de_LU.properties.i
data/src/share/classes/com/sun/jmx/snmp/SnmpTooBigException.java.i
-data/src/share/classes/javax/swing/plaf/ColorUIResource.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_HN.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java.i
-data/test/sun/text/resources/Collator/Bug4848897.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java.i
+data/test/java/lang/Runtime/exec/StreamsSurviveDestroy.java.i
+data/src/share/classes/sun/tools/javac/CompilerMember.java.i
data/src/windows/npt/utf_md.c.i
data/test/javax/management/ObjectName/ValueWildcardTest.java.i
+data/src/share/classes/sun/io/CharToByteCp273.java.i
data/src/windows/native/sun/java2d/d3d/D3DUtils.h.i
data/src/share/native/java/util/zip/zlib-1.2.3/crc32.h.i
data/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java.i
-data/test/java/lang/instrument/RedefineClassWithNativeMethod.sh.i
+data/src/share/classes/javax/xml/crypto/KeySelector.java.i
data/src/share/classes/java/text/DateFormat.java.i
data/test/sun/security/provider/SeedGenerator/Awt_Hang_Test.java.i
-data/test/sun/nio/cs/TestEUC_TW.java.i
-data/test/org/openjdk/jigsaw/cli/ModuleFormatTest01.sh.i
-data/make/sun/jdga/Makefile.i
+data/src/solaris/classes/sun/awt/X11/XHorizontalScrollbar.java.i
+data/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java.i
data/src/share/classes/sun/awt/image/DataBufferNative.java.i
+data/test/java/beans/Introspector/4750368/com/foo/test/Component.java.i
data/make/tools/src/build/tools/charsetmapping/JIS0213.java.i
+data/test/java/awt/dnd/URIListBetweenJVMsTest/TargetFileListFrame.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java.i
+data/src/share/classes/java/net/HttpRetryException.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipConstants.java.i
data/test/java/util/Random/NextBytes.java.i
data/src/share/demo/jvmti/waiters/waiters.cpp.i
+data/src/share/classes/sun/security/x509/PolicyMappingsExtension.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java.i
-data/src/share/demo/applets/Fractal/CLSFractal.java.i
-data/src/share/classes/sun/misc/GC.java.i
+data/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java.i
data/test/java/awt/font/TextLayout/DecorationBoundsTest.java.i
data/src/share/demo/applets/SpreadSheet/example1.html.i
data/test/sun/security/pkcs11/ec/ReadPKCS12.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java.i
-data/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java.i
-data/src/solaris/classes/sun/nio/ch/SctpAssocChange.java.i
+data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java.i
+data/test/sun/security/pkcs11/Provider/Login.java.i
data/test/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtilsTemp.java.i
data/test/java/io/Serializable/partialClassDesc/PartialClassDesc.java.i
-data/src/share/classes/org/openjdk/jigsaw/LibraryPool.java.i
+data/src/linux/doc/man/policytool.1.i
data/src/share/classes/com/sun/tools/jdi/LocalVariableImpl.java.i
-data/test/java/nio/channels/FileChannel/TransferToNonWritable.java.i
-data/test/java/lang/instrument/BootClassPath/Setup.java.i
-data/src/share/back/error_messages.h.i
-data/src/share/classes/sun/nio/cs/SingleByteDecoder.java.i
+data/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java.i
+data/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java.i
+data/src/share/classes/sun/java2d/pipe/TextPipe.java.i
+data/src/share/classes/sun/io/CharToByteCp285.java.i
data/src/windows/classes/sun/awt/windows/awtLocalization_fr.properties.i
-data/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java.i
data/make/mkdemo/jfc/SwingSet3/Makefile.i
data/src/share/native/java/util/zip/zlib-1.1.3/infutil.h.i
data/make/sun/javazic/tzdata/VERSION.i
@@ -10429,70 +10361,69 @@ data/src/share/classes/javax/management/BadStringOperationException.java.i
data/src/share/classes/sun/security/x509/CertificateIssuerName.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java.i
data/test/java/nio/channels/Selector/BasicAccept.java.i
-data/test/java/net/Socket/InheritTimeout.java.i
+data/src/share/classes/javax/xml/crypto/dsig/SignedInfo.java.i
data/test/java/net/Inet6Address/serialize/Serialize.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_th_TH.properties.i
-data/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java.i
+data/test/java/security/SecureRandom/sha1prng-new.bin.i
data/src/solaris/native/sun/awt/awt_Robot.c.i
data/test/sun/security/pkcs11/fips/CipherTest.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/EType.java.i
data/make/tools/CharsetMapping/IBM833.c2b.i
data/src/share/classes/java/security/Permissions.java.i
data/test/sun/security/jgss/spnego/NoSpnegoAsDefMech.java.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy21.i
-data/test/javax/xml/crypto/dsig/data/certs/crl.i
-data/make/tools/GenerateCharacter/CharacterDataLatin1.java.template.i
-data/test/com/sun/security/sasl/util/CheckAccess.java.i
+data/src/share/classes/javax/naming/ldap/ControlFactory.java.i
+data/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java.i
+data/test/javax/swing/JSlider/4987336/box.gif.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Gradient.java.i
+data/test/sun/tools/jstat/jstatClassloadOutput1.sh.i
data/src/share/classes/sun/util/calendar/Gregorian.java.i
data/src/share/classes/sun/security/ssl/AppInputStream.java.i
data/test/javax/print/attribute/AttributeTest.java.i
data/src/share/classes/java/security/Key.java.i
-data/src/share/classes/javax/crypto/SecretKeyFactorySpi.java.i
data/test/java/nio/channels/DatagramChannel/SelectWhenRefused.java.i
-data/src/share/classes/sun/security/krb5/KrbAsReq.java.i
+data/src/windows/native/sun/windows/awt_IconCursor.h.i
data/test/sun/security/pkcs11/KeyStore/BasicData/basic.keystore.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java.i
data/src/share/classes/sun/io/CharToByteMacSymbol.java.i
-data/test/javax/management/namespace/VirtualMBeanNotifTest.java.i
+data/src/share/classes/java/lang/doc-files/theta.gif.i
data/src/share/classes/sun/invoke/anon/ConstantPoolPatch.java.i
-data/src/share/classes/java/net/JarURLConnection.java.i
-data/make/sun/javazic/tzdata/pacificnew.i
+data/make/launchers/Makefile.launcher.i
+data/test/java/io/StreamTokenizer/Comment.java.i
data/test/java/math/BigInteger/OperatorNpeTests.java.i
-data/make/sun/security/ec/FILES_c.gmk.i
+data/LICENSE.i
data/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java.i
-data/test/sun/tools/jstat/lineCounts2.awk.i
+data/src/share/classes/sun/io/ByteToCharCp1258.java.i
data/src/share/classes/sun/tools/jconsole/ConnectDialog.java.i
data/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java.i
-data/src/share/classes/sun/util/resources/TimeZoneNames_en_GB.java.i
+data/src/share/classes/javax/naming/directory/InvalidSearchControlsException.java.i
data/src/share/classes/java/security/cert/PKIXParameters.java.i
-data/test/java/util/Currency/Bug4512215.java.i
-data/src/share/classes/javax/management/NumericValueExp.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy35.i
+data/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java.i
+data/test/java/rmi/activation/Activatable/restartService/RestartService.java.i
+data/src/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java.i
+data/make/tools/src/build/tools/generatenimbus/Utils.java.i
data/test/javax/swing/JColorChooser/Test4711996.java.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java.i
-data/test/sun/net/www/protocol/http/ChunkedErrorStream.java.i
+data/test/java/net/Socket/reset/Test.java.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.chk.i
data/test/java/util/TreeMap/cr5045147.java.i
data/src/share/classes/java/awt/print/package.html.i
data/test/sun/security/provider/PolicyFile/Alias.keystore.i
-data/src/share/classes/com/sun/beans/WeakCache.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/Warn.gif.i
+data/test/java/lang/ClassLoader/findSystemClass/Loadee.java.i
data/src/share/classes/java/lang/Cloneable.java.i
data/src/share/classes/javax/swing/JToggleButton.java.i
-data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties.i
+data/test/java/net/SocketPermission/ActionSpace.java.i
data/test/java/net/URL/HashCode.java.i
data/test/java/lang/management/ThreadMXBean/Locks.java.i
data/src/share/classes/java/security/cert/PolicyQualifierInfo.java.i
data/test/javax/management/remote/mandatory/notif/policy.positive.i
-data/src/share/demo/management/VerboseGC/README.txt.i
+data/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java.i
data/src/share/classes/java/dyn/MethodHandle.java.i
data/src/share/demo/jvmti/hprof/hprof_blocks.h.i
-data/test/java/rmi/testlibrary/TestFailedException.java.i
+data/test/java/io/PrintStream/FailingConstructors.java.i
data/test/java/rmi/server/serverStackTrace/Impl1_Skel.java.i
data/test/sun/security/pkcs11/fips/certs/server.cer.i
-data/test/sun/security/pkcs11/fips/ImportKeyStore.java.i
+data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif.i
data/test/javax/crypto/NullCipher/TestWithoutInit.java.i
+data/test/java/io/RandomAccessFile/Close.java.i
data/src/share/classes/java/awt/peer/PopupMenuPeer.java.i
data/src/share/classes/java/awt/dnd/Autoscroll.java.i
data/src/share/native/java/lang/fdlibm/src/e_log.c.i
@@ -10502,111 +10433,104 @@ data/test/sun/net/www/AuthHeaderTest.java.i
data/test/com/sun/tools/attach/PermissionTest.java.i
data/test/com/sun/jdi/HomeTest.java.i
data/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java.i
-data/test/sun/net/www/http/KeepAliveCache/B5045306.java.i
+data/test/sun/security/tools/policytool/i18n.sh.i
data/src/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java.i
-data/test/javax/script/Test8.java.i
-data/src/share/classes/sun/io/ByteToCharMS932.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain5.txt.i
+data/src/share/native/java/util/zip/zlib-1.2.3/inffast.c.i
+data/src/share/native/java/lang/Float.c.i
+data/src/share/classes/com/sun/jndi/ldap/LdapURL.java.i
data/src/share/native/sun/awt/libpng/pngread.c.i
data/test/java/beans/XMLDecoder/spec/TestFloat.java.i
-data/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMBean.java.i
data/src/share/back/ArrayReferenceImpl.c.i
data/src/share/classes/java/util/IllformedLocaleException.java.i
data/test/sun/nio/cs/TestConverterDroppedCharacters.java.i
-data/test/java/beans/XMLDecoder/4676532/test.jar.i
+data/src/share/native/sun/awt/image/jpeg/jddctmgr.c.i
data/test/java/net/Socket/UrgentDataTest.java.i
data/src/share/classes/sun/management/OperatingSystemImpl.java.i
data/test/demo/jvmti/hprof/OptionsTest.java.i
data/src/solaris/doc/sun/man/man1/ja/jarsigner.1.i
-data/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java.i
+data/make/tools/swing-beans/beaninfo/images/JInternalFrameColor32.gif.i
data/src/share/classes/com/sun/media/sound/SF2Layer.java.i
-data/test/java/awt/dnd/ImageDecoratedDnD/DnDTarget.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java.i
data/test/sun/security/ssl/sun/net/www/httpstest/HttpTransaction.java.i
data/src/share/classes/javax/swing/ActionPropertyChangeListener.java.i
-data/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java.i
+data/src/share/classes/sun/io/ByteToCharCp933.java.i
data/test/javax/script/Test6.java.i
data/src/share/classes/sun/nio/cs/ext/IBM943.java.i
data/src/share/classes/com/sun/tools/hat/internal/parser/PositionDataInputStream.java.i
-data/test/java/awt/font/StyledMetrics/BoldSpace.java.i
+data/src/share/classes/java/awt/image/renderable/RenderContext.java.i
data/test/java/nio/file/WatchService/FileTreeModifier.java.i
data/test/java/lang/instrument/GetInitiatedClassesTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java.i
data/src/share/classes/sun/text/resources/FormatData_es_ES.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/batch.sh.i
+data/src/share/native/java/lang/fdlibm/src/s_tanh.c.i
data/src/solaris/doc/sun/man/man1/ja/javac.1.i
data/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java.i
data/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java.i
data/src/share/native/sun/management/HotSpotDiagnostic.c.i
-data/test/sun/security/tools/keytool/trystore.sh.i
-data/src/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java.i
+data/src/share/classes/sun/security/provider/certpath/CertId.java.i
data/test/java/math/BigDecimal/RangeTests.java.i
-data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml.i
+data/src/share/native/sun/awt/medialib/mlib_status.h.i
data/src/share/classes/javax/swing/text/ComponentView.java.i
-data/test/javax/crypto/Cipher/TestCipherMode.java.i
-data/test/java/lang/Math/Expm1Tests.java.i
+data/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c.i
+data/test/java/lang/Character/CheckProp.java.i
+data/src/share/classes/java/awt/color/package.html.i
data/test/java/awt/PrintJob/Security/SecurityDialogTest.java.i
data/src/share/classes/javax/naming/event/ObjectChangeListener.java.i
data/src/share/classes/javax/swing/tree/DefaultTreeModel.java.i
-data/src/share/classes/sun/tools/tree/ExprExpression.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest12_ok.ssl.in.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain7.txt.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java.i
-data/src/share/classes/sun/security/jgss/GSSNameImpl.java.i
+data/test/java/io/Serializable/PutField/Write2.java.i
+data/src/share/classes/com/sun/tools/example/doc/index.html.i
data/test/javax/sound/midi/Gervill/SoftChannel/Controller.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/p11-activcard.txt.i
+data/src/share/classes/sun/tracing/MultiplexProviderFactory.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c.i
-data/test/sun/security/rsa/TestCACerts.java.i
+data/src/share/classes/java/awt/font/GlyphJustificationInfo.java.i
data/src/share/demo/jfc/Metalworks/MetalworksPrefs.java.i
data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface.java.i
data/test/java/security/Policy/Dynamic/DynamicPolicy.java.i
data/test/com/sun/tracing/BasicWithSecurityMgr.java.i
-data/test/javax/management/modelmbean/DescriptorSupportXMLTest.java.i
-data/test/sun/util/resources/TimeZone/Bug4858517.java.i
-data/src/share/classes/sun/util/resources/CalendarData_mk.properties.i
+data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java.i
+data/make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java.i
data/src/windows/classes/sun/java2d/windows/DDBlitLoops.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java.i
data/src/linux/doc/man/ja/jdb.1.i
data/src/share/classes/javax/crypto/spec/IvParameterSpec.java.i
-data/test/javax/print/applet/applet2/Applet2PrintServiceLookup.java.i
+data/src/share/classes/com/sun/jndi/dns/ResourceRecord.java.i
data/make/tools/swing-beans/beaninfo/images/JEditorPaneMono16.gif.i
-data/src/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java.i
-data/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java.i
+data/make/tools/jarreorder/Makefile.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java.i
data/test/java/awt/dnd/ImageDecoratedDnDInOut/DnDTarget.java.i
data/test/org/openjdk/jigsaw/preinstall-setup.sh.i
-data/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java.i
+data/test/java/security/cert/CertPathValidator/OCSP/AIACert.pem.i
data/src/share/classes/sun/io/ByteToCharUnicodeLittleUnmarked.java.i
-data/src/share/classes/sun/security/x509/PolicyMappingsExtension.java.i
+data/src/share/classes/sun/security/util/DerInputBuffer.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/internal/ColumnarData.java.i
data/test/java/util/ResourceBundle/Bug4396021GeneralMessages.java.i
data/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java.i
data/src/share/native/sun/awt/libpng/pngmem.c.i
data/src/share/classes/java/net/URLStreamHandler.java.i
-data/test/java/util/Formatter/Basic-X.java.i
+data/src/share/classes/sun/reflect/generics/tree/Tree.java.i
data/src/share/classes/sun/nio/ch/DatagramChannelImpl.java.i
data/src/share/classes/sun/tools/jstat/RawOutputFormatter.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java.i
data/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java.i
data/src/share/classes/sun/security/provider/DSAKeyFactory.java.i
-data/src/share/classes/java/lang/ref/FinalReference.java.i
-data/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java.i
-data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c.i
data/src/share/native/sun/management/VMManagementImpl.c.i
-data/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFParser.java.i
data/test/java/awt/Focus/ContainerFocusAutoTransferTest/ContainerFocusAutoTransferTest.java.i
-data/test/java/net/Inet6Address/B4923906.java.i
data/test/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java.i
-data/src/share/classes/java/lang/reflect/UndeclaredThrowableException.java.i
data/src/share/sample/nio/file/Copy.java.i
-data/src/share/native/sun/security/ec/ecl.c.i
+data/src/share/classes/javax/security/auth/callback/ConfirmationCallback.java.i
data/test/sun/net/idn/nfscsi.spp.i
-data/src/share/classes/sun/font/Underline.java.i
data/test/sun/net/www/protocol/http/ProtocolRedirect.java.i
data/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h.i
data/src/share/classes/java/util/concurrent/CompletionService.java.i
-data/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java.i
+data/src/share/classes/com/sun/jdi/event/EventQueue.java.i
data/src/solaris/bin/ergo_zero.c.i
data/src/windows/native/sun/windows/awt_List.cpp.i
data/test/sun/tools/jstat/gcOldOutput1.awk.i
@@ -10616,96 +10540,96 @@ data/test/tools/launcher/libraryCaller.h.i
data/src/share/native/java/io/ObjectInputStream.c.i
data/test/sun/security/rsa/rsakeys.ks.i
data/test/javax/swing/JColorChooser/Test6199676.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java.i
-data/test/java/rmi/reliability/scripts/run_serialbench.ksh.i
+data/src/share/classes/sun/security/provider/IdentityDatabase.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java.i
data/test/java/security/BasicPermission/PermClass.1.3.1.i
data/src/share/classes/java/awt/geom/NoninvertibleTransformException.java.i
data/test/javax/management/mxbean/MXBeanPreRegisterTest.java.i
data/src/share/classes/java/lang/annotation/RetentionPolicy.java.i
data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpec.java.i
-data/test/java/beans/XMLDecoder/spec/TestVar.java.i
+data/src/share/classes/java/lang/invoke/InvokeGeneric.java.i
data/src/share/classes/javax/net/ssl/SSLSocketFactory.java.i
data/src/share/classes/sun/text/resources/BreakIteratorInfo_th.java.i
-data/test/java/util/ResourceBundle/Bug4168625Resource3.java.i
+data/make/tools/CharsetMapping/ISO_8859_15.map.i
data/src/share/classes/sun/text/resources/FormatData_da.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/B.1.i
+data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl_Stub.java.i
data/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.h.i
data/src/windows/native/sun/windows/awt_DnDDT.h.i
-data/make/tools/swing-beans/beaninfo/images/JToolBarMono16.gif.i
+data/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java.i
data/test/java/awt/image/GetSamplesTest.java.i
data/test/com/sun/nio/sctp/SctpChannel/Receive.java.i
data/test/org/openjdk/jigsaw/cli/timestamp-test.sh.i
-data/make/java/text/FILES_java.gmk.i
+data/src/solaris/native/sun/awt/awt_dnd.h.i
+data/test/java/lang/reflect/Generics/TestC2.java.i
data/test/com/sun/jdi/redefineMethod/Different_RedefineSubTarg.java.i
data/test/java/security/BasicPermission/PermClass.1.2.1.i
-data/test/java/rmi/dgc/dgcImplInsulation/security.policy.i
+data/test/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java.i
data/test/java/dyn/6987555/Test6987555.java.i
data/test/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties.i
data/make/modules/tools/src/com/sun/classanalyzer/AnnotatedDependency.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java.i
data/src/share/native/sun/awt/image/cvutils/img_dir8dither.h.i
-data/src/share/classes/sun/security/util/AuthResources_ja.java.i
-data/test/java/util/HashMap/ToString.java.i
+data/src/share/classes/sun/applet/Main.java.i
+data/src/share/classes/sun/awt/resources/awt_ja.properties.i
data/src/share/native/sun/java2d/opengl/OGLRenderer.c.i
data/src/share/classes/sun/management/HotspotInternal.java.i
-data/src/share/classes/com/sun/pept/presentation/Tie.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/inffixed.h.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c.i
+data/test/sun/security/tools/policytool/SaveAs.sh.i
+data/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandardMBean.java.i
data/test/com/sun/net/httpserver/FileServerHandler.java.i
data/test/java/lang/management/ThreadMXBean/InvalidThreadID.java.i
+data/src/share/classes/com/sun/media/sound/SoftVoice.java.i
data/test/java/net/Socket/asyncClose/AsyncClose.java.i
-data/src/share/classes/java/lang/ThreadDeath.java.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java.i
-data/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy.i
+data/make/javax/swing/plaf/Makefile.i
+data/src/share/classes/sun/util/resources/CalendarData_th.properties.i
+data/src/share/classes/javax/management/loading/MLetObjectInputStream.java.i
data/test/java/awt/print/PrinterJob/duke.gif.i
data/src/solaris/doc/sun/man/man1/ja/unpack200.1.i
-data/test/javax/management/context/localizable/Whatsit.java.i
-data/src/share/classes/java/util/concurrent/ThreadLocalRandom.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html.i
+data/test/java/security/cert/CertificateFactory/BadX509CertData.java.i
+data/make/javax/swing/beaninfo/Makefile.i
data/src/share/classes/java/awt/image/IndexColorModel.java.i
data/test/java/rmi/activation/Activatable/restartCrashedService/group.security.policy.i
data/src/solaris/classes/sun/awt/motif/X11CNS11643P3.java.i
data/make/common/internal/Defs-jaxws.gmk.i
-data/src/share/classes/javax/swing/text/StyleConstants.java.i
-data/src/windows/native/java/io/dirent_md.c.i
+data/src/share/classes/java/beans/XMLDecoder.java.i
+data/src/solaris/doc/sun/man/man1/jrunscript.1.i
+data/src/share/classes/sun/awt/image/BufferedImageDevice.java.i
data/test/java/util/logging/LoggingDeadlock3.props.i
data/src/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java.i
data/src/share/classes/javax/xml/crypto/KeySelectorResult.java.i
-data/test/java/beans/Beans/6669869/TestGuiAvailable.java.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java.i
+data/src/share/classes/javax/sql/rowset/JdbcRowSet.java.i
+data/src/solaris/native/sun/java2d/loops/vis_ThreeByteBgr.c.i
data/src/share/classes/java/awt/image/PixelGrabber.java.i
-data/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java.i
+data/test/javax/print/attribute/CollateAttr.java.i
data/test/java/beans/XMLEncoder/Test4652928.java.i
data/src/windows/native/java/util/TimeZone_md.h.i
data/test/tools/launcher/MiscTests.java.i
data/src/share/classes/sun/awt/OrientableFlowLayout.java.i
-data/src/share/demo/jfc/Metalworks/resources/HelpFiles/toc.html.i
data/test/sun/security/mscapi/AccessKeyStore.java.i
-data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Cipher.java.i
+data/test/java/beans/PropertyEditor/TestByteType.java.i
data/src/share/back/transport.h.i
+data/src/share/classes/java/security/cert/PKIXReason.java.i
data/src/share/classes/sun/text/resources/FormatData_sr_Latn.java.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpDecryptedPdu.java.i
-data/test/sun/tools/jconsole/ResourceCheckTest.sh.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Longs.java.i
+data/test/java/net/SocketPermission/Wildcard.java.i
+data/test/sun/security/util/PropertyExpander/ExpandAndEncode.java.i
data/src/share/classes/sun/nio/ch/PendingFuture.java.i
data/make/modules/modularize.sh.i
data/test/java/lang/instrument/AppendToBootstrapClassPathSetUp.sh.i
data/test/sun/util/resources/TimeZone/Bug6442006.java.i
data/test/java/text/Bidi/BidiEmbeddingTest.java.i
-data/src/share/classes/javax/sql/XAConnection.java.i
data/test/java/security/Policy/GetInstance/GetInstance.policy.i
-data/test/com/sun/servicetag/DeleteServiceTag.java.i
-data/test/java/lang/ClassLoader/package2/Class2.java.i
+data/src/share/classes/sun/text/resources/FormatData_cs_CZ.java.i
+data/make/mkdemo/jfc/Notepad/Makefile.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java.i
data/src/solaris/classes/java/net/PlainDatagramSocketImpl.java.i
-data/make/sun/security/mscapi/Makefile.i
-data/src/share/classes/sun/security/krb5/internal/rcache/ReplayCache.java.i
+data/src/share/classes/javax/management/MBeanNotificationInfo.java.i
data/src/share/classes/java/util/Collection.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XDataViewer.java.i
data/src/share/native/sun/awt/libpng/pngrtran.c.i
data/src/share/classes/sun/security/ssl/HandshakeMessage.java.i
data/test/java/io/Serializable/optionalDataEnd/OptionalDataEnd.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java.i
data/test/java/io/PipedWriter/FlushAfterClose.java.i
data/src/share/classes/javax/management/MBeanServerNotification.java.i
data/src/share/classes/javax/rmi/ssl/package.html.i
@@ -10716,22 +10640,22 @@ data/make/tools/CharsetMapping/euc_tw.map.i
data/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java.i
data/src/solaris/classes/sun/awt/X11/XAWTXSettings.java.i
data/src/share/classes/sun/io/ByteToCharHKSCS.java.i
-data/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java.i
-data/make/com/sun/nio/Makefile.i
+data/src/share/classes/sun/font/TextSourceLabel.java.i
+data/src/share/classes/com/sun/servicetag/RegistrationData.java.i
data/src/share/classes/sun/java2d/loops/DrawParallelogram.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java.i
data/src/solaris/hpi/export/byteorder_md.h.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_TW.properties.i
+data/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java.i
data/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java.i
-data/test/sun/security/pkcs11/KeyGenerator/DESParity.java.i
-data/test/sun/tools/jps/jps-lm_Output1.awk.i
+data/src/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java.i
+data/src/share/classes/javax/management/DefaultLoaderRepository.java.i
data/test/java/net/Inet6Address/serialize/serial1.4.2.ser.i
-data/src/share/bin/jli_util.h.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land.i
data/make/tools/CharsetMapping/IBM278.nr.i
-data/src/share/classes/com/sun/jndi/dns/Header.java.i
-data/test/java/lang/ClassLoader/deadlock/SupBob.java.i
+data/test/java/lang/Short/ByteSwap.java.i
+data/test/sun/security/provider/DSA/TestDSA.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_fr.properties.i
data/src/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java.i
data/src/windows/native/sun/management/FileSystemImpl.c.i
@@ -10740,148 +10664,136 @@ data/src/share/classes/sun/awt/DisplayChangedListener.java.i
data/src/share/classes/java/util/concurrent/locks/Lock.java.i
data/src/share/classes/sun/net/httpserver/UnmodifiableHeaders.java.i
data/src/share/native/com/sun/java/util/jar/pack/main.cpp.i
+data/src/share/classes/javax/management/openmbean/CompositeData.java.i
data/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java.i
-data/test/javax/management/context/LocaleTest.java.i
data/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation_Stub.java.i
-data/test/java/net/Authenticator/B4962064.java.i
+data/src/share/classes/sun/font/FontFamily.java.i
data/src/share/demo/nbproject/jfc/TableExample/nbproject/project.xml.i
data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_ME.properties.i
data/src/share/classes/java/awt/geom/LineIterator.java.i
-data/src/solaris/doc/sun/man/man1/rmic.1.i
-data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy.i
+data/test/java/beans/XMLEncoder/Test5023557.java.i
+data/test/java/lang/management/MemoryMXBean/PendingAllGC.sh.i
data/src/share/classes/sun/tools/native2ascii/N2AFilter.java.i
-data/test/javax/management/namespace/NamespaceControllerMBean.java.i
+data/test/javax/swing/border/Test4243289.html.i
data/test/java/security/UnresolvedPermission/AccessorMethods.signer2.i
-data/src/share/classes/sun/text/resources/CollationData_hr.java.i
data/src/share/classes/javax/swing/GraphicsWrapper.java.i
data/src/solaris/native/sun/java2d/loops/java2d_Mlib.c.i
data/src/share/classes/java/lang/invoke/DirectMethodHandle.java.i
-data/make/tools/jarsplit/Makefile.i
-data/test/java/awt/Multiscreen/DeviceIdentificationTest/DeviceIdentificationTest.java.i
+data/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c.i
+data/test/javax/management/namespace/VirtualPropsTest.java.i
data/src/share/classes/com/sun/tools/example/doc/trace.html.i
data/test/java/lang/StringBuilder/Insert.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO_8859_8.java.i
data/src/share/classes/java/io/PipedWriter.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java.i
data/test/sun/nio/cs/FindEncoderBugs.java.i
-data/src/share/demo/jfc/FileChooserDemo/FileChooserDemo.java.i
data/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp.i
data/src/share/classes/javax/naming/InterruptedNamingException.java.i
-data/test/java/util/zip/FlaterCriticalArray.java.i
data/src/share/classes/sun/security/tools/JarSigner.java.i
-data/src/share/classes/sun/security/krb5/KrbApRep.java.i
-data/test/sun/security/pkcs11/fips/fips.cfg.i
+data/test/com/sun/jdi/ClassLoaderClassesTest.java.i
+data/src/share/classes/javax/naming/LinkLoopException.java.i
data/src/windows/native/sun/windows/alloc.h.i
data/src/windows/classes/sun/awt/windows/awtLocalization_de.properties.i
data/test/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java.i
data/src/share/classes/sun/nio/cs/ext/MS1256.java.i
-data/test/javax/management/descriptor/UnionTest.java.i
+data/test/java/nio/file/Files/SkipSiblings.java.i
data/src/share/classes/sun/io/ByteToCharCp855.java.i
-data/src/share/instrument/InstrumentationImplNativeMethods.c.i
+data/test/javax/management/mxbean/MXBeanAnnotationTest.java.i
data/make/tools/src/build/tools/generatecharacter/UnicodeSpec.java.i
-data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template.i
+data/src/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java.i
data/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h.i
+data/src/share/classes/sun/net/www/ApplicationLaunchException.java.i
data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp.i
+data/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java.i
data/test/tools/launcher/ZipMeUp.java.i
-data/src/share/classes/java/rmi/Remote.java.i
-data/src/share/classes/java/awt/ModalEventFilter.java.i
-data/src/windows/classes/sun/awt/windows/WCheckboxPeer.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadBlocksClose.java.i
+data/src/share/classes/com/sun/java/browser/net/ProxyInfo.java.i
data/test/sun/net/www/protocol/http/RetryUponTimeout.java.i
data/src/share/classes/javax/management/remote/JMXConnectorServerProvider.java.i
-data/test/sun/security/pkcs11/ec/TestKeyFactory.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java.i
data/src/windows/native/java/util/WindowsPreferences.c.i
+data/test/java/nio/file/attribute/FileTime/Basic.java.i
+data/test/java/rmi/testlibrary/TestParams.java.i
data/src/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java.i
-data/test/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java.i
-data/test/tools/pack200/TestExceptions.java.i
-data/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider.i
+data/test/sun/jvmstat/testlibrary/Sleeper.java.i
+data/src/share/classes/com/sun/rowset/internal/XmlErrorHandler.java.i
+data/test/java/rmi/reliability/benchmark/bench/Makefile.i
data/src/share/classes/javax/management/remote/MBeanServerForwarder.java.i
data/test/javax/swing/JFileChooser/7036025/security.policy.i
data/test/sun/nio/cs/TestIllegalISO2022Esc.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/thai.ut8.txt.i
data/src/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java.i
-data/test/java/awt/TrayIcon/CtorTest/CtorTest.java.i
+data/src/share/classes/javax/swing/table/TableRowSorter.java.i
data/test/java/security/Policy/GetInstance/GetInstance.policyURL.i
data/make/tools/src/build/tools/generatenimbus/PainterGenerator.java.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest09_ko.properties.in.i
data/src/share/classes/sun/text/resources/FormatData_ar_OM.java.i
data/src/share/classes/sun/applet/AppletThreadGroup.java.i
-data/src/share/classes/com/sun/jdi/InterfaceType.java.i
-data/src/share/demo/java2d/J2DBench/resources/textdata/english.ut8.txt.i
+data/test/java/security/cert/CertPathBuilder/targetConstraints/ca.cer.i
data/src/share/classes/javax/print/attribute/standard/Media.java.i
data/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.policy.i
data/src/share/classes/sun/net/ftp/impl/FtpClient.java.i
-data/src/share/native/sun/security/ec/ec.h.i
+data/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibHandler.java.i
data/src/share/classes/sun/text/resources/FormatData_et.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpV6Address.java.i
data/src/share/classes/sun/net/spi/nameservice/NameService.java.i
-data/src/share/classes/javax/print/PrintException.java.i
-data/test/sun/security/provider/PolicyFile/SelfWildcard.java.i
-data/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java.i
+data/src/share/classes/com/sun/jdi/CharValue.java.i
+data/src/share/classes/java/awt/MenuBar.java.i
+data/src/share/classes/sun/swing/ImageIconUIResource.java.i
data/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java.i
-data/src/share/classes/sun/font/TextSource.java.i
-data/test/java/util/Random/NextIntPowerOfTwoMod.java.i
+data/src/share/classes/sun/nio/cs/SingleByteEncoder.java.i
data/test/java/nio/charset/coders/StreamTimeout.java.i
data/src/share/classes/org/ietf/jgss/MessageProp.java.i
data/src/share/native/java/io/RandomAccessFile.c.i
+data/src/share/classes/sun/tools/jconsole/ClassTab.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java.i
data/src/share/classes/javax/sound/sampled/LineListener.java.i
-data/test/javax/accessibility/6986385/bug6986385.java.i
-data/src/solaris/native/sun/awt/awt_xembed_server.c.i
+data/src/share/sample/nio/server/ChannelIO.java.i
+data/test/java/util/ResourceBundle/Bug4168625Resource2.java.i
data/src/share/classes/java/nio/file/ReadOnlyFileSystemException.java.i
data/make/tools/CharsetMapping/IBM943.nr.i
data/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java.i
-data/src/share/demo/jvmti/heapViewer/README.txt.i
-data/src/windows/native/sun/windows/hand.cur.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif.i
+data/test/java/util/PluggableLocale/ClasspathTest.sh.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java.i
-data/src/share/native/sun/awt/image/jpeg/jchuff.c.i
+data/src/share/classes/javax/swing/table/JTableHeader.java.i
data/make/java/java/localelist.sh.i
-data/src/share/native/sun/java2d/loops/AnyByte.c.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java.i
data/src/share/native/sun/java2d/opengl/J2D_GL/glext.h.i
data/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java.i
-data/make/sun/javazic/tzdata/antarctica.i
data/src/share/classes/sun/security/krb5/KrbException.java.i
data/src/share/classes/javax/management/event/package-info.java.i
data/test/java/io/BufferedInputStream/CloseStream.java.i
data/src/share/classes/com/sun/crypto/provider/AESParameters.java.i
-data/src/share/classes/java/lang/Thread.java.i
data/src/windows/classes/com/sun/management/OSMBeanFactory.java.i
data/src/share/classes/java/nio/charset/StandardCharsets.java.i
data/test/java/util/ResourceBundle/Bug4179766Class.java.i
-data/src/share/classes/java/security/cert/CertificateException.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java.i
data/src/share/classes/com/sun/management/OperatingSystemMXBean.java.i
-data/src/share/classes/sun/awt/image/VolatileSurfaceManager.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/PaintModel.java.i
data/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java.i
data/src/share/classes/java/awt/peer/ComponentPeer.java.i
-data/src/share/classes/sun/net/www/URLConnection.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java.i
-data/test/sun/net/InetAddress/nameservice/dns/CanonicalName.java.i
+data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java.i
data/src/share/native/sun/misc/VM.c.i
data/make/mkdemo/jfc/Font2DTest/Makefile.i
data/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java.i
data/test/com/sun/jdi/OnThrowTest.java.i
-data/make/tools/src/build/tools/jdwpgen/ErrorSetNode.java.i
data/test/javax/management/remote/mandatory/connection/RMIExitTest.java.i
-data/test/java/nio/Buffer/StringCharBufferSliceTest.java.i
data/src/share/native/sun/awt/image/jpeg/jfdctint.c.i
-data/src/share/native/sun/reflect/ConstantPool.c.i
-data/src/share/classes/sun/tools/tree/MultiplyExpression.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageUtils.c.i
data/src/solaris/hpi/native_threads/include/monitor_md.h.i
-data/src/share/native/sun/java2d/loops/FourByteAbgr.c.i
-data/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations_Stub.java.i
-data/make/common/BuildPackages.gmk.i
-data/src/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java.i
+data/src/share/classes/com/sun/crypto/provider/DESCrypt.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java.i
-data/test/sun/nio/cs/OLD/Johab_OLD.java.i
-data/src/share/native/sun/font/layout/LEStandalone.h.i
+data/src/share/classes/java/security/UnrecoverableKeyException.java.i
data/test/java/beans/XMLEncoder/Test4936682.java.i
-data/src/solaris/doc/sun/man/man1/jstat.1.i
-data/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java.i
+data/test/java/nio/file/Files/Links.java.i
+data/test/java/beans/Introspector/Test6311051.java.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageColormap.h.i
data/test/tools/pack200/Pack200Simple.sh.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java.i
-data/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java.i
+data/src/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java.i
+data/src/share/classes/java/awt/Font.java.i
data/src/share/classes/sun/text/resources/FormatData_en_NZ.java.i
data/src/share/native/sun/awt/image/cvutils/img_fsdither.h.i
data/src/share/classes/java/lang/module/ModuleIdQuery.java.i
@@ -10892,79 +10804,76 @@ data/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap.i
data/src/share/classes/sun/dyn/CallSiteImpl.java.i
data/test/java/io/File/BlockIsDirectory.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_VE.properties.i
-data/src/share/classes/sun/text/CollatorUtilities.java.i
+data/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java.i
data/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java.i
+data/test/java/lang/Class/forName/classes/period.class.i
data/src/share/native/sun/font/layout/MarkArrays.h.i
data/test/java/io/pathNames/win32/DriveSlash.java.i
data/src/share/classes/sun/misc/DoubleConsts.java.i
-data/test/java/io/Serializable/oldTests/SimpleArrays.java.i
+data/src/share/classes/com/sun/jmx/event/EventParams.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMeta.java.i
data/test/java/util/EnumMap/EntrySetIteratorRemoveInvalidatesEntry.java.i
-data/test/java/util/Collections/EmptyIterator.java.i
+data/src/solaris/native/sun/awt/list.h.i
+data/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy.i
data/test/java/rmi/activation/Activatable/restartLatecomer/security.policy.i
data/src/share/classes/sun/tools/tree/AssignSubtractExpression.java.i
data/make/tools/swing-beans/beaninfo/images/JDesktopPaneColor32.gif.i
data/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java.i
-data/src/share/classes/sun/awt/image/FileImageSource.java.i
-data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Encoder.java.i
+data/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c.i
data/src/share/classes/sun/net/sdp/SdpSupport.java.i
data/src/share/classes/sun/io/CharToByteCp864.java.i
+data/src/windows/bin/java-rmi.c.i
data/test/sun/nio/cs/ConvertSingle.java.i
data/src/share/native/sun/font/layout/ClassDefinitionTables.cpp.i
-data/src/share/native/sun/font/layout/MirroredCharData.cpp.i
+data/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java.i
data/make/sun/jpeg/mapfile-vers-closed.i
data/test/com/sun/net/httpserver/DummyVerifier.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html.i
+data/src/share/classes/sun/tools/javac/resources/javac_zh_CN.properties.i
data/src/share/classes/java/lang/invoke/ConstantCallSite.java.i
-data/src/windows/native/java/net/NetworkInterface.h.i
data/src/share/classes/com/sun/inputmethods/internal/thaiim/resources/DisplayNames.properties.i
data/test/sun/nio/cs/TestUTF8BOM.java.i
-data/src/solaris/classes/sun/nio/ch/SocketDispatcher.java.i
-data/make/netbeans/common/windows-view.ent.i
+data/src/share/native/sun/awt/image/jpeg/jpegdecoder.c.i
+data/test/java/util/logging/GetGlobalTest.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java.i
data/src/windows/lib/images/cursors/cursors.properties.i
-data/test/java/nio/channels/AsynchronousFileChannel/Lock.java.i
-data/src/share/classes/javax/swing/Spring.java.i
+data/src/share/classes/sun/security/x509/X509Key.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java.i
-data/src/share/classes/com/sun/tools/hat/resources/platform_names.txt.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load7.java.i
-data/src/share/classes/sun/font/FontScalerException.java.i
+data/src/windows/npt/utf_md.h.i
+data/src/share/classes/sun/java2d/SunGraphics2D.java.i
data/src/share/classes/javax/swing/event/TableModelListener.java.i
data/src/share/classes/sun/java2d/pipe/DrawImagePipe.java.i
data/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/IntArrays.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecVisitor.java.i
-data/test/java/net/Socket/SocksConnectTimeout.java.i
-data/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.i
-data/src/windows/classes/java/io/Win32FileSystem.java.i
+data/src/share/classes/sun/security/x509/X400Address.java.i
+data/src/solaris/classes/sun/awt/X11/XlibWrapper.java.i
+data/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain6.txt.i
data/src/share/classes/sun/util/resources/CurrencyNames_ro_RO.properties.i
-data/test/java/net/CookieHandler/CookieHandlerTest.java.i
-data/test/java/util/ResourceBundle/Test4318520RB_en.properties.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java.i
+data/src/share/classes/sun/net/dns/ResolverConfiguration.java.i
data/src/share/native/java/net/net_util.h.i
data/src/solaris/doc/sun/man/man1/ja/schemagen.1.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/Generator.java.i
-data/test/java/util/Hashtable/ReadObject.java.i
data/make/sun/jpeg/reorder-sparc.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java.i
+data/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java.i
data/test/java/beans/XMLEncoder/Test6501431.java.i
-data/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java.i
+data/test/java/lang/reflect/Proxy/Basic1.java.i
data/make/netbeans/common/standard-actions.ent.i
-data/src/share/classes/com/sun/java/util/jar/pack/Instruction.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java.i
data/src/share/classes/java/nio/charset/MalformedInputException.java.i
data/src/share/native/sun/awt/image/jpeg/jerror.c.i
-data/src/share/classes/sun/font/FontScaler.java.i
data/src/share/classes/sun/management/StackTraceElementCompositeData.java.i
data/src/share/classes/sun/awt/PeerEvent.java.i
-data/make/com/sun/tracing/Makefile.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c.i
data/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java.i
-data/test/java/io/Serializable/nonserializable/ExceptionDetail.java.i
data/src/share/native/sun/font/layout/GlyphDefinitionTables.cpp.i
-data/src/share/classes/sun/misc/resources/Messages_it.java.i
+data/src/share/classes/com/sun/security/auth/SolarisPrincipal.java.i
data/src/share/classes/javax/swing/text/doc-files/Document-coord.gif.i
-data/src/share/classes/sun/text/resources/FormatData_et_EE.java.i
+data/src/share/classes/sun/text/resources/CollationData_sr_Latn.java.i
data/src/share/classes/java/awt/image/PixelInterleavedSampleModel.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java.i
data/test/java/security/Security/signedfirst/Static.props.i
data/test/java/io/DataOutputStream/WriteUTF.java.i
data/src/share/demo/jfc/CodePointIM/README_zh_CN.html.i
@@ -10974,170 +10883,162 @@ data/src/share/classes/com/sun/net/httpserver/HttpContext.java.i
data/test/java/rmi/reliability/launch_reliability.ksh.i
data/test/java/util/jar/JarFile/SignedJarFileGetInputStream.java.i
data/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.config.i
-data/test/sun/security/tools/keytool/readjar.sh.i
data/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java.i
data/test/javax/swing/JFileChooser/6698013/bug6698013.java.i
-data/test/com/oracle/net/Sanity.java.i
+data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Decoder.java.i
data/src/share/demo/jvmti/heapTracker/HeapTracker.java.i
data/test/java/security/UnresolvedPermission/DebugPermission2.java.i
data/test/java/math/BigDecimal/MultiplyTests.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java.i
data/src/share/classes/javax/script/Compilable.java.i
-data/test/java/beans/XMLEncoder/Test4646747.java.i
+data/test/java/net/InetAddress/WhiteSpaceHostTest.java.i
data/test/sun/net/www/protocol/jar/foo1.jar.i
data/src/share/classes/com/sun/jdi/IntegerType.java.i
data/src/share/classes/sun/java2d/pipe/PixelDrawPipe.java.i
data/src/share/back/ArrayReferenceImpl.h.i
-data/test/javax/sound/midi/Sequencer/SequencerImplicitSynthOpen.java.i
-data/src/share/native/sun/font/layout/LookupProcessor.cpp.i
+data/src/share/classes/javax/swing/border/StrokeBorder.java.i
+data/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_f.c.i
data/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java.i
data/src/share/classes/javax/swing/colorchooser/ColorModelHSV.java.i
data/src/solaris/classes/sun/nio/fs/UnixFileStore.java.i
-data/src/share/native/sun/security/ec/mp_gf2m.c.i
+data/src/share/classes/com/sun/media/sound/SoftFilter.java.i
data/src/share/native/sun/security/pkcs11/j2secmod.h.i
data/src/solaris/classes/sun/awt/X11/XInputMethodDescriptor.java.i
-data/test/java/util/ResourceBundle/Control/BadControlsTest.java.i
+data/test/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java.i
data/src/share/classes/java/net/BindException.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmstypes.c.i
-data/test/com/sun/net/httpserver/Test5.java.i
data/src/share/sample/nio/file/FileType.java.i
data/src/share/classes/sun/io/ByteToCharGB18030DB.java.i
-data/test/javax/print/LookupServices.java.i
-data/src/solaris/native/sun/nio/ch/DatagramDispatcher.c.i
+data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form.i
data/src/share/classes/java/util/concurrent/ConcurrentNavigableMap.java.i
data/src/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java.i
data/test/java/util/Collections/Swap.java.i
data/test/java/nio/channels/DatagramChannel/UseDGWithIPv6.java.i
data/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java.i
data/src/share/classes/sun/util/locale/LocaleExtensions.java.i
-data/src/share/classes/sun/io/CharToByteISO8859_5.java.i
+data/test/java/rmi/activation/Activatable/notSerializable/NotSerializable.java.i
data/src/share/classes/sun/security/x509/CertificateSubjectUniqueIdentity.java.i
data/src/share/native/sun/font/layout/LayoutEngine.h.i
data/test/java/util/Collections/MinMax.java.i
data/src/share/classes/java/io/UnsupportedEncodingException.java.i
-data/src/share/classes/sun/java2d/loops/GeneralRenderer.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/AnnotationParser.java.i
data/src/share/classes/sun/reflect/UnsafeFieldAccessorFactory.java.i
data/src/share/classes/javax/swing/tree/MutableTreeNode.java.i
data/src/share/classes/sun/security/x509/CertificateValidity.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1112.java.i
-data/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties.i
data/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java.i
data/src/linux/doc/man/jps.1.i
data/test/com/sun/jdi/RedefineClasses.sh.i
-data/src/share/classes/com/sun/jndi/ldap/Ber.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties.i
+data/src/share/classes/javax/imageio/ImageIO.java.i
+data/src/windows/native/sun/windows/hand.cur.i
data/make/tools/swing-beans/beaninfo/images/JComboBoxMono16.gif.i
+data/test/sun/tools/native2ascii/N2A_4636448.expected.i
data/test/java/nio/channels/SocketChannel/SocketOptionTests.java.i
data/test/java/rmi/activation/Activatable/checkAnnotations/group.security.policy.i
data/src/share/classes/javax/swing/plaf/OptionPaneUI.java.i
-data/src/share/classes/java/io/LineNumberInputStream.java.i
+data/test/javax/swing/JInternalFrame/6726866/bug6726866.html.i
data/src/share/native/sun/font/layout/CursiveAttachmentSubtables.h.i
-data/make/tools/swing-beans/beaninfo/images/JPanelColor16.gif.i
+data/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java.i
data/src/share/demo/jfc/SampleTree/README.txt.i
data/test/java/awt/dnd/FileListBetweenJVMsTest/InterprocessMessages.java.i
-data/src/windows/native/sun/windows/README.JNI.i
+data/test/sun/management/jmxremote/bootstrap/management_ssltest10_ok.properties.in.i
data/test/sun/security/krb5/auto/OkAsDelegateXRealm.java.i
data/make/netbeans/common/demo-sources.ent.i
data/src/share/classes/sun/io/ByteToCharConverter.java.i
data/src/share/classes/sun/nio/cs/ext/MS874.java.i
data/make/tools/swing-beans/beaninfo/images/JColorChooserMono16.gif.i
-data/src/share/classes/sun/text/resources/FormatData_zh_CN.java.i
+data/make/modules/jdk.boot.ls.i
data/src/share/classes/sun/util/resources/LocaleNames_it.properties.i
data/src/share/sample/jmx/jmx-scandir/src/etc/password.properties.i
data/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.h.i
data/src/share/native/sun/font/layout/IndicLayoutEngine.cpp.i
-data/src/share/native/java/util/concurrent/atomic/AtomicLong.c.i
data/test/java/util/Collections/ViewSynch.java.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java.i
-data/src/windows/classes/sun/nio/ch/PollArrayWrapper.java.i
-data/src/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java.i
-data/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java.i
+data/src/share/classes/java/security/spec/ECField.java.i
+data/src/share/classes/sun/font/FontRunIterator.java.i
+data/src/linux/doc/man/servertool.1.i
+data/src/share/classes/java/awt/peer/LabelPeer.java.i
data/test/javax/swing/border/Test4252164.java.i
-data/test/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpMsg.java.i
+data/src/share/sample/nio/server/ChannelIOSecure.java.i
+data/src/share/classes/javax/sound/sampled/Line.java.i
data/test/sun/nio/cs/TestUTF_32.java.i
-data/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.html.i
+data/src/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java.i
data/src/share/classes/java/text/EntryPair.java.i
data/src/solaris/classes/sun/awt/X11/keysym2ucs.h.i
data/src/windows/native/sun/windows/awt_MenuBar.h.i
data/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java.i
-data/src/windows/classes/java/lang/ProcessImpl.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif.i
+data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_4.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html.i
data/src/share/classes/sun/security/jgss/krb5/CipherHelper.java.i
data/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java.i
data/src/solaris/classes/sun/awt/X11/doc-files/Modality.txt.i
-data/test/java/io/PrintWriter/OversynchronizedTest.java.i
-data/src/share/back/standardHandlers.h.i
-data/src/share/classes/java/lang/annotation/ElementType.java.i
+data/src/share/classes/java/lang/module/package-info.java.i
+data/src/share/classes/sun/reflect/generics/tree/ReturnType.java.i
+data/src/share/classes/org/ietf/jgss/GSSContext.java.i
data/test/java/nio/file/attribute/BasicFileAttributeView/Basic.java.i
data/src/share/native/com/sun/tools/jdi/SharedMemory.h.i
data/src/share/classes/sun/security/provider/DSAParameterGenerator.java.i
data/test/sun/security/util/Resources/Format.java.i
data/test/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java.i
-data/test/java/net/CookieHandler/CookieManagerTest.java.i
-data/test/java/awt/xembed/server/TestXEmbedServerJava.java.i
+data/src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java.i
+data/src/share/classes/sun/java2d/InvalidPipeException.java.i
data/test/sun/tools/jstat/jstatGcNewOutput1.sh.i
-data/src/share/classes/java/awt/event/ActionListener.java.i
+data/src/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java.i
data/src/share/classes/sun/jvmstat/monitor/HostIdentifier.java.i
-data/src/share/native/sun/security/ec/impl/ec2.h.i
data/src/share/classes/com/sun/net/ssl/package.html.i
data/src/share/classes/com/sun/media/sound/SoftCubicResampler.java.i
-data/src/share/classes/java/text/RuleBasedBreakIterator.java.i
+data/test/sun/security/pkcs11/sslecc/CipherTest.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties.i
data/src/share/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java.i
data/test/sun/java2d/cmm/ColorConvertOp/PYCC.png.i
data/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java.i
data/src/solaris/native/sun/security/pkcs11/j2secmod_md.c.i
+data/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java.i
data/src/solaris/doc/sun/man/man1/ja/jar.1.i
-data/test/com/sun/jdi/DebuggerThreadTest.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java.i
-data/src/share/classes/sun/awt/datatransfer/DataTransferer.java.i
-data/src/share/classes/sun/util/resources/CalendarData.properties.i
data/make/tools/compile_font_config/Makefile.i
-data/src/share/classes/sun/java2d/opengl/OGLMaskBlit.java.i
-data/test/org/openjdk/jigsaw/_JigsawVersionQuery.java.i
+data/src/share/sample/nio/file/WatchDir.java.i
data/test/javax/management/Introspector/DuplicateGetterTest.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java.i
data/src/windows/native/sun/windows/awt_Menu.h.i
-data/src/share/classes/sun/awt/AWTCharset.java.i
+data/src/solaris/bin/zero/jvm.cfg.i
data/src/share/classes/sun/awt/image/BufImgSurfaceData.java.i
-data/test/javax/crypto/Mac/NullMacSpi.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocket.java.i
data/src/share/classes/sun/misc/UCEncoder.java.i
data/test/java/lang/ClassLoader/package1/Class1.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S32Func.c.i
-data/src/share/classes/sun/font/NullFontScaler.java.i
+data/test/java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java.i
+data/src/share/classes/javax/print/URIException.java.i
data/make/tools/CharsetMapping/ISO_8859_13.map.i
-data/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java.i
+data/src/share/demo/jfc/TableExample/TableSorter.java.i
data/src/share/classes/java/security/spec/EllipticCurve.java.i
-data/test/sun/net/www/http/HttpClient/IsKeepingAlive.java.i
+data/src/windows/native/java/net/NetworkInterface.h.i
data/make/java/applet/Makefile.i
-data/src/share/classes/java/text/Format.java.i
-data/src/share/native/sun/awt/image/cvutils/img_output16_32.h.i
data/src/share/native/sun/font/layout/LigatureSubstProc.h.i
data/test/sun/rmi/rmic/newrmic/equivalence/OrangeEcho.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java.i
+data/make/tools/CharsetMapping/IBM420.nr.i
+data/src/share/native/java/util/zip/zlib-1.1.3/README.i
data/test/com/sun/jdi/Unload2Targ.java.i
data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Foo.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java.i
data/make/sun/cmm/kcms/FILES_c_unix.gmk.i
data/test/sun/security/tools/jarsigner/newsize7.sh.i
data/src/share/native/sun/awt/image/cvutils/img_colors.h.i
-data/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java.i
-data/src/share/classes/javax/naming/event/NamingEvent.java.i
+data/test/java/util/ResourceBundle/Control/Chinese_zh.properties.i
+data/test/java/lang/instrument/AppendToBootstrapClassPathTest.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.password.in.i
-data/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java.i
+data/src/share/classes/javax/naming/event/package.html.i
data/test/java/lang/ThreadGroup/Stop.java.i
data/make/com/sun/security/auth/FILES_java.gmk.i
data/test/java/lang/ClassLoader/deadlock/DelegatingLoader.java.i
data/src/share/classes/javax/swing/text/ElementIterator.java.i
-data/test/com/sun/security/auth/login/ConfigFile/Override.props.i
-data/src/share/classes/javax/security/sasl/RealmChoiceCallback.java.i
+data/make/tools/src/build/tools/charsetmapping/DBCS.java.i
+data/src/share/classes/sun/nio/cs/MS1254.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/zutil.c.i
-data/test/java/nio/file/WatchService/Basic.java.i
+data/test/javax/sound/sampled/AudioFormat/PCM_FLOAT_support.java.i
data/src/share/classes/sun/launcher/resources/launcher_sv.properties.i
data/test/sun/tools/jstat/jstatFileURITest1.sh.i
-data/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java.i
+data/test/java/net/URLConnection/ChunkedEncoding.java.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties.i
data/src/share/classes/sun/awt/EventListenerAggregate.java.i
data/src/share/classes/com/sun/tracing/dtrace/ModuleAttributes.java.i
@@ -11145,97 +11046,88 @@ data/test/java/io/File/GetXSpace.java.i
data/src/share/classes/sun/tools/jstat/Operator.java.i
data/src/share/classes/sun/print/PathGraphics.java.i
data/src/share/demo/applets/GraphicsTest/GraphicsTest.java.i
-data/make/tools/CharsetMapping/MacArabic.map.i
+data/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java.i
data/src/share/classes/sun/nio/ch/SocketOpts.java.i
data/src/share/classes/sun/font/StrikeCache.java.i
data/test/java/lang/reflect/Method/GenericStringTest.java.i
data/src/windows/classes/sun/security/mscapi/RSAKeyPair.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpEngine.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif.i
data/src/share/classes/sun/management/AgentConfigurationError.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java.i
-data/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so.i
+data/src/share/classes/sun/rmi/rmic/RemoteClass.java.i
data/src/share/classes/javax/management/Descriptor.java.i
data/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java.i
+data/src/share/native/sun/java2d/loops/ThreeByteBgr.c.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java.i
data/test/sun/tools/jstatd/jpsOutput1.awk.i
data/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java.i
data/src/share/classes/sun/swing/FilePane.java.i
-data/src/share/classes/sun/io/CharToByteBig5_Solaris.java.i
-data/src/share/classes/sun/jkernel/StandaloneByteArrayAccess.java.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java.i
-data/test/java/rmi/activation/Activatable/restartService/RestartService_Stub.java.i
+data/make/java/main/java/mapfile-amd64.i
+data/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java.i
data/src/share/classes/com/sun/crypto/provider/SymmetricCipher.java.i
-data/test/java/nio/file/Files/Misc.java.i
+data/src/share/classes/com/sun/media/sound/ModelStandardDirector.java.i
data/test/sun/nio/cs/OLD/TestIBMDB.java.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/README.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html.i
-data/src/share/classes/com/sun/security/sasl/ClientFactoryImpl.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/deflate.h.i
data/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java.i
-data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java.i
+data/src/share/classes/sun/awt/im/CompositionArea.java.i
data/test/com/sun/net/httpserver/Test4.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/ArgumentList.java.i
-data/src/share/classes/sun/tools/jconsole/LabeledComponent.java.i
-data/src/share/native/sun/security/jgss/wrapper/gssapi.h.i
-data/src/windows/native/sun/java2d/d3d/D3DGlyphCache.h.i
+data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html.i
data/test/sun/text/resources/Collator/Bug4248694.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ResourceFile.java.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java.i
-data/test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java.i
-data/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileAttributeView.java.i
data/test/sun/security/pkcs11/rsa/GenKeyStore.java.i
data/src/share/classes/sun/net/URLCanonicalizer.java.i
data/test/java/util/Collections/Frequency.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpMessage.java.i
+data/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java.i
-data/src/share/classes/javax/swing/JSlider.java.i
-data/src/share/classes/sun/net/idn/StringPrepDataReader.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509ExtendedKeyManager.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java.i
+data/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java.i
data/make/tools/swing-beans/beaninfo/images/JFileChooserMono32.gif.i
data/make/tools/src/build/tools/jdwpgen/AbstractSimpleNode.java.i
data/test/javax/management/namespace/EventWithNamespaceTest.java.i
-data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java.i
-data/test/java/beans/Introspector/TestTypeResolver.java.i
+data/test/javax/swing/JScrollPane/6559589/bug6559589.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformCommunity.java.i
data/src/share/classes/java/beans/PropertyEditorSupport.java.i
data/src/share/classes/sun/font/FontDesignMetrics.java.i
data/src/windows/classes/sun/awt/windows/WListPeer.java.i
-data/make/jpda/expr/Makefile.i
-data/src/share/classes/javax/management/loading/PrivateClassLoader.java.i
data/test/java/util/Locale/Bug4175998Test.java.i
-data/src/share/native/sun/security/ec/ec2_233.c.i
+data/make/com/sun/jndi/cosnaming/Makefile.i
+data/src/share/classes/sun/text/resources/FormatData_de_LU.java.i
data/src/share/classes/java/awt/event/MouseListener.java.i
data/src/share/classes/sun/tools/tree/ContinueStatement.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMeta.java.i
data/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java.i
data/src/share/classes/sun/jvmstat/monitor/Units.java.i
data/test/java/security/KeyRep/PBE.pre.1.5.key.i
-data/test/javax/management/descriptor/ImmutableArrayFieldTest.java.i
+data/test/com/sun/jdi/ShutdownDebuggee.java.i
data/src/share/classes/sun/util/resources/LocaleNames_uk.properties.i
data/src/share/classes/com/sun/jdi/connect/Connector.java.i
data/test/java/net/URLClassLoader/getresourceasstream/Test.java.i
data/src/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java.i
+data/test/java/lang/reflect/Method/invoke/ErrorInInvoke.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_el_CY.properties.i
-data/make/sun/launcher/Makefile.i
+data/src/share/classes/com/sun/security/auth/module/UnixSystem.java.i
data/ASSEMBLY_EXCEPTION.i
-data/src/share/demo/jfc/CodePointIM/resources/codepoint_zh_CN.properties.i
+data/src/share/classes/sun/io/ByteToCharUTF16.java.i
data/src/share/classes/java/lang/Iterable.java.i
data/test/java/net/Socket/ReadTimeout.java.i
data/make/tools/src/build/tools/javazic/ZoneRec.java.i
data/src/share/native/sun/awt/medialib/mlib_sys_proto.h.i
-data/src/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java.i
-data/src/share/sample/scripting/scriptpad/build.xml.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java.i
+data/src/share/classes/java/text/DontCareFieldPosition.java.i
data/src/share/classes/sun/tools/tree/VarDeclarationStatement.java.i
-data/test/javax/security/auth/login/Configuration/GetInstanceConfigSpi.java.i
-data/src/share/classes/com/sun/jdi/connect/ListeningConnector.java.i
+data/src/share/demo/jvmti/minst/minst.c.i
data/src/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java.i
data/src/share/classes/sun/security/pkcs11/KeyCache.java.i
data/test/java/util/Collections/ReverseOrder.java.i
data/test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java.i
data/make/tools/src/build/tools/jdwpgen/LocationTypeNode.java.i
-data/src/share/classes/com/sun/jdi/ArrayType.java.i
-data/src/share/classes/javax/swing/text/html/BRView.java.i
+data/src/share/classes/javax/swing/text/ChangedCharSetException.java.i
data/test/org/openjdk/jigsaw/optional-jaxp.sh.i
data/src/share/native/sun/font/bidi/jbidi.c.i
data/test/java/nio/file/Files/SimpleFileTypeDetector.java.i
@@ -11244,21 +11136,20 @@ data/test/java/nio/channels/AsynchronousSocketChannel/Leaky.java.i
data/test/java/beans/XMLDecoder/spec/TestTrue.java.i
data/make/tools/CharsetMapping/IBM1149.map.i
data/src/share/classes/sun/io/CharToByteISO2022.java.i
-data/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java.i
+data/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp.i
data/test/java/net/DatagramSocket/ImplicitBind.java.i
data/src/share/classes/javax/print/event/PrintJobEvent.java.i
data/src/share/classes/sun/io/ByteToCharCp864.java.i
-data/src/share/classes/sun/security/validator/KeyStores.java.i
+data/test/java/lang/instrument/ParallelTransformerLoader.sh.i
data/src/share/classes/sun/tools/tree/PositiveExpression.java.i
data/src/share/classes/com/sun/jdi/InvocationException.java.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java.i
-data/test/java/net/URL/URIToURLTest.java.i
+data/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java.i
+data/test/javax/management/Introspector/ChangingNotifsTest.java.i
data/test/java/rmi/MarshalledObject/compare/HashCode.java.i
-data/src/share/classes/javax/management/ValueExp.java.i
data/test/sun/security/krb5/auto/SpnegoReqFlags.java.i
data/src/share/demo/jvmti/hprof/hprof_loader.h.i
-data/src/share/demo/jfc/Notepad/resources/open.gif.i
data/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpecList.java.i
data/test/java/io/charStreams/UTF8.java.i
data/src/share/classes/javax/script/SimpleBindings.java.i
@@ -11267,18 +11158,17 @@ data/test/java/io/RandomAccessFile/Seek.java.i
data/test/java/util/jar/JarFile/TurkCert.java.i
data/test/java/security/BasicPermission/NullOrEmptyName.java.i
data/src/share/native/sun/java2d/opengl/OGLTextRenderer.h.i
+data/test/sun/security/provider/PolicyParser/EncodeURL.java.i
data/test/javax/swing/JSlider/4987336/bug4987336.html.i
data/test/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java.i
-data/src/share/classes/javax/swing/event/ListSelectionListener.java.i
-data/test/sun/security/tools/keytool/file-in-help.sh.i
+data/src/solaris/sample/dtrace/hotspot/method_compile_stat.d.i
+data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter.i
data/test/java/math/BigDecimal/RoundingTests.java.i
-data/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityCache.java.i
+data/make/com/sun/security/sasl/Makefile.i
data/src/share/native/sun/awt/giflib/gif_lib.h.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ExceptionCalls.java.i
data/src/share/demo/scripting/jconsole-plugin/src/scripts/invoke.js.i
data/src/share/classes/java/lang/ref/SoftReference.java.i
-data/src/share/classes/sun/rmi/transport/tcp/MultiplexOutputStream.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceTableMetaImpl.java.i
data/src/share/classes/javax/swing/plaf/MenuItemUI.java.i
@@ -11287,36 +11177,39 @@ data/src/share/classes/javax/management/remote/JMXConnectorServerMBean.java.i
data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/file-targets.xml.i
data/src/share/native/sun/font/layout/LayoutTables.h.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so.d
+data/test/javax/security/auth/x500/X500Principal/RFC4514.java.i
data/src/share/classes/java/sql/SQLTransientException.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so.i
-data/src/share/classes/sun/security/provider/DSAPrivateKey.java.i
-data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml.i
-data/make/tools/swing-beans/beaninfo/images/JRadioButtonMono16.gif.i
+data/test/org/openjdk/jigsaw/ContextBuilder.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_de.properties.i
+data/test/java/rmi/reliability/benchmark/bench/ConfigFormatException.java.i
data/make/tools/CharsetMapping/IBM869.map.i
-data/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh.i
+data/src/share/classes/sun/awt/image/ImageFetcher.java.i
data/src/share/classes/java/awt/Image.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties.i
data/src/solaris/classes/sun/font/XRGlyphCache.java.i
-data/make/netbeans/swing/build.properties.i
data/src/share/classes/sun/security/x509/PolicyInformation.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java.i
-data/test/sun/net/www/protocol/http/UserCookie.java.i
+data/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java.i
data/test/sun/security/provider/PolicyFile/TokenStore.RelPassPolicy.i
data/src/solaris/classes/sun/awt/X11/XPropertyCache.java.i
data/make/tools/swing-beans/beaninfo/images/JScrollPaneColor16.gif.i
data/test/java/math/BigInteger/ModPowPowersof2.java.i
data/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java.i
data/test/java/nio/Buffer/genCopyDirectMemory.sh.i
-data/test/sun/tools/jstat/jstatSnap2.sh.i
+data/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java.i
data/src/share/classes/javax/naming/Context.java.i
data/test/java/beans/Introspector/4520754/Test4520754.java.i
data/test/javax/xml/crypto/dsig/SignatureValidator.java.i
data/src/share/classes/java/util/concurrent/Executor.java.i
data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider.i
-data/src/share/classes/sun/misc/Compare.java.i
+data/src/share/classes/java/lang/reflect/InvocationHandler.java.i
+data/src/share/lib/images/cursors/invalid32x32.gif.i
data/src/share/classes/java/lang/management/ManagementFactory.java.i
-data/src/share/demo/management/JTop/JTopPlugin.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.i
+data/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java.i
data/src/share/classes/sun/tools/tree/SynchronizedStatement.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmslut.c.i
data/src/share/classes/sun/nio/cs/ext/IBM1006.java.i
data/make/tools/CharsetMapping/IBM942.map.i
data/src/share/classes/java/awt/image/ImageProducer.java.i
@@ -11324,51 +11217,51 @@ data/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java.i
data/src/share/native/sun/awt/libpng/pngget.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java.i
data/test/sun/nio/cs/Test4206507.java.i
+data/test/java/lang/instrument/TransformerManagementThreadAddTests.java.i
data/test/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java.i
-data/test/java/io/Serializable/evolution/RenamePackage/test/SerialDriver.java.i
+data/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java.i
data/src/windows/classes/sun/awt/Win32FontManager.java.i
data/src/share/classes/java/lang/ref/ReferenceQueue.java.i
data/src/share/native/sun/font/layout/TibetanReordering.h.i
data/test/java/io/Serializable/classDescFlagConflict/Foo.ser.i
data/test/java/beans/XMLEncoder/java_util_Collections_SingletonList.java.i
-data/src/share/classes/java/util/Calendar.java.i
-data/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.java.i
-data/test/java/awt/FontClass/FontAccess.java.i
+data/src/share/classes/java/awt/image/VolatileImage.java.i
+data/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java.i
data/src/windows/native/sun/windows/awt_InputEvent.cpp.i
data/test/java/net/ipv6tests/BadIPv6Addresses.java.i
-data/src/share/native/sun/awt/image/imageInitIDs.h.i
+data/test/com/sun/jdi/FetchLocals.java.i
data/test/java/security/cert/CertificateFactory/openssl/BadFooter.java.i
-data/test/java/lang/StackTraceElement/PublicConstructor.java.i
-data/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java.i
+data/src/share/native/sun/security/ec/ecp_384.c.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java.i
data/src/solaris/sample/dtrace/hotspot/class_loading_stat.d.i
data/src/share/demo/applets/WireFrame/models/dinasaur.obj.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/dnsstore.i
data/src/solaris/classes/sun/awt/X11/XKeysym.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_2.java.i
-data/test/com/sun/tools/attach/java.policy.deny.i
+data/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java.i
data/src/share/classes/sun/nio/cs/ISO_8859_15.java.i
data/test/java/io/OutputStreamWriter/Encode.java.i
-data/src/share/classes/java/text/AttributedCharacterIterator.java.i
-data/src/share/classes/sun/applet/AppletImageRef.java.i
+data/src/share/classes/java/io/ExpiringCache.java.i
+data/make/mkdemo/jvmti/heapViewer/Makefile.i
data/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java.i
data/test/sun/tools/jstat/classOutput1.awk.i
-data/src/share/classes/sun/io/ByteToCharCp285.java.i
+data/test/sun/security/provider/PolicyFile/AliasExpansion.java.i
data/test/java/rmi/testlibrary/RegistryRunner_Stub.java.i
-data/test/javax/swing/GroupLayout/6613904/bug6613904.java.i
+data/src/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java.i
-data/src/share/classes/sun/net/ftp/FtpClientProvider.java.i
+data/src/share/classes/com/sun/awt/SecurityWarning.java.i
+data/src/share/native/java/lang/fdlibm/src/w_exp.c.i
data/test/java/awt/Focus/FocusTraversalPolicy/DefaultFTPTest.java.i
data/src/share/classes/javax/sound/midi/Sequencer.java.i
data/test/sun/net/www/protocol/http/B6299712.java.i
data/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java.i
-data/src/share/classes/javax/swing/text/html/ResourceLoader.java.i
+data/src/share/classes/sun/rmi/transport/DGCImpl.java.i
data/src/share/classes/com/sun/security/sasl/PlainClient.java.i
-data/src/share/transport/shmem/shmemBack.c.i
data/src/share/demo/nbproject/jfc/Notepad/build.xml.i
data/src/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java.i
-data/src/share/classes/javax/crypto/ExemptionMechanismSpi.java.i
-data/src/share/classes/javax/sound/sampled/AudioFileFormat.java.i
-data/src/share/classes/com/sun/media/sound/SoftSincResampler.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java.i
+data/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java.i
+data/src/share/classes/java/dyn/MethodType.java.i
data/src/windows/native/sun/windows/awt_Insets.cpp.i
data/src/share/classes/sun/tools/jconsole/resources/masthead-right.png.i
data/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java.i
@@ -11379,22 +11272,22 @@ data/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java.i
data/src/share/classes/java/awt/im/spi/package.html.i
data/src/share/classes/javax/security/auth/callback/package.html.i
data/test/javax/management/mxbean/ComparatorExceptionTest.java.i
-data/test/javax/swing/RepaintManager/6608456/bug6608456.java.i
data/test/java/beans/PropertyEditor/TestStringClassNull.java.i
data/src/windows/native/sun/windows/awtmsg.h.i
data/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java.i
data/src/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java.i
-data/make/tools/strip_properties/Makefile.i
+data/src/share/classes/sun/net/www/http/HttpCapture.java.i
data/test/java/net/DatagramSocket/SetReceiveBufferSize.java.i
data/src/solaris/native/sun/nio/fs/SolarisWatchService.c.i
data/make/com/sun/java/pack/FILES_cpp.gmk.i
data/src/share/npt/README.txt.i
-data/test/java/util/concurrent/DelayQueue/Iterate.java.i
+data/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java.i
data/src/share/classes/javax/print/attribute/standard/JobStateReason.java.i
data/test/com/sun/security/sasl/names.properties.i
data/src/share/classes/javax/print/attribute/standard/JobState.java.i
data/src/share/classes/javax/naming/directory/NoSuchAttributeException.java.i
data/src/share/demo/jvmti/hprof/hprof_trace.c.i
+data/test/javax/management/namespace/NamespaceControllerMBean.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpStatusException.java.i
data/test/java/beans/Introspector/4520754/infos/ComponentBeanInfo.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java.i
@@ -11407,43 +11300,41 @@ data/make/com/sun/security/jgss/Makefile.i
data/src/share/native/com/sun/media/sound/PortMixerProvider.c.i
data/test/com/sun/jdi/JdbVarargsTest.sh.i
data/src/share/classes/sun/text/resources/CollationData_vi.java.i
-data/src/share/classes/javax/print/event/package.html.i
+data/src/share/classes/com/sun/tracing/ProbeName.java.i
data/test/java/rmi/activation/CommandEnvironment/security.policy.i
data/src/solaris/classes/sun/awt/X11/generator/sizes.64-solaris-i386.i
data/src/share/classes/java/util/logging/Handler.java.i
-data/test/java/lang/Throwable/LocalizedMessage.java.i
-data/test/com/sun/security/sasl/pw.properties.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png.i
+data/src/share/demo/java2d/J2DBench/README.i
+data/src/share/classes/sun/tools/tree/BinaryExpression.java.i
+data/src/share/classes/java/rmi/package.html.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_CN.properties.i
-data/src/share/classes/sun/security/util/ManifestEntryVerifier.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/zutil.c.i
data/src/share/back/ClassLoaderReferenceImpl.c.i
data/src/share/classes/sun/security/jca/ProviderConfig.java.i
-data/make/sun/nio/cs/Makefile.i
-data/src/share/classes/com/sun/jdi/AbsentInformationException.java.i
+data/src/share/classes/sun/dyn/ToGeneric.java.i
data/src/share/classes/java/awt/doc-files/FocusCycle.gif.i
data/src/solaris/classes/sun/awt/motif/java.fonts.dir.i
data/test/tools/pack200/Pack200Test.java.i
-data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i
+data/src/linux/doc/man/jarsigner.1.i
data/test/java/nio/charset/coders/IOCoders.java.i
-data/src/share/native/sun/awt/libpng/pngrutil.c.i
-data/src/solaris/native/java/io/UnixFileSystem_md.c.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/GoodProvider.java.i
-data/src/share/classes/java/util/concurrent/CancellationException.java.i
+data/src/share/classes/sun/java2d/Surface.java.i
+data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav.i
+data/src/share/classes/sun/rmi/rmic/IndentingWriter.java.i
+data/src/linux/doc/man/schemagen.1.i
data/test/java/io/RandomAccessFile/WriteUTF.java.i
data/src/share/native/sun/awt/image/jpeg/jccolor.c.i
-data/src/share/classes/sun/swing/plaf/synth/SynthUI.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java.i
-data/make/tools/src/build/tools/jdwpgen/CommentNode.java.i
-data/test/java/net/Inet6Address/IPv6Numeric.java.i
+data/src/share/classes/sun/management/counter/StringCounter.java.i
+data/test/java/net/CookieHandler/CookieManagerTest.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/README.i
+data/src/solaris/native/sun/nio/ch/DatagramDispatcher.c.i
data/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.h.i
-data/src/share/classes/java/rmi/server/ServerNotActiveException.java.i
data/src/windows/native/sun/windows/awt_PopupMenu.h.i
-data/src/share/classes/sun/security/krb5/internal/UDPClient.java.i
+data/make/sun/cmm/kcms/Makefile.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java.i
data/src/share/classes/javax/swing/plaf/nimbus/Effect.java.i
-data/test/java/io/File/GetParent.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpGauge.java.i
data/test/java/net/URL/jar_urls.i
-data/test/sun/security/tools/jarsigner/Test4431684.java.i
+data/src/share/classes/sun/reflect/annotation/AnnotationParser.java.i
data/test/java/io/FileInputStream/LargeFileAvailable.java.i
data/test/java/util/jar/JarInputStream/BadSignedJar.jar.i
data/src/share/classes/javax/print/attribute/standard/JobStateReasons.java.i
@@ -11453,73 +11344,68 @@ data/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java.i
data/src/solaris/classes/sun/awt/motif/X11GB18030_0.java.i
data/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java.i
data/src/share/classes/javax/management/ClientContext.java.i
-data/src/share/classes/java/net/URL.java.i
-data/test/sun/security/krb5/auto/Context.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/ca.key.i
-data/src/share/classes/javax/naming/NameClassPair.java.i
+data/test/java/util/Hashtable/SimpleSerialization.java.i
+data/src/share/classes/sun/text/resources/CollationData_cs.java.i
+data/src/share/classes/javax/script/ScriptContext.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_NN.c.i
data/src/share/native/sun/java2d/loops/DrawPath.h.i
data/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.h.i
data/src/share/classes/java/awt/Label.java.i
data/src/windows/native/sun/java2d/d3d/D3DMaskCache.h.i
data/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java.i
-data/src/share/classes/sun/io/CharToByteHKSCS.java.i
+data/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java.i
data/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java.i
data/test/java/security/cert/CertPathValidatorException/Serial.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java.i
-data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html.i
+data/make/tools/CharsetMapping/IBM864.map.i
+data/test/java/util/jar/JarFile/MevNPE.java.i
data/src/share/classes/sun/text/resources/FormatData_it.java.i
data/make/tools/sharing/classlist.windows.i
data/test/java/util/Locale/data/deflocale.win7.fmtasdefault.i
data/test/java/io/FileInputStream/OpenDir.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java.i
+data/src/linux/doc/man/jstatd.1.i
data/src/share/classes/sun/tools/util/CommandLine.java.i
data/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.java.i
data/src/share/classes/javax/swing/plaf/ProgressBarUI.java.i
-data/test/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java.i
-data/src/share/classes/java/util/BitSet.java.i
-data/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java.i
+data/src/share/classes/javax/swing/colorchooser/CenterLayout.java.i
+data/src/share/classes/sun/text/resources/FormatData_fr_LU.java.i
data/src/share/classes/sun/jvmstat/monitor/MonitorException.java.i
-data/src/share/demo/jfc/Font2DTest/Font2DTest.html.i
+data/test/java/awt/font/TextLayout/TestHebrewMark.java.i
data/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java.i
data/src/share/classes/javax/print/DocPrintJob.java.i
data/test/java/beans/Introspector/Test6868189.java.i
data/src/share/native/sun/awt/image/jpeg/jidctred.c.i
-data/test/java/beans/Introspector/Test4498236.java.i
+data/src/share/demo/management/FullThreadDump/ThreadMonitor.java.i
data/test/sun/security/provider/PolicyFile/Comparator.Principal.Policy.i
-data/src/share/classes/javax/swing/plaf/multi/package.html.i
+data/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java.i
data/test/java/awt/font/NumericShaper/EasternArabicTest.java.i
data/src/share/classes/javax/naming/ldap/LdapContext.java.i
data/test/java/net/InterfaceAddress/NetworkPrefixLength.java.i
-data/src/share/classes/com/sun/beans/finder/ClassFinder.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM871.java.i
data/src/share/classes/javax/management/namespace/JMXRemoteNamespaceMBean.java.i
data/src/share/classes/java/awt/image/RGBImageFilter.java.i
-data/src/share/classes/sun/net/httpserver/LeftOverInputStream.java.i
data/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java.i
-data/test/javax/xml/crypto/dsig/data/exc-signature.xml.i
data/src/windows/classes/sun/java2d/windows/Win32SurfaceDataProxy.java.i
data/test/sun/security/tools/keytool/resource.sh.i
data/test/sun/nio/cs/OLD/IBM943_OLD.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_th.properties.i
+data/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c.i
data/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java.i
-data/test/sun/nio/cs/SurrogateTestEUCTW.plane3.surrogates.i
-data/test/java/util/Collections/RotateEmpty.java.i
-data/src/share/demo/jvmti/waiters/Agent.cpp.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java.i
+data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml.i
data/test/java/awt/dnd/ImageDecoratedDnDNegative/DnDTarget.java.i
data/test/java/security/Security/removing/RemoveProviders.java.i
data/test/java/rmi/activation/Activatable/downloadParameterClass/Bar.java.i
data/test/java/io/Serializable/subclass/run.sh.i
data/test/java/io/Writer/WriteParams.java.i
data/make/common/internal/Defs-jaxp.gmk.i
-data/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java.i
+data/src/share/javavm/export/jawt.h.i
+data/src/share/classes/sun/security/tools/KeyTool.java.i
data/src/share/classes/sun/net/spi/nameservice/dns/DNSNameServiceDescriptor.java.i
-data/src/solaris/classes/sun/awt/X11/InfoWindow.java.i
-data/test/javax/imageio/plugins/jpeg/WritingInterruptionTest.java.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c.i
-data/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java.i
+data/src/share/classes/sun/swing/WindowsPlacesBar.java.i
+data/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java.i
data/src/share/classes/javax/management/timer/package.html.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/AcceptLargeFragments.java.i
-data/src/share/classes/sun/io/ByteToCharCp949C.java.i
-data/src/share/native/com/sun/java/util/jar/pack/zip.h.i
+data/test/javax/management/Introspector/DescribedMX.java.i
data/src/solaris/classes/sun/awt/X11/XCursorFontConstants.java.i
data/test/sun/net/InetAddress/nameservice/simple/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
data/test/javax/crypto/CryptoPermission/RC2PermCheck.java.i
@@ -11535,31 +11421,28 @@ data/make/sun/javazic/javatz/jdk1.1.x_zone_ids.txt.i
data/src/share/classes/com/sun/tools/hat/internal/parser/MappedReadBuffer.java.i
data/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java.i
data/src/share/demo/jfc/FileChooserDemo/README.txt.i
-data/src/solaris/classes/sun/awt/X11/XException.java.i
+data/src/share/classes/sun/tools/tree/SubtractExpression.java.i
data/test/javax/swing/UIDefaults/6795356/bug6795356.java.i
data/test/sun/net/www/protocol/jar/jarbug/etc/jar1/res1.txt.i
data/src/share/classes/sun/awt/VariableGridLayout.java.i
data/src/share/demo/jfc/Metalworks/MetalworksDocumentFrame.java.i
-data/src/share/demo/nbproject/jfc/SwingApplet/build.xml.i
-data/test/javax/management/loading/LibraryLoader/UseNativeLib1.html.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnUnmarshal.java.i
data/make/sun/security/other/Makefile.i
data/src/windows/back/linker_md.c.i
-data/src/share/classes/javax/imageio/spi/IIOServiceProvider.java.i
-data/test/java/rmi/reliability/juicer/OrangeEchoImpl.java.i
+data/test/java/util/Currency/Bug4512215.java.i
+data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml.i
data/test/java/lang/instrument/ilib/RuntimeConstants.java.i
data/test/java/security/cert/pkix/nameConstraintsMinMax/VerifyNameConstraints.java.i
data/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java.i
-data/src/share/demo/nbproject/jfc/Notepad/nbproject/jdk.xml.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_OM.properties.i
+data/src/share/classes/sun/util/resources/LocaleNames_ro.properties.i
data/src/share/classes/javax/management/ManagedAttribute.java.i
-data/src/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java.i
+data/src/share/classes/javax/net/ssl/SSLEngineResult.java.i
data/src/windows/javavm/include/typedefs_md.h.i
-data/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIBOidTable.java.i
+data/test/java/nio/channels/FileChannel/ReadFull.java.i
data/test/javax/xml/crypto/dsig/data/signature-external-dsa.xml.i
data/test/javax/swing/JTableHeader/6889007/bug6889007.java.i
data/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java.i
-data/src/windows/classes/sun/awt/windows/WGlobalCursorManager.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java.i
+data/test/javax/management/relation/RelationNotificationSourceTest.java.i
data/src/linux/doc/man/ja/wsimport.1.i
data/make/sun/net/others/Makefile.i
data/test/java/security/KeyRep/Serial.java.i
@@ -11572,86 +11455,86 @@ data/src/share/classes/sun/tools/jstat/ExpressionEvaluator.java.i
data/make/common/Modules.gmk.i
data/src/solaris/hpi/export/timeval_md.h.i
data/src/share/classes/javax/naming/BinaryRefAddr.java.i
-data/src/share/classes/com/sun/security/auth/module/NTSystem.java.i
-data/test/com/sun/jdi/redefine/SchemaChange_RedefineSubTarg.java.i
+data/src/share/classes/java/lang/VerifyError.java.i
+data/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java.i
data/src/share/classes/sun/util/logging/resources/logging_fr.properties.i
data/src/share/classes/java/util/zip/GZIPOutputStream.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so.d
data/src/share/demo/jvmti/waiters/Monitor.cpp.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so.i
data/src/share/classes/sun/java2d/pisces/PiscesCache.java.i
-data/src/share/native/sun/font/FontInstanceAdapter.cpp.i
data/src/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java.i
-data/src/share/classes/sun/io/ByteToCharEUC_KR.java.i
+data/src/share/classes/sun/io/ByteToCharCp942C.java.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java.i
data/src/share/classes/sun/awt/resources/awt_sv.properties.i
data/test/sun/security/pkcs11/ec/TestCurves.java.i
-data/src/share/demo/jfc/FileChooserDemo/ExampleFileView.java.i
-data/src/share/classes/java/awt/doc-files/Checkbox-1.gif.i
+data/src/share/classes/sun/awt/NullComponentPeer.java.i
data/test/java/util/zip/TestZipError.java.i
data/make/tools/swing-beans/beaninfo/images/BoxMono16.gif.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedSet.java.i
-data/src/share/native/java/lang/fdlibm/src/e_cosh.c.i
-data/src/solaris/native/sun/awt/awt_mgrsel.c.i
+data/test/java/security/BasicPermission/PermClass.1.4.i
+data/src/share/demo/applets/SimpleGraph/example1.html.i
data/test/com/sun/crypto/provider/Cipher/AES/Test4512704.java.i
-data/src/share/classes/sun/awt/resources/awt_ko.properties.i
+data/src/share/classes/sun/util/resources/CalendarData_lt.properties.i
data/src/share/classes/javax/management/build.xml.i
data/test/sun/net/www/http/ChunkedInputStream/TestAvailable.java.i
data/src/share/classes/sun/dyn/FromGeneric.java.i
-data/test/sun/java2d/OpenGL/GradientPaints.java.i
+data/src/share/classes/java/awt/event/InvocationEvent.java.i
+data/src/share/classes/java/awt/Transparency.java.i
data/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java.i
-data/test/java/awt/print/PrinterJob/PrtException.java.i
+data/test/java/beans/PropertyEditor/TestLongClass.java.i
data/src/share/native/sun/misc/Signal.c.i
-data/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/ShortArrayCalls.java.i
+data/src/share/classes/javax/swing/text/html/HRuleView.java.i
+data/make/tools/CharsetMapping/ISO_8859_6.map.i
data/make/tools/CharsetMapping/HKSCS2001.c2b.i
data/src/share/classes/java/nio/file/NotLinkException.java.i
data/src/share/native/sun/java2d/loops/Ushort565Rgb.h.i
-data/src/share/classes/javax/management/event/RMIPushEventForwarder.java.i
-data/src/share/classes/sun/util/resources/CalendarData_pl.properties.i
+data/src/share/classes/sun/text/resources/FormatData_pl.java.i
+data/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c.i
data/test/com/sun/security/sasl/digest/ClientCallbackHandler.java.i
data/src/windows/native/sun/java2d/windows/WindowsFlags.h.i
data/test/java/rmi/server/serverStackTrace/ServerStackTrace_Stub.java.i
data/src/share/classes/sun/jvmstat/monitor/MonitoredHost.java.i
data/test/java/nio/channels/ServerSocketChannel/SocketOptionTests.java.i
data/src/share/classes/sun/security/util/AuthResources_de.java.i
-data/test/java/nio/channels/Selector/SelectorTest.java.i
+data/test/javax/swing/border/Test4760089.java.i
data/make/modules/tools/src/com/sun/classanalyzer/ClassPath.java.i
data/src/share/classes/java/util/Random.java.i
data/src/solaris/bin/ergo_sparc.c.i
-data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java.i
+data/src/share/classes/java/awt/doc-files/RadialGradientPaint-4.png.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ModifyCorePoolSize.java.i
data/src/share/classes/sun/text/resources/BreakIteratorRules.java.i
-data/test/com/sun/net/httpserver/SimpleSSLContext.java.i
data/src/share/classes/sun/security/krb5/RealmException.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Strings.java.i
-data/src/share/classes/java/awt/doc-files/GridBagLayout-baseline.png.i
+data/src/share/native/java/lang/fdlibm/src/k_standard.c.i
+data/src/share/classes/sun/java2d/Disposer.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java.i
+data/src/share/classes/javax/sound/midi/MidiUnavailableException.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties.i
data/test/java/awt/TrayIcon/DragEventSource/DragEventSource.java.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java.i
data/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java.i
-data/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java.i
+data/src/solaris/classes/sun/misc/FileURLMapper.java.i
data/test/java/util/ServiceLoader/FooProvider1.java.i
data/test/sun/nio/cs/FindASCIICodingBugs.java.i
-data/src/share/classes/java/security/interfaces/DSAPrivateKey.java.i
-data/src/solaris/native/sun/awt/awt_DrawingSurface.h.i
+data/test/java/nio/channels/Pipe/EmptyRead.java.i
+data/src/share/classes/javax/swing/text/html/OptionComboBoxModel.java.i
data/test/java/rmi/activation/Activatable/createPrivateActivable/rmid.security.policy.i
data/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java.i
-data/test/java/nio/channels/AsyncCloseAndInterrupt.java.i
+data/src/share/classes/java/security/SecureClassLoader.java.i
data/src/share/demo/nbproject/jfc/TransparentRuler/build.properties.i
data/src/share/native/sun/java2d/loops/IntRgb.h.i
-data/src/share/classes/sun/io/CharToByteMS932DB.java.i
data/test/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html.i
-data/make/java/jli/mapfile-vers.i
data/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java.i
data/src/share/classes/java/sql/NClob.java.i
data/src/windows/native/sun/java2d/windows/dxInit.cpp.i
+data/test/sun/net/www/ftptest/FtpFileSystemHandler.java.i
data/test/java/rmi/invalidName/InvalidName.java.i
data/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java.i
data/src/share/classes/sun/security/x509/OCSPNoCheckExtension.java.i
data/test/sun/security/pkcs11/Serialize/SerializeProvider.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/CipherSuite/SSL_NULL.java.i
-data/make/tools/src/build/tools/jdwpgen/ReferenceIDTypeNode.java.i
+data/src/share/classes/com/sun/security/auth/PolicyParser.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java.i
data/src/share/classes/java/nio/charset/package.html.i
data/src/share/classes/javax/swing/doc-files/groupLayout.1.gif.i
data/test/java/nio/channels/FileChannel/ClosedChannelTransfer.java.i
@@ -11661,21 +11544,21 @@ data/src/share/classes/java/awt/TextField.java.i
data/src/solaris/native/sun/awt/XDrawingAreaP.h.i
data/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java.i
data/test/java/beans/XMLEncoder/javax_swing_KeyStroke.java.i
-data/test/java/awt/print/PrinterJob/ExceptionTest.java.i
+data/test/java/awt/regtesthelpers/AbstractTest.java.i
+data/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c.i
data/make/tools/CharsetMapping/IBM1140.map.i
data/test/javax/management/modelmbean/OnUnregisterTest.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java.i
-data/src/share/classes/sun/tools/asm/NumberConstantData.java.i
-data/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java.i
-data/test/java/lang/instrument/ATestCaseScaffold.java.i
+data/test/sun/tools/jps/usage.out.i
+data/src/share/classes/java/net/SdpSocketImpl.java.i
data/test/java/lang/Thread/StartOOMTest.java.i
data/src/share/classes/java/lang/NegativeArraySizeException.java.i
-data/src/share/classes/sun/java2d/pipe/RenderQueue.java.i
+data/src/share/classes/com/sun/jdi/ArrayType.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java.i
-data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.h.i
-data/test/java/io/Serializable/skipToEndOfBlockData/SkipToEndOfBlockData.java.i
+data/make/tools/swing-beans/beaninfo/images/JPanelMono16.gif.i
+data/src/share/classes/sun/io/CharToByteUnicodeLittle.java.i
data/src/share/classes/sun/font/FontResolver.java.i
-data/src/share/classes/javax/management/monitor/package.html.i
+data/src/share/native/com/sun/java/util/jar/pack/zip.h.i
data/src/share/classes/sun/io/ByteToCharCp1141.java.i
data/test/java/lang/Integer/ParsingTest.java.i
data/make/tools/UnicodeData/SpecialCasing.txt.i
@@ -11689,273 +11572,273 @@ data/src/share/classes/javax/security/auth/spi/package.html.i
data/src/share/classes/com/sun/jdi/VMDisconnectedException.java.i
data/src/solaris/doc/sun/man/man1/ja/javaws.1.i
data/src/windows/native/java/io/Console_md.c.i
-data/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java.i
+data/src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java.i
data/src/share/classes/sun/text/resources/FormatData_lt.java.i
-data/src/share/demo/management/JTop/JTop.java.i
+data/src/share/classes/sun/misc/VMNotification.java.i
data/src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java.i
data/test/java/io/OutputStream/WriteParams.java.i
-data/src/share/classes/sun/tools/tree/ShiftLeftExpression.java.i
+data/src/share/classes/sun/io/CharToByteSJIS.java.i
data/src/windows/hpi/export/byteorder_md.h.i
data/test/com/sun/jdi/ConstantPoolInfo.java.i
+data/test/sun/nio/cs/TestCompoundTest.java.i
data/test/java/net/Socket/OldSocketImpl.sh.i
data/src/share/classes/java/text/CollationElementIterator.java.i
-data/test/java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmscam02.c.i
-data/src/share/classes/sun/text/normalizer/Trie.java.i
+data/src/share/native/sun/security/ec/impl/ec2_233.c.i
+data/src/solaris/native/sun/awt/list.c.i
+data/make/tools/src/build/tools/jdwpgen/BooleanTypeNode.java.i
data/src/share/classes/sun/tools/tree/AddExpression.java.i
data/test/sun/security/tools/jarsigner/AlgOptions.sh.i
data/test/java/lang/Long/ParsingTest.java.i
-data/make/tools/swing-beans/beaninfo/images/JProgressBarMono16.gif.i
-data/src/share/native/sun/font/AccelGlyphCache.c.i
+data/src/share/classes/java/util/IllegalFormatPrecisionException.java.i
data/src/windows/native/sun/java2d/j2d_md.h.i
-data/test/java/io/LineNumberReader/Skip.java.i
-data/src/share/classes/sun/text/resources/FormatData_is_IS.java.i
+data/test/lib/security/java.policy/Ext_AllPolicy.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM1026.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java.i
data/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java.i
data/src/windows/native/sun/windows/awt_Button.h.i
data/src/share/classes/sun/nio/cs/ext/IBM939.java.i
data/test/sun/java2d/pisces/Test7036754.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java.i
data/test/java/io/Serializable/readPastObject/ReadPastObject.java.i
+data/test/java/lang/instrument/NoTransformerAddedTest.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c.i
-data/test/javax/management/namespace/DomainCreationTest.java.i
-data/test/javax/imageio/plugins/bmp/TopDownTest.java.i
+data/test/com/sun/tools/attach/redefineagent.mf.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java.i
data/test/java/security/cert/pkix/nameConstraintsMinMax/sun.cer.i
data/test/java/awt/print/PrinterJob/Margins.java.i
data/test/java/nio/charset/RemovingSunIO/TestCOMP.java.i
-data/test/java/awt/FileDialog/MultipleMode/MultipleMode.html.i
-data/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java.i
-data/src/share/classes/javax/swing/AbstractCellEditor.java.i
+data/src/share/classes/sun/tools/tree/AssignAddExpression.java.i
data/src/windows/native/sun/windows/ObjectList.h.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties.i
data/src/share/classes/sun/security/x509/FreshestCRLExtension.java.i
-data/test/java/security/BasicPermission/SerialVersion.java.i
+data/src/share/classes/sun/awt/dnd/SunDropTargetEvent.java.i
data/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java.i
data/make/com/sun/java/pack/prop/Makefile.i
-data/test/sun/security/validator/samedn.sh.i
+data/src/share/native/sun/font/layout/TibetanLayoutEngine.h.i
+data/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp.i
data/src/share/native/java/lang/fdlibm/src/e_gamma.c.i
data/src/share/native/sun/security/ec/impl/ec_naf.c.i
-data/src/solaris/classes/sun/java2d/xr/XRMaskImage.java.i
+data/test/java/io/File/MaxPathLength.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties.i
data/src/share/classes/sun/util/resources/CurrencyNames_zh_TW.properties.i
data/src/share/classes/sun/nio/cs/ext/IBM33722.java.i
-data/src/share/classes/sun/io/ByteToCharCp1149.java.i
+data/src/share/native/sun/font/layout/SinglePositioningSubtables.h.i
data/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java.i
+data/test/sun/security/rsa/TestSignatures.java.i
+data/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java.i
data/make/tools/CharsetMapping/IBM850.map.i
data/test/sun/security/krb5/auto/BadKdc3.java.i
data/src/share/classes/com/sun/jmx/snmp/ServiceName.java.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarC/my/impl/StandardMessageService.java.i
-data/src/share/native/java/lang/fdlibm/src/w_atanh.c.i
-data/test/java/util/Collections/FindSubList.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java.i
+data/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java.i
+data/src/windows/native/sun/windows/ComCtl32Util.cpp.i
+data/test/java/nio/file/Files/walkFileTree/denyAll.policy.i
+data/make/common/internal/NativeCompileRules.gmk.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java.i
data/test/java/rmi/registry/reexport/Reexport.java.i
data/src/share/classes/javax/swing/event/TableModelEvent.java.i
data/make/tools/CharsetMapping/DoubleByte-X.java.template.i
-data/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java.i
+data/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java.i
data/src/share/native/sun/java2d/loops/ByteBinary4Bit.h.i
data/src/share/classes/sun/reflect/MethodAccessorGenerator.java.i
-data/src/share/classes/sun/tools/jar/resources/jar.properties.i
data/src/share/classes/java/security/spec/ECGenParameterSpec.java.i
data/src/share/classes/sun/io/ByteToCharCp868.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/inftrees.h.i
-data/src/windows/classes/sun/nio/fs/WindowsWatchService.java.i
data/src/share/classes/java/util/concurrent/DelayQueue.java.i
-data/src/share/classes/sun/tools/jar/resources/jar_ja.properties.i
+data/test/org/openjdk/jigsaw/cli/expired-signer-cert.pem.i
+data/src/share/classes/sun/security/ec/ECPublicKeyImpl.java.i
+data/test/java/nio/channels/Selector/OutOfBand.java.i
data/test/java/beans/PropertyChangeSupport/TestSerialization.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java.i
data/src/share/classes/sun/tools/attach/HotSpotAttachProvider.java.i
data/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java.i
data/test/sun/nio/cs/DecoderOverflow.java.i
data/src/share/classes/sun/util/resources/LocaleNames_fr.properties.i
-data/src/share/native/sun/font/layout/MPreFixups.h.i
-data/make/com/sun/security/auth/Makefile.i
+data/src/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java.i
data/test/sun/net/InetAddress/nameservice/simple/CacheTest.java.i
data/make/tools/swing-beans/beaninfo/images/JToolBarMono32.gif.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/DynamicTest.java.i
+data/test/sun/security/pkcs11/Secmod/secmod.db.i
data/make/netbeans/common/build-folder.ent.i
data/src/share/classes/javax/swing/JFileChooser.java.i
-data/src/windows/native/sun/jkernel/stdafx.cpp.i
+data/src/share/classes/java/security/SecurityPermission.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileStore.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif.i
+data/test/java/io/LineNumberReader/MarkReset.java.i
data/src/share/classes/sun/java2d/pisces/Transform4.java.i
-data/test/sun/security/pkcs11/tls/TestPRF.java.i
+data/test/java/lang/StringBuffer/InsertMaxValue.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/deflate.c.i
data/src/share/classes/sun/tools/tree/InlineReturnStatement.java.i
data/src/share/classes/sun/io/CharToByteCp500.java.i
-data/src/share/classes/java/rmi/server/SkeletonNotFoundException.java.i
data/test/javax/security/auth/Subject/doAs/Test.java.i
data/src/windows/native/sun/windows/awt_Object.h.i
data/src/share/classes/com/sun/rowset/package.html.i
data/make/sun/dcpr/FILES_c.gmk.i
data/test/sun/security/mscapi/SignUsingNONEwithRSA.sh.i
-data/test/java/nio/charset/spi/FooProvider.java.i
-data/src/windows/native/sun/java2d/d3d/D3DShaderGen.c.i
+data/src/share/classes/org/openjdk/jigsaw/LoaderPool.java.i
data/test/sun/security/krb5/UnknownCCEntry.java.i
data/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh.i
data/src/share/native/sun/font/layout/TibetanReordering.cpp.i
data/test/java/net/ResponseCache/B6181108.java.i
data/src/share/classes/sun/font/Type1Font.java.i
+data/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/Echo.java.i
data/test/javax/management/monitor/StartStopTest.java.i
-data/src/share/classes/com/sun/servicetag/package.html.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedByteFieldAccessorImpl.java.i
-data/src/share/classes/javax/management/remote/JMXConnectorServer.java.i
-data/test/java/io/RandomAccessFile/WriteBytesChars.java.i
+data/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java.i
data/test/java/lang/module/Main.java.i
-data/src/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java.i
-data/make/java/nio/reorder-sparcv9.i
+data/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Traffic.java.i
data/src/share/classes/java/awt/font/LineBreakMeasurer.java.i
data/test/java/nio/channels/DatagramChannel/NotBound.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh.i
+data/src/share/classes/sun/io/ByteToCharCp277.java.i
data/src/share/classes/sun/io/ByteToCharMacCroatian.java.i
data/src/share/classes/javax/swing/JComboBox.java.i
data/src/share/classes/javax/management/remote/JMXConnectorProvider.java.i
-data/src/share/classes/sun/tools/tree/GreaterExpression.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy25.i
data/src/solaris/classes/sun/nio/fs/UnixCopyFile.java.i
data/make/java/java/Exportedfiles.gmk.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/TemplateLayer.java.i
-data/make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java.i
-data/test/java/net/InetAddress/B5087907.java.i
+data/src/solaris/hpi/native_threads/src/monitor_md.c.i
+data/test/javax/management/namespace/VirtualNamespaceQueryTest.java.i
data/src/share/classes/sun/rmi/transport/tcp/MultiplexConnectionInfo.java.i
-data/test/sun/security/tools/policytool/UsePolicy.html.i
+data/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency_Stub.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties.i
data/test/javax/swing/JSpinner/6532833/bug6532833.java.i
-data/src/share/classes/org/openjdk/jigsaw/ContextFactory.java.i
-data/src/share/classes/java/awt/image/DataBufferShort.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java.i
+data/src/share/classes/java/awt/Scrollbar.java.i
data/test/java/beans/XMLEncoder/java_lang_Enum.java.i
data/src/solaris/hpi/include/largefile_solaris.h.i
data/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java.i
-data/test/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf.i
+data/src/share/classes/sun/jvmstat/monitor/event/package.html.i
data/test/java/rmi/reliability/benchmark/bench/serial/ProxyClassDesc.java.i
data/src/share/classes/sun/text/resources/BreakIteratorRules_th.java.i
data/test/java/io/Serializable/classDescHooks/CNFException.java.i
-data/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java.i
+data/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java.i
data/src/solaris/native/sun/awt/awt_Choice21.c.i
data/src/share/native/com/sun/java/util/jar/pack/zip.cpp.i
data/src/solaris/native/sun/awt/awt_Mlib.h.i
data/src/share/demo/nbproject/management/VerboseGC/build.properties.i
-data/src/share/classes/java/lang/Comparable.java.i
-data/src/share/classes/sun/security/rsa/SunRsaSign.java.i
+data/make/tools/CharsetMapping/IBM870.map.i
data/test/org/openjdk/jigsaw/cli/signed-module.policy.i
data/test/javax/management/Introspector/DescribedMBean.java.i
data/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java.i
data/src/share/classes/org/openjdk/jigsaw/LinkingContext.java.i
-data/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java.i
-data/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstXor.c.i
+data/src/share/classes/javax/crypto/spec/PBEKeySpec.java.i
data/src/share/classes/javax/swing/text/CompositeView.java.i
data/test/java/rmi/registry/altSecurityManager/TestSecurityManager.java.i
-data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/jdk.xml.i
+data/src/share/classes/java/util/IllegalFormatWidthException.java.i
data/test/java/net/URLConnection/URLConnectionHeaders.java.i
data/make/javax/sound/FILES_c.gmk.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java.i
data/src/share/classes/com/sun/servicetag/WindowsSystemEnvironment.java.i
-data/src/share/classes/sun/awt/image/ImagingLib.java.i
+data/src/share/classes/org/openjdk/jigsaw/PathLinker.java.i
data/src/share/classes/com/sun/beans/decoder/NewElementHandler.java.i
-data/test/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java.i
+data/test/com/sun/tools/extcheck/TestExtcheckArgs.sh.i
data/src/share/classes/java/lang/instrument/IllegalClassFormatException.java.i
data/test/org/openjdk/jigsaw/optional-deps.sh.i
-data/test/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector.i
-data/src/share/native/sun/font/layout/GlyphPositioningTables.h.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java.i
data/src/share/classes/java/security/Signer.java.i
-data/src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES.i
+data/src/share/classes/sun/nio/cs/ext/IBM861.java.i
data/src/share/classes/javax/management/openmbean/TabularData.java.i
data/test/java/security/SignedObject/Correctness.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java.i
+data/src/share/classes/javax/net/ssl/ExtendedSSLSession.java.i
data/src/windows/native/sun/windows/awt_TextArea.h.i
data/test/java/util/ResourceBundle/Control/Chinese_zh_CN.properties.i
data/src/share/classes/sun/rmi/transport/Target.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Decoder.java.i
-data/src/share/classes/sun/io/CharToByteCp1025.java.i
+data/test/com/sun/crypto/provider/Cipher/PBE/PBEInvalidParamsTest.java.i
data/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c.i
-data/src/share/demo/jfc/TableExample/TableSorter.java.i
+data/test/java/io/BufferedInputStream/CountUpdate.java.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy.i
-data/test/sun/security/tools/jarsigner/JarSigningNonAscii.java.i
-data/src/share/classes/java/dyn/MethodHandleProvider.java.i
+data/make/sun/management/jmxremote/Makefile.i
+data/src/share/classes/sun/net/www/protocol/https/HttpsClient.java.i
data/test/java/io/Serializable/maskSyntheticModifier/Test.java.i
data/src/share/classes/javax/naming/spi/StateFactory.java.i
data/src/share/native/sun/awt/medialib/safe_alloc.h.i
-data/src/share/classes/java/nio/file/LinkPermission.java.i
-data/src/share/native/sun/java2d/loops/ByteBinary1Bit.h.i
+data/test/java/util/Locale/LocaleEnhanceTest.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Layer.java.i
+data/src/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java.i
data/make/java/text/base/FILES_java.gmk.i
-data/test/java/util/EnumSet/AllOf.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/RGBColorConvertTest.java.i
+data/test/javax/management/mxbean/OperationImpactTest.java.i
+data/src/share/demo/jfc/SampleTree/SampleTree.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java.i
-data/src/share/sample/nio/server/Reply.java.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java.i
data/make/tools/CharsetMapping/IBM1381.map.i
-data/test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java.i
+data/src/share/classes/sun/tools/java/Identifier.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/Host.java.i
data/test/javax/imageio/plugins/jpeg/ReadAsGrayTest.java.i
data/make/javax/crypto/policy/unlimited/default_local.policy.i
data/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh.i
data/src/share/classes/sun/security/provider/certpath/PolicyChecker.java.i
data/src/share/demo/jvmti/hprof/hprof_tag.c.i
-data/src/share/native/sun/font/DrawGlyphList.c.i
+data/make/sun/dcpr/Makefile.i
data/src/share/classes/sun/util/calendar/ZoneInfo.java.i
data/test/java/io/charStreams/BCat.java.i
+data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html.i
data/src/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java.i
-data/src/share/classes/javax/swing/ComponentInputMap.java.i
+data/make/tools/CharsetMapping/IBM284.c2b.i
data/src/solaris/native/sun/awt/awt_MToolkit.h.i
data/src/share/classes/javax/security/sasl/SaslClient.java.i
data/test/java/dyn/MethodHandlesTest.java.i
-data/test/java/util/zip/ZipFile/Available.java.i
+data/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java.i
data/src/share/classes/sun/io/CharToByteCp943C.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java.i
+data/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono32.gif.i
data/src/share/classes/sun/security/ssl/Krb5Helper.java.i
data/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java.i
data/src/share/native/sun/java2d/opengl/OGLSurfaceData.c.i
-data/src/share/classes/sun/java2d/pipe/TextPipe.java.i
+data/src/share/back/error_messages.h.i
data/make/mkdemo/applets/Blink/Makefile.i
data/src/share/classes/java/awt/event/KeyListener.java.i
-data/test/org/openjdk/jigsaw/optional-base.sh.i
-data/test/java/io/StreamTokenizer/Comment.java.i
-data/src/share/classes/sun/tools/java/AmbiguousClass.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java.i
+data/src/share/classes/sun/security/provider/SHA2.java.i
+data/make/sun/javazic/tzdata/pacificnew.i
data/test/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java.i
-data/test/sun/net/www/protocol/http/DigestTest.java.i
-data/test/java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java.i
+data/src/share/classes/sun/security/rsa/RSAPadding.java.i
data/src/share/classes/sun/management/HotspotInternalMBean.java.i
data/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java.i
-data/src/share/classes/com/sun/jmx/event/RepeatedSingletonJob.java.i
data/test/sun/misc/BootClassLoaderHook/TestHook.java.i
data/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java.i
data/src/share/demo/scripting/jconsole-plugin/src/scripts/jstack.js.i
data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java.i
-data/src/share/classes/sun/security/provider/certpath/CertId.java.i
+data/test/sun/security/tools/keytool/trystore.sh.i
data/test/sun/tools/jps/jps-Vvml.sh.i
data/src/share/classes/java/rmi/activation/ActivationGroupDesc.java.i
data/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java.i
data/make/tools/swing-beans/DocBeanInfo.java.i
data/src/share/classes/sun/util/resources/CalendarData_fr.properties.i
-data/src/share/demo/jvmti/hprof/hprof_object.h.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/crisubn.jks.i
data/test/sun/security/ssl/sanity/pluggability/CipherSuites.java.i
data/src/share/classes/java/awt/doc-files/FlowLayout-1.gif.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts.mf.i
-data/test/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java.i
-data/src/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java.i
+data/test/java/io/BufferedInputStream/ReadAfterClose.java.i
+data/src/share/demo/jvmti/gctest/sample.makefile.txt.i
+data/test/java/io/Serializable/class/SerialA_2.java.i
+data/src/share/classes/sun/io/CharToByteUnicodeLittleUnmarked.java.i
data/src/solaris/doc/sun/man/man1/pack200.1.i
data/make/sun/awt/FILES_export_unix.gmk.i
data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java.i
data/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java.i
-data/src/share/classes/com/sun/beans/WildcardTypeImpl.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-b64-dsa.xml.i
-data/test/javax/print/attribute/CollateAttr.java.i
+data/test/java/util/concurrent/ConcurrentQueues/GCRetention.java.i
+data/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java.i
data/test/sun/security/krb5/krb5.conf.i
-data/test/javax/management/remote/mandatory/notif/RMINotifTest.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Longs.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_U16.c.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java.i
+data/test/sun/tools/jstatd/jstatdPort.sh.i
+data/test/java/lang/ClassLoader/package2/Class2.java.i
data/test/java/lang/Class/forName/InitArg.java.i
data/src/share/classes/java/security/interfaces/ECPrivateKey.java.i
-data/test/java/rmi/activation/ActivationSystem/unregisterGroup/Callback_Stub.java.i
-data/src/share/classes/sun/security/util/PathList.java.i
+data/make/tools/src/build/tools/dtdbuilder/PublicMapping.java.i
data/src/share/classes/java/text/DigitList.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/ParserRules.java.i
data/make/tools/CharsetMapping/IBM1148.c2b.i
-data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java.i
+data/test/javax/management/context/LocaleTest.java.i
data/make/netbeans/jmx/build.xml.i
data/src/share/classes/sun/text/resources/FormatData_ar_TN.java.i
data/test/java/io/File/CheckTempDir.java.i
@@ -11963,79 +11846,79 @@ data/test/sun/net/www/HeaderTests.java.i
data/src/share/classes/sun/awt/shell/ShellFolder.java.i
data/test/org/openjdk/jigsaw/cli/ModuleFormatTest01.java.i
data/src/share/classes/sun/security/smartcardio/PCSCTerminals.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpAddress.java.i
data/src/share/native/sun/font/bidi/uchardir.h.i
-data/test/java/security/cert/CertPathBuilder/targetConstraints/ca.cer.i
-data/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c.i
+data/src/share/demo/java2d/J2DBench/resources/textdata/english.ut8.txt.i
+data/src/share/native/sun/security/ec/impl/ecdecode.c.i
data/src/linux/doc/man/ja/jconsole.1.i
+data/test/javax/management/mxbean/LeakTest.java.i
data/src/share/demo/jvmti/versionCheck/versionCheck.c.i
-data/test/sun/security/provider/certpath/ReverseBuilder/mgrMcrl.i
+data/src/share/classes/java/lang/Thread.java.i
data/make/sun/headless/reorder-sparcv9.i
-data/src/share/classes/javax/swing/plaf/SeparatorUI.java.i
data/make/netbeans/common/properties.ent.i
-data/src/share/sample/vm/clr-jvm/Makefile.i
+data/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java.i
data/test/java/util/jar/Attributes/Name.java.i
-data/src/share/classes/sun/text/resources/CollationData_sv.java.i
-data/test/java/beans/Introspector/Test6311051.java.i
+data/test/sun/nio/cs/OLD/Johab_OLD.java.i
+data/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java.i
+data/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java.i
data/src/share/native/java/lang/fdlibm/src/s_log1p.c.i
data/src/share/demo/jvmti/mtrace/sample.makefile.txt.i
data/src/share/classes/javax/swing/event/TreeWillExpandListener.java.i
data/src/share/classes/sun/text/resources/CollationData_nl.java.i
-data/test/java/io/RandomAccessFile/OpsAfterClose.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java.i
+data/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c.i
+data/src/solaris/classes/sun/nio/ch/SocketDispatcher.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java.i
data/test/java/awt/FontClass/CreateFont/bigfont.html.i
-data/test/java/util/Hashtable/IllegalLoadFactor.java.i
-data/src/share/classes/sun/security/x509/X400Address.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain6.txt.i
+data/src/share/classes/com/sun/jdi/InterfaceType.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecVisitor.java.i
+data/src/windows/classes/java/io/Win32FileSystem.java.i
+data/test/sun/net/util/IPAddressUtilTest.java.i
data/test/java/util/ResourceBundle/TestResource.java.i
data/src/share/classes/java/util/EnumMap.java.i
-data/src/share/classes/javax/management/MBeanOperationInfo.java.i
+data/test/java/util/PluggableLocale/providersrc/LocaleNames_xx.properties.i
data/src/share/classes/sun/nio/ch/SelectionKeyImpl.java.i
data/src/share/classes/java/security/cert/TrustAnchor.java.i
data/make/tools/swing-beans/beaninfo/images/JTextFieldColor16.gif.i
data/src/share/classes/javax/crypto/SealedObject.java.i
data/test/sun/security/krb5/ConfigWithQuotations.java.i
data/src/share/native/com/sun/java/util/jar/pack/unpack.h.i
-data/src/share/classes/javax/swing/table/TableRowSorter.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostName.java.i
-data/test/java/lang/instrument/MakeJAR3.sh.i
-data/test/java/util/Locale/Bug4210525.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java.i
-data/src/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.access.in.i
+data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java.i
+data/src/share/classes/java/awt/dnd/peer/DropTargetPeer.java.i
data/test/java/nio/channels/FileChannel/Truncate.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif.i
-data/src/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java.i
+data/src/share/classes/javax/sql/XAConnection.java.i
data/test/java/beans/XMLDecoder/spec/TestProperty.java.i
-data/src/share/classes/javax/security/auth/x500/X500Principal.java.i
-data/src/share/classes/org/ietf/jgss/GSSContext.java.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java.i
-data/test/java/beans/Introspector/Test4918902.java.i
+data/src/share/native/sun/font/layout/ContextualGlyphSubstitution.h.i
+data/src/solaris/classes/sun/java2d/xr/XRPaints.java.i
+data/src/share/classes/java/lang/annotation/ElementType.java.i
+data/src/share/classes/sun/io/CharToByteCp420.java.i
data/src/share/classes/javax/accessibility/AccessibleValue.java.i
data/src/share/classes/javax/swing/plaf/ButtonUI.java.i
-data/src/solaris/bin/zero/jvm.cfg.i
+data/src/share/classes/sun/awt/AWTCharset.java.i
data/test/javax/imageio/CachePremissionsTest/rwd.policy.i
+data/test/sun/java2d/SunGraphics2D/SimplePrimQuality.java.i
data/test/sun/tools/native2ascii/A2N_6247817.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java.i
data/test/java/util/ResourceBundle/Control/MalformedDataRB_en.properties.i
data/src/share/classes/java/lang/doc-files/javalang.doc.anc38.gif.i
-data/test/javax/sound/sampled/AudioFormat/PCM_FLOAT_support.java.i
+data/test/java/nio/file/WatchService/Basic.java.i
data/make/jprt.properties.i
-data/test/sun/net/www/http/HttpClient/RetryPost.sh.i
+data/src/solaris/classes/com/sun/management/OSMBeanFactory.java.i
data/test/java/beans/XMLEncoder/6777487/TestEncoder.java.i
data/src/share/native/java/lang/fdlibm/src/w_sqrt.c.i
data/test/java/rmi/transport/dgcDeadLock/TestImpl_Stub.java.i
data/src/share/native/sun/awt/image/jpeg/jidctflt.c.i
data/test/java/nio/Buffer/CopyDirect-X-Memory.java.i
-data/src/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif.i
data/src/share/classes/javax/management/NotificationBroadcaster.java.i
data/test/java/util/Locale/serialized/java6locale___Java.i
data/src/share/classes/javax/swing/text/DefaultFormatterFactory.java.i
data/make/java/hpi/native/reorder-sparcv9.i
data/test/sun/security/ssl/sun/net/www/httpstest/AbstractCallback.java.i
-data/src/share/classes/javax/sql/rowset/spi/XmlWriter.java.i
+data/src/share/classes/javax/management/MalformedObjectNameException.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/RootsQuery.java.i
-data/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp.i
+data/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java.i
data/src/share/classes/javax/naming/NamingSecurityException.java.i
data/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java.i
data/test/java/lang/Class/forName/classes/0.class.i
@@ -12046,40 +11929,44 @@ data/src/share/classes/javax/swing/JOptionPane.java.i
data/src/share/classes/sun/security/krb5/internal/LocalSeqNumber.java.i
data/src/share/classes/javax/imageio/metadata/IIOMetadata.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java.i
+data/src/share/classes/java/rmi/UnexpectedException.java.i
data/src/share/classes/java/beans/beancontext/BeanContextServicesListener.java.i
+data/test/java/beans/XMLEncoder/6329581/Test6329581.java.i
+data/src/share/classes/com/sun/crypto/provider/PCBC.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMManagers.java.i
data/src/share/classes/com/sun/nio/sctp/SendFailedNotification.java.i
data/src/share/classes/sun/io/ByteToCharCp1140.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_JO.properties.i
-data/make/tools/swing-beans/beaninfo/images/JSpinnerMono32.gif.i
-data/test/java/awt/geom/Path2D/FillPPathTest.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/I18N.java.i
+data/src/share/classes/java/sql/RowId.java.i
data/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java.i
data/src/share/classes/javax/swing/plaf/synth/package.html.i
data/src/share/classes/javax/security/cert/Certificate.java.i
data/test/java/beans/PropertyEditor/TestIntegerTypeNull.java.i
data/make/common/Cscope.gmk.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java.i
+data/src/share/classes/com/sun/tools/hat/README.txt.i
+data/test/java/net/Authenticator/B4962064.java.i
data/src/share/classes/java/awt/event/ComponentListener.java.i
-data/make/common/CancelImplicits.gmk.i
-data/src/share/classes/sun/nio/cs/ArrayDecoder.java.i
-data/test/java/net/URLClassLoader/sealing/Makefile.i
-data/src/share/demo/nio/zipfs/META-INF/services/java.nio.file.spi.FileSystemProvider.i
+data/test/java/lang/Math/WorstCaseTests.java.i
+data/test/java/nio/charset/Charset/EmptyCharsetName.java.i
+data/src/share/native/sun/font/layout/GDEFMarkFilter.h.i
+data/test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java.i
data/src/share/classes/sun/nio/cs/ext/MacCentralEurope.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_hu.properties.i
+data/make/tools/src/build/tools/javazic/Mappings.java.i
data/test/java/nio/charset/spi/basic.sh.i
data/src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java.i
data/src/share/classes/sun/misc/ClassFileTransformer.java.i
-data/src/share/classes/java/io/ObjectOutput.java.i
-data/test/java/awt/font/TextLayout/TestHebrewMark.java.i
-data/test/java/rmi/activation/Activatable/downloadParameterClass/manual.security.policy.i
+data/src/share/demo/jfc/Font2DTest/Font2DTest.html.i
+data/make/sun/xawt/Makefile.i
data/test/java/math/BigDecimal/AddTests.java.i
data/make/netbeans/awt2d/build.properties.i
data/src/share/classes/javax/management/OperationsException.java.i
-data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml.i
+data/src/share/demo/jvmti/waiters/Agent.cpp.i
data/src/share/native/sun/security/ec/ecc_impl.h.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java.i
-data/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java.i
+data/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java.i
+data/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java.i
+data/make/tools/CharsetMapping/IBM863.map.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java.i
data/test/com/sun/crypto/provider/Cipher/CTS/CTSMode.java.i
data/src/share/classes/sun/misc/CEFormatException.java.i
@@ -12087,31 +11974,31 @@ data/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh.i
data/test/java/awt/Focus/CloseDialogActivateOwnerTest/java.policy.i
data/src/windows/native/sun/java2d/windows/WinBackBufferSurfaceData.cpp.i
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/secmod.db.i
-data/test/java/util/PluggableLocale/BreakIteratorProviderTest.java.i
-data/test/javax/management/relation/RelationNotificationSourceTest.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIBOidTable.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java.i
data/src/windows/native/sun/net/spi/DefaultProxySelector.c.i
data/test/java/io/File/SetAccess.java.i
data/make/tools/src/build/tools/makeclasslist/MakeClasslist.java.i
data/src/solaris/classes/sun/awt/motif/MEmbedCanvasPeer.java.i
data/src/share/classes/sun/security/krb5/internal/KRBPriv.java.i
data/src/share/classes/java/awt/MenuComponent.java.i
-data/src/share/classes/sun/java2d/Disposer.java.i
+data/src/share/classes/java/awt/doc-files/GridBagLayout-baseline.png.i
data/src/share/classes/java/util/FormatterClosedException.java.i
-data/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java.i
data/test/javax/management/monitor/CounterMonitorThresholdTest.java.i
data/src/share/classes/sun/security/util/BitArray.java.i
data/make/tools/src/build/tools/jdwpgen/ByteTypeNode.java.i
-data/test/sun/tools/jps/usage.out.i
+data/src/share/classes/sun/tools/asm/NumberConstantData.java.i
data/src/share/classes/sun/awt/PaintEventDispatcher.java.i
data/src/linux/doc/man/jhat.1.i
data/src/share/native/java/util/zip/zlib-1.1.3/minigzip.c.i
data/src/share/classes/sun/security/krb5/internal/LastReq.java.i
data/src/share/classes/javax/print/attribute/standard/DocumentName.java.i
data/src/share/classes/java/io/CharConversionException.java.i
-data/src/solaris/native/sun/awt/list.c.i
+data/src/share/native/sun/java2d/cmm/lcms/cmscam02.c.i
data/src/share/classes/javax/swing/plaf/metal/MetalTreeUI.java.i
-data/make/com/sun/security/Makefile.i
+data/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java.i
data/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor.i
+data/test/java/math/BigDecimal/CompareToTests.java.i
data/test/java/lang/annotation/Missing/D.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java.i
data/make/javax/sound/Makefile.i
@@ -12119,85 +12006,88 @@ data/src/solaris/classes/sun/java2d/x11/X11SurfaceDataProxy.java.i
data/src/share/classes/sun/text/resources/FormatData_lv.java.i
data/src/share/classes/sun/tools/tree/NullExpression.java.i
data/src/share/native/sun/font/layout/OpenTypeTables.h.i
-data/src/share/lib/images/cursors/invalid32x32.gif.i
+data/test/java/util/ResourceBundle/Control/Bug6530694.java.i
data/src/share/classes/sun/io/ByteToCharCp943.java.i
-data/test/java/io/LineNumberReader/MarkReset.java.i
-data/src/share/classes/sun/security/krb5/KrbCryptoException.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif.i
+data/test/java/rmi/transport/checkLeaseInfoLeak/security.policy.i
data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java.i
-data/test/java/util/ServiceLoader/Load.java.i
-data/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java.i
+data/src/share/classes/com/sun/servicetag/package.html.i
+data/test/java/io/RandomAccessFile/WriteBytesChars.java.i
+data/src/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java.i
data/src/share/classes/javax/net/ssl/X509ExtendedKeyManager.java.i
data/src/share/classes/javax/crypto/ExemptionMechanismException.java.i
data/test/javax/xml/crypto/dsig/GenerationTests.java.i
data/test/com/sun/jdi/ReferrersTest.java.i
-data/src/share/demo/jvmti/gctest/sample.makefile.txt.i
-data/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java.i
-data/test/java/net/Inet6Address/IPv6AddressTypes.java.i
+data/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/run.sh.i
+data/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java.i
+data/src/share/classes/javax/print/PrintException.java.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java.i
data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java.i
-data/test/java/net/Socket/AddressTest.java.i
+data/src/solaris/native/sun/nio/ch/FileKey.c.i
data/src/share/classes/sun/util/resources/LocaleNames_zh.properties.i
data/src/share/classes/javax/swing/JScrollPane.java.i
-data/src/share/classes/javax/swing/undo/package.html.i
+data/src/share/classes/java/lang/module/RequireOptionalModule.java.i
data/test/java/rmi/activation/Activatable/shutdownGracefully/TestSecurityManager.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java.i
-data/test/java/nio/channels/TestUtil.java.i
-data/test/com/sun/servicetag/InvalidServiceTag.java.i
+data/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java.i
+data/test/sun/tools/jrunscript/hello.js.i
data/test/javax/crypto/Cipher/TestGetInstance.java.i
data/test/java/beans/PropertyChangeSupport/TestListeners.java.i
-data/test/java/io/Serializable/class/SerialA_2.java.i
+data/test/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java.i
data/test/sun/net/www/protocol/ftp/UserAndPasswordTest.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/Load2.java.i
data/test/sun/java2d/cmm/ColorConvertOp/ColConvTest.java.i
-data/test/java/security/KeyRep/Blowfish.pre.1.5.key.i
data/src/share/classes/sun/security/provider/certpath/State.java.i
data/make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java.i
data/src/share/classes/javax/swing/package.html.i
data/src/share/classes/sun/nio/cs/ext/EUC_KR.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties.i
-data/test/java/util/PluggableLocale/providersrc/LocaleNames_xx.properties.i
+data/src/share/classes/sun/java2d/pisces/Stroker.java.i
+data/src/share/classes/javax/management/MBeanOperationInfo.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.access.in.i
-data/test/java/util/ResourceBundle/bug6572242.properties.i
-data/test/java/security/CodeSigner/Serialize.java.i
+data/test/java/lang/instrument/MakeJAR3.sh.i
+data/src/share/classes/javax/net/ssl/SSLProtocolException.java.i
+data/src/share/classes/sun/security/x509/DNSName.java.i
data/src/share/classes/com/sun/beans/decoder/ValueObject.java.i
-data/test/tools/jar/JarEntryTime.java.i
data/test/java/util/concurrent/Phaser/TieredArriveLoops.java.i
data/src/share/classes/com/sun/jdi/request/ClassPrepareRequest.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/NotActivatableInterface.java.i
data/test/sun/tools/jps/jps-q.sh.i
data/src/share/native/java/util/zip/zlib-1.1.3/example.c.i
+data/test/java/lang/management/ThreadMXBean/AllThreadIds.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java.i
data/test/javax/management/modelmbean/UnserializableTargetObjectTest.java.i
+data/src/solaris/classes/sun/awt/X11CustomCursor.java.i
data/test/javax/management/context/LocaleAwareBroadcasterTest.java.i
data/src/share/classes/sun/misc/ServiceConfigurationError.java.i
-data/src/windows/classes/sun/awt/windows/ThemeReader.java.i
+data/test/javax/print/attribute/GetCopiesSupported.java.i
+data/src/share/classes/javax/management/namespace/MBeanServerConnectionWrapper.java.i
data/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java.i
data/test/java/io/FilePermission/SpecTests.java.i
-data/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java.i
-data/src/share/demo/jfc/Font2DTest/resources/TextResources_ko.properties.i
+data/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java.i
+data/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java.i
data/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java.i
data/src/share/classes/java/lang/invoke/FilterOneArgument.java.i
data/test/com/sun/jdi/BadHandshakeTest.java.i
data/test/java/nio/channels/etc/Shadow.java.i
data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java.i
data/src/share/classes/sun/awt/Mutex.java.i
-data/src/share/native/sun/font/layout/AlternateSubstSubtables.h.i
data/src/windows/classes/sun/print/Win32PrintServiceLookup.java.i
-data/src/share/classes/sun/text/resources/CollationData_pl.java.i
+data/src/share/native/sun/font/layout/LookupTables.h.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c.i
data/test/java/util/regex/POSIX_Unicode.java.i
data/test/javax/management/query/QueryDottedAttrTest.java.i
-data/src/share/classes/java/net/Inet4AddressImpl.java.i
+data/src/share/native/sun/awt/image/jpeg/jchuff.c.i
data/test/com/sun/jdi/NewInstanceTest.java.i
data/test/java/beans/PropertyEditor/TestColorClassNull.java.i
data/make/tools/CharsetMapping/IBM939.nr.i
data/test/java/text/Format/DateFormat/Bug4823811.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1.xml.i
-data/make/common/Defs-solaris.gmk.i
+data/src/share/classes/sun/java2d/pipe/AAShapePipe.java.i
data/src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java.i
data/src/share/native/sun/awt/libpng/pngpread.c.i
+data/src/share/native/sun/awt/image/BufImgSurfaceData.h.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xenc-schema.rng.i
data/src/share/classes/sun/management/resources/agent_zh_CN.properties.i
data/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java.i
@@ -12206,9 +12096,11 @@ data/make/common/shared/PrivateDefs.gmk-example.i
data/src/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java.i
data/src/share/classes/sun/security/ssl/DHCrypt.java.i
data/src/share/classes/java/nio/file/package-info.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java.i
+data/test/javax/management/Introspector/SetWrongTypeAttributeTest.java.i
+data/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java.i
data/src/share/back/debugDispatch.h.i
-data/src/windows/native/sun/windows/awt_InputEvent.h.i
+data/test/sun/security/action/Generify.java.i
+data/src/share/native/sun/font/layout/LESwaps.h.i
data/src/share/classes/java/dyn/MethodHandleStatics.java.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java.i
data/test/sun/util/resources/Calendar/Bug4518811.java.i
@@ -12219,6 +12111,7 @@ data/src/share/classes/sun/security/provider/DigestBase.java.i
data/src/solaris/native/sun/awt/awt_TextArea.h.i
data/src/share/classes/java/awt/im/spi/InputMethodDescriptor.java.i
data/src/share/classes/sun/security/krb5/KrbKdcRep.java.i
+data/src/share/classes/sun/rmi/transport/Channel.java.i
data/src/share/classes/java/nio/file/DirectoryStreamFilters.java.i
data/test/javax/management/proxy/ProxyObjectMethodsTest.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java.i
@@ -12234,27 +12127,29 @@ data/src/solaris/doc/sun/man/man1/schemagen.1.i
data/src/share/classes/com/sun/jdi/StringReference.java.i
data/make/sun/xawt/ToBin.java.i
data/test/java/net/URL/ftp_urls.i
-data/src/share/classes/java/io/DataOutput.java.i
+data/test/java/io/Serializable/wrongReturnTypes/Read.java.i
data/test/com/sun/jdi/AllLineLocations.java.i
data/test/java/rmi/server/serverStackTrace/Impl2_Stub.java.i
data/test/javax/swing/JSpinner/6463712/bug6463712.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties.i
+data/src/share/classes/sun/swing/UIClientPropertyKey.java.i
data/test/javax/swing/JFileChooser/6550546/bug6550546.java.i
-data/test/sun/tools/jstat/gcPermCapacityOutput1.awk.i
-data/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java.i
+data/src/share/classes/sun/net/InetAddressCachePolicy.java.i
+data/test/sun/nio/cs/OLD/IBM950_OLD.java.i
data/src/share/classes/java/awt/image/ComponentColorModel.java.i
data/test/sun/security/ssl/javax/net/ssl/SSLContextVersion.java.i
-data/src/share/classes/javax/sound/sampled/AudioInputStream.java.i
+data/test/javax/rmi/ssl/SSLSocketParametersTest.sh.i
data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/file-targets.xml.i
data/src/share/classes/sun/net/ProgressEvent.java.i
data/test/sun/tools/jps/jps-Vvm_Output1.awk.i
data/src/share/classes/sun/util/resources/TimeZoneNames_en.java.i
data/src/windows/classes/sun/awt/windows/awtLocalization.properties.i
data/src/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptorSupport.java.i
+data/src/share/demo/jfc/Notepad/resources/Notepad.properties.i
data/src/solaris/doc/sun/man/man1/ja/rmiregistry.1.i
data/src/share/classes/javax/swing/plaf/DesktopIconUI.java.i
data/src/linux/doc/man/pack200.1.i
data/src/share/classes/com/sun/jmx/interceptor/NamespaceDispatchInterceptor.java.i
+data/test/java/util/ResourceBundle/Control/PackagePrivateTest.java.i
data/src/solaris/classes/sun/print/UnixPrintServiceLookup.java.i
data/test/java/util/EnumSet/LargeEnumIteratorRemoveResilience.java.i
data/test/javax/swing/SwingWorker/6480289/bug6480289.java.i
@@ -12267,23 +12162,26 @@ data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S32Func.c.i
data/src/share/classes/javax/swing/colorchooser/ColorPanel.java.i
data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter.java.i
data/src/share/classes/com/sun/jmx/defaults/JmxProperties.java.i
-data/src/windows/native/java/util/TimeZone_md.c.i
+data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.config.i
+data/test/sun/java2d/cmm/ColorConvertOp/ColorConvertTest.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicBoolean.java.i
data/src/share/classes/sun/tools/asm/FieldConstantData.java.i
-data/src/share/classes/sun/misc/FormattedFloatingDecimal.java.i
+data/make/tools/CharsetMapping/IBM937.c2b.i
data/src/share/native/sun/java2d/loops/Index12Gray.h.i
-data/test/java/beans/PropertyEditor/TestColorClassValue.java.i
+data/src/share/classes/sun/security/tools/CertAndKeyGen.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/JavaClass.java.i
data/make/modules/tools/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java.i
data/test/java/io/charStreams/ABCInputStream.java.i
-data/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher.i
-data/test/java/lang/management/RuntimeMXBean/UpTime.java.i
+data/src/share/classes/sun/font/Underline.java.i
data/src/share/demo/management/FullThreadDump/README.txt.i
data/test/java/rmi/transport/readTimeout/TestIface.java.i
data/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java.i
data/test/sun/security/provider/KeyStore/pw.jks.i
data/src/share/classes/sun/text/resources/FormatData_ja.java.i
data/test/java/nio/file/Files/walkFileTree/grantTopOnly.policy.i
-data/src/share/classes/java/lang/reflect/Constructor.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/Classes.java.i
+data/test/javax/management/modelmbean/LoggingExceptionTest.java.i
data/test/java/util/concurrent/forkjoin/NQueensCS.java.i
data/test/java/util/jar/JarFile/JarNoManifest.java.i
data/test/java/awt/FontClass/CreateFont/DeleteFont.java.i
@@ -12291,42 +12189,45 @@ data/make/mkdemo/management/JTop/Makefile.i
data/src/share/native/sun/security/ec/impl/ec2_163.c.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplc4.so.i
data/src/share/classes/sun/misc/Version.java.template.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy22.i
+data/test/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java.i
data/test/sun/rmi/rmic/classFileVersion/G1.java.i
data/src/solaris/native/sun/awt/awt_AWTEvent.h.i
data/test/com/sun/jdi/DeleteEventRequestsTest.java.i
data/src/share/demo/nbproject/management/JTop/nbproject/jdk.xml.i
-data/src/solaris/transport/socket/socket_md.h.i
+data/src/windows/native/sun/windows/awt_InputEvent.h.i
data/make/com/Makefile.i
-data/make/modules/tools/src/com/sun/classanalyzer/ClassAnalyzer.java.i
-data/src/share/classes/sun/applet/AppletEventMulticaster.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java.i
data/src/share/native/sun/font/layout/LEInsertionList.h.i
data/src/share/classes/java/lang/Short.java.i
data/src/share/classes/javax/swing/text/html/HTMLWriter.java.i
data/test/com/sun/tools/attach/ProviderTest.java.i
+data/test/sun/nio/cs/CheckICNE.java.i
data/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java.i
data/src/windows/transport/shmem/shmem_md.c.i
-data/src/share/classes/javax/naming/ldap/Rdn.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_sq.properties.i
data/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/pk3.key.i
data/src/share/classes/sun/nio/cs/ext/IBM273.java.i
data/src/share/classes/java/dyn/MemberName.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties.i
data/src/share/classes/javax/swing/text/MutableAttributeSet.java.i
data/src/share/classes/sun/util/resources/LocaleNames_sr.properties.i
+data/src/share/classes/sun/nio/ch/OptionKey.java.i
data/src/solaris/native/sun/awt/awt_mgrsel.h.i
+data/src/solaris/classes/sun/awt/motif/X11GB2312.java.i
data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevelRevoked.java.i
data/test/javax/management/MBeanInfo/NotificationInfoTest.java.i
-data/src/share/classes/java/security/cert/CollectionCertStoreParameters.java.i
+data/test/java/io/IOException/LastErrorString.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java.i
data/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java.i
data/test/com/sun/jdi/OptionTest.java.i
data/test/java/beans/XMLEncoder/4741757/AbstractTest.java.i
data/src/share/classes/sun/security/provider/PolicyFile.java.i
data/make/java/fdlibm/Makefile.i
-data/src/share/classes/sun/misc/Timer.java.i
+data/test/java/net/URL/URIToURLTest.java.i
data/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java.i
+data/test/tools/launcher/DefaultLocaleTest.sh.i
data/test/tools/pack200/pack200-verifier/src/xmlkit/CommandLineParser.java.i
-data/test/java/lang/ThreadGroup/SetMaxPriority.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java.i
data/src/share/classes/sun/nio/cs/IBM857.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpEngineImpl.java.i
@@ -12342,6 +12243,7 @@ data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementat
data/test/java/util/prefs/ExportSubtree.java.i
data/test/com/sun/security/auth/login/ConfigFile/InconsistentError.java.i
data/make/sun/javazic/javatz/java_zone_ids.txt.i
+data/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java.i
data/src/share/classes/com/sun/tools/jdi/MethodImpl.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/InstrumentedApplication.java.i
data/src/share/classes/java/util/regex/ASCII.java.i
@@ -12354,7 +12256,6 @@ data/src/share/classes/sun/io/CharToByteCp1149.java.i
data/src/share/native/sun/awt/image/jpeg/jutils.c.i
data/src/share/classes/sun/tools/jconsole/PlotterPanel.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticDoubleFieldAccessorImpl.java.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java.i
data/src/solaris/doc/sun/man/man1/ja/jstat.1.i
data/test/javax/script/Test2.java.i
data/src/share/classes/javax/security/auth/kerberos/KerberosKey.java.i
@@ -12369,58 +12270,58 @@ data/test/java/beans/XMLDecoder/spec/TestField.java.i
data/test/java/lang/Double/BitwiseConversion.java.i
data/test/sun/security/krb5/auto/NonMutualSpnego.java.i
data/src/solaris/doc/sun/man/man1/ja/wsgen.1.i
-data/src/share/classes/com/sun/media/sound/ModelPatch.java.i
data/src/share/classes/javax/swing/text/html/InlineView.java.i
-data/test/java/io/BufferedInputStream/ReadAfterClose.java.i
+data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i
data/test/java/beans/Introspector/4520754/WombatBeanInfo.java.i
data/src/solaris/classes/sun/awt/X11/XDragSourceProtocolListener.java.i
data/src/share/classes/org/openjdk/jigsaw/JigsawModuleSystem.java.i
data/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java.i
data/test/java/awt/Mixing/LWPopupMenu.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_16nw.c.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy13.i
+data/test/javax/swing/JColorChooser/Test4759934.html.i
data/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java.i
data/test/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java.i
+data/src/share/classes/javax/print/attribute/standard/Fidelity.java.i
data/src/solaris/native/java/io/Console_md.c.i
data/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh.i
data/test/java/util/Collections/ReverseOrder2.java.i
data/src/share/native/com/sun/media/sound/PlatformMidi.c.i
data/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java.i
data/src/windows/classes/sun/java2d/windows/GDIRenderer.java.i
data/src/share/classes/sun/font/FontStrike.java.i
data/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.password.in.i
data/src/linux/doc/man/ja/keytool.1.i
+data/test/sun/security/smartcardio/TestMultiplePresent.java.i
+data/test/java/net/Socket/TrafficClass.java.i
data/src/share/classes/java/util/FormatFlagsConversionMismatchException.java.i
data/src/share/classes/java/nio/file/attribute/FileStoreAttributeView.java.i
+data/test/sun/security/pkcs11/Provider/ConfigQuotedString.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java.i
data/src/share/classes/javax/smartcardio/Card.java.i
data/src/share/classes/sun/nio/cs/ext/MacGreek.java.i
data/src/share/classes/sun/net/spi/nameservice/NameServiceDescriptor.java.i
-data/test/java/awt/Mixing/Validating.java.i
data/src/windows/native/sun/windows/awt_Dimension.h.i
data/test/java/math/BigDecimal/FloatDoubleValueTests.java.i
data/test/java/nio/file/Files/walkFileTree/PrintFileTree.java.i
data/src/share/classes/org/openjdk/jigsaw/LocatableCatalog.java.i
data/src/share/classes/javax/swing/DefaultButtonModel.java.i
-data/test/java/net/Socket/TestAfterClose.java.i
+data/src/share/native/sun/security/ec/mp_gf2m.c.i
data/src/share/back/classTrack.h.i
data/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/internal/Strings.java.i
data/test/java/security/Provider/DefaultPKCS11.java.i
-data/src/share/classes/com/sun/net/httpserver/Filter.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java.i
data/src/share/npt/utf.c.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java.i
+data/src/share/classes/javax/sql/rowset/spi/SyncResolver.java.i
data/test/java/awt/print/PageFormat/PageFormatFromAttributes.java.i
data/src/share/classes/sun/tools/javac/SourceMember.java.i
data/src/share/classes/java/awt/doc-files/FocusSpec.html.i
data/make/tools/src/build/tools/jdwpgen/LongTypeNode.java.i
data/src/share/classes/javax/management/namespace/MBeanServerSupport.java.i
-data/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java.i
+data/test/java/util/ResourceBundle/Test4314141B_fr.properties.i
data/src/share/native/sun/java2d/loops/IntRgbx.c.i
data/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java.i
data/src/windows/native/sun/windows/ComCtl32Util.h.i
@@ -12431,10 +12332,9 @@ data/src/share/classes/com/sun/jdi/event/LocatableEvent.java.i
data/test/javax/swing/JFileChooser/6798062/bug6798062.java.i
data/src/share/classes/org/openjdk/jigsaw/FileConstants.java.i
data/test/java/rmi/activation/Activatable/checkActivateRef/group.security.policy.i
-data/src/windows/native/sun/windows/awt_Multimon.h.i
-data/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java.i
-data/src/solaris/classes/sun/awt/X11/XScrollbar.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/SmallObjTrees.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java.i
+data/test/java/nio/file/Files/BytesAndLines.java.i
+data/test/java/awt/image/BufferedImage/TinyScale.java.i
data/test/javax/management/eventService/NotSerializableNotifTest.java.i
data/test/java/net/URLConnection/contentHandler/COM/foo/content/text/plain.java.i
data/src/share/classes/java/awt/RadialGradientPaint.java.i
@@ -12442,76 +12342,78 @@ data/make/sun/image/Makefile.i
data/src/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java.i
data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java.i
-data/test/sun/net/www/protocol/jar/foo.jar.i
+data/make/mksample/nio/Makefile.i
data/src/solaris/native/sun/nio/ch/nio_util.h.i
data/src/share/classes/javax/management/event/EventClientDelegate.java.i
data/test/java/awt/Focus/RequestOnCompWithNullParent/RequestOnCompWithNullParent1.java.i
data/src/share/classes/com/sun/servicetag/resources/javase_6_swordfish.properties.i
data/src/share/classes/java/lang/NoSuchMethodException.java.i
data/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_BO.properties.i
data/src/share/classes/javax/swing/text/LayeredHighlighter.java.i
data/test/javax/management/MBeanInfo/SerializedMBeanInfo.java.i
data/test/java/beans/XMLEncoder/Test4993777.java.i
data/src/windows/native/sun/nio/ch/nio_util.h.i
-data/src/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java.i
+data/test/sun/tools/jstat/jstatGcOldOutput1.sh.i
data/src/share/classes/org/openjdk/internal/joptsimple/IllegalOptionClusterException.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM948.java.i
+data/src/share/classes/java/io/DataOutput.java.i
data/src/share/classes/java/util/concurrent/LinkedTransferQueue.java.i
-data/src/solaris/doc/sun/man/man1/jstack.1.i
+data/src/share/classes/java/beans/AppletInitializer.java.i
data/src/share/instrument/FileSystemSupport.h.i
-data/src/share/classes/sun/security/x509/RDN.java.i
+data/test/java/nio/channels/TestThread.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMeta.java.i
data/test/sun/net/idn/TestData.java.i
data/src/share/classes/java/nio/file/attribute/AclEntryPermission.java.i
data/src/share/classes/javax/swing/RowSorter.java.i
data/test/java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java.i
-data/make/tools/CharsetMapping/IBM420.nr.i
+data/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableStreamCipher.java.i
+data/test/sun/net/www/protocol/jar/B5105410.sh.i
data/test/com/sun/servicetag/servicetag5.properties.i
data/src/share/classes/sun/reflect/generics/tree/ClassSignature.java.i
data/test/java/io/BufferedReader/MarkedFillAtEOF.java.i
-data/test/sun/rmi/rmic/manifestClassPath/Util.sh.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties.i
data/src/share/classes/java/nio/package.html.i
-data/make/sun/awt/FILES_c_windows.gmk.i
data/src/linux/doc/man/ja/klist.1.i
+data/src/share/classes/java/awt/event/TextEvent.java.i
data/src/share/classes/org/openjdk/jigsaw/Configuration.java.i
-data/src/share/classes/sun/io/ByteToCharCp1046.java.i
-data/test/java/rmi/transport/readTimeout/security.policy.i
-data/src/share/classes/com/sun/media/sound/DLSSampleOptions.java.i
-data/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java.i
-data/test/java/nio/channels/Selector/KeySets.java.i
+data/src/share/classes/sun/security/krb5/internal/rcache/ReplayCache.java.i
+data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java.i
+data/test/sun/tools/jstat/gcPermCapacityOutput1.awk.i
+data/src/solaris/classes/java/lang/ProcessEnvironment.java.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties.i
data/test/java/awt/regtesthelpers/Util.java.i
data/test/sun/util/resources/TimeZone/Bug4848242.java.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/services/no.name.service.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSubSystem.java.i
data/src/windows/native/sun/windows/WBufferStrategy.cpp.i
-data/src/share/classes/java/net/SocketImplFactory.java.i
+data/test/sun/tools/jconsole/ImmutableResourceTest.sh.i
data/test/tools/launcher/MultipleJRE.sh.i
data/src/share/classes/javax/xml/crypto/dsig/Manifest.java.i
-data/src/share/classes/java/security/DigestOutputStream.java.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java.i
data/src/share/classes/com/sun/net/httpserver/HttpHandler.java.i
data/test/java/awt/FontClass/LCDScale.java.i
-data/src/share/classes/com/sun/management/VMOption.java.i
+data/src/share/classes/sun/security/x509/CRLExtensions.java.i
data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_1.java.i
data/src/share/classes/java/awt/datatransfer/FlavorTable.java.i
data/src/share/native/sun/java2d/loops/Index8Gray.h.i
data/src/share/classes/javax/accessibility/AccessibleStateSet.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReuseAddr.java.i
-data/src/share/classes/javax/swing/AbstractSpinnerModel.java.i
+data/src/solaris/classes/sun/awt/X11/XRootWindow.java.i
data/src/share/classes/javax/net/ssl/SSLServerSocket.java.i
-data/src/share/classes/sun/text/resources/FormatData_sr_CS.java.i
+data/src/share/classes/javax/management/openmbean/InvalidKeyException.java.i
data/src/solaris/hpi/native_threads/include/threads_md.h.i
data/make/tools/src/build/tools/jdwpgen/ReferenceTypeNode.java.i
data/test/sun/net/www/protocol/http/BasicLongCredentials.java.i
data/test/java/io/Serializable/resolveClass/deserializeButton/Foo.java.i
data/test/javax/sql/rowset/serial/SerialBlob/SetBinaryStream.java.i
-data/test/java/lang/ThreadGroup/Daemon.java.i
-data/src/share/classes/javax/smartcardio/CommandAPDU.java.i
+data/test/javax/management/openmbean/NullConstructorParamsTest.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java.i
data/src/windows/native/sun/java2d/d3d/D3DBlitLoops.h.i
-data/test/sun/rmi/rmic/newrmic/equivalence/G1.java.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java.i
+data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java.i
data/src/share/back/MethodImpl.h.i
data/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java.i
-data/src/share/classes/org/openjdk/jigsaw/Files.java.i
+data/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java.i
data/src/share/classes/java/awt/PointerInfo.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/CharArrayCalls.java.i
data/test/sun/nio/cs/UkrainianIsNotRussian.java.i
@@ -12521,9 +12423,9 @@ data/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerTableMeta.java.i
data/src/share/classes/sun/io/ByteToCharMacThai.java.i
data/test/java/util/concurrent/ScheduledThreadPoolExecutor/Stress.java.i
data/src/share/classes/com/sun/tools/jdi/MirrorImpl.java.i
-data/src/windows/classes/sun/awt/windows/WMenuPeer.java.i
+data/test/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java.i
data/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableBlockCipher.java.i
-data/src/share/classes/java/lang/RuntimePermission.java.i
+data/test/javax/management/namespace/namespace.policy.i
data/make/sun/javazic/tzdata/solar87.i
data/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java.i
data/src/share/classes/sun/nio/cs/ext/ISO_8859_11.java.i
@@ -12531,21 +12433,23 @@ data/test/sun/rmi/rmic/covariantReturns/run.sh.i
data/src/share/classes/sun/security/provider/SHA5.java.i
data/src/share/classes/sun/text/normalizer/SymbolTable.java.i
data/test/sun/management/jmxremote/bootstrap/ssl/keystore.i
+data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.d
+data/test/java/nio/charset/StandardCharsets/Standard.java.i
data/test/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java.i
data/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java.i
data/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java.i
data/src/share/native/java/util/TimeZone.c.i
data/src/share/classes/com/sun/beans/decoder/FalseElementHandler.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthParser.java.i
-data/test/sun/tools/jstat/jstatGcOldOutput1.sh.i
+data/src/share/classes/java/util/UUID.java.i
data/src/share/classes/javax/management/relation/RelationTypeSupport.java.i
data/src/share/classes/java/net/ContentHandler.java.i
data/test/java/awt/FontClass/SurrogateTest/SupplementaryCanDisplayUpToTest.java.i
-data/src/share/classes/sun/io/CharToByteTIS620.java.i
-data/src/share/classes/java/nio/ByteOrder.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NonAutoClose.java.i
-data/src/solaris/classes/sun/awt/X11ComponentPeer.java.i
+data/src/share/classes/java/security/DigestOutputStream.java.i
+data/test/javax/sound/midi/File/SMPTESequence.java.i
+data/src/solaris/sample/dtrace/hotspot_jni/README.txt.i
+data/test/java/io/LineNumberReader/Skip.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_sv.java.i
+data/src/share/classes/sun/security/x509/X509CRLEntryImpl.java.i
data/test/sun/misc/Safe.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFuncHereAPI.java.i
data/test/java/security/KeyStore/EntryMethods.pre15.keystore.i
@@ -12561,44 +12465,45 @@ data/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java.i
data/src/share/classes/sun/util/resources/CalendarData_en_MT.properties.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpTools.java.i
data/src/share/demo/nbproject/management/VerboseGC/nbproject/jdk.xml.i
-data/src/share/classes/javax/print/attribute/DocAttributeSet.java.i
-data/src/share/classes/sun/tools/asm/LocalVariableTable.java.i
-data/src/share/lib/security/java.security.i
+data/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_tr_TR.properties.i
+data/src/share/classes/sun/print/CustomMediaSizeName.java.i
+data/test/java/lang/instrument/NativeMethodPrefixAgent.java.i
data/src/share/classes/sun/font/BidiUtils.java.i
+data/src/share/classes/java/rmi/registry/RegistryHandler.java.i
data/src/share/classes/com/sun/media/sound/WaveFileFormat.java.i
data/test/com/sun/crypto/provider/Cipher/AES/Test4517355.java.i
data/test/java/lang/instrument/RedefineClassesDisabledTest.java.i
-data/make/tools/CharsetMapping/IBM942.c2b.i
-data/src/share/classes/sun/security/krb5/internal/SeqNumber.java.i
+data/src/share/classes/com/sun/beans/decoder/ValueObjectImpl.java.i
data/src/share/sample/vm/clr-jvm/jinvoker.cpp.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ServerTimeout.java.i
data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PublicCtor.java.i
+data/src/share/classes/sun/security/tools/PolicyTool.java.i
data/test/java/beans/XMLEncoder/Test4994637.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Decoder.java.i
+data/src/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java.i
data/src/share/classes/sun/font/Script.java.i
-data/test/java/io/Serializable/subclassGC/security.policy.i
+data/src/windows/classes/sun/java2d/d3d/D3DTextRenderer.java.i
+data/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java.i
data/src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java.i
-data/make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java.i
-data/test/java/awt/im/InputContext/bug4625203.java.i
+data/test/java/math/BigDecimal/PowTests.java.i
data/test/sun/security/provider/PolicyFile/TokenStore.java.i
data/test/sun/tools/jrunscript/jrunscript-eTest.sh.i
-data/test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java.i
data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java.i
data/src/share/classes/sun/jkernel/KernelError.java.i
data/make/java/net/mapfile-vers.i
data/test/javax/sound/midi/Gervill/SoftChannel/Mute.java.i
data/src/share/classes/java/awt/peer/LightweightPeer.java.i
-data/src/share/classes/sun/security/tools/JarSignerResources.java.i
+data/src/share/classes/java/text/BreakDictionary.java.i
data/src/solaris/native/java/lang/ProcessEnvironment_md.c.i
data/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java.i
data/test/com/sun/servicetag/missing-environ-field.xml.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java.i
-data/test/sun/security/jgss/spnego/NegTokenTargFields.java.i
+data/test/sun/tools/jstatd/usage.out.i
data/src/share/classes/javax/swing/text/html/parser/Entity.java.i
-data/src/share/classes/sun/text/resources/FormatData_ms.java.i
-data/test/sun/tools/jrunscript/Hello.java.i
+data/src/share/native/java/lang/fdlibm/src/s_logb.c.i
data/src/share/classes/javax/sql/RowSetReader.java.i
-data/src/share/classes/sun/security/tools/KeyTool.java.i
+data/make/tools/CharsetMapping/IBM870.c2b.i
+data/src/share/classes/sun/util/resources/LocaleNames_hr.properties.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_mk_MK.properties.i
data/test/javax/management/remote/mandatory/notif/NotificationSender.java.i
@@ -12610,8 +12515,8 @@ data/src/share/classes/javax/swing/event/CellEditorListener.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/SoftTestUtils.java.i
data/src/share/classes/javax/management/BinaryOpValueExp.java.i
data/src/share/classes/java/awt/image/DataBufferDouble.java.i
+data/src/solaris/native/sun/font/X11FontScaler.c.i
data/src/windows/javavm/export/jvm_md.h.i
-data/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java.i
data/src/windows/native/sun/jkernel/version.rc.i
data/src/share/classes/sun/security/timestamp/TSResponse.java.i
data/src/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java.i
@@ -12619,47 +12524,45 @@ data/test/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java.i
data/src/share/classes/sun/management/jmxremote/package.html.i
data/src/share/classes/java/beans/Encoder.java.i
data/src/share/classes/java/nio/file/attribute/AclEntryFlag.java.i
-data/src/share/classes/sun/awt/event/IgnorePaintEvent.java.i
-data/make/mkdemo/jfc/SwingApplet/Makefile.i
+data/src/share/classes/sun/nio/fs/Globs.java.i
+data/src/share/classes/sun/text/resources/FormatData_ru.java.i
data/src/share/classes/java/awt/peer/CheckboxPeer.java.i
-data/src/share/classes/sun/security/ssl/Record.java.i
-data/src/share/demo/jfc/SampleTree/DynamicTreeNode.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/GRAY.png.i
+data/src/share/classes/sun/text/resources/CollationData_sv.java.i
data/make/netbeans/common/architectures/name-SunOS.properties.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipPath.java.i
data/test/java/lang/annotation/loaderLeak/C.java.i
data/test/sun/security/pkcs11/nss/p11-deimos.txt.i
data/src/share/classes/javax/swing/DefaultFocusManager.java.i
+data/src/share/classes/java/util/spi/LocaleNameProvider.java.i
data/src/share/classes/sun/invoke/util/VerifyType.java.i
data/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java.i
-data/src/share/classes/javax/xml/crypto/dsig/dom/package.html.i
-data/test/java/nio/file/Files/PassThroughFileSystem.java.i
data/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h.i
-data/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NonAutoClose.java.i
+data/make/tools/src/build/tools/jdwpgen/Context.java.i
data/make/tools/CharsetMapping/IBM871.c2b.i
data/src/share/classes/javax/swing/JLayer.java.i
data/make/modules/update_module.sh.i
-data/test/java/nio/charset/Charset/AvailableCharsetNames.java.i
+data/src/windows/native/java/util/TimeZone_md.c.i
data/src/share/classes/sun/java2d/pipe/GeneralCompositePipe.java.i
data/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java.i
-data/src/share/classes/javax/management/openmbean/CompositeDataView.java.i
data/src/share/classes/javax/crypto/interfaces/DHPrivateKey.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/policy.all.i
data/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c.i
data/test/sun/net/www/http/HttpClient/RetryPost.java.i
-data/test/java/nio/channels/Selector/CloseWhenKeyIdle.java.i
+data/test/sun/security/smartcardio/TestDefault.java.i
data/test/java/util/Locale/data/deflocale.rhel5.fmtasdefault.i
data/src/share/native/sun/awt/image/jpeg/jcmaster.c.i
data/src/share/classes/javax/smartcardio/CardPermission.java.i
data/src/share/classes/javax/management/MBeanServerDelegate.java.i
-data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.policy.i
+data/test/javax/swing/JColorChooser/Test4380468.html.i
data/src/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java.i
data/src/share/classes/sun/io/ByteToCharCp1255.java.i
data/src/share/classes/javax/naming/MalformedLinkException.java.i
data/test/java/net/URL/Equals.java.i
-data/test/com/sun/net/httpserver/bugs/B6424196.java.i
-data/make/jpda/transport/socket/mapfile-vers.i
-data/make/sun/font/mapfile-vers.openjdk.i
+data/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html.i
+data/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java.i
data/test/java/rmi/transport/httpSocket/HttpSocketTest_Stub.java.i
data/make/tools/reorder/tests/Hello.java.i
data/src/share/classes/javax/swing/event/MenuKeyListener.java.i
@@ -12668,26 +12571,25 @@ data/src/share/demo/applets/BarChart/example2.html.i
data/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java.i
data/test/java/awt/FullScreen/MultimonFullscreenTest/MultimonFullscreenTest.java.i
data/test/sun/security/tools/keytool/PrintSSL.java.i
-data/make/javax/swing/plaf/FILES.gmk.i
+data/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/HandshakeOutStream/NullCerts.java.i
data/src/share/classes/com/sun/imageio/plugins/common/ImageUtil.java.i
-data/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp.i
-data/test/java/beans/PropertyEditor/TestByteClassJava.java.i
+data/src/solaris/hpi/native_threads/src/condvar_md.c.i
+data/test/java/beans/PropertyEditor/TestColorClassValue.java.i
data/test/javax/management/openmbean/CompositeDataToMapTest.java.i
data/src/share/classes/sun/security/ssl/Handshaker.java.i
data/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif.i
+data/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile.i
-data/src/share/classes/sun/nio/ch/PollSelectorProvider.java.i
-data/src/share/classes/sun/print/PrintJobAttributeException.java.i
+data/src/share/classes/javax/swing/undo/UndoableEdit.java.i
+data/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java.i
data/src/share/classes/com/sun/media/sound/SoftProvider.java.i
data/test/sun/security/x509/X500Name/RDNwithMultipleAVAs.java.i
data/make/sun/jawt/Makefile.i
-data/test/tools/launcher/SolarisRunpath.sh.i
data/test/com/sun/tracing/BasicFunctionality.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicListUI.java.i
-data/test/java/io/IOException/LastErrorString.java.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityCache.java.i
data/test/sun/tools/jstat/lineCounts1.awk.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.c.i
data/test/java/nio/channels/Channels/Basic2.java.i
data/src/share/classes/sun/tools/jstat/JStatLogger.java.i
data/test/javax/imageio/plugins/png/ItxtUtf8Test.java.i
@@ -12697,15 +12599,16 @@ data/test/javax/sound/midi/Gervill/SoftTuning/Load1.java.i
data/src/share/native/sun/java2d/pipe/SpanIterator.h.i
data/src/share/classes/sun/util/locale/Extension.java.i
data/test/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java.i
-data/src/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java.i
+data/test/java/lang/management/RuntimeMXBean/UpTime.java.i
data/src/share/classes/sun/awt/HToolkit.java.i
-data/test/java/awt/Graphics2D/DrawString/AlphaSurfaceText.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java.i
data/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java.i
data/src/share/classes/java/awt/event/ContainerEvent.java.i
data/src/share/classes/java/util/concurrent/package-info.java.i
data/src/share/native/sun/java2d/loops/AlphaMacros.h.i
data/test/java/lang/instrument/TestClass1.java.i
-data/test/java/nio/file/WatchService/LotsOfEvents.java.i
+data/src/solaris/hpi/native_threads/src/threads_linux.c.i
+data/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java.i
data/test/demo/jvmti/Hello.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_pl_PL.properties.i
@@ -12714,9 +12617,9 @@ data/test/sun/security/tools/keytool/selfissued.sh.i
data/test/com/sun/crypto/provider/TLS/masterdata.txt.i
data/test/com/sun/jdi/VMDeathRequestTest.java.i
data/src/share/classes/java/net/ServerSocket.java.i
-data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java.i
-data/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java.i
data/test/java/util/Arrays/Correct.java.i
+data/src/share/native/sun/management/GarbageCollectorImpl.c.i
data/test/javax/security/auth/login/LoginContext/DefaultHandlerModule.java.i
data/src/share/classes/javax/swing/JEditorPane.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/IllegalOptionSpecificationException.java.i
@@ -12726,35 +12629,40 @@ data/src/share/classes/sun/tools/asm/NameAndTypeConstantData.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java.i
data/test/java/util/PluggableLocale/providersrc/LocaleNames_ja.properties.i
data/src/share/classes/java/awt/event/package.html.i
+data/src/share/classes/java/dyn/FilterOneArgument.java.i
data/test/javax/security/auth/PrivateCredentialPermission/Subset.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java.i
-data/src/share/native/java/lang/fdlibm/src/k_tan.c.i
+data/test/sun/management/jmxremote/bootstrap/Utils.java.i
data/test/java/rmi/reliability/benchmark/runSerialBench.sh.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java.i
+data/test/javax/xml/crypto/dsig/data/exc-signature.xml.i
data/src/share/classes/java/nio/file/OpenOption.java.i
+data/test/java/net/InetSocketAddress/CreateUnresolved.java.i
data/test/sun/security/provider/KeyStore/WrongPassword.java.i
data/test/javax/script/UnescapedBracketRegExTest.java.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java.i
-data/src/share/classes/javax/swing/colorchooser/ColorSelectionModel.java.i
+data/src/share/classes/sun/tools/tree/BinaryAssignExpression.java.i
+data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorServerProvider.i
data/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest14_ko.properties.in.i
data/src/share/classes/java/util/Arrays.java.i
data/src/share/classes/java/nio/channels/Channel.java.i
data/test/java/security/Provider/Turkish.java.i
-data/test/java/lang/reflect/Method/invoke/IllegalAccessInInvoke.java.i
+data/src/share/native/sun/security/ec/ecl.h.i
+data/make/netbeans/common/unix-view.ent.i
data/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java.i
data/src/share/classes/com/sun/jdi/request/DuplicateRequestException.java.i
data/src/share/classes/sun/text/resources/FormatData_vi.java.i
data/test/java/net/URL/RelativePath.java.i
-data/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java.i
-data/make/common/Release.gmk.i
+data/src/share/classes/java/lang/StringBuilder.java.i
+data/src/share/classes/java/awt/image/ReplicateScaleFilter.java.i
data/test/java/rmi/activation/Activatable/downloadParameterClass/Foo.java.i
data/test/java/beans/PropertyEditor/TestBooleanClassJava.java.i
-data/src/share/classes/sun/reflect/misc/ReflectUtil.java.i
+data/src/share/classes/java/lang/reflect/Constructor.java.i
+data/test/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java.i
data/src/share/demo/jvmti/hprof/hprof_check.h.i
data/src/share/classes/sun/dyn/AdapterMethodHandle.java.i
data/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html.i
-data/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java.i
+data/test/com/sun/jdi/DeoptimizeWalk.sh.i
+data/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java.i
data/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java.i
data/test/java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java.i
data/src/share/classes/javax/sql/rowset/serial/package.html.i
@@ -12766,10 +12674,10 @@ data/test/sun/rmi/transport/tcp/blockAccept/TestImpl.java.i
data/test/Makefile.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S32Func.c.i
data/test/sun/security/provider/PolicyFile/SelfExpansion.java.i
-data/make/tools/swing-beans/beaninfo/images/JSplitPaneMono32.gif.i
+data/make/tools/swing-beans/beaninfo/images/JLabelMono32.gif.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init4.java.i
data/make/tools/CharsetMapping/IBM775.map.i
-data/src/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java.i
+data/test/java/lang/reflect/Constructor/TestParameterAnnotations.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/CommunicationException.java.i
data/src/share/classes/sun/text/resources/FormatData_ms_MY.java.i
@@ -12781,47 +12689,50 @@ data/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java.i
data/test/javax/management/namespace/RoutingServerProxyTest.java.i
data/src/share/classes/sun/invoke/util/Wrapper.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java.i
-data/src/share/classes/java/util/Locale.java.i
+data/src/share/demo/jvmti/waiters/Agent.hpp.i
data/src/share/demo/jvmti/hprof/hprof_class.h.i
data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java.i
data/src/share/native/sun/java2d/loops/FourByteAbgrPre.h.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineResultArgs.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/Expr.jj.i
data/test/sun/net/www/protocol/file/GetContentType.java.i
data/src/solaris/demo/jigsaw/basic/run.sh.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.h.i
-data/src/share/classes/javax/management/namespace/JMXNamespace.java.i
+data/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfig.java.i
data/src/share/classes/javax/management/relation/RelationSupport.java.i
data/test/sun/security/provider/PolicyParser/AvoidPropertyExpansionExceptions.java.i
data/test/java/math/BigDecimal/LongValueExactTests.java.i
-data/src/share/classes/sun/reflect/ReflectionFactory.java.i
data/test/java/beans/XMLEncoder/java_awt_Insets.java.i
data/src/share/native/sun/font/layout/ValueRecords.h.i
-data/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConvEdge.h.i
data/src/share/classes/javax/print/attribute/PrintRequestAttributeSet.java.i
data/src/solaris/native/sun/awt/awt_AWTEvent.c.i
-data/src/share/classes/java/nio/channels/Selector.java.i
+data/src/windows/native/sun/java2d/windows/ddrawObject.h.i
data/src/share/classes/sun/java2d/loops/ScaledBlit.java.i
data/test/java/io/charStreams/Cat.java.i
+data/test/sun/security/ssl/README.i
data/src/windows/native/sun/windows/UnicowsLoader.h.i
data/src/share/classes/sun/io/CharToByteCp865.java.i
-data/src/share/classes/java/security/GeneralSecurityException.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java.i
data/make/netbeans/awt2d/README.i
data/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java.i
data/src/share/classes/java/lang/ArithmeticException.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/Orange.java.i
data/src/share/classes/javax/management/ClassAttributeValueExp.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_pt_PT.properties.i
-data/src/share/classes/javax/swing/text/AbstractDocument.java.i
-data/test/com/sun/net/httpserver/bugs/B6393710.java.i
+data/src/share/native/sun/security/ec/impl/ecp_aff.c.i
+data/test/java/util/zip/TestEmptyZip.java.i
+data/test/java/lang/instrument/NamedBuffer.java.i
+data/src/share/native/sun/font/layout/SimpleArrayProcessor.cpp.i
+data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup_Stub.java.i
+data/test/sun/security/krb5/auto/basic.sh.i
+data/src/windows/native/sun/jkernel/kernel_pt_BR.rc.i
data/test/java/lang/System/ExitFinalizersAndJIT.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_PA.properties.i
-data/test/sun/java2d/loops/Bug7049339.java.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarA/com/message/spi/MessageService.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/TestThread.java.i
+data/src/share/classes/java/text/Format.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html.i
data/src/share/classes/sun/nio/ch/SctpStdSocketOption.java.i
data/src/share/classes/java/awt/geom/Ellipse2D.java.i
@@ -12829,40 +12740,37 @@ data/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java.i
data/src/share/classes/java/io/CharArrayReader.java.i
data/test/sun/tools/jps/jps-lm.sh.i
data/src/share/classes/javax/management/remote/IdentityMBeanServerForwarder.java.i
-data/test/java/text/Bidi/Bug7051769.java.i
data/src/share/classes/sun/awt/geom/Order3.java.i
+data/test/javax/script/DummyScriptEngine.java.i
data/src/share/back/invoker.c.i
data/test/sun/management/jmxremote/bootstrap/Makefile.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java.i
data/src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java.i
data/src/share/classes/sun/jvmstat/monitor/remote/BufferedMonitoredVm.java.i
data/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java.i
-data/make/tools/swing-beans/beaninfo/images/JEditorPaneColor16.gif.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java.i
data/test/java/lang/instrument/RedefineClassWithNativeMethodApp.java.i
data/test/java/util/ResourceBundle/Bug6190861Data_en_US.properties.i
data/make/mkdemo/jvmti/heapTracker/Makefile.i
data/test/javax/management/remote/mandatory/util/CacheMapTest.java.i
-data/make/tools/src/build/tools/jdwpgen/OutNode.java.i
+data/test/java/util/Formatter/BasicBigDecimal.java.i
data/test/java/security/Security/removing/RemoveStaticProvider.policy.i
-data/src/share/classes/java/lang/Shutdown.java.i
data/test/java/beans/XMLEncoder/6380849/Bean.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.pass.i
data/test/java/net/URLClassLoader/jars/class_path_test.jar.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-8-attack.xml.i
-data/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh.i
data/test/java/rmi/reliability/benchmark/bench/serial/GetPutFieldTrees.java.i
data/src/share/classes/sun/java2d/loops/DrawGlyphListLCD.java.i
-data/src/share/classes/java/lang/InstantiationError.java.i
-data/src/windows/native/sun/java2d/d3d/D3DSurfaceData.h.i
+data/src/share/classes/java/text/spi/NumberFormatProvider.java.i
+data/src/share/classes/sun/net/ftp/FtpClientProvider.java.i
data/src/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java.i
data/src/share/native/sun/security/ec/mplogic.h.i
data/test/sun/security/x509/X500Name/DerValueConstructor.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java.i
data/src/share/classes/java/net/package.html.i
data/src/share/classes/sun/net/spi/DefaultProxySelector.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/run.sh.i
-data/src/windows/native/sun/windows/awt_ScrollPane.cpp.i
-data/src/share/classes/sun/io/ByteToCharDBCS_EBCDIC.java.i
-data/src/share/classes/javax/management/event/RMIPushServer.java.i
+data/test/java/rmi/transport/readTimeout/security.policy.i
+data/src/share/classes/sun/text/normalizer/RangeValueIterator.java.i
data/src/share/classes/javax/sql/rowset/serial/SerialException.java.i
data/test/java/io/Serializable/finalFields/FinalFields.java.i
data/make/tools/swing-beans/beaninfo/images/JComboBoxMono32.gif.i
@@ -12870,11 +12778,10 @@ data/src/share/classes/com/sun/jmx/interceptor/MBeanServerSupport.java.i
data/src/share/classes/java/nio/channels/ByteChannel.java.i
data/test/java/net/MulticastSocket/SetTTLAndGetTTL.java.i
data/src/share/classes/com/sun/tools/example/README.i
-data/src/share/demo/applets/Fractal/example1.html.i
data/test/java/beans/Introspector/4520754/Wombat.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java.i
-data/test/java/lang/reflect/Constructor/GenericStringTest.java.i
-data/test/java/net/CookieHandler/B6644726.java.i
+data/test/java/util/PluggableLocale/BreakIteratorProviderTest.java.i
+data/src/share/classes/java/awt/geom/CubicCurve2D.java.i
+data/test/java/nio/Buffer/CopyDirectIntMemory.java.i
data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java.i
data/test/com/sun/net/httpserver/Test9.java.i
data/src/share/native/sun/java2d/pipe/Region.h.i
@@ -12882,46 +12789,48 @@ data/make/tools/src/build/tools/fontchecker/FontCheckDummy.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/AnnotatedDependency.java.i
data/test/java/security/ProtectionDomain/AllPerm.jar.i
data/test/com/sun/security/sasl/gsskerb/NoSecurityLayer.java.i
-data/test/java/io/Serializable/badSerialPersistentField/BadSerialPersistentField.java.i
data/src/share/demo/jfc/SwingApplet/SwingApplet.java.i
data/src/share/classes/sun/launcher/resources/launcher.properties.i
data/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java.i
+data/src/share/classes/sun/rmi/server/Util.java.i
+data/src/share/classes/sun/security/util/HostnameChecker.java.i
data/src/share/classes/java/util/AbstractSequentialList.java.i
data/src/share/classes/sun/reflect/generics/tree/Wildcard.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgentMBean.java.i
data/make/sun/cmm/kcms/mapfile-vers.i
-data/test/java/security/cert/PKIXParameters/InvalidParameters.java.i
data/src/share/native/sun/awt/image/jpeg/jcapimin.c.i
data/test/java/rmi/reliability/benchmark/bench/rmi/BenchServer.java.i
data/src/share/classes/com/sun/crypto/provider/PKCS5Padding.java.i
data/src/share/native/java/nio/Bits.c.i
-data/src/windows/native/java/io/Win32FileSystem_md.c.i
+data/src/share/classes/java/lang/doc-files/javalang.doc.anc41.gif.i
data/src/share/classes/javax/naming/spi/DirObjectFactory.java.i
data/test/java/util/ResourceBundle/Bug4257318Res_en.java.i
+data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java.i
data/src/share/native/sun/security/ec/ecl_curve.c.i
data/test/java/nio/channels/DatagramChannel/ThereCanBeOnlyOne.java.i
data/test/java/util/EnumSet/OneUniverse.java.i
data/src/share/classes/javax/net/ssl/TrustManager.java.i
data/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java.i
data/src/share/demo/jfc/SampleTree/SampleTreeCellRenderer.java.i
-data/make/tools/src/build/tools/jarsplit/JarSplit.java.i
+data/src/share/native/sun/font/layout/LETypes.h.i
data/src/solaris/classes/sun/awt/motif/X11JIS0201.java.i
data/src/share/classes/sun/io/CharToByteJIS0201.java.i
-data/make/sun/xawt/mapfile-vers.i
+data/test/java/io/charStreams/StringGenerator.java.i
data/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties.i
data/src/share/native/sun/java2d/loops/MaskFill.c.i
data/test/javax/management/remote/mandatory/connection/CloseServerTest.java.i
data/src/solaris/doc/sun/man/man1/appletviewer.1.i
data/src/share/classes/sun/java2d/pipe/NullPipe.java.i
-data/test/java/lang/management/ManagementFactory/StateTestMBean.java.i
+data/src/share/classes/com/sun/jdi/event/MethodExitEvent.java.i
+data/src/share/back/export/sys.h.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java.i
data/test/java/lang/ref/SoftReference/Pin.java.i
data/test/java/util/Collections/NullComparator.java.i
-data/test/sun/jvmstat/testlibrary/Sleeper.java.i
-data/src/share/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml.i
+data/test/java/beans/PropertyEditor/TestDoubleClassValue.java.i
+data/src/share/classes/sun/io/ByteToCharEUC_JP_Solaris.java.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/manifest.mf.i
data/src/share/classes/sun/security/timestamp/HttpTimestamper.java.i
-data/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c.i
data/src/share/classes/javax/security/sasl/Sasl.java.i
@@ -12930,30 +12839,25 @@ data/test/java/beans/Introspector/memory/Test4809008.java.i
data/test/javax/swing/JLayer/6875153/bug6875153.java.i
data/test/java/util/concurrent/DelayQueue/PollUnexpired.java.i
data/src/share/classes/java/util/regex/PatternSyntaxException.java.i
-data/src/solaris/native/sun/nio/ch/SctpNet.c.i
+data/src/share/classes/com/sun/beans/WildcardTypeImpl.java.i
data/src/share/classes/sun/awt/ExtendedKeyCodes.java.i
-data/test/javax/management/mxbean/customtypes/IntegerIsStringFactory.java.i
data/src/linux/doc/man/ja/javac.1.i
data/src/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java.i
data/test/java/util/Calendar/WeekDateTest.java.i
-data/src/windows/native/sun/java2d/d3d/D3DTestRaster.h.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_OM.properties.i
data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java.i
-data/make/netbeans/jarzip/build.xml.i
data/src/share/classes/javax/management/loading/MLet.java.i
data/src/share/demo/applets/GraphicsTest/example1.html.i
data/src/share/classes/java/lang/doc-files/capchi.gif.i
-data/src/share/native/sun/awt/image/jpeg/jquant1.c.i
+data/src/share/classes/com/sun/media/sound/ModelPatch.java.i
data/src/share/modules/jdk.tools/module-info.java.i
data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_5.java.i
-data/src/share/classes/java/security/PolicySpi.java.i
data/test/javax/crypto/spec/IvParameterSpec/InvalidArgs.java.i
-data/src/share/classes/sun/reflect/generics/repository/MethodRepository.java.i
data/test/java/awt/Mixing/JButtonInGlassPane.java.i
data/src/windows/native/sun/nio/ch/Net.c.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java.i
data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPParameterSpec.java.i
data/src/share/classes/java/awt/image/FilteredImageSource.java.i
-data/src/share/classes/com/sun/media/sound/SunFileReader.java.i
data/src/share/classes/com/sun/crypto/provider/PBEKey.java.i
data/src/share/classes/javax/swing/JPanel.java.i
data/src/share/classes/java/rmi/server/SocketSecurityException.java.i
@@ -12962,11 +12866,10 @@ data/test/java/io/FilterOutputStream/Write.java.i
data/src/share/classes/javax/management/relation/Role.java.i
data/src/share/classes/javax/sound/sampled/DataLine.java.i
data/src/share/classes/sun/tracing/dtrace/Activation.java.i
-data/src/share/sample/nio/server/N2.java.i
data/test/java/nio/charset/StandardCharset/Standard.java.i
data/src/share/classes/javax/print/attribute/ResolutionSyntax.java.i
data/src/share/classes/com/sun/crypto/provider/AESWrapCipher.java.i
-data/src/share/native/sun/awt/image/jpeg/jctrans.c.i
+data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails_Stub.java.i
data/src/share/classes/java/io/InvalidClassException.java.i
data/test/java/lang/Math/Rint.java.i
data/src/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java.i
@@ -12987,54 +12890,62 @@ data/test/java/awt/Robot/RobotExtraButton/RobotExtraButton.java.i
data/test/javax/security/auth/login/LoginContext/DefaultHandler.java.i
data/src/share/classes/javax/sql/rowset/spi/XmlReader.java.i
data/test/java/beans/XMLEncoder/Test4679556.java.i
+data/test/java/lang/reflect/Proxy/ClassRestrictions.java.i
data/test/java/net/NetworkInterface/IPv4Only.java.i
data/src/share/native/sun/security/ec/impl/mpmontg.c.i
data/src/share/classes/sun/io/ByteToCharCp437.java.i
-data/test/com/sun/net/httpserver/Test8a.java.i
-data/make/javax/crypto/policy/limited/LIMITED.i
+data/src/share/classes/sun/text/resources/CollationData_iw.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_PR.java.i
data/src/share/classes/java/security/interfaces/RSAPublicKey.java.i
data/src/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java.i
data/test/sun/net/ftp/FtpURL.java.i
data/test/java/beans/XMLEncoder/javax_swing_JButton.java.i
-data/src/share/classes/java/awt/font/TextMeasurer.java.i
+data/test/java/security/cert/X509CertSelector/SetNameConstraintsEmptySequence.java.i
data/src/windows/native/sun/java2d/windows/RegistryKey.cpp.i
data/test/javax/security/auth/login/LoginContext/ConfigConstructor.config.i
data/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java.i
data/test/sun/nio/cs/ISO8859x.java.i
data/test/java/io/Serializable/proxy/skipMissing/Write.java.i
-data/src/share/native/java/lang/fdlibm/src/k_cos.c.i
-data/src/share/classes/javax/swing/event/AncestorListener.java.i
+data/test/java/io/pathNames/GeneralWin32.java.i
+data/src/share/classes/sun/font/TextSource.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java.i
data/src/share/classes/sun/awt/image/ByteComponentRaster.java.i
data/test/java/util/ResourceBundle/awtres.jar.i
data/test/java/util/Arrays/Fill.java.i
data/test/java/lang/management/MemoryMXBean/MemoryTest.java.i
-data/src/share/classes/sun/rmi/log/LogOutputStream.java.i
+data/test/java/io/Serializable/evolution/AddedSuperClass/README.i
data/src/share/classes/sun/security/jgss/spi/MechanismFactory.java.i
data/make/tools/CharsetMapping/MS1252.map.i
data/src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp.i
-data/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java.i
+data/src/windows/classes/sun/awt/windows/WDesktopProperties.java.i
data/src/share/classes/com/sun/net/httpserver/HttpExchange.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-yellow48.png.i
data/test/java/security/UnresolvedPermission/DebugPermission1.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/ding.sf2.i
data/src/share/classes/sun/security/krb5/internal/LastReqEntry.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java.i
+data/test/java/lang/Class/IsEnum.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java.i
data/src/share/classes/javax/swing/event/ChangeListener.java.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java.i
+data/src/share/native/java/lang/fdlibm/src/e_gamma_r.c.i
data/src/share/classes/sun/misc/Cleaner.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_UY.properties.i
data/test/sun/net/www/protocol/jar/GetContentType.java.i
data/src/share/classes/sun/text/resources/FormatData_ga.java.i
data/src/share/classes/sun/awt/image/ImageConsumerQueue.java.i
-data/src/share/native/sun/awt/image/jpeg/jcdctmgr.c.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load6.java.i
data/make/tools/generatecurrencydata/Makefile.i
-data/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-interim24.png.i
+data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java.i
data/test/sun/security/provider/certpath/ReverseBuilder/mgrM2leadMA.i
-data/src/share/classes/javax/naming/RefAddr.java.i
+data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java.i
data/test/java/io/pathNames/win32/DriveRelativePath.java.i
data/src/share/classes/javax/swing/text/html/CSSBorder.java.i
data/make/sun/net/spi/nameservice/dns/Makefile.i
-data/src/share/native/sun/security/ec/mpi.h.i
+data/test/javax/crypto/SecretKeyFactory/FailOverTest.java.i
+data/test/java/util/ResourceBundle/Test4300693.java.i
data/test/java/nio/channels/FileChannel/TryLock.java.i
data/test/javax/management/MBeanServer/PostExceptionTest.java.i
data/src/share/classes/sun/java2d/cmm/ProfileActivator.java.i
@@ -13045,12 +12956,13 @@ data/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.jav
data/test/sun/tools/jps/jps-Vvml_Output2.awk.i
data/test/vm/verifier/VerifyProtectedConstructor.java.i
data/src/windows/native/common/java_main_md.h.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseError.java.i
data/make/tools/CharsetMapping/MS1258.map.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java.i
data/test/sun/net/sdp/Sanity.java.i
-data/src/share/classes/javax/management/AttributeChangeNotification.java.i
+data/src/share/native/sun/java2d/opengl/OGLFuncMacros.h.i
data/src/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java.i
data/src/share/classes/sun/tools/asm/SwitchData.java.i
data/test/java/lang/instrument/classpathAgent.mf.i
@@ -13059,20 +12971,23 @@ data/src/share/classes/com/sun/jndi/ldap/NotifierArgs.java.i
data/src/share/demo/jvmti/heapTracker/README.txt.i
data/test/sun/rmi/rmic/defaultStubVersion/G1Impl.java.i
data/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java.i
-data/src/share/classes/java/net/MulticastSocket.java.i
+data/test/javax/swing/JFileChooser/6484091/bug6484091.java.i
+data/test/demo/jvmti/hprof/StackMapTableTest.java.i
data/make/tools/swing-beans/beaninfo/images/JTreeMono32.gif.i
-data/src/share/classes/java/io/ObjectStreamConstants.java.i
+data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor32.gif.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_SG.properties.i
data/src/share/classes/sun/misc/UUDecoder.java.i
+data/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java.i
data/src/share/classes/sun/nio/cs/SingleByte.java.i
-data/test/java/nio/channels/FileChannel/Write.java.i
+data/test/sun/security/pkcs11/fips/keystore.i
data/test/javax/sound/midi/Gervill/SoftTuning/Load8.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java.i
data/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java.i
data/src/share/native/sun/awt/giflib/gif_lib_private.h.i
data/src/windows/native/sun/windows/awt_Font.h.i
data/src/solaris/native/sun/awt/awt_Choice12.c.i
-data/src/solaris/hpi/src/memory_md.c.i
+data/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java.i
data/test/sun/security/util/Resources/Format.config.i
+data/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java.i
data/make/tools/CharsetMapping/MacRoman.map.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileAttributes.java.i
data/test/sun/tools/jstat/jstatCompilerOutput1.sh.i
@@ -13080,130 +12995,137 @@ data/test/java/util/concurrent/ScheduledThreadPoolExecutor/DelayOverflow.java.i
data/src/share/classes/javax/swing/ArrayTable.java.i
data/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl_Stub.java.i
data/test/java/security/cert/CertificateFactory/invalidEncodedCerts/DetectInvalidEncoding.java.i
-data/make/tools/swing-beans/beaninfo/BeanInfoUtils.java.i
-data/src/share/classes/com/sun/media/sound/AbstractMixer.java.i
-data/src/share/classes/javax/print/Doc.java.i
+data/test/sun/tools/jhat/hprof.bin.i
+data/test/java/lang/Class/EnumPoseur.java.src.i
+data/test/javax/swing/RepaintManager/6608456/bug6608456.java.i
data/src/share/classes/sun/security/ssl/EngineInputRecord.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java.i
+data/src/share/classes/sun/font/TextLineComponent.java.i
data/src/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java.i
data/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java.i
data/src/windows/native/sun/java2d/windows/RegistryKey.h.i
data/make/sun/rmi/cgi/Makefile.i
data/src/share/classes/java/rmi/dgc/VMID.java.i
+data/test/com/sun/jdi/RedefineCrossStart.java.i
data/src/share/classes/javax/swing/PopupFactory.java.i
+data/src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties.i
data/test/java/security/Policy/GetInstance/GetInstanceSecurity.java.i
data/src/share/classes/javax/swing/JRootPane.java.i
data/src/share/classes/com/sun/media/sound/MidiUtils.java.i
data/src/share/classes/sun/security/ssl/SunJSSE.java.i
-data/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java.i
-data/src/solaris/classes/sun/awt/motif/MCustomCursor.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/StreamBuffer.java.i
+data/src/share/classes/java/awt/peer/PanelPeer.java.i
+data/test/java/io/FilterOutputStream/BoundsCheck.java.i
data/test/org/openjdk/jigsaw/_JigsawVersion.java.i
data/src/share/classes/javax/swing/text/html/LineView.java.i
data/src/share/classes/sun/security/ssl/SessionId.java.i
data/src/solaris/classes/sun/awt/X11/XDropTargetEventProcessor.java.i
data/src/share/native/sun/java2d/loops/ByteGray.c.i
data/test/java/net/MulticastSocket/TimeToLive.java.i
-data/src/share/classes/sun/text/resources/FormatData_pl.java.i
-data/src/solaris/classes/sun/awt/motif/MLabelPeer.java.i
+data/src/share/classes/sun/text/resources/FormatData_lv_LV.java.i
+data/test/sun/management/jmxremote/bootstrap/rmiregistryssl.properties.i
data/src/share/classes/com/sun/pept/ept/MessageInfo.java.i
-data/src/share/classes/sun/security/provider/certpath/Vertex.java.i
data/src/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java.i
data/test/java/security/PermissionCollection/AddToReadOnlyPermissionCollection.java.i
data/test/java/beans/PropertyEditor/TestEnumClassJava.java.i
-data/src/share/native/java/lang/Runtime.c.i
+data/test/java/text/Format/DateFormat/Bug4396385.java.i
data/make/tools/reorder/tools/remove_mcount.c.i
-data/make/tools/CharsetMapping/IBM1141.c2b.i
+data/src/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java.i
data/make/tools/swing-beans/beaninfo/images/JTableMono16.gif.i
data/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java.i
data/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh.i
-data/src/share/classes/sun/nio/ch/FileLockImpl.java.i
data/src/share/classes/javax/swing/text/rtf/Constants.java.i
data/src/share/demo/management/FullThreadDump/FullThreadDump.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties.i
+data/src/share/classes/java/awt/font/LineMetrics.java.i
data/src/share/classes/java/security/cert/CertPathBuilderException.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/Floats.java.i
-data/src/share/demo/nbproject/management/JTop/nbproject/project.xml.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassListWriter.java.i
data/src/share/native/java/lang/fdlibm/src/s_copysign.c.i
-data/make/sun/security/action/Makefile.i
+data/src/share/classes/sun/io/CharToByteCp1026.java.i
data/test/demo/jvmti/heapViewer/HeapViewerTest.java.i
data/src/solaris/native/sun/awt/VDrawingArea.c.i
-data/test/java/util/ResourceBundle/Test4314141B_en.properties.i
-data/src/windows/native/sun/windows/security_warning_int.ico.i
+data/src/share/classes/com/sun/media/sound/SF2Soundbank.java.i
+data/test/java/util/ServiceLoader/Load.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java.i
-data/make/tools/swing-beans/beaninfo/images/JMenuBarColor32.gif.i
-data/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c.i
+data/test/sun/net/www/protocol/http/SetIfModifiedSince.java.i
+data/src/windows/native/sun/windows/awt_ScrollPane.cpp.i
data/src/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java.i
data/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java.i
+data/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java.i
data/src/share/classes/java/text/spi/DateFormatProvider.java.i
-data/test/java/io/Serializable/PutField/Write.java.i
+data/test/sun/net/www/protocol/http/ProxyTunnelServer.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java.i
data/src/share/back/debugInit.c.i
data/test/sun/nio/cs/EUC_TW_OLD.java.i
data/test/demo/jvmti/hprof/DefineClass.java.i
data/src/share/classes/sun/print/resources/oneside.png.i
data/test/sun/net/InetAddress/nameservice/B6442088.java.i
data/test/javax/swing/JSlider/6742358/bug6742358.html.i
+data/src/solaris/classes/sun/awt/X11/XSelection.java.i
data/test/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/README.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java.i
data/test/java/nio/channels/SocketChannel/BigReadWrite.java.i
data/src/share/classes/java/util/SimpleTimeZone.java.i
data/test/java/rmi/activation/CommandEnvironment/group.security.policy.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/ColorMapper.java.i
data/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java.i
data/make/tools/src/build/tools/dirdiff/DirDiff.java.i
-data/test/javax/xml/crypto/dsig/data/signature-keyname.xml.i
data/make/docs/NON_CORE_PKGS.gmk.i
-data/src/solaris/classes/sun/awt/X11/security-icon-yellow24.png.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java.i
data/test/java/util/Locale/serialized/java6locale_en_US_Java.i
data/test/javax/print/attribute/Chroma.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties.i
+data/src/share/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml.i
+data/src/share/classes/sun/util/resources/CalendarData_mk.properties.i
data/src/share/classes/com/sun/tools/jdi/LineInfo.java.i
data/src/solaris/native/java/net/PlainSocketImpl.c.i
-data/src/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java.i
+data/src/share/classes/sun/util/resources/TimeZoneNames_en_GB.java.i
data/make/common/Defs-linux.gmk.i
data/src/share/classes/sun/net/httpserver/HttpError.java.i
data/src/share/classes/javax/management/BadBinaryOpValueExpException.java.i
-data/src/share/classes/sun/tools/jconsole/ClassTab.java.i
+data/src/share/native/sun/font/layout/LEStandalone.h.i
data/src/share/classes/javax/imageio/event/IIOWriteWarningListener.java.i
data/test/java/io/ObjectInputStream/ResolveProxyClass.java.i
data/test/java/nio/channels/ServerSocketChannel/NonBlockingAccept.java.i
data/src/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java.i
data/src/share/classes/sun/management/HotspotRuntime.java.i
data/src/share/classes/sun/swing/plaf/synth/SynthIcon.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so.d
+data/test/javax/swing/JSlider/6348946/bug6348946.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicListUI.java.i
data/src/solaris/classes/sun/nio/ch/EPollSelectorProvider.java.i
data/test/java/beans/XMLEncoder/java_awt_GradientPaint.java.i
-data/test/java/awt/Paint/PgramUserBoundsTest.java.i
-data/src/windows/native/sun/windows/awt_DataTransferer.h.i
-data/test/java/util/ResourceBundle/Control/PrivateConstructorRB.java.i
+data/src/share/classes/java/util/jar/Manifest.java.i
data/test/java/util/concurrent/CyclicBarrier/Basic.java.i
-data/src/share/classes/sun/management/VMManagement.java.i
-data/src/share/classes/sun/io/CharToByteCp970.java.i
+data/src/share/demo/jfc/CodePointIM/resources/codepoint_zh_CN.properties.i
+data/src/share/demo/jvmti/agent_util/agent_util.h.i
data/src/share/classes/sun/rmi/server/resources/rmid_ko.properties.i
data/test/java/awt/Toolkit/Headless/ExceptionContract/ExceptionContract.java.i
data/test/java/rmi/activation/Activatable/checkAnnotations/rmid.security.policy.i
data/make/tools/CharsetMapping/HKSCS2001.map.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html.i
data/src/share/classes/sun/text/resources/FormatData_ca_ES.java.i
+data/test/java/security/cert/PolicyNode/GetPolicyQualifiers.java.i
data/src/share/classes/sun/security/pkcs11/P11SecureRandom.java.i
data/src/share/classes/sun/security/acl/PrincipalImpl.java.i
data/src/windows/native/sun/jkernel/kernel_ja.rc.i
data/src/share/classes/sun/java2d/pipe/CompositePipe.java.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java.i
data/src/share/classes/sun/tools/tree/Node.java.i
-data/src/share/classes/java/beans/PropertyChangeSupport.java.i
-data/src/share/demo/jfc/CodePointIM/README_ja.html.i
+data/test/com/sun/servicetag/environ.properties.i
+data/test/java/io/RandomAccessFile/ReadWritePrimitives.java.i
data/src/share/classes/com/sun/media/sound/DLSSoundbank.java.i
data/test/javax/management/modelmbean/SimpleModelMBean/policy.i
data/src/share/classes/sun/tools/java/AmbiguousMember.java.i
data/src/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java.i
+data/test/sun/nio/cs/NIOJISAutoDetectTest.java.i
+data/test/java/net/Socket/SocksConnectTimeout.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java.i
-data/test/java/lang/Class/IsEnum.java.i
+data/test/java/net/Socket/asyncClose/BrokenPipe.java.i
data/src/share/classes/javax/accessibility/AccessibleHypertext.java.i
-data/test/java/awt/font/TextLayout/TestSinhalaChar.java.i
-data/src/share/classes/sun/java2d/pisces/Renderer.java.i
+data/test/java/awt/Robot/CtorTest/CtorTest.java.i
+data/src/windows/classes/sun/nio/fs/WindowsWatchService.java.i
data/src/share/classes/javax/swing/table/TableStringConverter.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java.i
data/src/share/classes/sun/tools/javac/Main.java.i
data/src/share/classes/java/security/Policy.java.i
data/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp.i
@@ -13220,25 +13142,27 @@ data/make/mkdemo/applets/DitherTest/Makefile.i
data/test/java/awt/geom/CubicCurve2D/ContainsTest.java.i
data/test/java/beans/XMLEncoder/Test6256805.java.i
data/src/share/classes/sun/java2d/pipe/RenderBuffer.java.i
-data/src/share/classes/java/util/jar/package.html.i
+data/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java.i
data/make/com/sun/jndi/rmi/registry/Makefile.i
+data/src/share/instrument/Utilities.h.i
data/src/share/javavm/export/jmm.h.i
data/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java.i
data/src/share/classes/sun/swing/text/CompoundPrintable.java.i
data/test/java/beans/PropertyEditor/TestByteClassNull.java.i
-data/make/netbeans/swing/nbproject/project.xml.i
+data/test/java/lang/Class/getClasses/Sanity.java.i
data/make/com/sun/inputmethods/thaiim/Makefile.i
-data/src/share/classes/sun/tools/java/SyntaxError.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMBean.java.i
data/src/share/classes/com/sun/tools/jdi/SDE.java.i
-data/make/sun/net/spi/nameservice/Makefile.i
+data/src/share/lib/images/cursors/win32_MoveNoDrop32x32.gif.i
data/src/share/classes/javax/swing/text/DefaultStyledDocument.java.i
data/src/share/classes/sun/rmi/server/resources/rmid_fr.properties.i
-data/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h.i
+data/test/sun/nio/cs/SurrogateTestEUCTW.plane6.surrogates.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so.d
data/src/windows/classes/sun/management/FileSystemImpl.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/Files.java.i
data/test/sun/security/pkcs11/sslecc/JSSEServer.java.i
-data/test/sun/nio/cs/OLD/GBK_OLD.java.i
+data/src/share/classes/javax/management/IntrospectionException.java.i
+data/test/java/lang/management/MemoryMXBean/Pending.java.i
data/src/share/classes/com/sun/nio/sctp/HandlerResult.java.i
data/src/share/demo/scripting/jconsole-plugin/src/scripts/sysprops.js.i
data/test/java/util/ResourceBundle/Control/StressOut_en_CA.properties.i
@@ -13247,39 +13171,41 @@ data/src/share/classes/sun/tools/tree/ExpressionStatement.java.i
data/test/sun/tools/jstat/jstatLineCounts1.sh.i
data/test/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java.i
data/src/share/classes/java/awt/event/InputEvent.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java.i
+data/test/java/beans/XMLDecoder/4676532/test.jar.i
data/src/share/classes/java/awt/event/AWTEventListenerProxy.java.i
data/src/linux/doc/man/ja/unpack200.1.i
-data/src/solaris/native/sun/awt/awt_KeyboardFocusManager.c.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java.i
data/src/share/classes/sunw/util/EventListener.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java.i
data/src/linux/doc/man/ja/ktab.1.i
data/test/java/util/ResourceBundle/KeySetResources_ja_JP.properties.i
+data/test/java/awt/Modal/SupportedTest/SupportedTest.java.i
data/make/tools/dtdbuilder/dtds/HTMLsymbol.sgml.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_SV.properties.i
data/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c.i
data/make/netbeans/awt2d/build.xml.i
data/src/share/classes/sun/rmi/rmic/newrmic/Constants.java.i
+data/test/sun/security/util/DerInputBuffer/BigInteger0.java.i
data/src/share/classes/com/sun/jndi/dns/ResourceRecords.java.i
data/test/java/io/Serializable/duplicateSerialFields/Test.java.i
data/src/share/demo/jfc/Metalworks/PropertiesMetalTheme.java.i
-data/src/share/classes/java/util/prefs/package.html.i
-data/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java.i
+data/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java.i
+data/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java.i
data/src/share/classes/sun/nio/cs/MS1252.java.i
data/src/share/classes/sun/text/resources/FormatData_fi_FI.java.i
data/test/sun/nio/cs/HWKatakanaMS932EncodeTest.java.i
data/src/share/classes/sun/net/www/protocol/jar/Handler.java.i
-data/src/share/classes/sun/rmi/transport/tcp/TCPConnection.java.i
data/src/share/classes/sun/nio/cs/ArrayEncoder.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.h.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c.i
data/src/share/classes/javax/sound/sampled/spi/package.html.i
-data/src/solaris/classes/sun/management/FileSystemImpl.java.i
+data/test/sun/security/pkcs11/fips/fips.cfg.i
data/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh.i
-data/src/share/native/sun/java2d/SurfaceData.c.i
+data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml.i
+data/src/share/native/sun/font/layout/LEFontInstance.h.i
data/make/com/sun/tools/attach/mapfile-solaris.i
+data/test/sun/tools/native2ascii/A2N_4630463.i
data/src/share/native/sun/font/layout/GXLayoutEngine.h.i
data/test/java/nio/Buffer/Chew.java.i
data/test/java/beans/Introspector/4520754/FooBarBeanInfo.java.i
@@ -13290,7 +13216,7 @@ data/src/share/classes/javax/print/MimeType.java.i
data/test/java/util/Vector/CopyInto.java.i
data/src/share/classes/java/awt/image/Raster.java.i
data/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowDeps.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_EG.properties.i
data/test/java/util/Collections/T6433170.java.i
data/src/share/classes/java/awt/datatransfer/Transferable.java.i
data/test/java/net/Authenticator/Deadlock.java.i
@@ -13308,30 +13234,27 @@ data/src/share/classes/sun/net/httpserver/Request.java.i
data/src/share/classes/sun/dyn/DirectMethodHandle.java.i
data/src/share/classes/javax/swing/JSeparator.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java.i
-data/test/java/beans/PropertyEditor/TestFloatTypeJava.java.i
+data/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java.i
data/src/share/classes/sun/font/DelegatingShape.java.i
data/src/share/sample/nio/server/AcceptHandler.java.i
-data/make/sun/javazic/tzdata/zone.tab.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif.i
data/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.java.i
-data/test/java/text/Bidi/Bug7041232.java.i
+data/test/java/util/Collections/CheckedListBash.java.i
data/test/com/sun/servicetag/InstanceUrnCheck.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c.i
-data/src/share/classes/sun/security/util/DerEncoder.java.i
+data/src/share/demo/jfc/Metalworks/MetalThemeMenu.java.i
data/test/sun/nio/cs/TestISO2022JPSubBytes.java.i
data/src/share/classes/sun/io/CharToByteHKSCS_2001.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanArrayCalls.java.i
data/make/mkdemo/jfc/TransparentRuler/Makefile.i
data/src/share/classes/sun/security/jca/JCAUtil.java.i
-data/src/share/native/java/lang/fdlibm/src/s_cbrt.c.i
-data/src/share/classes/com/sun/jmx/defaults/package.html.i
+data/src/share/native/sun/awt/image/cvutils/img_util.h.i
data/src/share/classes/javax/management/event/EventForwarder.java.i
-data/src/share/classes/java/security/PublicKey.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties.i
data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/project.xml.i
data/src/share/classes/sun/io/CharToByteMacUkraine.java.i
data/src/share/classes/sun/security/krb5/EncryptionKey.java.i
data/src/solaris/classes/sun/nio/fs/SolarisWatchService.java.i
data/src/share/classes/com/sun/crypto/provider/DESedeCrypt.java.i
-data/src/share/classes/javax/naming/ReferralException.java.i
data/src/share/native/sun/font/glyphblitting.h.i
data/src/share/classes/sun/management/counter/perf/Prologue.java.i
data/test/demo/jvmti/hprof/MonitorTest.java.i
@@ -13345,37 +13268,32 @@ data/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java.
data/test/java/io/File/basic.sh.i
data/src/share/sample/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg.i
data/test/java/io/Serializable/packageAccess/B.java.i
-data/src/share/classes/sun/awt/HeadlessToolkit.java.i
data/test/java/util/TimeZone/Bug6772689.java.i
data/test/java/nio/charset/coders/ref.shift_jis.i
-data/src/share/classes/javax/swing/text/ParagraphView.java.i
data/src/share/classes/sun/nio/cs/ext/MacArabic.java.i
data/src/share/back/FrameID.c.i
data/test/java/nio/Buffer/CopyDirectLongMemory.java.i
-data/src/windows/classes/sun/java2d/windows/WinBackBuffer.java.i
-data/src/share/classes/com/sun/tools/script/shell/messages.properties.i
+data/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java.i
data/src/share/native/java/lang/fdlibm/src/e_sqrt.c.i
data/test/java/util/zip/ZipFile/FinalizeInflater.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html.i
data/test/java/nio/file/Path/TemporaryFiles.java.i
data/src/share/classes/java/security/interfaces/DSAPublicKey.java.i
data/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java.i
-data/src/share/classes/java/lang/OutOfMemoryError.java.i
-data/test/java/net/URLConnection/UNCTest.sh.i
+data/src/windows/native/java/io/Win32FileSystem_md.c.i
data/test/java/net/InetAddress/GetLocalHostWithSM.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_15.java.i
-data/src/windows/native/sun/windows/awt_Toolkit.cpp.i
+data/test/java/lang/instrument/PremainClass/InheritAgent1010.java.i
data/src/share/lib/cmm/lcms/LINEAR_RGB.pf.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java.i
-data/src/share/classes/sun/security/x509/CertificatePolicyMap.java.i
+data/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java.i
data/test/com/sun/crypto/provider/Cipher/DES/TestUtility.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java.i
data/test/java/lang/String/Regex.java.i
data/src/share/classes/sun/io/CharToByteCp1123.java.i
data/src/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java.i
data/test/java/lang/instrument/ExampleForBootClassPath.java.i
-data/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties.i
-data/test/com/sun/jdi/BreakpointWithFullGC.sh.i
+data/src/share/classes/sun/management/MemoryPoolImpl.java.i
data/test/java/beans/Introspector/Test4274639.java.i
data/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp.i
data/test/java/lang/management/RuntimeMXBean/PropertiesTest.java.i
@@ -13384,39 +13302,40 @@ data/test/java/lang/annotation/Missing/B.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/CheckNullEntity.java.i
data/test/java/beans/Introspector/4750368/Test4750368.java.i
data/src/share/classes/sun/tools/jstat/OptionFormat.java.i
-data/src/solaris/classes/sun/font/XMap.java.i
+data/src/share/classes/com/sun/net/httpserver/spi/package-info.java.i
data/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h.i
data/test/sun/security/tools/jarsigner/JavaApplication1.jar.i
-data/src/share/classes/com/sun/crypto/provider/DESParameters.java.i
+data/test/java/lang/instrument/bootreporter/StringIdCallbackReporter.java.i
data/src/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java.i
data/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java.i
-data/src/share/classes/javax/swing/event/AncestorEvent.java.i
data/test/java/net/URLClassLoader/getresourceasstream/test.jar.i
data/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java.i
data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html.i
data/src/share/classes/sun/util/resources/CalendarData_es_ES.properties.i
-data/src/share/classes/javax/imageio/ImageIO.java.i
+data/src/share/native/sun/font/layout/ContextualGlyphInsertion.h.i
+data/test/java/util/PluggableLocale/providersrc/java.util.spi.LocaleNameProvider.i
data/test/sun/nio/cs/OLD/IBM935_OLD.java.i
data/test/sun/rmi/transport/tcp/blockAccept/TestImpl_Stub.java.i
-data/src/share/classes/javax/print/StreamPrintServiceFactory.java.i
+data/test/java/awt/Color/OpacityChange/OpacityChange.java.i
data/test/java/net/Socket/asyncClose/Socket_getInputStream_read.java.i
data/make/sun/security/jgss/wrapper/Makefile.i
data/test/com/sun/security/auth/module/KeyStoreLoginModule/ReadOnly.java.i
data/src/share/classes/javax/crypto/CipherInputStream.java.i
data/src/share/classes/javax/print/MultiDoc.java.i
data/src/share/back/SDE.c.i
+data/make/tools/src/build/tools/jdwpgen/OutNode.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java.i
+data/src/solaris/doc/sun/man/man1/jstat.1.i
data/src/solaris/demo/jvmti/hprof/hprof_md.c.i
-data/test/javax/swing/text/html/TableView/7030332/sample1.png.i
data/test/sun/security/mscapi/SignUsingSHA2withRSA.sh.i
data/make/mkdemo/jfc/Laffy/Makefile.i
data/src/share/classes/sun/io/CharToByteISO8859_1.java.i
data/src/share/classes/java/io/FileSystem.java.i
data/test/java/net/URLDecoder/EncodeDecode.java.i
-data/src/share/classes/java/util/ArrayDeque.java.i
+data/test/java/awt/xembed/server/RunTestXEmbed.java.i
data/src/share/classes/sun/util/locale/BaseLocale.java.i
data/test/javax/swing/UIDefaults/6622002/bug6622002.java.i
-data/src/share/classes/java/lang/ArrayStoreException.java.i
+data/src/share/classes/sun/swing/PrintColorUIResource.java.i
data/src/share/native/sun/awt/image/awt_ImageRep.c.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init3.java.i
data/src/share/classes/java/util/Vector.java.i
@@ -13429,37 +13348,37 @@ data/test/com/sun/jdi/InstanceFilter.java.i
data/src/share/classes/javax/swing/doc-files/JScrollPane-1.gif.i
data/test/java/awt/Component/NoUpdateUponShow/NoUpdateUponShow.java.i
data/test/java/util/ResourceBundle/Test4314141A_.properties.i
-data/src/share/classes/sun/security/krb5/internal/KRBCred.java.i
-data/src/share/classes/java/awt/doc-files/CheckboxGroup-1.gif.i
-data/src/share/classes/sun/security/jgss/krb5/Krb5Util.java.i
+data/src/windows/hpi/src/monitor_md.c.i
+data/test/java/beans/Introspector/6380849/beans/FirstBean.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.d
data/make/common/shared/Defs-utils.gmk.i
data/src/windows/hpi/export/io_md.h.i
data/src/share/classes/sun/security/x509/CertAndKeyGen.java.i
data/src/share/classes/sun/security/krb5/Confounder.java.i
data/src/share/classes/sun/misc/LRUCache.java.i
-data/test/javax/management/modelmbean/DescriptorSupportTest.java.i
-data/make/tools/src/build/tools/jdwpgen/ArrayObjectTypeNode.java.i
+data/src/share/lib/images/cursors/win32_LinkNoDrop32x32.gif.i
+data/test/sun/tools/jstatd/jstatdDefaults.sh.i
+data/test/sun/nio/cs/TestStringCoding.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java.i
data/make/mkdemo/scripting/jconsole-plugin/Makefile.i
data/src/share/classes/sun/security/ssl/DefaultSSLContextImpl.java.i
data/src/share/native/sun/security/ec/ec2_193.c.i
data/src/share/classes/sun/text/resources/FormatData_fr.java.i
-data/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
+data/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java.i
data/test/javax/crypto/spec/DESKeySpec/NullKey.java.i
data/test/java/beans/XMLEncoder/javax_swing_Box_Filler.java.i
-data/make/sun/security/ec/Makefile.i
+data/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java.i
+data/src/share/classes/java/awt/Container.java.i
data/src/solaris/classes/sun/awt/motif/X11Dingbats.java.i
data/test/sun/nio/cs/Test4200310.sh.i
-data/test/java/io/charStreams/RandomLines.java.i
-data/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java.i
+data/src/share/classes/sun/io/ByteToCharCp424.java.i
data/src/share/classes/java/util/concurrent/ExecutorService.java.i
-data/test/com/sun/tools/attach/SimpleProvider.java.i
+data/src/share/classes/sun/security/validator/Validator.java.i
data/src/share/classes/java/awt/event/PaintEvent.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java.i
-data/test/javax/management/monitor/MBeanServerForwarderInvocationHandler.java.i
+data/src/share/classes/sun/security/krb5/internal/rcache/CacheTable.java.i
data/make/tools/swing-beans/beaninfo/images/JButtonMono32.gif.i
-data/src/share/sample/scripting/scriptpad/src/resources/conc.js.i
data/test/java/io/Serializable/longString/mesg.ser.i
data/test/javax/swing/JColorChooser/Test6348456.java.i
data/test/java/awt/print/PrinterJob/ValidatePage/ValidatePage.java.i
@@ -13472,43 +13391,44 @@ data/src/share/classes/com/sun/jdi/ClassObjectReference.java.i
data/test/sun/security/krb5/etype/weakcrypto.conf.i
data/test/javax/swing/JSlider/6579827/bug6579827.java.i
data/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java.i
-data/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy.i
+data/test/java/net/Socket/TestAfterClose.java.i
+data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.i
data/src/share/classes/java/rmi/server/ExportException.java.i
data/test/sun/misc/URLClassPath/ClassnameCharTest.java.i
+data/test/sun/security/pkcs11/Signature/ReinitSignature.java.i
data/src/share/classes/javax/naming/directory/SearchResult.java.i
data/src/share/classes/javax/swing/BufferStrategyPaintManager.java.i
data/src/windows/native/sun/java2d/d3d/D3DUtils.cpp.i
-data/make/com/sun/java/pack/mapfile-vers.i
+data/src/share/classes/java/nio/channels/package-info.java.i
data/src/share/classes/sun/tools/tree/Expression.java.i
data/src/share/sample/nio/multicast/Reader.java.i
data/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html.i
data/src/share/classes/sun/nio/cs/ext/IBM948.java.d
data/src/share/classes/javax/swing/undo/StateEdit.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/InterruptedIO.java.i
-data/make/tools/CharsetMapping/IBM420.map.i
+data/make/java/java_crw_demo/Makefile.i
data/src/share/native/sun/font/layout/GlyphPositioningTables.cpp.i
-data/src/share/native/sun/java2d/loops/UshortIndexed.h.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java.i
data/test/java/net/DatagramSocket/Send12k.java.i
-data/test/java/nio/channels/Selector/LotsOfUpdates.java.i
+data/test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java.i
data/src/share/classes/java/lang/module/Dependence.java.i
data/test/java/beans/PropertyEditor/TestStringClass.java.i
-data/src/windows/native/sun/java2d/windows/dxCapabilities.cpp.i
+data/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java.i
data/src/share/demo/jvmti/hprof/hprof_io.h.i
data/test/java/net/Inet6Address/serialize/Readme.txt.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/FloatCalls.java.i
+data/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java.i
data/src/share/classes/sun/nio/cs/ext/MS1258.java.i
data/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_MX.properties.i
-data/src/share/native/com/sun/media/sound/Ports.h.i
+data/test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java.i
data/test/java/util/Locale/bug6277243.java.i
data/src/share/classes/com/sun/security/auth/NTNumericCredential.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_PR.properties.i
-data/make/mksample/nio/file/Makefile.i
data/src/share/classes/javax/management/MBeanTrustPermission.java.i
data/test/java/beans/Introspector/Test4935607.java.i
-data/src/share/classes/javax/print/attribute/AttributeSetUtilities.java.i
-data/src/share/classes/java/util/TimerTask.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/manifest.i
+data/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java.i
+data/test/java/beans/XMLDecoder/spec/TestClass.java.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java.i
data/src/share/classes/java/lang/Byte.java.i
data/src/solaris/classes/sun/awt/X11/generator/functions.txt.i
data/test/java/util/logging/AnonLoggerWeakRefLeak.java.i
@@ -13520,22 +13440,31 @@ data/src/share/classes/com/sun/jndi/ldap/BerEncoder.java.i
data/src/share/classes/sun/font/FontManager.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java.i
data/src/share/classes/sun/tools/jconsole/resources/brandlogo.png.i
+data/src/windows/hpi/src/path_md.c.i
+data/test/java/util/PluggableLocale/providersrc/DateFormatProviderImpl.java.i
data/src/share/classes/sun/security/krb5/internal/util/KerberosString.java.i
+data/src/share/classes/sun/security/pkcs11/Secmod.java.i
data/src/share/classes/java/awt/image/AffineTransformOp.java.i
data/src/windows/native/sun/java2d/d3d/D3DBadHardware.h.i
data/src/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java.i
-data/src/share/classes/java/text/spi/DateFormatSymbolsProvider.java.i
-data/src/share/classes/sun/text/resources/FormatData_ru_RU.java.i
+data/src/share/demo/scripting/jconsole-plugin/build.xml.i
data/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java.i
+data/test/java/security/KeyRep/SerialOld.java.i
data/src/share/native/sun/java2d/Trace.h.i
data/test/demo/jvmti/hprof/CpuSamplesTest.java.i
+data/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java.i
data/src/share/classes/java/security/cert/CertificateRevokedException.java.i
+data/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java.i
data/src/share/classes/javax/swing/plaf/PopupMenuUI.java.i
+data/test/java/util/zip/GZIP/GZIPInputStreamRead.java.i
data/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java.i
+data/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java.i
data/test/java/net/URL/B5086147.sh.i
-data/test/javax/swing/JTable/6735286/bug6735286.java.i
+data/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java.i
+data/test/javax/management/query/QueryNotifFilterTest.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/AbstractOptionSpec.java.i
data/test/java/nio/charset/spi/default-pol.i
+data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java.i
data/src/share/classes/java/sql/DriverManager.java.i
data/src/share/classes/com/sun/servicetag/RegistrationDocument.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownSubSystemException.java.i
@@ -13544,17 +13473,18 @@ data/src/share/classes/javax/swing/tree/TreePath.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java.i
data/test/java/rmi/server/RemoteObject/toStub/security.policy.i
data/make/tools/UnicodeData/VERSION.i
-data/src/solaris/doc/sun/man/man1/ja/jsadebugd.1.i
+data/test/java/beans/XMLEncoder/6777487/TestEnumMap.java.i
data/src/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java.i
data/src/share/classes/javax/swing/ButtonModel.java.i
+data/src/share/classes/javax/management/NotificationInfos.java.i
data/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java.i
data/src/share/classes/javax/management/QueryEval.java.i
data/make/tools/swing-beans/beaninfo/images/JAppletColor32.gif.i
data/src/windows/classes/sun/awt/windows/WDesktopPeer.java.i
-data/make/java/zip/Makefile.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandardMBean.java.i
data/test/sun/nio/cs/TestISO2022JP.java.i
data/src/share/classes/java/io/FilePermission.java.i
-data/src/share/classes/sun/tools/serialver/SerialVer.java.i
+data/test/java/awt/print/PrinterJob/PrtException.java.i
data/src/share/classes/sun/nio/cs/ext/IBM918.java.i
data/test/javax/imageio/plugins/bmp/BMPSubsamplingTest.java.i
data/src/share/classes/javax/crypto/spec/RC2ParameterSpec.java.i
@@ -13562,12 +13492,11 @@ data/test/sun/misc/ClassLoaderUtil/Test.java.i
data/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java.i
data/src/solaris/classes/sun/awt/X11/ListHelper.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/GetResponseCode.java.i
data/test/sun/net/idn/nfscis.spp.i
data/test/javax/management/remote/mandatory/connection/RMISerializeTest.java.i
-data/test/sun/security/pkcs11/tls/TestKeyMaterial.java.i
+data/src/windows/classes/sun/java2d/windows/WinBackBuffer.java.i
data/make/tools/sharing/tests/GHello.java.i
-data/src/share/classes/java/security/acl/Group.java.i
+data/src/solaris/native/sun/awt/awt_motif.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java.i
data/src/share/classes/java/util/Formattable.java.i
data/src/share/classes/sun/util/resources/CalendarData_ca.properties.i
@@ -13584,13 +13513,11 @@ data/make/tools/src/build/tools/jdwpgen/Main.java.i
data/test/sun/security/provider/PolicyFile/TrustedCert.java.i
data/src/share/classes/sun/swing/plaf/WindowsKeybindings.java.i
data/test/javax/management/mxbean/ThreadMXBeanTest.java.i
-data/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html.i
+data/src/share/classes/com/sun/media/sound/DLSSampleOptions.java.i
data/test/java/util/Collections/SetFromMap.java.i
-data/src/share/native/sun/java2d/loops/FillSpans.c.i
+data/test/sun/tools/jrunscript/Hello.java.i
data/test/java/nio/file/Files/CreateFileTree.java.i
-data/src/share/classes/sun/security/x509/AlgIdDSA.java.i
data/src/share/classes/javax/management/monitor/MonitorNotification.java.i
-data/src/share/native/sun/font/layout/SegmentSingleProcessor.cpp.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java.i
data/src/windows/bin/java_md.c.i
data/src/share/classes/java/util/JumboEnumSet.java.i
@@ -13599,23 +13526,27 @@ data/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java.i
data/src/share/classes/sun/security/krb5/internal/util/KerberosFlags.java.i
data/src/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java.i
data/test/java/util/Formatter/Constructors.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java.i
data/src/solaris/native/sun/java2d/x11/XRSurfaceData.c.i
data/src/share/classes/com/sun/jmx/snmp/SnmpValue.java.i
-data/test/com/sun/net/httpserver/Test2.java.i
+data/make/sun/motif12/reorder-sparc.i
data/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java.i
data/src/share/classes/sun/text/normalizer/UnicodeSetIterator.java.i
data/test/sun/security/krb5/Krb5NameEquals.java.i
+data/test/javax/crypto/CryptoPermission/AllPermCheck.java.i
+data/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java.i
+data/src/share/classes/java/awt/AWTEvent.java.i
data/src/share/demo/jfc/Notepad/resources/paste.gif.i
-data/src/share/classes/javax/sql/rowset/Joinable.java.i
+data/src/share/classes/sun/text/normalizer/UnicodeMatcher.java.i
data/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh.i
data/test/org/openjdk/jigsaw/_RepositoryCatalog.java.i
-data/test/java/beans/XMLEncoder/java_lang_reflect_Method.java.i
data/test/sun/net/www/protocol/jar/B4756443.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java.i
+data/src/share/sample/nio/server/BP.java.i
data/make/tools/swing-beans/beaninfo/images/JMenuItemColor32.gif.i
data/src/share/classes/java/util/concurrent/locks/ReentrantLock.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionImpl/HashCodeMissing.java.i
+data/src/solaris/hpi/include/interrupt.h.i
+data/src/share/native/sun/awt/libpng/pngerror.c.i
data/test/java/rmi/reliability/benchmark/bench/serial/ClassDesc.java.i
data/make/org/openjdk/Makefile.i
data/src/share/classes/java/awt/print/PrinterAbortException.java.i
@@ -13623,62 +13554,65 @@ data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/project.xml.i
data/src/share/lib/logging.properties.i
data/src/share/classes/sun/io/CharToByteCp874.java.i
data/src/share/native/java/lang/fdlibm/src/e_sinh.c.i
-data/test/java/rmi/reliability/benchmark/bench/Benchmark.java.i
-data/src/share/classes/javax/sound/sampled/Port.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java.i
+data/src/share/classes/sun/applet/AppletIOException.java.i
data/test/java/lang/Math/CeilAndFloorTests.java.i
-data/src/share/classes/java/awt/GridLayout.java.i
+data/test/java/util/Locale/bug4123285.java.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java.i
data/src/share/native/sun/security/ec/impl/ec.h.i
-data/test/java/nio/channels/FileChannel/Position.java.i
-data/test/java/beans/PropertyChangeSupport/Test4985020.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/DoubleArrays.java.i
+data/src/share/classes/sun/reflect/generics/tree/TypeSignature.java.i
+data/test/java/lang/instrument/AInstrumentationTestCase.java.i
+data/test/javax/print/applet/applet3/Applet3PrintService.java.i
+data/src/share/classes/sun/text/bidi/BidiRun.java.i
+data/src/solaris/javavm/export/jni_md.h.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h.i
data/test/javax/swing/JFileChooser/6741890/bug6741890.java.i
-data/src/windows/classes/com/sun/security/auth/module/README.i
+data/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java.i
data/make/tools/src/build/tools/jdwpgen/UntaggedValueTypeNode.java.i
data/src/share/classes/sun/awt/shell/ShellFolderManager.java.i
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/p11-nss.txt.i
data/src/share/classes/java/security/cert/PKIXBuilderParameters.java.i
data/test/java/net/Socket/asyncClose/ServerSocket_accept.java.i
-data/src/share/classes/sun/net/www/protocol/http/InMemoryCookieStore.java.i
-data/test/java/security/Provider/CaseSensitiveServices.java.i
+data/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java.i
+data/test/java/lang/Throwable/LegacyChainedExceptionSerialization.java.i
data/src/share/classes/sun/security/provider/certpath/BuildStep.java.i
-data/test/java/beans/VetoableChangeSupport/1.6.0.ser.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapItem.java.i
data/src/share/classes/sun/security/ssl/HandshakeInStream.java.i
data/src/windows/native/sun/windows/awt_FileDialog.h.i
-data/src/windows/bin/i586/jvm.cfg.i
-data/src/share/classes/java/awt/font/MultipleMaster.java.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h.i
+data/src/share/native/java/util/zip/zlib-1.1.3/zadler32.c.i
+data/test/sun/net/www/protocol/jar/foo.jar.i
data/test/java/beans/PropertyEditor/TestBooleanTypeJava.java.i
data/test/java/security/Identity/EqualsHashCodeContract.java.i
data/test/sun/security/util/DerValue/DerValueEqualsHashCode.java.i
data/make/sun/xawt/FILES_export_unix.gmk.i
-data/test/java/nio/channels/DatagramChannel/ChangingAddress.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java.i
data/test/java/io/Serializable/packageAccess/D.java.i
data/test/java/util/ResourceBundle/Control/ControlFactoryTest.java.i
data/src/share/classes/javax/smartcardio/CardTerminal.java.i
data/make/tools/src/build/tools/jdwpgen/Parse.java.i
-data/make/tools/CharsetMapping/IBM500.c2b.i
-data/src/share/classes/sun/util/resources/CalendarData_ja.properties.i
+data/src/share/classes/sun/io/CharToByteCp964.java.i
+data/test/sun/security/pkcs11/Provider/cspPlus.cfg.i
data/test/java/net/URLConnection/RequestPropertyValues.java.i
-data/src/share/classes/sun/security/x509/X500Name.java.i
+data/make/mkdemo/applets/SimpleGraph/Makefile.i
data/test/java/io/PipedOutputStream/NotConnected.java.i
data/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html.i
data/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java.i
-data/src/share/classes/sun/text/resources/FormatData_bg_BG.java.i
+data/src/share/classes/sun/tools/tree/FinallyStatement.java.i
data/src/share/classes/javax/management/AttributeValueExp.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java.i
-data/src/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/Tracer.java.i
+data/src/solaris/classes/sun/awt/X11InputMethod.java.i
data/src/share/classes/java/awt/event/KeyAdapter.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.i
-data/test/sun/nio/cs/X11CNS11643.java.i
+data/test/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java.i
+data/src/share/classes/com/sun/naming/internal/VersionHelper.java.i
+data/src/share/classes/com/sun/jdi/ObjectCollectedException.java.i
data/test/java/lang/annotation/loaderLeak/A.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.d
+data/src/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java.i
data/make/tools/CharsetMapping/IBM874.nr.i
data/src/share/classes/com/sun/rmi/rmid/ExecPermission.java.i
data/src/share/classes/java/util/Map.java.i
-data/test/java/io/Serializable/6559775/README.i
-data/src/share/javavm/export/classfile_constants.h.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sv.properties.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java.i
data/test/java/rmi/reliability/README.i
data/src/share/classes/java/util/Stack.java.i
@@ -13689,179 +13623,181 @@ data/test/demo/jvmti/hprof/HeapDumpTest.java.i
data/src/share/classes/java/security/KeyManagementException.java.i
data/src/share/classes/org/openjdk/jigsaw/Library.java.i
data/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh.i
-data/test/java/util/AbstractMap/SimpleEntries.java.i
-data/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java.i
+data/src/share/classes/java/lang/TypeNotPresentException.java.i
+data/src/share/classes/java/util/regex/Matcher.java.i
data/make/tools/reorder/tests/JHello.java.i
data/src/share/javavm/include/opcodes.length.i
data/src/share/classes/java/security/acl/Permission.java.i
-data/src/share/classes/sun/security/rsa/RSAKeyFactory.java.i
+data/src/share/classes/sun/tools/tree/PreIncExpression.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java.i
data/test/java/awt/dnd/FileListBetweenJVMsTest/SourceFileListFrame.java.i
data/test/java/rmi/RemoteException/chaining/Chaining.java.i
-data/src/windows/classes/sun/security/smartcardio/PlatformPCSC.java.i
-data/test/javax/management/ObjectInstance/MBeanInfoFailTest.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java.i
+data/make/com/sun/security/auth/module/FILES_export_windows.gmk.i
data/src/share/classes/sun/io/CharToByteEUC.java.i
data/src/share/classes/sun/io/CharToByteGBK.java.i
data/test/java/beans/XMLEncoder/Test4950122.java.i
data/test/java/io/File/DeleteOnExit.java.i
data/src/share/classes/javax/imageio/spi/RegisterableService.java.i
-data/test/java/lang/instrument/IsModifiableClassAgent.java.i
+data/test/tools/jar/JarEntryTime.java.i
data/src/share/classes/sun/nio/cs/MS1250.java.i
-data/test/java/net/SocketInputStream/SocketClosedException.java.i
+data/src/share/classes/sun/tools/tree/BitNotExpression.java.i
data/src/share/classes/sun/java2d/pipe/ShapeSpanIterator.java.i
-data/src/share/classes/sun/io/ByteToCharMacCyrillic.java.i
-data/test/java/io/Serializable/skippedObjCNFException/Write.java.i
+data/src/share/classes/java/util/AbstractSet.java.i
+data/src/share/classes/sun/security/x509/AlgIdDSA.java.i
data/src/windows/classes/sun/awt/windows/WClipboard.java.i
data/src/share/classes/sun/reflect/package.html.i
-data/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpBadSecurityLevelException.java.i
data/src/share/classes/javax/net/ssl/SSLSession.java.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java.i
data/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java.i
data/test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java.i
data/test/java/awt/Mixing/setComponentZOrder.java.i
-data/src/share/classes/sun/tools/jconsole/Plotter.java.i
+data/src/share/classes/sun/print/CustomMediaTray.java.i
data/test/java/beans/XMLDecoder/spec/TestString.java.i
-data/src/share/native/java/lang/fdlibm/src/s_cos.c.i
+data/src/share/native/sun/awt/image/jpeg/jcphuff.c.i
data/test/sun/security/provider/certpath/DisabledAlgorithms/README.i
data/src/share/classes/com/sun/tools/attach/spi/package.html.i
+data/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png.i
data/src/share/classes/com/sun/media/sound/AuFileFormat.java.i
data/test/java/net/URLClassLoader/B6827999.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif.i
-data/src/share/classes/java/awt/AWTEvent.java.i
-data/test/java/security/Security/ClassLoaderDeadlock/CreateSerialized.java.i
+data/test/java/io/Serializable/class/SerialA_1.java.i
+data/src/share/native/sun/security/ec/mp_gf2m.h.i
+data/src/share/classes/sun/nio/cs/ext/IBM948.java.i
+data/src/share/demo/jvmti/hprof/hprof_object.h.i
+data/make/tools/swing-beans/beaninfo/images/JRadioButtonColor32.gif.i
data/test/java/util/concurrent/locks/ReentrantReadWriteLock/Count.java.i
data/test/java/net/URLClassLoader/closetest/test1/com/foo/Resource1.i
-data/test/sun/nio/cs/LatinCharReplacementTWTest.java.i
+data/src/share/classes/sun/security/krb5/KrbKdcReq.java.i
data/test/java/util/EnumMap/ToArray.java.i
-data/test/com/sun/servicetag/DuplicateNotFound.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sk_SK.properties.i
+data/make/tools/CharsetMapping/IBM868.map.i
+data/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java.i
+data/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java.i
data/src/share/classes/com/sun/servicetag/resources/register_ja.html.i
-data/src/share/classes/com/sun/security/sasl/digest/SecurityCtx.java.i
-data/src/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java.i
+data/test/sun/nio/cs/OLD/EUC_KR_OLD.java.i
data/src/solaris/native/sun/awt/awt_TextField.h.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/ValueConverter.java.i
data/src/windows/native/common/jdk_util_md.c.i
-data/src/share/classes/javax/sql/rowset/RowSetFactory.java.i
-data/src/share/classes/sun/tools/jconsole/resources/masthead-left.png.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c.i
data/src/share/native/sun/awt/libpng/LICENSE.i
data/src/share/classes/sun/management/Sensor.java.i
-data/make/netbeans/common/jtreg-view.ent.i
-data/src/share/classes/sun/io/ByteToCharDoubleByte.java.i
-data/src/share/classes/sun/misc/Cache.java.i
-data/src/share/classes/javax/swing/JComponent.java.i
-data/src/share/classes/sun/security/util/HostnameChecker.java.i
+data/src/share/classes/javax/management/openmbean/CompositeDataView.java.i
+data/src/share/classes/java/lang/annotation/Retention.java.i
+data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono16.gif.i
+data/src/share/classes/sun/reflect/generics/tree/IntSignature.java.i
data/src/share/classes/com/sun/tools/jdi/Packet.java.i
-data/test/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java.i
+data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml.i
data/test/java/nio/charset/Charset/EncDec.java.i
data/src/share/classes/java/net/SocketAddress.java.i
data/src/solaris/doc/sun/man/man1/javap.1.i
data/src/share/classes/sun/tools/jstat/RowClosure.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/Constants.java.i
-data/test/sun/net/www/protocol/jar/getcontenttype.sh.i
-data/test/java/lang/instrument/RedefineSetUp.sh.i
+data/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java.i
+data/src/share/classes/java/nio/X-Buffer-bin.java.template.i
+data/test/java/beans/EventHandler/Test6179222.java.i
data/src/share/classes/sun/util/logging/resources/logging.properties.i
+data/test/sun/security/provider/PolicyParser/ExtDirs.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1047.java.i
-data/test/sun/management/windows/revokeall.c.i
+data/src/share/classes/sun/awt/TracedEventQueue.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryMetaImpl.java.i
data/test/java/awt/AlphaComposite/TestAlphaCompositeForNaN.java.i
data/src/share/native/java/lang/SecurityManager.c.i
data/test/java/awt/dnd/ImageDecoratedDnDInOut/MyCursor.java.i
data/src/share/classes/sun/text/resources/FormatData_ar.java.i
data/test/java/rmi/activation/Activatable/checkActivateRef/rmid.security.policy.i
-data/test/java/lang/Class/IsSynthetic.java.i
+data/test/java/beans/Statement/Test6788531.java.i
data/src/solaris/doc/sun/man/man1/ja/jinfo.1.i
data/test/sun/security/tools/keytool/NewSize7.java.i
data/src/share/classes/javax/swing/JFormattedTextField.java.i
data/src/share/classes/sun/security/krb5/PrincipalName.java.i
data/test/javax/swing/JTabbedPane/6670274/bug6670274.java.i
data/src/share/classes/java/security/interfaces/DSAKey.java.i
-data/src/share/classes/org/ietf/jgss/ChannelBinding.java.i
data/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java.i
-data/src/share/classes/javax/swing/text/TabSet.java.i
-data/test/java/lang/reflect/Method/InheritedInterfaceMethods.java.i
-data/test/org/openjdk/jigsaw/cli/TimestampTest.java.i
-data/make/sun/font/reorder-i586.i
+data/src/share/classes/javax/swing/event/RowSorterEvent.java.i
+data/make/tools/swing-beans/beaninfo/images/JRadioButtonMono16.gif.i
+data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.cpp.i
+data/src/share/classes/com/sun/security/auth/LdapPrincipal.java.i
data/test/sun/security/krb5/auto/KeyTabCompat.java.i
data/make/netbeans/common/architectures/arch-i386.properties.i
data/src/share/classes/java/nio/channels/spi/SelectorProvider.java.i
-data/test/java/beans/XMLEncoder/java_util_Date.java.i
+data/src/share/classes/sun/security/rsa/RSAKeyFactory.java.i
data/src/share/classes/sun/print/resources/serviceui_ko.properties.i
data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java.i
data/test/java/util/zip/InflateIn_DeflateOut.java.i
-data/test/javax/imageio/plugins/png/MergeStdCommentTest.java.i
-data/src/share/classes/sun/text/normalizer/UCharacterProperty.java.i
-data/src/share/classes/com/sun/beans/decoder/StringElementHandler.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy35.i
+data/src/share/classes/javax/security/auth/callback/CallbackHandler.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/manifest.i
data/test/com/sun/nio/sctp/SctpChannel/Util.java.i
data/test/sun/tools/jstat/hsperfdata_3433.i
-data/src/share/native/sun/security/ec/mp_gf2m-priv.h.i
-data/src/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java.i
+data/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java.i
+data/src/share/classes/java/lang/ClassCircularityError.java.i
+data/src/share/classes/com/sun/tools/attach/VirtualMachine.java.i
data/src/windows/bin/java_md.h.i
-data/src/share/classes/javax/swing/text/doc-files/Document-insert.gif.i
-data/src/share/classes/java/beans/ExceptionListener.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_nl.properties.i
+data/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties.i
data/test/javax/security/auth/login/LoginContext/ResetModule.java.i
-data/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java.i
-data/src/share/classes/java/nio/file/attribute/FileAttributeView.java.i
data/test/java/lang/management/ThreadMXBean/LockingThread.java.i
data/src/share/classes/sun/io/ByteToCharCp834.java.i
data/src/share/classes/com/sun/jdi/VMMismatchException.java.i
data/src/share/classes/sun/security/krb5/internal/KDCRep.java.i
data/src/share/classes/sun/java2d/opengl/OGLPaints.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java.i
-data/src/share/classes/sun/beans/editors/FontEditor.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/Mono.java.i
+data/src/share/classes/java/io/PushbackReader.java.i
data/src/share/classes/sun/tools/jstat/Jstat.java.i
data/src/share/classes/javax/management/event/EventSubscriber.java.i
data/src/share/native/sun/java2d/loops/MapAccelFunc.c.i
data/src/share/classes/java/beans/PropertyEditorManager.java.i
-data/src/share/classes/java/rmi/activation/ActivationGroup.java.i
data/src/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java.i
+data/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java.i
+data/src/windows/native/java/util/logging.c.i
data/src/share/classes/java/util/concurrent/Executors.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO2022_CN.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/font/Typeface.java.i
-data/make/tools/swing-beans/beaninfo/images/JProgressBarColor16.gif.i
-data/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java.i
+data/test/java/security/BasicPermission/SerialVersion.1.2.1.i
+data/src/windows/classes/sun/awt/windows/WSystemTrayPeer.java.i
+data/test/java/text/Bidi/Bug7051769.java.i
data/test/com/sun/jdi/ProcessAttachDebuggee.java.i
data/src/share/demo/nbproject/jfc/Metalworks/nbproject/project.xml.i
-data/src/share/classes/sun/tools/tree/ByteExpression.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1143.java.i
-data/src/share/native/sun/java2d/pipe/RenderBuffer.c.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S16Func.c.i
data/test/com/sun/crypto/provider/Cipher/DES/FlushBug.java.i
-data/test/java/security/spec/ECCBasic.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java.i
data/test/sun/net/idn/PunycodeTest.java.i
data/src/share/classes/sun/font/CompositeStrike.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/TruncateArray.java.i
+data/src/share/classes/sun/security/provider/certpath/OCSPResponse.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/korean.ut8.txt.i
data/src/share/back/ClassTypeImpl.h.i
+data/src/share/classes/sun/security/provider/SeedGenerator.java.i
data/test/java/net/MulticastSocket/MulticastTTL.java.i
-data/test/sun/security/krb5/IPv6.java.i
-data/src/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java.i
-data/test/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java.i
-data/src/share/classes/sun/net/util/IPAddressUtil.java.i
+data/make/tools/swing-beans/beaninfo/images/JButtonMono16.gif.i
+data/src/share/classes/sun/nio/cs/MS1257.java.i
+data/src/share/classes/sun/io/ByteToCharCp1046.java.i
data/src/share/classes/java/awt/dnd/package.html.i
data/src/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM1046.java.i
data/test/java/net/ResponseCache/ResponseCacheTest.java.i
data/make/sun/security/Makefile.i
data/test/java/rmi/activation/Activatable/checkImplClassLoader/rmid.security.policy.i
data/test/sun/security/provider/PolicyFile/getinstance/GetInstance.java.i
data/test/java/util/Scanner/FailingConstructors.java.i
data/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_no_NO_NY.properties.i
-data/test/sun/rmi/rmic/newrmic/equivalence/Agent.java.i
+data/src/share/classes/sun/text/resources/FormatData_ar_KW.java.i
+data/src/share/classes/com/sun/jdi/connect/ListeningConnector.java.i
data/make/java/nio/spp.sh.i
data/src/share/classes/java/nio/file/FileTreeWalker.java.i
data/src/share/native/sun/tracing/dtrace/JVM.c.i
data/src/share/classes/com/sun/jdi/Method.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java.i
data/make/sun/nio/cs/FILES_java.gmk.i
data/test/javax/management/query/QuerySubstringTest.java.i
+data/src/share/classes/com/sun/beans/decoder/StringElementHandler.java.i
data/src/share/classes/sun/net/ResourceManager.java.i
+data/src/share/classes/sun/security/pkcs/EncodingException.java.i
+data/test/java/net/URLClassLoader/closetest/Common.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h.i
-data/src/windows/classes/java/lang/Terminator.java.i
+data/src/share/classes/sun/text/normalizer/UProperty.java.i
+data/test/java/net/MulticastSocket/Leave.java.i
data/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java.i
data/src/share/classes/sun/font/AttributeValues.java.i
-data/src/share/classes/java/awt/color/ColorSpace.java.i
-data/src/share/classes/sun/net/www/protocol/https/HttpsClient.java.i
+data/test/java/lang/ThreadGroup/Daemon.java.i
+data/src/share/classes/java/sql/SQLPermission.java.i
data/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java.i
data/src/share/classes/sun/swing/BakedArrayList.java.i
data/src/share/classes/javax/management/relation/RoleResult.java.i
@@ -13869,16 +13805,15 @@ data/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java.i
data/make/mkdemo/jvmti/compiledMethodLoad/Makefile.i
data/test/java/util/jar/JarFile/no-manifest.jar.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl_Stub.java.i
-data/test/sun/net/www/protocol/http/SetIfModifiedSince.java.i
-data/test/sun/security/pkcs11/ec/TestECDH.java.i
-data/src/share/classes/javax/print/attribute/Attribute.java.i
+data/src/share/classes/java/net/Inet4Address.java.i
+data/test/java/rmi/server/useCustomRef/UseCustomRef.java.i
+data/src/windows/native/sun/windows/README.JNI.i
data/src/share/classes/javax/security/cert/CertificateExpiredException.java.i
data/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html.i
data/src/share/classes/javax/naming/ldap/package.html.i
-data/src/share/classes/javax/management/event/EventRelay.java.i
data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java.i
-data/src/share/classes/java/awt/geom/GeneralPath.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java.i
+data/make/tools/swing-beans/beaninfo/images/JRootPaneMono32.gif.i
+data/src/share/classes/javax/xml/crypto/dsig/dom/package.html.i
data/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java.i
data/src/share/classes/sun/io/CharToByteISCII91.java.i
data/src/share/classes/javax/accessibility/AccessibleAttributeSequence.java.i
@@ -13886,82 +13821,83 @@ data/src/share/instrument/Reentrancy.c.i
data/src/share/classes/javax/swing/text/html/TextAreaDocument.java.i
data/test/com/sun/crypto/provider/Cipher/PBE/PBEKeysAlgorithmNames.java.i
data/make/javax/sound/jsoundhs/Makefile.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java.i
+data/test/java/net/DatagramSocket/SendSize.java.i
+data/test/java/beans/PropertyEditor/TestFontClass.java.i
data/test/java/nio/charset/CharsetEncoder/Flush.java.i
-data/src/share/classes/sun/text/resources/FormatData_ko_KR.java.i
-data/src/share/classes/sun/jkernel/Mutex.java.i
+data/src/share/classes/sun/font/SunFontManager.java.i
+data/src/linux/doc/man/ja/javadoc.1.d
data/src/share/classes/com/sun/security/auth/module/Crypt.java.i
data/src/share/classes/java/lang/reflect/ReflectPermission.java.i
data/src/linux/doc/man/ja/javadoc.1.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReverseNameLookup.java.i
data/src/share/classes/sun/misc/CharacterEncoder.java.i
-data/src/share/classes/sun/rmi/server/resources/rmid.properties.i
+data/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64.i
+data/src/share/back/eventFilter.h.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java.i
data/test/java/util/concurrent/ExecutorService/Invoke.java.i
-data/test/sun/tools/jps/jps-l_Output1.awk.i
-data/src/share/classes/sun/security/util/BigInt.java.i
-data/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c.i
+data/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c.i
+data/src/share/classes/sun/applet/AppletPanel.java.i
+data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0212.java.i
-data/src/share/classes/sun/font/CMap.java.i
data/src/share/classes/javax/swing/ImageIcon.java.i
data/src/share/classes/com/sun/jdi/request/EventRequestManager.java.i
-data/src/share/demo/jfc/Metalworks/UISwitchListener.java.i
-data/test/java/util/concurrent/locks/Lock/FlakyMutex.java.i
-data/test/java/io/Serializable/arraySuidConflict/Read.java.i
+data/src/windows/native/sun/windows/awt_MouseEvent.cpp.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecBuilder.java.i
+data/src/share/classes/com/sun/rowset/WebRowSetImpl.java.i
data/test/sun/net/sdp/sanity.sh.i
data/test/java/awt/GraphicsEnvironment/TestGetDefScreenDevice.java.i
-data/make/tools/CharsetMapping/SingleByte-X.java.i
-data/src/share/classes/sun/io/ByteToCharJIS0208.java.i
+data/test/java/util/TreeMap/NullPermissiveComparator.java.i
+data/make/tools/CharsetMapping/IBM860.map.i
data/test/java/io/StreamTokenizer/input.txt.i
-data/make/modules/tools/src/com/sun/classanalyzer/ResolutionInfo.java.i
data/test/sun/security/provider/PolicyFile/TrustedCert.policy.i
-data/test/java/util/Collections/Ser.java.i
+data/test/java/nio/charset/RemovingSunIO/SunioAlias.java.i
+data/src/share/classes/sun/text/resources/FormatData_zh_SG.java.i
+data/src/share/classes/java/awt/event/AdjustmentListener.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java.i
-data/src/share/classes/javax/swing/text/DateFormatter.java.i
-data/make/common/shared/Defs-windows.gmk.i
+data/src/share/classes/javax/imageio/IIOException.java.i
+data/src/share/classes/com/sun/jdi/request/EventRequest.java.i
data/test/java/beans/PropertyEditor/6380849/editors/SecondBeanEditor.java.i
data/test/java/lang/Class/getModifiers/ForStaticInnerClass.java.i
data/test/java/net/InetAddress/MyPrincipal.java.i
data/src/share/classes/java/awt/doc-files/modal-example2.gif.i
data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java.i
data/src/share/native/sun/java2d/loops/ParallelogramUtils.h.i
-data/src/share/classes/javax/swing/InputVerifier.java.i
+data/src/share/classes/java/util/concurrent/FutureTask.java.i
data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Receiver.java.i
data/src/share/classes/java/net/StandardSocketOption.java.i
data/test/java/beans/PropertyEditor/TestBooleanClass.java.i
-data/src/share/classes/sun/security/util/DerIndefLenConverter.java.i
data/src/windows/native/java/io/RandomAccessFile_md.c.i
data/src/share/native/sun/font/layout/ThaiShaping.cpp.i
-data/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy.i
+data/test/java/net/URLClassLoader/getresourceasstream/test.sh.i
data/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c.i
-data/src/share/classes/sun/font/FontManagerFactory.java.i
-data/test/java/io/NegativeInitSize.java.i
+data/test/java/awt/PrintJob/MultipleEnd/MultipleEnd.java.i
+data/src/share/classes/java/io/PrintStream.java.i
data/test/java/lang/ClassLoader/ExceptionHidingLoader.java.i
-data/test/javax/security/auth/Subject/Serial.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseStart.java.i
+data/src/linux/doc/man/jsadebugd.1.i
data/src/share/classes/sun/io/CharToByteCp833.java.i
-data/test/java/net/MulticastSocket/B6427403.java.i
+data/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java.i
data/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_ru.properties.i
-data/src/share/classes/sun/swing/PrintingStatus.java.i
-data/src/share/classes/sun/net/www/protocol/http/AuthScheme.java.i
-data/src/solaris/native/sun/awt/CUPSfuncs.c.i
+data/src/share/classes/java/awt/event/MouseMotionAdapter.java.i
+data/src/share/classes/com/sun/media/sound/ReferenceCountingDevice.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java.i
+data/test/java/nio/Buffer/BasicShort.java.i
data/src/share/classes/com/sun/beans/decoder/NullElementHandler.java.i
data/test/javax/naming/spi/DirectoryManager/DummyObjectFactory.java.i
data/src/solaris/classes/sun/awt/X11/XVerticalScrollbar.java.i
-data/test/java/util/Locale/ThaiGov.java.i
data/src/share/classes/com/sun/media/sound/PortMixerProvider.java.i
data/src/share/sample/nio/server/Handler.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaValue.java.i
data/src/share/native/sun/font/layout/GlyphPositionAdjustments.h.i
data/test/java/net/URLConnection/ResendPostBody.java.i
data/test/java/util/concurrent/Phaser/Arrive.java.i
+data/test/java/util/Locale/icuLocales.txt.i
+data/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java.i
data/test/com/sun/jdi/redefineMethod/RedefineTest.java.i
data/test/java/nio/Buffer/Order.java.i
data/test/javax/print/attribute/ChromaticityValues.java.i
data/make/tools/src/build/tools/dtdbuilder/DTDInputStream.java.i
data/src/share/classes/java/nio/file/Path.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl_Stub.java.i
-data/test/javax/security/auth/PrivateCredentialPermission/Subset.policy.i
+data/src/share/demo/jfc/Font2DTest/resources/TextResources_ko.properties.i
data/src/share/classes/javax/swing/ProgressMonitor.java.i
data/test/java/lang/System/finalization/FinExit.java.i
data/test/sun/security/mscapi/AccessKeyStore.sh.i
@@ -13970,91 +13906,94 @@ data/src/share/classes/java/sql/PseudoColumnUsage.java.i
data/test/java/lang/Double/ParseDouble.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpNull.java.i
data/src/share/classes/javax/naming/SizeLimitExceededException.java.i
-data/src/share/classes/java/awt/color/ICC_ProfileRGB.java.i
data/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XTable.java.i
data/test/sun/nio/cs/OLD/DoubleByteDecoder.java.i
data/src/share/classes/java/beans/ConstructorProperties.java.i
data/src/share/classes/sun/applet/AppletProps.java.i
-data/test/java/beans/PropertyEditor/TestEnumSubclassJava.java.i
+data/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java.i
data/src/share/classes/sun/java2d/opengl/OGLUtilities.java.i
-data/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java.i
+data/make/tools/swing-beans/beaninfo/images/AbstractButtonColor16.gif.i
data/test/javax/swing/JPopupMenu/Separator/6547087/bug6547087.java.i
data/src/share/classes/javax/management/remote/rmi/RMIServer.java.i
-data/test/com/sun/jdi/redefine/RedefineSubTarg.java.i
+data/src/share/demo/jfc/CodePointIM/CodePointInputMethod.java.i
data/test/java/lang/instrument/RetransformAgent.java.i
data/src/share/classes/sun/text/CompactByteArray.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c.i
-data/src/share/classes/java/util/zip/GZIPInputStream.java.i
+data/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java.i
data/src/share/classes/com/sun/crypto/provider/AESCrypt.java.i
data/test/java/nio/file/Files/content_type.sh.i
data/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java.i
data/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java.i
data/src/share/classes/sun/java2d/opengl/OGLContext.java.i
-data/src/share/demo/java2d/J2DBench/resources/textdata/greek.ut8.txt.i
-data/test/java/security/BasicPermission/EqualsImplies.java.i
+data/src/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java.i
+data/src/share/classes/com/sun/media/sound/ModelOscillator.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM864.java.i
data/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass1.java.i
data/test/java/net/URLConnection/ExifContentGuesser.java.i
data/test/com/sun/jdi/ArgumentValuesTest.java.i
-data/src/solaris/classes/sun/nio/ch/PipeImpl.java.i
+data/src/share/classes/sun/awt/CausedFocusEvent.java.i
data/test/java/util/HashMap/SetValue.java.i
-data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp.i
+data/src/share/native/sun/font/bidi/ubidi.h.i
data/src/solaris/native/sun/awt/awt_MenuBar.c.i
data/src/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png.i
-data/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java.i
data/test/java/io/Serializable/packageAccess/Test.java.i
-data/src/share/classes/sun/security/action/PutAllAction.java.i
+data/test/java/security/cert/CertPathBuilder/targetConstraints/BuildOddSel.java.i
+data/src/share/native/common/jdk_util.c.i
data/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java.i
data/test/javax/imageio/stream/StreamCloserLeak/test/Main.java.i
data/src/share/classes/sun/io/CharToByteMacHebrew.java.i
-data/src/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java.i
-data/test/sun/tools/jrunscript/jrunscript-helpTest.sh.i
+data/test/java/net/URLEncoder/URLEncoderEncodeArgs.java.i
+data/src/share/classes/javax/management/relation/RelationType.java.i
data/src/share/demo/java2d/J2DBench/nbproject/project.xml.i
data/test/sun/net/www/http/HttpClient/RequestURI.java.i
data/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java.i
-data/test/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java.i
+data/src/share/classes/sun/net/www/http/KeepAliveCache.java.i
data/test/java/util/ArrayList/RangeCheckMicroBenchmark.java.i
-data/test/javax/script/MyContext.java.i
-data/src/share/classes/javax/naming/spi/ResolveResult.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c.i
+data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java.i
data/src/share/classes/sun/security/jgss/wrapper/GSSLibStub.java.i
data/test/java/io/Serializable/inactiveRegistration/InactiveRegistration.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java.i
-data/test/lib/security/cacerts/VerifyCACerts.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/G1.java.i
+data/src/share/classes/com/sun/tools/example/debug/event/JDIListener.java.i
+data/test/sun/security/smartcardio/TestExclusive.java.i
+data/src/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java.i
data/test/java/nio/channels/DatagramChannel/IsConnected.java.i
-data/test/java/security/cert/pkix/policyChanges/ca.cer.i
+data/src/share/classes/javax/management/relation/RelationNotification.java.i
data/make/tools/swing-beans/beaninfo/images/JPopupMenuColor32.gif.i
data/test/com/sun/crypto/provider/TLS/prf12data.txt.i
data/test/java/math/BigInteger/StringConstructor.java.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java.i
-data/test/javax/swing/border/Test6978482.java.i
+data/test/java/util/Locale/Bug4210525.java.i
data/src/share/classes/java/util/zip/ZipException.java.i
data/src/windows/native/java/io/dirent_md.h.i
-data/test/java/awt/regtesthelpers/Sysout.java.i
+data/test/java/dyn/ClassValueTest.java.i
data/make/tools/reorder/tests/LoadFrame.java.i
data/make/tools/CharsetMapping/IBM935.nr.i
data/src/share/classes/sun/tools/tree/NaryExpression.java.i
data/test/sun/security/tools/jarsigner/ts.sh.i
-data/src/share/classes/sun/management/snmp/util/SnmpTableHandler.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java.i
data/src/share/classes/com/sun/java/util/jar/pack/FixedList.java.i
data/src/share/classes/sun/io/ByteToCharUnicodeLittle.java.i
-data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java.i
-data/test/java/nio/file/Files/BytesAndLines.java.i
-data/test/java/lang/Character/PropertyValueAliases.txt.i
-data/src/share/classes/sun/text/resources/FormatData_uk.java.i
-data/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java.i
+data/src/share/classes/org/openjdk/jigsaw/Files.java.i
+data/test/sun/security/ssl/sanity/pluggability/CheckSSLContextExport.java.i
+data/src/share/classes/java/beans/DesignMode.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java.i
+data/src/share/classes/sun/java2d/pisces/Renderer.java.i
data/src/share/classes/sun/print/resources/serviceui_zh_TW.properties.i
data/src/share/classes/org/openjdk/jigsaw/Loader.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM1144.java.i
data/test/java/util/logging/ParentLoggersTest.props.i
data/test/java/rmi/MarshalledObject/compare/NullReference.java.i
data/src/share/classes/java/nio/file/LinkOption.java.i
data/src/share/classes/java/awt/Stroke.java.i
+data/test/java/security/cert/pkix/policyChanges/ee.cer.i
data/test/java/math/BigDecimal/NegateTests.java.i
-data/test/com/sun/net/httpserver/Test10.java.i
-data/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.Connector.i
+data/test/java/util/ResourceBundle/bug6572242.properties.i
data/src/share/demo/jvmti/heapTracker/heapTracker.h.i
-data/test/sun/security/krb5/auto/ok-as-delegate-xrealm.sh.i
-data/src/share/classes/javax/management/BadAttributeValueExpException.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanArrayCalls.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedSet.java.i
data/test/java/security/KeyFactory/Failover.java.i
data/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java.i
data/test/java/lang/instrument/ilib/ClassReaderWriter.java.i
@@ -14063,80 +14002,78 @@ data/make/java/verify/mapfile-vers.i
data/test/java/awt/Graphics2D/DrawString/ScaledLCDTextMetrics.java.i
data/make/mksample/nio/multicast/Makefile.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java.i
-data/src/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java.i
+data/src/share/classes/org/openjdk/jigsaw/ClassInfo.java.i
+data/test/com/sun/tools/attach/java.policy.allow.i
data/test/javax/swing/JColorChooser/Test4165217.java.i
-data/src/share/demo/jvmti/hprof/hprof_table.h.i
-data/test/java/io/PipedWriter/ConnectAfterReaderClose.java.i
data/test/java/awt/print/PrinterJob/PrintAWTImage.java.i
-data/test/java/awt/List/SetFontTest/SetFontTest.java.i
-data/src/share/classes/javax/management/remote/JMXServiceURL.java.i
+data/src/share/native/sun/font/fontscalerdefs.h.i
+data/src/share/classes/com/sun/jmx/snmp/InetAddressAcl.java.i
data/src/windows/hpi/export/timeval_md.h.i
data/test/java/io/ByteArrayOutputStream/ToString.java.i
-data/src/share/classes/sun/tools/tree/LessExpression.java.i
data/src/share/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml.i
-data/src/share/classes/com/sun/servicetag/resources/javase_servicetag.properties.i
data/src/share/classes/javax/swing/AncestorNotifier.java.i
-data/src/share/classes/org/relaxng/datatype/Datatype.java.i
data/src/solaris/doc/sun/man/man1/unpack200.1.i
data/src/share/classes/com/sun/tools/jdi/TypeComponentImpl.java.i
data/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/java/net/MyDatagramSocketImplFactory.java.i
-data/src/share/classes/javax/imageio/stream/package.html.i
-data/src/share/classes/sun/misc/JavaIOAccess.java.i
+data/src/share/classes/sun/tools/jstat/resources/jstat_unsupported_options.i
+data/src/share/classes/sun/io/ByteToCharCp935.java.i
data/make/java/main/javaw/Makefile.i
data/src/share/classes/javax/management/JMX.java.i
-data/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java.i
+data/make/com/sun/jndi/dns/Makefile.i
data/src/share/classes/java/lang/InterruptedException.java.i
-data/src/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java.i
+data/test/org/openjdk/jigsaw/_Library.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java.i
data/src/solaris/classes/sun/font/NativeStrikeDisposer.java.i
data/src/share/native/sun/security/ec/ec2_163.c.i
data/src/share/classes/javax/naming/CommunicationException.java.i
-data/src/share/classes/sun/rmi/runtime/RuntimeUtil.java.i
-data/test/javax/crypto/JceSecurity/MyProvider.java.i
+data/src/share/classes/sun/management/CompilationImpl.java.i
data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java.i
data/make/sun/tools/Makefile.i
-data/src/share/classes/sun/text/resources/CollationData_iw.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif.i
+data/test/javax/naming/ldap/LdapName/LdapParserTests.java.i
+data/src/share/classes/sun/management/HotspotThreadMBean.java.i
data/test/java/io/Serializable/typeStringBackRef/TypeStringBackRef.java.i
-data/src/share/classes/java/lang/RuntimeException.java.i
data/src/windows/classes/sun/net/www/protocol/file/Handler.java.i
-data/src/share/native/sun/security/ec/impl/mp_gf2m.h.i
-data/test/org/openjdk/jigsaw/hello.sh.i
+data/src/share/native/sun/font/layout/MPreFixups.h.i
+data/src/share/classes/sun/net/smtp/SmtpProtocolException.java.i
data/test/java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java.i
-data/src/share/native/sun/awt/debug/debug_assert.c.i
-data/test/java/beans/XMLEncoder/java_util_Collections_CheckedMap.java.i
-data/test/java/nio/file/Files/walkFileTree/grantAll.policy.i
-data/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java.i
+data/make/common/CancelImplicits.gmk.i
+data/src/share/classes/java/lang/RuntimePermission.java.i
+data/test/java/security/SecureRandom/sha1prng-old.bin.i
+data/src/windows/native/sun/jkernel/graphics/masthead.bmp.i
+data/test/java/util/ResourceBundle/Control/PrivateConstructorRB.java.i
data/test/java/rmi/activation/Activatable/checkAnnotations/security.policy.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest12_ko.properties.in.i
data/test/java/nio/file/WatchService/grantDirAndOneLevel.policy.i
data/src/share/demo/jfc/Metalworks/resources/HelpFiles/duke.gif.i
data/src/share/classes/javax/swing/plaf/basic/BasicViewportUI.java.i
data/src/solaris/classes/sun/awt/motif/MFileDialogPeer.java.i
-data/src/share/classes/com/sun/media/sound/JARSoundbankReader.java.i
+data/src/share/classes/com/sun/media/sound/AudioSynthesizer.java.i
data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java.i
data/test/javax/swing/text/WrappedPlainView/6857057/bug6857057.java.i
+data/src/solaris/classes/com/sun/management/UnixOperatingSystem.java.i
data/make/tools/CharsetMapping/MS1251.map.i
data/test/java/beans/Introspector/Test4072197.java.i
data/make/java/main/java/mapfile-sparcv9.i
data/test/java/lang/reflect/Modifier/toStringTest.java.i
-data/test/com/sun/jndi/ldap/NoWaitForReplyTest.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpAddress.java.i
-data/src/share/classes/javax/management/loading/MLetMBean.java.i
-data/src/solaris/native/java/io/FileSystem_md.c.i
+data/src/share/demo/jfc/Metalworks/BigContrastMetalTheme.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java.i
+data/src/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java.i
+data/src/solaris/classes/sun/awt/motif/MFontConfiguration.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java.i
-data/test/java/nio/Buffer/genBasic.sh.i
+data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh.i
data/src/share/demo/applets/WireFrame/example2.html.i
+data/test/sun/net/InetAddress/nameservice/chaining/Simple1NameServiceDescriptor.java.i
data/make/mkdemo/jvmti/README.txt.i
data/test/java/security/CodeSigner/cert_file.i
-data/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java.i
-data/src/share/classes/javax/print/attribute/standard/OrientationRequested.java.i
-data/make/tools/src/build/tools/javazic/RuleDay.java.i
-data/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java.i
+data/src/share/classes/java/io/OutputStreamWriter.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java.i
+data/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java.i
+data/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java.i
data/src/share/classes/sun/dc/DuctusRenderingEngine.java.i
data/test/org/openjdk/jigsaw/repolist.sh.i
data/test/javax/swing/plaf/synth/6771547/synthconfig.xml.i
-data/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java.i
data/test/java/net/Socket/ShutdownBoth.java.i
+data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy.i
data/src/share/classes/sun/security/jgss/GSSContextImpl.java.i
data/src/share/classes/sun/text/resources/FormatData_no_NO.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_fr_CH.properties.i
@@ -14145,142 +14082,141 @@ data/src/share/classes/java/net/URLStreamHandlerFactory.java.i
data/test/java/awt/print/PrinterJob/SameService.java.i
data/test/sun/security/jgss/DefaultGssConfig.java.i
data/src/share/native/sun/reflect/NativeAccessors.c.i
-data/src/solaris/native/sun/java2d/loops/vis_IntBgr.c.i
-data/src/solaris/doc/sun/man/man1/ja/jvisualvm.1.i
-data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/Receiver.java.i
+data/src/solaris/native/sun/awt/awt_InputMethod.c.i
+data/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java.i
data/test/sun/net/www/protocol/jar/copyin.sh.i
-data/src/share/native/sun/awt/medialib/mlib_ImageCreate.h.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509KeyManager.java.i
+data/make/tools/CharsetMapping/IBM1143.map.i
data/test/sun/tools/jstat/jstatGcOutput1.sh.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_GB.properties.i
+data/test/javax/smartcardio/Serialize.java.i
data/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java.i
data/src/share/classes/sun/security/ec/ECKeyPairGenerator.java.i
data/src/share/classes/sun/tools/tree/IncDecExpression.java.i
-data/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java.i
data/test/java/beans/XMLEncoder/javax_swing_OverlayLayout.java.i
data/test/java/nio/file/Files/walkFileTree/Nulls.java.i
data/src/solaris/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Fp.c.i
data/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java.i
-data/src/share/classes/java/security/UnrecoverableKeyException.java.i
+data/src/windows/native/sun/windows/awt_GDIObject.h.i
data/src/share/demo/jfc/Metalworks/resources/HelpFiles/back.gif.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java.i
data/make/tools/CharsetMapping/IBM1025.map.i
-data/src/share/classes/java/util/concurrent/ForkJoinPool.java.i
+data/src/share/classes/java/lang/management/package.html.i
data/test/com/sun/jdi/LocationTest.java.i
data/test/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java.i
-data/src/share/classes/java/security/cert/package.html.i
+data/src/share/classes/java/awt/font/MultipleMaster.java.i
+data/test/java/security/BasicPermission/ExitVMEquals.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_en_IE.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert2.i
data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java.i
data/src/share/native/com/sun/media/sound/PlatformMidi.h.i
data/test/javax/management/remote/mandatory/socketFactories/RMIServerFactory.java.i
-data/src/solaris/native/sun/awt/awt_Checkbox.c.i
+data/src/share/classes/javax/swing/SpinnerListModel.java.i
data/src/share/classes/sun/security/ec/NamedCurve.java.i
-data/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java.i
+data/src/share/classes/javax/crypto/spec/DHParameterSpec.java.i
data/test/sun/security/krb5/auto/Test5653.java.i
data/src/share/classes/sun/tools/java/BinaryConstantPool.java.i
-data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java.i
+data/test/sun/security/tools/jarsigner/diffend.sh.i
+data/src/share/classes/sun/io/ByteToCharCp964.java.i
data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl_Stub.java.i
data/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java.i
data/src/share/classes/sun/security/ssl/ProtocolList.java.i
-data/make/com/sun/java/browser/dom/Makefile.i
+data/src/share/classes/com/sun/security/auth/SubjectCodeSource.java.i
data/src/share/demo/jfc/TableExample/TableMap.java.i
data/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java.i
data/src/share/classes/javax/imageio/event/IIOWriteProgressListener.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_PA.java.i
+data/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java.i
data/src/share/demo/nbproject/management/JTop/build.xml.i
data/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider.i
-data/src/share/demo/jvmti/hprof/hprof_tls.c.i
+data/src/share/classes/java/text/Bidi.java.i
data/src/share/sample/nio/server/B1.java.i
data/test/java/util/zip/ZipFile/CorruptedZipFiles.java.i
-data/src/share/demo/jvmti/hprof/hprof_cpu.c.i
-data/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java.i
+data/src/share/classes/javax/management/loading/MLetMBean.java.i
data/src/share/classes/sun/tools/tree/CharExpression.java.i
data/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java.i
data/test/sun/nio/cs/JISAutoDetectTest.java.i
data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/hindi.ut8.txt.i
-data/src/share/classes/sun/nio/cs/ext/IBM949C.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/SimpleShape.java.i
data/src/windows/classes/sun/awt/Win32ColorModel24.java.i
-data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/rmid.security.policy.i
-data/test/java/lang/management/ThreadMXBean/Semaphore.java.i
+data/src/share/demo/jvmti/hprof/hprof_io.c.i
data/test/java/io/File/Basic.java.i
data/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt.i
-data/test/java/util/ResourceBundle/Test4318520.java.i
+data/src/share/native/java/util/zip/zip_util.c.i
+data/src/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java.i
data/test/java/net/DatagramSocket/SendDatagramToBadAddress.java.i
data/src/windows/classes/sun/awt/windows/WCustomCursor.java.i
data/test/java/lang/Character/CheckScript.java.i
data/src/share/classes/sun/net/www/content/image/png.java.i
data/test/java/net/ProxySelector/NullSelector.java.i
-data/test/javax/management/mxbean/MXBeanAnnotationTest.java.i
-data/test/java/net/DatagramSocket/SendSize.java.i
+data/src/solaris/bin/arm/jvm.cfg.i
+data/src/share/classes/sun/swing/CachedPainter.java.i
+data/src/share/native/sun/font/layout/MPreFixups.cpp.i
data/test/sun/nio/cs/OLD/IBM948_OLD.java.d
data/src/share/classes/sun/rmi/transport/LiveRef.java.i
data/src/share/classes/sun/security/krb5/internal/TCPClient.java.i
data/src/solaris/native/java/lang/java_props_md.c.i
data/test/java/lang/instrument/DummyClass.java.i
+data/src/share/demo/nio/zipfs/src/META-INF/services/java.nio.file.spi.FileSystemProvider.i
data/src/share/classes/sun/tools/tree/SwitchStatement.java.i
data/test/com/sun/crypto/provider/Cipher/DES/KeyWrapping.java.i
data/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java.i
data/test/demo/jvmti/hprof/CpuOldTest.java.i
-data/make/PatchList.solaris.i
data/test/sun/nio/cs/OLD/MS932_OLD.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java.i
-data/test/java/security/Provider/ProviderInfoCheck.java.i
+data/src/solaris/classes/sun/awt/X11ComponentPeer.java.i
data/make/tools/CharsetMapping/ISO_8859_11.map.i
-data/src/share/classes/javax/swing/border/CompoundBorder.java.i
data/src/windows/native/sun/java2d/d3d/D3DRenderQueue.h.i
data/test/java/awt/image/GetDataElementsTest.java.i
-data/src/share/classes/sun/util/resources/CalendarData_ro.properties.i
-data/test/sun/security/krb5/auto/Action.java.i
+data/make/sun/security/mscapi/Makefile.i
+data/src/windows/native/sun/jkernel/kernel_en.rc.i
data/test/sun/nio/cs/OLD/IBM943C_OLD.java.i
-data/src/share/classes/java/io/PipedOutputStream.java.i
+data/test/java/util/zip/ZipEntry/input.jar.i
data/test/java/util/ResourceBundle/Bug6204853.java.i
-data/src/share/native/sun/awt/image/DataBufferNative.c.i
+data/test/javax/security/auth/login/Configuration/GetInstanceConfigSpi.java.i
data/test/java/lang/invoke/6991596/Test6991596.java.i
data/test/java/net/URLClassLoader/closetest/build.sh.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S16Func.c.i
data/src/share/demo/java2d/J2DBench/options/default.opt.i
data/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java.i
-data/test/tools/pack200/pack200-verifier/data/README.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/FontMapper.java.i
data/src/share/classes/com/sun/crypto/provider/AESCipher.java.i
data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java.i
data/src/share/classes/javax/crypto/KeyAgreement.java.i
-data/test/java/nio/file/TestUtil.java.i
+data/src/share/classes/javax/management/monitor/package.html.i
+data/src/windows/native/sun/jkernel/DownloadHelper.h.i
data/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java.i
-data/test/java/math/BigDecimal/DivideMcTests.java.i
+data/src/share/instrument/JavaExceptions.c.i
data/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java.i
-data/test/sun/java2d/DirectX/NonOpaqueDestLCDAATest/NonOpaqueDestLCDAATest.java.i
+data/test/org/openjdk/jigsaw/hello.sh.i
data/test/java/util/PluggableLocale/ExecTest.sh.i
-data/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java.i
+data/src/share/classes/sun/text/resources/FormatData_ms.java.i
data/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java.i
-data/src/share/classes/java/awt/DisplayMode.java.i
+data/src/share/classes/sun/util/calendar/ZoneInfoFile.java.i
data/test/java/net/InetAddress/Simple2NameServiceDescriptor.java.i
data/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java.i
data/src/share/classes/sun/security/x509/AttributeNameEnumeration.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java.i
+data/test/javax/script/CommonSetup.sh.i
data/make/tools/src/build/tools/charsetmapping/Main.java.i
data/src/share/classes/sun/security/util/ManifestDigester.java.i
-data/src/solaris/classes/sun/nio/fs/UnixMountEntry.java.i
+data/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java.i
data/test/java/util/jar/JarInputStream/ScanSignedJar.java.i
-data/test/java/net/Socket/AccurateTimeout.java.i
+data/src/share/classes/sun/font/FontLineMetrics.java.i
data/test/java/io/charStreams/LineGenerator.java.i
-data/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Stub.java.i
+data/make/java/management/FILES_c.gmk.i
data/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java.i
data/make/tools/CharsetMapping/euc_tw.map.d
-data/test/org/openjdk/jigsaw/hello-optional.sh.i
data/src/solaris/classes/sun/nio/ch/SctpAssociationImpl.java.i
data/test/sun/nio/cs/EucJpLinux0212.java.i
-data/src/share/native/sun/font/layout/TrimmedArrayProcessor.h.i
+data/src/share/classes/sun/security/krb5/internal/MethodData.java.i
data/test/java/net/URL/ParseAuthority.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java.i
data/make/mkdemo/jfc/Makefile.i
data/src/share/native/sun/java2d/pipe/PathConsumer2D.h.i
-data/src/share/native/sun/font/layout/LEGlyphStorage.cpp.i
-data/src/solaris/hpi/native_threads/include/porting.h.i
-data/make/tools/CharsetMapping/IBM284.map.i
+data/src/share/classes/com/sun/tools/hat/resources/platform_names.txt.i
+data/src/share/classes/java/net/DatagramSocket.java.i
+data/src/share/native/sun/awt/image/jpeg/jversion.h.i
data/src/share/classes/java/rmi/server/RMIFailureHandler.java.i
-data/test/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java.i
+data/make/tools/CharsetMapping/IBM939.c2b.i
data/test/sun/security/pkcs11/fips/JSSEClient.java.i
data/src/share/native/sun/font/layout/LEGlyphFilter.h.i
data/src/solaris/native/sun/awt/medialib/vis_proto.h.i
@@ -14288,126 +14224,130 @@ data/test/sun/security/provider/certpath/DisabledAlgorithms/openssl.cnf.i
data/src/linux/doc/man/jstat.1.i
data/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/ActivateMe.java.i
-data/src/share/native/sun/java2d/opengl/OGLBlitLoops.h.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java.i
data/test/sun/nio/cs/BufferUnderflowEUCTWTest.java.i
+data/src/share/classes/java/security/DomainCombiner.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/hebrew.ut8.txt.i
-data/test/java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java.i
+data/src/share/classes/com/sun/jdi/connect/spi/package.html.i
data/src/share/classes/javax/swing/doc-files/groupLayout.2.gif.i
-data/test/java/beans/XMLEncoder/java_sql_Timestamp.java.i
+data/src/share/classes/sun/nio/cs/IBM852.java.i
data/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java.i
-data/test/java/net/B6499348.java.i
+data/src/share/classes/sun/invoke/util/ValueConversions.java.i
data/src/share/classes/javax/naming/spi/DirectoryManager.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain0.txt.i
+data/test/javax/swing/plaf/nimbus/ColorCustomizationTest.java.i
data/src/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java.i
data/src/windows/native/sun/windows/awt_MouseEvent.h.i
data/test/java/nio/channels/DatagramChannel/ReceiveISA.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java.i
+data/src/share/classes/sun/io/ByteToCharDoubleByte.java.i
data/src/share/classes/sun/security/x509/X509Cert.java.i
data/test/com/sun/jdi/NullLocalVariable.sh.i
-data/test/java/rmi/server/serverStackTrace/ServerStackTrace.java.i
-data/test/java/awt/image/MemoryLeakTest/MemoryLeakTest.java.i
+data/src/share/classes/java/nio/file/FileVisitor.java.i
+data/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java.i
data/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java.i
-data/test/java/security/Security/signedfirst/exp.jar.i
-data/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties.i
+data/test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy.i
data/test/java/lang/annotation/AnnotationTypeMismatchException/FoundType.java.i
-data/make/javax/rmi/ssl/Makefile.i
+data/src/share/classes/javax/swing/colorchooser/SyntheticImage.java.i
data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java.i
data/make/tools/CharsetMapping/IBM833.map.i
data/make/tools/CharsetMapping/ISO_8859_3.map.i
data/src/share/classes/javax/management/modelmbean/XMLParseException.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java.i
-data/test/java/beans/Introspector/Test6963811.java.i
+data/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java.i
+data/src/share/native/java/lang/fdlibm/src/k_cos.c.i
data/src/solaris/classes/sun/java2d/xr/XRRenderer.java.i
-data/test/java/io/Serializable/defaultReadObjectCNFException/DefaultReadObjectCNFException.java.i
+data/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java.i
data/src/share/classes/java/awt/font/package.html.i
data/test/sun/tools/jstat/jstatHelp.sh.i
+data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java.i
data/src/share/native/sun/font/layout/SingleTableProcessor.cpp.i
-data/src/share/classes/sun/io/ByteToCharSingleByte.java.i
data/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh.i
data/src/share/classes/com/sun/net/ssl/KeyManager.java.i
-data/src/share/classes/javax/smartcardio/CardChannel.java.i
-data/src/share/classes/java/sql/Clob.java.i
+data/make/tools/CharsetMapping/IBM1144.c2b.i
data/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java.i
-data/test/java/security/cert/CertificateFactory/BadX509CertData.java.i
+data/src/share/classes/java/io/DataInputStream.java.i
data/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java.i
data/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.html.i
+data/test/java/lang/ThreadLocal/TestThreadId.java.i
data/test/java/awt/event/MouseEvent/EventTimeInFuture/EventTimeInFuture.java.i
data/test/java/util/UUID/UUIDTest.java.i
-data/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java.i
-data/test/javax/swing/DataTransfer/6456844/bug6456844.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java.i
data/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp.i
data/test/java/beans/XMLEncoder/Test6570354.java.i
+data/test/java/awt/image/MemoryLeakTest/MemoryLeakTest.java.i
data/src/share/classes/sun/print/resources/serviceui.properties.i
-data/test/java/net/URLConnection/xml/xml1.i
+data/src/share/classes/sun/text/normalizer/UCharacterIterator.java.i
data/test/java/util/logging/LoggerWeakRefLeak.sh.i
data/src/windows/native/sun/windows/awt_DnDDT.cpp.i
-data/test/javax/management/mxbean/TypeNameTest.java.i
-data/src/windows/native/sun/windows/awt_Button.cpp.i
+data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy.i
+data/src/windows/native/sun/windows/security_warning_int.ico.i
data/make/tools/CharsetMapping/IBM1142.map.i
data/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java.i
data/test/sun/security/pkcs11/fips/cert8.db.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java.i
+data/src/share/classes/sun/io/ByteToCharISO2022KR.java.i
+data/src/share/native/java/lang/fdlibm/src/w_hypot.c.i
data/test/demo/zipfs/basic.sh.i
-data/src/share/classes/com/sun/media/sound/SoftMixingMixer.java.i
+data/test/java/lang/StrictMath/HypotTests.java.i
data/src/share/classes/com/sun/servicetag/LinuxSystemEnvironment.java.i
data/make/tools/sharing/tests/JHello.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java.i
-data/test/com/sun/jdi/connect/spi/Foo.java.i
+data/test/java/nio/channels/etc/NetworkChannelTests.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionException.java.i
data/src/share/classes/java/awt/GraphicsCallback.java.i
-data/test/java/lang/instrument/PremainClass/InheritAgent0011.java.i
+data/src/share/classes/javax/security/auth/x500/X500Principal.java.i
+data/src/share/classes/sun/tools/javac/BatchParser.java.i
data/test/java/lang/instrument/PremainClass/README.i
data/test/java/util/ResourceBundle/Control/NonResourceBundle.java.i
data/src/share/classes/com/sun/pept/transport/Connection.java.i
-data/src/share/classes/javax/swing/text/Caret.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java.i
data/test/java/io/PrintWriter/OpsAfterClose.java.i
-data/src/solaris/native/sun/nio/ch/PollArrayWrapper.c.i
-data/src/share/classes/sun/tools/jar/resources/jar_de.properties.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ipstore.i
+data/src/share/classes/javax/imageio/event/IIOReadWarningListener.java.i
data/src/solaris/native/sun/awt/awt_Cursor.h.i
data/test/java/net/DatagramPacket/ReuseBuf.java.i
data/src/share/classes/sun/io/CharToByteCp1143.java.i
data/make/java/nio/FILES_java.gmk.i
-data/src/share/classes/java/util/jar/Pack200.java.i
+data/src/share/classes/sun/applet/AppletIllegalArgumentException.java.i
data/src/share/classes/sun/applet/AppletAudioClip.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/OrangeEchoImpl.java.i
data/src/share/classes/sun/security/krb5/Config.java.i
data/src/share/native/java/lang/Class.c.i
data/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h.i
-data/src/share/classes/sun/tools/tree/ForStatement.java.i
data/test/java/lang/ThreadLocal/MemoryLeak.java.i
data/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java.i
-data/make/mkdemo/applets/GraphicsTest/Makefile.i
+data/src/share/classes/java/util/concurrent/locks/ReadWriteLock.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-interim48.png.i
-data/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java.i
-data/src/share/transport/shmem/shmemBase.h.i
+data/src/share/classes/sun/java2d/pipe/RenderQueue.java.i
+data/src/share/classes/sun/text/resources/FormatData_zh_CN.java.i
data/make/tools/swing-beans/beaninfo/images/JInternalFrameMono16.gif.i
-data/make/java/nio/mxbean/Makefile.i
+data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg.i
data/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java.i
-data/src/share/instrument/JPLISAgent.c.i
+data/src/share/native/sun/security/ec/impl/ec.c.i
data/src/share/hpi/src/hpi.c.i
data/make/tools/src/build/tools/jdwpgen/ClassTypeNode.java.i
data/test/java/nio/charset/CharsetDecoder/EmptyInput.java.i
+data/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java.i
data/test/javax/swing/AbstractButton/6711682/bug6711682.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java.i
data/src/share/demo/jvmti/hprof/hprof_object.c.i
+data/test/java/net/Authenticator/B4678055.java.i
data/test/javax/imageio/plugins/png/PngOutputTypeTest.java.i
data/src/share/demo/jfc/Notepad/resources/cut.gif.i
data/test/tools/launcher/lib/sparc/lib32/liblibrary.so.i
data/src/share/native/sun/font/layout/GlyphPosnLookupProc.h.i
-data/test/java/io/Serializable/serialver/classpath/Test.java.i
data/test/java/rmi/activation/Activatable/nestedActivate/ActivateMe.java.i
-data/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh.i
-data/test/javax/management/ObjectName/ComparatorTest.java.i
-data/test/java/lang/InheritableThreadLocal/ITLRemoveTest.java.i
+data/src/share/sample/scripting/scriptpad/src/resources/conc.js.i
+data/test/java/util/Locale/serialized/java6locale__US.i
+data/src/share/classes/sun/tools/util/ModifierFilter.java.i
data/test/com/sun/jdi/FilterNoMatch.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_nl_NL.properties.i
+data/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_CheckedRandomAccessList.java.i
data/test/com/sun/security/sasl/log.properties.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_US.properties.i
+data/src/share/classes/javax/swing/table/package.html.i
data/src/share/classes/sun/awt/util/IdentityLinkedList.java.i
data/test/sun/tools/common/ShutdownSimpleApplication.java.i
data/src/share/classes/sun/java2d/pipe/ShapeDrawPipe.java.i
-data/src/share/classes/sun/util/resources/CalendarData_pt.properties.i
+data/src/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java.i
data/test/java/util/Currency/currency.properties.i
data/src/share/classes/java/awt/doc-files/ImplicitFocusTransfer.gif.i
data/src/share/classes/com/sun/media/sound/DataPusher.java.i
@@ -14415,93 +14355,96 @@ data/test/java/lang/reflect/Generics/TestC1.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java.i
data/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java.i
data/src/share/classes/sun/text/resources/FormatData_de.java.i
-data/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java.i
+data/src/share/classes/java/util/CurrencyData.properties.i
data/test/javax/print/applet/applet1/Applet1.java.i
data/src/share/classes/javax/swing/MenuSelectionManager.java.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties.i
-data/test/java/security/cert/CertPathValidatorException/GetMessage.java.i
+data/make/tools/CharsetMapping/IBM424.nr.i
+data/src/share/classes/javax/swing/LayoutComparator.java.i
+data/src/share/native/sun/awt/giflib/dgif_lib.c.i
data/src/share/demo/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml.i
-data/make/modules/jdk.tools.ls.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java.i
data/test/javax/print/DialogMargins.java.i
data/src/share/classes/sun/awt/EmbeddedFrame.java.i
-data/test/javax/management/modelmbean/ExoticTargetTypeTest.java.i
+data/test/sun/security/smartcardio/Utils.java.i
data/src/share/classes/com/sun/media/sound/SunFileWriter.java.i
data/test/org/openjdk/jigsaw/_Resolver.java.i
data/test/javax/swing/border/Test4120351.java.i
data/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java.i
-data/src/windows/native/sun/windows/awt_MenuItem.cpp.i
-data/src/share/classes/java/awt/geom/AffineTransform.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load4.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerGlowEffect.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Compress.java.i
+data/src/share/native/java/lang/fdlibm/src/s_expm1.c.i
data/make/tools/swing-beans/beaninfo/images/JTextPaneMono16.gif.i
-data/src/share/demo/applets/Clock/example1.html.i
+data/src/windows/native/sun/java2d/d3d/D3DGlyphCache.h.i
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/truststore.i
-data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedMap.java.i
+data/test/java/nio/charset/Charset/Default.java.i
+data/test/sun/security/provider/PolicyParser/p002.policy.i
data/test/java/lang/instrument/bootclasspathAgent.mf.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/Makefile.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java.i
-data/test/javax/management/relation/NonArrayListTest.java.i
+data/test/javax/print/applet/applet4/Applet4.java.i
+data/test/java/net/Socket/AddressTest.java.i
data/src/share/classes/com/sun/servicetag/resources/Putback-Notes.txt.i
data/src/windows/native/java/lang/ProcessImpl_md.c.i
data/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java.i
data/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java.i
data/src/solaris/native/sun/java2d/loops/vis_SrcMaskFill.c.i
-data/src/share/classes/javax/management/MBeanPermission.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM1383.java.i
+data/test/sun/security/ssl/templates/SSLEngineTemplate.java.i
+data/test/java/io/File/HashCodeEquals.java.i
data/src/share/classes/sun/reflect/generics/scope/Scope.java.i
-data/src/linux/doc/man/ja/rmic.1.i
+data/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java.i
data/src/share/native/sun/awt/image/jpeg/jdapimin.c.i
-data/src/share/classes/javax/swing/text/TabableView.java.i
-data/src/share/classes/sun/print/CustomMediaSizeName.java.i
+data/src/share/classes/java/dyn/MethodHandleProvider.java.i
+data/src/share/classes/sun/tools/java/SyntaxError.java.i
data/src/share/classes/sun/font/TrueTypeGlyphMapper.java.i
+data/test/java/security/KeyRep/RC5.pre.1.5.key.i
data/src/share/classes/java/lang/reflect/Proxy.java.i
-data/make/org/Makefile.i
+data/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java.i
data/src/share/classes/java/util/concurrent/PriorityBlockingQueue.java.i
-data/src/share/modules/jdk.swing/module-info.java.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/generate.sh.i
-data/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java.i
-data/src/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java.i
-data/test/java/rmi/activation/Activatable/nestedActivate/rmid.security.policy.i
-data/test/java/util/ResourceBundle/Bug4168625Resource2.java.i
+data/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java.i
+data/src/share/native/sun/java2d/loops/ImageData.h.i
+data/test/java/util/jar/JarEntry/test.jar.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpPduFactoryBER.java.i
+data/src/solaris/classes/sun/awt/X11/XScrollPanePeer.java.i
+data/test/java/awt/print/Dialog/DialogType.java.i
data/src/share/classes/sun/security/pkcs11/P11Signature.java.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java.i
data/src/share/classes/sun/awt/geom/ChainEnd.java.i
data/src/share/classes/sun/tools/jconsole/inspector/IconManager.java.i
data/src/solaris/doc/sun/man/man1/ja/jconsole.1.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy.i
+data/src/share/native/sun/security/ec/mpi-priv.h.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/Company-corporate.ttf.i
data/src/share/classes/com/sun/tools/hat/resources/hat.js.i
-data/test/java/lang/instrument/StressGetObjectSizeTest.sh.i
+data/test/java/security/Security/signedfirst/Static.sh.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java.i
data/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java.i
data/make/tools/swing-beans/beaninfo/images/JViewportColor16.gif.i
data/src/share/sample/vm/jvm-clr/invoker.java.i
data/src/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java.i
-data/src/share/classes/sun/security/x509/RFC822Name.java.i
+data/src/share/classes/javax/sound/midi/spi/MidiFileReader.java.i
data/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh.i
data/test/sun/security/krb5/DnsFallback.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c.i
data/test/java/lang/instrument/ParallelTransformerLoaderAgent.java.i
data/test/java/awt/Component/isLightweightCrash/IsLightweightCrash.java.i
-data/test/java/beans/VetoableChangeSupport/TestListeners.java.i
-data/test/sun/net/InetAddress/nameservice/CacheTest.java.i
+data/test/java/io/InputStream/OpsAfterClose.java.i
data/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/Functions.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so.i
+data/src/share/classes/sun/nio/cs/US_ASCII.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so.i
data/test/java/rmi/reliability/benchmark/bench/serial/Main.java.i
-data/test/com/sun/jdi/MonitorEventTest.java.i
+data/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java.i
data/src/share/classes/sun/security/pkcs11/P11Mac.java.i
data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java.i
data/src/share/classes/java/sql/Ref.java.i
-data/test/java/util/concurrent/atomic/VMSupportsCS8.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/ca2.cert.i
data/src/share/classes/java/sql/Array.java.i
-data/test/java/nio/charset/spi/Test.java.i
+data/test/javax/xml/crypto/dsig/data/signature-keyname.xml.i
data/src/share/classes/sun/io/CharToByteCp1258.java.i
data/make/tools/CharsetMapping/IBM037.c2b.i
data/src/share/classes/sun/nio/cs/StreamEncoder.java.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java.i
+data/test/java/awt/im/InputContext/bug4625203.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/SimpleNode.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c.i
data/src/share/classes/javax/swing/SwingPaintEventDispatcher.java.i
@@ -14509,18 +14452,21 @@ data/test/demo/jvmti/DemoRun.java.i
data/src/share/sample/nio/chatserver/DataReader.java.i
data/src/share/classes/javax/naming/event/EventDirContext.java.i
data/make/tools/src/build/tools/jdwpgen/CommandSetNode.java.i
+data/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java.i
data/test/javax/rmi/ssl/SSLSocketParametersTest.java.i
-data/src/share/back/threadControl.c.i
+data/src/share/classes/sun/text/resources/FormatData_ar_BH.java.i
data/test/java/nio/channels/ServerSocketChannel/Open.java.i
-data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_2.java.i
+data/src/share/classes/com/sun/jndi/dns/DnsClient.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java.i
data/src/share/classes/com/sun/tools/jdi/VMAction.java.i
data/test/javax/management/descriptor/MBeanInfoInteropTest.java.i
data/src/share/classes/sun/nio/fs/Cancellable.java.i
data/src/share/classes/java/lang/doc-files/sigma1.gif.i
data/src/share/sample/nbproject/project.xml.i
-data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.i
+data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java.i
+data/make/tools/swing-beans/beaninfo/images/JFrameColor32.gif.i
data/test/java/nio/file/DirectoryStream/SecureDS.java.i
-data/test/java/net/URLEncoder/Decoder.java.i
+data/src/share/native/sun/java2d/loops/IntArgb.c.i
data/test/java/net/Socks/SocksV4Test.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java.i
data/test/java/beans/XMLEncoder/java_beans_Statement.java.i
@@ -14531,185 +14477,188 @@ data/src/share/sample/nio/chatserver/README.txt.i
data/src/linux/doc/man/javap.1.i
data/make/sun/javazic/tzdata/solar88.i
data/test/javax/swing/JSlider/6587742/bug6587742.html.i
-data/src/share/classes/java/lang/reflect/InvocationTargetException.java.i
-data/src/share/classes/java/beans/package.html.i
-data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java.i
+data/src/solaris/native/sun/awt/XDrawingArea.c.i
+data/src/share/classes/sun/util/locale/LocaleUtils.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpInformHandler.java.i
data/src/share/classes/java/net/DatagramSocketImplFactory.java.i
data/test/javax/swing/JSlider/6524424/bug6524424.html.i
data/src/windows/classes/sun/awt/windows/WDragSourceContextPeer.java.i
data/src/share/classes/javax/swing/text/Element.java.i
-data/src/share/native/sun/font/layout/PairPositioningSubtables.h.i
+data/make/sun/motif12/reorder-i586.i
data/src/share/classes/javax/management/QualifiedAttributeValueExp.java.i
data/src/share/classes/java/lang/Compiler.java.i
data/src/solaris/native/sun/awt/awt_DataTransferer.h.i
data/src/windows/native/sun/windows/awt_Debug.h.i
data/src/share/native/sun/awt/image/cvutils/img_input32.h.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Hello.java.i
+data/test/javax/management/mxbean/JMXServiceURLTest.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java.i
data/test/java/lang/String/Exceptions.java.i
data/test/sun/nio/cs/SurrogateTestEUCTW.java.i
data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/ValidateCertPath.java.i
data/src/solaris/classes/sun/awt/X11/XFontPeer.java.i
+data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java.i
data/src/windows/native/sun/windows/awt_InputMethod.cpp.i
data/src/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif.i
data/test/sun/java2d/SunGraphicsEnvironment/TestSGEuseAlternateFontforJALocales.java.i
data/src/solaris/native/sun/awt/awt_XmDnD.c.i
data/src/windows/hpi/export/path_md.h.i
-data/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java.i
-data/make/common/BuildToolJar.gmk.i
+data/src/share/classes/java/rmi/server/RMIServerSocketFactory.java.i
data/test/java/security/Exceptions/ChainingConstructors.java.i
-data/test/sun/net/sdp/ProbeIB.java.i
+data/src/share/native/sun/font/layout/GDEFMarkFilter.cpp.i
data/src/share/classes/java/lang/invoke/SwitchPoint.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineService.java.i
data/test/javax/swing/JColorChooser/Test6977726.html.i
-data/src/share/native/sun/java2d/opengl/OGLPaints.c.i
data/src/share/classes/sun/io/CharToByteCp297.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerShadowEffect.java.i
-data/test/java/beans/PropertyEditor/TestShortTypeValue.java.i
+data/test/sun/net/www/protocol/http/DigestTest.java.i
data/src/solaris/bin/java_md.c.i
-data/test/java/nio/channels/AsynchronousSocketChannel/Basic.java.i
+data/src/solaris/classes/sun/awt/X11/XContentWindow.java.i
data/src/share/classes/sun/nio/fs/Reflect.java.i
-data/src/share/demo/applets/WireFrame/Matrix3D.java.i
-data/test/sun/java2d/cmm/ProfileOp/SetDataTest.java.i
-data/src/share/native/sun/java2d/loops/IntRgb.c.i
-data/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java.i
+data/src/share/classes/javax/naming/ldap/StartTlsRequest.java.i
+data/test/java/text/Bidi/BidiConformance.java.i
+data/test/com/sun/jdi/InnerTarg.java.i
data/make/tools/src/build/tools/javazic/Month.java.i
data/test/javax/xml/crypto/dsig/SecurityManager/policy.i
data/src/linux/doc/man/jconsole.1.i
data/src/share/classes/java/text/SimpleDateFormat.java.i
-data/src/share/native/sun/awt/libpng/README.i
+data/test/java/nio/Buffer/StringCharBufferSliceTest.java.i
data/test/javax/management/monitor/StringMonitorDeadlockTest.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_en_CA.java.i
-data/src/share/classes/java/awt/event/FocusListener.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java.i
+data/src/windows/classes/sun/nio/fs/WindowsException.java.i
data/make/mkdemo/applets/Animator/Makefile.i
data/make/tools/winver/src/winver.cpp.i
-data/src/share/classes/javax/swing/plaf/DesktopPaneUI.java.i
+data/src/share/classes/java/awt/dnd/DropTarget.java.i
data/test/java/lang/Runtime/exec/ExecWithLotsOfArgs.java.i
data/test/javax/swing/MultiUIDefaults/Test6860438.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java.i
+data/src/share/classes/javax/swing/table/TableColumn.java.i
data/src/solaris/classes/sun/awt/motif/X11GBK.java.i
data/src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java.i
-data/src/share/classes/sun/io/CharToByteCp273.java.i
+data/src/share/classes/javax/sql/rowset/serial/SerialArray.java.i
data/test/sun/security/tools/policytool/OpenPolicy.java.i
data/test/java/lang/management/ThreadMXBean/Barrier.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java.i
+data/test/java/util/AbstractSequentialList/AddAll.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java.i
-data/test/java/beans/XMLEncoder/java_awt_Point.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c.i
data/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java.i
-data/src/share/back/stepControl.h.i
-data/make/tools/CharsetMapping/IBM1147.map.i
-data/src/share/sample/nio/server/Dispatcher1.java.i
+data/src/share/classes/javax/print/attribute/AttributeSetUtilities.java.i
+data/src/share/classes/java/io/InputStream.java.i
+data/src/share/classes/sun/security/action/GetLongAction.java.i
data/test/sun/security/pkcs11/Provider/csp.cfg.i
data/src/share/classes/java/util/Dictionary.java.i
-data/src/solaris/classes/sun/awt/X11/XToolkit.java.i
+data/src/share/classes/sun/tools/jstat/OptionFinder.java.i
data/test/sun/net/www/protocol/http/AsyncDisconnect.java.i
-data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java.i
+data/src/share/classes/javax/print/ServiceUI.java.i
+data/test/javax/swing/JColorChooser/Test4380468.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h.i
data/src/windows/native/sun/awt/splashscreen/splashscreen_config.h.i
data/src/share/classes/sun/io/CharToByteISO8859_3.java.i
data/src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java.i
-data/make/modules/imagine.sh.i
+data/src/share/demo/applets/Clock/example1.html.i
data/src/share/classes/java/awt/datatransfer/MimeType.java.i
data/src/share/classes/javax/swing/TimerQueue.java.i
-data/test/javax/swing/JFileChooser/6520101/bug6520101.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c.i
data/test/javax/swing/JColorChooser/Test4222508.java.i
data/test/sun/rmi/transport/tcp/blockAccept/security.policy.i
+data/test/java/beans/PropertyEditor/TestFloatClassJava.java.i
+data/test/sun/security/pkcs11/KeyStore/ClientAuthData/README.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java.i
data/src/share/classes/javax/naming/spi/ContinuationDirContext.java.i
data/src/share/back/commonRef.c.i
-data/test/java/beans/Introspector/4750368/com/foo/test/Component.java.i
+data/src/share/classes/sun/misc/GC.java.i
data/test/sun/security/util/Resources/NewNamesFormat.java.i
-data/src/solaris/classes/sun/font/NativeGlyphMapper.java.i
-data/test/sun/security/pkcs11/Provider/cspPlus.cfg.i
+data/src/share/classes/javax/sound/sampled/FloatControl.java.i
+data/make/mkdemo/jni/Makefile.i
+data/src/share/classes/java/util/zip/GZIPInputStream.java.i
data/src/windows/native/sun/windows/check.bmp.i
data/make/tools/swing-beans/beaninfo/images/JWindowColor16.gif.i
data/src/solaris/native/sun/awt/awt_Menu.h.i
data/test/javax/management/mxbean/SameObjectTwoNamesTest.java.i
data/src/linux/doc/man/extcheck.1.i
data/src/share/classes/javax/swing/plaf/package.html.i
-data/src/share/native/java/lang/fdlibm/src/s_rint.c.i
+data/src/share/classes/java/awt/IllegalComponentStateException.java.i
data/src/share/classes/java/util/concurrent/SynchronousQueue.java.i
-data/test/java/util/Timer/KillThread.java.i
+data/test/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java.i
data/src/share/classes/java/security/NoSuchProviderException.java.i
-data/test/org/openjdk/jigsaw/cli/expired-signer-cert.pem.i
+data/src/share/classes/java/lang/doc-files/captheta.gif.i
data/make/tools/swing-beans/beaninfo/images/JTableColor32.gif.i
data/src/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java.i
data/src/windows/native/sun/windows/mlib_types_md.h.i
data/test/javax/management/Introspector/Described.java.i
data/test/javax/management/remote/mandatory/loading/MethodResultTest.java.i
data/src/share/classes/sun/font/Font2DHandle.java.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java.i
-data/test/javax/management/ImplementationVersion/ImplVersionCommand.java.i
+data/src/share/javavm/export/jdwpTransport.h.i
+data/src/share/classes/java/rmi/UnknownHostException.java.i
data/test/java/io/Serializable/6559775/Test6559775.sh.i
-data/make/tools/CharsetMapping/KOI8_R.map.i
-data/test/java/net/URLConnection/HandleContentTypeWithAttrs.java.i
+data/src/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java.i
data/src/share/classes/com/sun/security/ntlm/NTLMException.java.i
-data/src/share/demo/nio/zipfs/Demo.java.i
-data/src/share/classes/sun/security/ec/ECDHKeyAgreement.java.i
-data/src/solaris/native/sun/nio/ch/FileKey.c.i
-data/test/javax/print/applet/applet2/Applet2.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java.i
+data/test/javax/print/PrintSubInputStream/Example.java.i
+data/make/tools/CharsetMapping/MS1254.map.i
+data/src/share/classes/sun/net/ftp/FtpProtocolException.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java.i
+data/src/share/native/sun/java2d/loops/ByteIndexed.c.i
data/test/com/sun/jdi/ExpiredRequestDeletionTest.java.i
+data/src/share/classes/sun/security/pkcs11/Token.java.i
data/make/mkdemo/applets/MoleculeViewer/Makefile.i
data/src/share/classes/sun/security/util/SecurityConstants.java.i
-data/src/share/classes/com/sun/beans/finder/AbstractFinder.java.i
data/src/share/demo/jvmti/hprof/hprof_monitor.c.i
data/src/solaris/native/sun/awt/multi_font.c.i
-data/test/javax/print/attribute/SidesPageRangesTest.java.i
+data/make/tools/UnicodeData/PropList.txt.i
data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_1.java.i
-data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java.i
-data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/services/com.message.spi.MessageService.i
+data/src/share/classes/java/dyn/BootstrapMethod.java.i
+data/src/share/classes/javax/swing/event/TreeExpansionEvent.java.i
data/src/share/classes/javax/security/sasl/AuthorizeCallback.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/G1Impl.java.i
data/test/javax/sound/sampled/Clip/ClipSetPos.java.i
-data/make/sun/headless/reorder-i586.i
+data/src/share/classes/java/sql/DatabaseMetaData.java.i
data/test/com/sun/security/sasl/ntlm/Conformance.java.i
-data/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java.i
-data/test/javax/management/remote/mandatory/connection/AddressableTest.java.i
-data/test/java/util/prefs/PrefsSpi.sh.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.c.i
+data/src/share/classes/sun/text/resources/FormatData_ar_SA.java.i
+data/test/java/io/Serializable/defaultDataEnd/DefaultDataEnd.java.i
+data/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations_Stub.java.i
data/src/share/classes/sun/jvmstat/monitor/Monitor.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/ImageTests.java.i
-data/test/java/beans/PropertyEditor/TestFontClassNull.java.i
+data/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java.i
+data/src/share/classes/javax/naming/NameAlreadyBoundException.java.i
+data/src/share/classes/sun/io/CharToByteCp858.java.i
data/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/SSLSocketTimeoutNulls.java.i
-data/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java.i
+data/src/share/classes/sun/net/www/http/HttpClient.java.i
data/src/share/classes/sun/java2d/cmm/ColorTransform.java.i
data/make/javax/swing/Makefile.i
data/src/share/classes/sun/java2d/SurfaceDataProxy.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java.i
data/src/share/classes/javax/print/attribute/standard/JobName.java.i
-data/src/solaris/sample/dtrace/hotspot_jni/README.txt.i
+data/src/share/classes/com/sun/java/util/jar/pack/Code.java.i
data/test/sun/tools/native2ascii/test1.i
data/test/java/lang/Class/getField/Exceptions.java.i
-data/src/share/classes/sun/awt/image/ImageFormatException.java.i
-data/test/sun/nio/cs/OLD/IBM933_OLD.java.i
-data/test/java/io/Serializable/oldTests/CircularList.java.i
-data/src/share/native/sun/java2d/opengl/OGLMaskBlit.c.i
-data/src/solaris/native/sun/java2d/loops/vis_GlyphListXor.c.i
-data/test/javax/swing/JScrollPane/Test6526631.java.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/README.i
+data/src/solaris/classes/sun/awt/XSettings.java.i
+data/src/share/demo/jfc/FileChooserDemo/resources/images/jpgIcon.jpg.i
+data/test/tools/launcher/unresolvedExceptions.sh.i
data/src/share/classes/java/nio/file/spi/package-info.java.i
data/src/share/classes/java/nio/channels/FileChannel.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_et.properties.i
-data/src/share/native/sun/java2d/opengl/OGLContext.h.i
+data/src/share/classes/sun/text/resources/FormatData_it_CH.java.i
+data/src/share/demo/jfc/SampleTree/DynamicTreeNode.java.i
+data/test/javax/smartcardio/HistoricalBytes.java.i
data/src/share/classes/java/rmi/server/UID.java.i
data/test/java/rmi/server/clientStackTrace/ClientStackTrace.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIRegion.java.i
-data/src/share/classes/javax/swing/text/NumberFormatter.java.i
+data/test/java/security/cert/CertPathValidatorException/jdk6.serial.i
data/src/share/native/sun/java2d/loops/ByteBinary2Bit.c.i
-data/test/sun/nio/cs/ISCIITest.java.i
+data/src/share/classes/sun/io/ByteToCharUnicodeBigUnmarked.java.i
data/src/share/classes/javax/swing/JPopupMenu.java.i
data/src/share/classes/sun/util/TimeZoneNameUtility.java.i
-data/src/share/classes/javax/swing/plaf/basic/ComboPopup.java.i
-data/src/share/classes/sun/management/MemoryImpl.java.i
+data/test/java/net/SocketPermission/Ctor.java.i
+data/src/share/demo/nbproject/jfc/Metalworks/build.properties.i
data/test/sun/security/krb5/auto/OneKDC.java.i
-data/src/share/classes/sun/net/www/http/HttpCapture.java.i
-data/make/netbeans/awt2d/nbproject/project.xml.i
-data/src/share/classes/com/sun/tools/jdi/IntegerValueImpl.java.i
-data/src/share/classes/java/dyn/WrongMethodTypeException.java.i
-data/src/share/lib/calendars.properties.i
+data/src/share/classes/java/security/spec/ECParameterSpec.java.i
+data/test/sun/security/provider/certpath/ReverseBuilder/prjM2divE.i
+data/test/java/io/LineNumberReader/ReadReadLine.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java.i
+data/src/share/native/sun/awt/image/cvutils/img_dcm8.h.i
+data/src/share/classes/sun/awt/image/ImageDecoder.java.i
+data/src/share/demo/jvmti/hprof/hprof_class.c.i
data/test/sun/nio/cs/OLD/MS932DB.java.i
data/src/windows/native/java/nio/MappedByteBuffer.c.i
data/test/java/io/Serializable/oldTests/CheckingEquality.java.i
@@ -14717,101 +14666,103 @@ data/src/share/classes/sun/util/resources/CurrencyNames_es_EC.properties.i
data/test/javax/swing/JSlider/6794831/bug6794831.java.i
data/src/share/classes/java/dyn/MethodHandles.java.i
data/src/solaris/classes/sun/java2d/jules/TileWorker.java.i
-data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml.i
+data/src/share/classes/sun/security/provider/ConfigSpiFile.java.i
data/test/tools/pack200/pack200-verifier/data/golden.jar.i
data/src/share/native/sun/java2d/opengl/OGLPaints.h.i
data/src/share/classes/javax/print/attribute/standard/PrinterState.java.i
data/src/share/javavm/include/opcodes.wide.i
data/src/share/classes/sun/util/resources/LocaleNames_el.properties.i
-data/test/sun/java2d/SunGraphics2D/SimplePrimQuality.java.i
+data/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java.i
data/test/java/lang/instrument/GetAllLoadedClassesTest.java.i
data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PackageCtor.java.i
data/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java.i
data/src/share/classes/sun/tools/tree/AssignBitAndExpression.java.i
data/src/share/classes/javax/security/cert/CertificateNotYetValidException.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_it.java.i
-data/src/solaris/hpi/include/interrupt.h.i
+data/src/share/classes/java/io/ObjectInputValidation.java.i
data/test/sun/text/resources/Format/Bug4994312.java.i
-data/test/java/lang/invoke/ClassValueTest.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties.i
+data/src/share/classes/sun/reflect/ByteVectorImpl.java.i
data/test/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html.i
-data/src/share/classes/java/nio/Heap-X-Buffer.java.i
+data/make/mksample/nio/file/Makefile.i
data/test/java/beans/Introspector/6380849/beans/ThirdBean.java.i
-data/test/javax/swing/JComponent/4337267/bug4337267.java.i
+data/src/share/classes/sun/io/CharToByteISO8859_7.java.i
data/test/java/awt/dnd/Button2DragTest/Button2DragTest.html.i
-data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java.i
-data/src/share/demo/jfc/Metalworks/KhakiMetalTheme.java.i
-data/test/java/rmi/reliability/juicer/OrangeEcho.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/pk3.key.i
+data/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java.i
+data/test/com/sun/jdi/sde/testString.i
+data/src/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java.i
+data/src/share/classes/javax/swing/event/UndoableEditListener.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseInboundException.java.i
-data/test/java/util/Arrays/CopyMethods.java.i
+data/test/javax/management/mxbean/GenericTypeTest.java.i
+data/make/templates/gpl-header.i
data/test/java/nio/channels/Selector/SelectAndClose.java.i
data/src/share/classes/java/beans/ReflectionUtils.java.i
data/src/share/demo/applets/CardTest/CardTest.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java.i
+data/src/share/classes/sun/awt/image/ToolkitImage.java.i
data/test/sun/security/tools/keytool/SecretKeyKS.sh.i
data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java.i
data/make/tools/swing-beans/beaninfo/images/JColorChooserMono32.gif.i
data/src/windows/classes/sun/awt/windows/WMenuItemPeer.java.i
data/src/share/classes/java/awt/print/PageFormat.java.i
-data/test/java/util/ServiceLoader/FooProvider2.java.i
+data/test/java/util/Hashtable/HashCode.java.i
data/test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeak.java.i
data/src/share/classes/sun/reflect/annotation/ExceptionProxy.java.i
-data/test/java/io/etc/FileDescriptorSharing.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/ChangeLog.i
data/test/sun/nio/cs/OLD/TestX11CS.java.i
data/src/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java.i
data/src/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy11.i
data/src/share/classes/sun/dyn/FilterOneArgument.java.i
-data/make/tools/generate_break_iterator/Makefile.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java.i
-data/make/javax/print/Makefile.i
+data/src/share/classes/java/util/concurrent/atomic/package-info.java.i
+data/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java.i
+data/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh.i
data/src/share/native/java/util/zip/CRC32.c.i
-data/test/java/net/InetAddress/ptr/lookup.sh.i
+data/src/share/classes/sun/security/acl/WorldGroupImpl.java.i
data/test/java/lang/StringBuffer/InsertNullString.java.i
-data/test/java/beans/XMLDecoder/spec/TestShort.java.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.access.in.i
data/test/java/security/MessageDigest/ArgumentSanity.java.i
data/src/share/classes/com/sun/beans/ObjectHandler.java.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java.i
data/src/share/classes/javax/swing/doc-files/groupLayout.example.png.i
-data/test/com/sun/tools/attach/BasicTests.sh.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html.i
data/test/java/util/zip/ConstructInflaterOutput.java.i
data/test/sun/security/rsa/TestKeyFactory.java.i
-data/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh.i
-data/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp.i
+data/src/share/classes/sun/tools/tree/ExprExpression.java.i
+data/make/java/java/mapfile-vers.i
data/src/share/native/sun/font/layout/MarkToBasePosnSubtables.h.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java.i
data/src/share/native/sun/management/management.c.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties.i
+data/test/java/nio/charset/Charset/AvailableCharsetNames.java.i
data/src/share/classes/sun/reflect/UnsafeDoubleFieldAccessorImpl.java.i
data/src/share/classes/java/rmi/activation/UnknownObjectException.java.i
data/src/share/classes/sun/rmi/rmic/BatchEnvironment.java.i
data/test/java/util/PluggableLocale/providersrc/java.text.spi.CollatorProvider.i
data/test/java/awt/font/TextLayout/TestOldHangul.java.i
-data/src/share/native/sun/awt/image/cvutils/img_dcm8.h.i
+data/src/share/native/java/lang/fdlibm/src/e_lgamma_r.c.i
data/src/share/classes/sun/security/ssl/EngineOutputRecord.java.i
-data/test/java/io/Serializable/corruptedUTFConsumption/CorruptedUTFConsumption.java.i
-data/src/solaris/classes/sun/awt/X11/XInputMethod.java.i
+data/test/java/io/charStreams/LineSink.java.i
+data/src/share/classes/javax/xml/crypto/Data.java.i
data/test/sun/tools/jps/jps-m.sh.i
data/test/sun/security/krb5/BadKdcDefaultValue.java.i
data/src/solaris/native/sun/nio/ch/NativeThread.c.i
data/make/tools/swing-beans/beaninfo/images/JPasswordFieldColor16.gif.i
-data/test/com/sun/jdi/InvokeTest.java.i
-data/src/share/classes/sun/io/CharToByteMacIceland.java.i
+data/test/java/lang/instrument/ATestCaseScaffold.java.i
data/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java.i
data/src/share/classes/java/util/logging/XMLFormatter.java.i
data/make/netbeans/j2se/build.xml.i
data/src/share/classes/sun/dyn/anon/ConstantPoolVisitor.java.i
-data/test/javax/security/auth/x500/X500Principal/RFC4514.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirs.policy.i
+data/test/java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java.i
+data/src/windows/native/sun/windows/awt_Cursor.cpp.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java.i
+data/src/share/classes/sun/nio/cs/MS1251.java.i
data/make/netbeans/jdwpgen/nbproject/project.properties.i
-data/test/org/openjdk/jigsaw/security.sh.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/beans/AbstractBean.java.i
data/src/share/classes/javax/print/attribute/standard/PrinterInfo.java.i
data/test/javax/security/auth/login/LoginContext/DefaultHandler.config.i
-data/test/java/rmi/reliability/benchmark/bench/serial/StreamBuffer.java.i
-data/make/tools/swing-beans/beaninfo/images/JScrollBarColor16.gif.i
+data/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java.i
data/src/solaris/native/sun/nio/ch/SocketDispatcher.c.i
data/src/share/native/sun/font/layout/GlyphSubstitutionTables.h.i
data/test/java/beans/Introspector/6380849/beans/SecondBean.java.i
@@ -14819,96 +14770,96 @@ data/src/share/classes/java/beans/beancontext/BeanContextServices.java.i
data/test/java/net/MulticastSocket/SetOutgoingIf.java.i
data/src/share/lib/images/cursors/win32_LinkDrop32x32.gif.i
data/src/share/native/sun/font/layout/OpenTypeUtilities.h.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostTrap.java.i
+data/test/java/nio/channels/Selector/CloseWhenKeyIdle.java.i
data/src/solaris/native/sun/awt/awt_UNIXToolkit.c.i
-data/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java.i
data/test/javax/security/auth/PrivateCredentialPermission/EmptyName.java.i
-data/make/tools/CharsetMapping/JIS_X_0201.map.i
data/test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java.i
-data/test/java/security/cert/CertificateFactory/GenerateCertificatesEmptyCollection.java.i
+data/src/share/classes/com/sun/jmx/event/RepeatedSingletonJob.java.i
+data/test/sun/security/mscapi/SignUsingNONEwithRSA.java.i
data/src/share/classes/sun/io/CharToByteCp869.java.i
-data/test/java/lang/instrument/basicAgent.mf.i
-data/test/javax/script/Helper.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java.i
data/src/share/classes/javax/management/ReflectionException.java.i
-data/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java.i
+data/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java.i
data/test/javax/management/mxbean/MBeanOperationInfoTest.java.i
data/src/share/back/commonRef.h.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java.i
-data/src/share/classes/sun/nio/cs/ext/MacHebrew.java.i
-data/src/share/bin/java.h.i
+data/src/share/classes/java/lang/invoke/MethodType.java.i
+data/make/modules/jdk.tools.ls.i
data/src/share/classes/javax/swing/text/html/ParagraphView.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/JarFileSystemProvider.java.i
-data/src/share/classes/sun/security/util/AuthResources.java.i
data/test/java/nio/channels/SocketChannel/Hangup.java.i
data/test/javax/print/CheckDupFlavor.java.i
data/src/share/classes/javax/management/relation/RoleInfo.java.i
data/test/javax/sql/rowset/serial/SerialClob/SetAsciiStream.java.i
data/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c.i
data/test/java/awt/Graphics/TextAAHintsTest.java.i
-data/src/share/classes/java/awt/AttributeValue.java.i
+data/test/java/awt/event/MouseEvent/SmoothWheel/SmoothWheel.java.i
data/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java.i
data/src/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java.i
-data/test/java/awt/Toolkit/HeadlessTray/HeadlessTray.java.i
+data/src/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java.i
data/test/java/util/ResourceBundle/Bug4083270Test.java.i
-data/src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h.i
+data/test/sun/security/x509/AlgorithmId/TurkishRegion.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java.i
-data/test/java/util/zip/ZipFile/ManyZipFiles.java.i
+data/test/java/util/LinkedList/Clone.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Ports.c.i
data/src/share/classes/javax/swing/plaf/ToolTipUI.java.i
data/src/share/classes/java/awt/peer/FontPeer.java.i
data/test/java/net/Inet4Address/textToNumericFormat.java.i
-data/src/share/classes/sun/swing/ImageIconUIResource.java.i
+data/test/java/lang/Thread/UncaughtExceptions.sh.i
+data/make/jpda/transport/socket/mapfile-vers.i
data/make/netbeans/jdwpgen/nbproject/genfiles.properties.i
data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java.i
data/src/share/classes/javax/swing/plaf/ToolBarUI.java.i
data/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplc4.so.i
+data/src/share/classes/javax/security/auth/login/AccountNotFoundException.java.i
data/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java.i
data/src/share/classes/sun/java2d/loops/TransformBlit.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java.i
-data/make/modules/tools/Makefile.i
+data/src/share/classes/java/lang/module/ModuleInfoReader.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMBean.java.i
data/src/share/classes/java/dyn/FilterGeneric.java.i
data/make/javax/sound/SoundDefs.gmk.i
data/test/java/rmi/server/RMIClassLoader/spi/Installed.java.i
data/src/share/back/EventRequestImpl.h.i
data/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java.i
-data/test/java/math/BigDecimal/PowTests.java.i
-data/make/java/invoke/Makefile.i
+data/src/windows/native/sun/font/fontpath.c.i
data/src/share/classes/javax/management/NotQueryExp.java.i
data/test/java/lang/reflect/Proxy/returnTypes/GetArray.java.i
-data/src/share/native/sun/management/Flag.c.i
-data/src/share/classes/sun/java2d/loops/DrawLine.java.i
-data/src/share/classes/javax/print/attribute/URISyntax.java.i
+data/src/share/classes/javax/swing/ListModel.java.i
data/src/share/classes/java/rmi/NotBoundException.java.i
-data/src/share/classes/javax/sound/midi/MidiDeviceTransmitter.java.i
+data/src/share/classes/sun/tools/jconsole/JConsole.java.i
data/test/java/util/zip/zip.java.i
data/src/linux/doc/man/ja/jar.1.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties.i
-data/src/share/native/sun/awt/image/jpeg/jinclude.h.i
+data/src/share/classes/sun/io/ByteToCharBig5_Solaris.java.i
data/src/share/classes/java/rmi/server/RMIClassLoaderSpi.java.i
-data/test/sun/security/x509/AVA/AVAEqualsHashCode.java.i
+data/test/java/beans/PropertyEditor/TestIntegerClassNull.java.i
data/make/sun/misc/Makefile.i
-data/src/share/classes/sun/security/provider/SeedGenerator.java.i
-data/src/share/classes/sun/swing/CachedPainter.java.i
-data/src/share/classes/sun/security/ssl/Debug.java.i
+data/src/share/classes/java/util/NavigableSet.java.i
+data/src/share/classes/sun/dyn/package-info.java.i
+data/test/java/security/cert/PolicyNode/speech2eve.i
data/src/share/demo/jvmti/mtrace/README.txt.i
data/src/share/classes/sun/misc/JavaSecurityCodeSignerAccess.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmspack.c.i
data/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java.i
-data/src/share/classes/javax/naming/event/NamespaceChangeListener.java.i
+data/make/com/sun/tools/attach/FILES_c.gmk.i
data/src/share/classes/com/sun/servicetag/SystemEnvironment.java.i
+data/src/share/classes/java/util/Locale.java.i
data/src/share/classes/sun/text/resources/FormatData_cs.java.i
data/test/javax/swing/plaf/nimbus/Test6849805.java.i
-data/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java.i
-data/src/windows/native/sun/jkernel/DownloadDialog.cpp.i
+data/src/share/classes/sun/print/ProxyGraphics.java.i
+data/src/share/classes/sun/awt/ScrollPaneWheelScroller.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java.i
+data/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java.i
data/make/tools/swing-beans/beaninfo/images/JTextPaneColor32.gif.i
data/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java.i
data/src/share/classes/sun/io/CharToByteDBCS_ASCII.java.i
-data/test/java/lang/Thread/NullStackTrace.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java.i
+data/test/java/io/File/WinDeviceName.java.i
+data/test/java/lang/management/ManagementFactory/StateTestMBean.java.i
data/src/share/classes/com/sun/crypto/provider/BlowfishConstants.java.i
data/src/share/classes/javax/sql/rowset/serial/SerialStruct.java.i
data/test/com/sun/jdi/NoLaunchOptionTest.java.i
@@ -14916,229 +14867,234 @@ data/src/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif.i
data/test/java/lang/Character/PropList.txt.i
data/test/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl_Stub.java.i
data/test/sun/net/www/protocol/http/UserAgent.java.i
-data/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java.i
data/test/javax/swing/JColorChooser/Test6707406.java.i
data/src/share/classes/sun/font/StrikeMetrics.java.i
data/test/sun/security/provider/MessageDigest/DigestKAT.java.i
data/test/java/rmi/transport/httpSocket/HttpSocketTest.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java.i
data/make/mkdemo/applets/DrawTest/Makefile.i
data/src/share/classes/sun/misc/PerfCounter.java.i
data/test/sun/rmi/rmic/defaultStubVersion/G1.java.i
+data/src/solaris/native/sun/awt/fontpath.c.i
data/src/share/native/sun/security/ec/ec_naf.c.i
-data/src/share/classes/java/util/zip/CheckedOutputStream.java.i
-data/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java.i
+data/make/java/net/Makefile.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaObject.java.i
data/test/java/util/TimeZone/OldIDMappingTest.java.i
-data/src/solaris/native/sun/awt/Xrandr.h.i
+data/src/share/classes/javax/naming/InitialContext.java.i
data/test/sun/security/ec/truststore.i
data/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh.i
-data/test/sun/security/provider/certpath/speech2speech.i
-data/src/share/classes/java/awt/BorderLayout.java.i
+data/src/share/classes/java/awt/event/WindowFocusListener.java.i
data/src/share/classes/java/nio/channels/exceptions.i
data/src/share/sample/nio/server/BN.java.i
-data/src/windows/classes/sun/nio/ch/DatagramDispatcher.java.i
+data/src/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java.i
+data/src/share/classes/javax/print/attribute/DocAttributeSet.java.i
data/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames_Stub.java.i
-data/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java.i
-data/test/sun/security/action/Generify.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html.i
+data/test/javax/swing/text/html/TableView/7030332/sample4.png.i
+data/src/share/classes/sun/java2d/cmm/lcms/LCMS.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/Identity.java.i
-data/src/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java.i
data/src/solaris/native/sun/java2d/loops/mlib_v_ImageZoom_NN_f.c.i
data/test/com/sun/net/httpserver/bugs/B6421581.java.i
+data/src/share/classes/javax/swing/undo/package.html.i
data/src/share/classes/java/nio/file/attribute/PosixFilePermission.java.i
-data/test/java/awt/dnd/URIListBetweenJVMsTest/SourceFileListFrame.java.i
-data/src/share/classes/com/sun/crypto/provider/HmacCore.java.i
-data/src/share/classes/com/sun/tools/hat/internal/util/Comparer.java.i
+data/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp.i
+data/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java.i
+data/src/solaris/classes/sun/awt/motif/MMenuPeer.java.i
data/test/java/nio/file/Files/InterruptCopy.java.i
data/src/solaris/classes/sun/awt/X11/XAWTFormatter.java.i
data/make/tools/swing-beans/beaninfo/images/JToggleButtonMono16.gif.i
-data/src/share/classes/sun/nio/cs/Unicode.java.i
-data/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java.i
+data/test/java/lang/instrument/IsModifiableClassApp.java.i
+data/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine.i
data/src/share/classes/javax/swing/event/CaretListener.java.i
data/test/javax/management/loading/ParserInfiniteLoopTest.java.i
data/src/share/classes/java/awt/image/renderable/package.html.i
-data/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java.i
-data/src/share/classes/java/util/MissingResourceException.java.i
-data/test/java/lang/Class/forName/classes/right-square.class.i
+data/src/solaris/classes/sun/awt/X11/XWrapperBase.java.i
+data/src/share/classes/sun/io/ConversionBufferFullException.java.i
+data/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java.i
data/src/share/classes/java/awt/doc-files/MenuBar-1.gif.i
-data/src/windows/classes/java/util/prefs/WindowsPreferences.java.i
-data/test/java/lang/Runtime/exec/ConcurrentRead.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java.i
+data/src/solaris/classes/sun/awt/X11/InfoWindow.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java.i
data/test/java/beans/XMLEncoder/java_util_RegularEnumSet.java.i
-data/make/tools/CharsetMapping/IBM273.map.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h.i
+data/src/share/classes/sun/reflect/ClassFileConstants.java.i
+data/test/tools/pack200/dyn.jar.i
data/test/java/lang/String/Encodings.java.i
-data/src/share/classes/sun/tools/jstat/SyntaxException.java.i
+data/test/java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java.i
data/test/java/nio/channels/SocketChannel/IsConnectable.java.i
-data/src/share/sample/nio/file/AclEdit.java.i
-data/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java.i
-data/test/java/util/EnumMap/DistinctEntrySetElements.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif.i
data/test/java/beans/PropertyEditor/TestBooleanClassNull.java.i
data/src/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java.i
data/src/windows/native/sun/windows/awt_Component.cpp.i
data/src/windows/native/sun/windows/awt_Insets.h.i
-data/make/mkdemo/jni/Makefile.i
-data/test/sun/security/rsa/TestKeyPairGenerator.java.i
+data/src/share/classes/sun/security/x509/CertificatePolicyMap.java.i
+data/test/java/io/Serializable/subclass/Allow.policy.i
data/test/java/net/URLClassLoader/ClassLoad.java.i
data/test/javax/management/mxbean/customtypes/package-info.java.i
data/src/share/classes/java/applet/AppletContext.java.i
-data/src/share/classes/java/lang/Boolean.java.i
-data/src/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanCalls.java.i
-data/src/share/native/sun/security/ec/mpi-priv.h.i
-data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy.i
-data/src/share/native/sun/awt/image/jpeg/jpegdecoder.c.i
-data/test/sun/net/www/ParseUtil_6478588.java.i
+data/make/docs/CORE_PKGS.gmk.i
+data/test/java/rmi/activation/Activatable/restartCrashedService/security.policy.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/BootAnalyzer.java.i
+data/make/tools/CharsetMapping/IBM1383.map.i
data/src/solaris/lib/content-types.properties.i
-data/src/share/classes/sun/tools/tree/WhileStatement.java.i
+data/src/share/classes/sun/security/krb5/internal/KRBCred.java.i
data/src/share/classes/java/text/FieldPosition.java.i
data/make/tools/src/build/tools/jdwpgen/ThreadObjectTypeNode.java.i
data/src/share/classes/sun/security/pkcs11/P11RSACipher.java.i
data/test/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java.i
data/src/share/classes/javax/security/cert/CertificateParsingException.java.i
data/src/share/classes/sun/security/action/GetPropertyAction.java.i
-data/test/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java.i
+data/src/windows/native/sun/java2d/d3d/D3DPaints.cpp.i
data/test/javax/swing/JSlider/4987336/bug4987336.java.i
-data/test/java/rmi/reliability/benchmark/bench/Makefile.i
-data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/project.xml.i
-data/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIRegion.java.i
+data/src/solaris/classes/sun/awt/motif/MLabelPeer.java.i
data/src/share/classes/com/sun/crypto/provider/HmacMD5.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c.i
+data/src/share/classes/java/lang/invoke/MethodHandleProxies.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpPduBulk.java.i
+data/src/share/classes/javax/accessibility/AccessibleRole.java.i
data/src/share/bin/jli_util.c.i
data/src/windows/native/sun/windows/awt_new.h.i
-data/src/share/classes/java/awt/BufferCapabilities.java.i
+data/src/share/classes/java/util/zip/CheckedOutputStream.java.i
data/test/java/beans/XMLEncoder/javax_swing_border_LineBorder.java.i
data/test/javax/management/remote/mandatory/notif/DeadListenerTest.java.i
data/test/java/lang/StringBuilder/Exceptions.java.i
-data/src/share/classes/java/security/cert/CertSelector.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Encoder.java.i
data/src/share/classes/sun/print/ImagePrinter.java.i
data/test/java/nio/file/Files/CopyAndMove.java.i
data/src/linux/doc/man/xjc.1.i
data/src/share/classes/javax/security/auth/callback/LanguageCallback.java.i
-data/src/share/lib/images/cursors/win32_MoveDrop32x32.gif.i
-data/src/share/classes/sun/io/ByteToCharISO2022.java.i
-data/src/share/classes/com/sun/net/ssl/TrustManagerFactory.java.i
+data/src/share/classes/java/util/concurrent/atomic/AtomicLong.java.i
+data/src/share/demo/jfc/Font2DTest/resources/TextResources_en_GB.properties.i
+data/test/java/security/Signature/NONEwithRSA.java.i
data/test/java/net/URLClassLoader/closetest/test2/com/foo/Resource1.i
data/test/com/sun/jdi/Java_gTest.java.i
data/test/java/nio/channels/SocketChannel/Trivial.java.i
-data/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c.i
-data/test/sun/security/tools/policytool/UsePolicy.sh.i
-data/src/share/classes/sun/security/krb5/Checksum.java.i
+data/test/java/util/ResourceBundle/Test4314141A___EURO.properties.i
+data/test/sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java.i
+data/src/share/classes/sun/tools/tree/GreaterExpression.java.i
+data/test/com/sun/jdi/InvokeTest.java.i
data/test/javax/management/mxbean/customtypes/IntegerIsLongFactory.java.i
+data/src/share/classes/java/util/EventObject.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/Solo.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java.i
+data/test/java/util/Collections/RacingCollections.java.i
data/test/javax/management/monitor/GaugeMonitorDeadlockTest.java.i
-data/src/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java.i
data/src/share/demo/nbproject/management/FullThreadDump/build.xml.i
-data/test/com/sun/net/httpserver/bugs/FixedLengthInputStream.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/ReflectionException.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariInputMethodDescriptor.java.i
data/test/java/util/Collections/Disjoint.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_LB.properties.i
+data/src/share/classes/sun/rmi/server/resources/rmid_sv.properties.i
data/test/req.flg.i
data/src/solaris/native/java/net/InetAddressImplFactory.c.i
+data/test/javax/management/openmbean/OpenTypeDescriptorTest.java.i
data/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh.i
-data/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so.i
+data/src/share/classes/java/text/ChoiceFormat.java.i
data/test/java/io/File/MaxPath.java.i
-data/test/java/security/KeyRep/SerialDSAPubKey.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp.i
+data/test/javax/management/loading/MLetCLR/policy.i
+data/test/java/beans/PropertyEditor/TestDoubleClassNull.java.i
+data/test/javax/management/namespace/JMXNamespaceViewTest.java.i
data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java.i
data/src/solaris/classes/sun/java2d/x11/XSurfaceData.java.i
-data/src/share/classes/sun/misc/UUEncoder.java.i
+data/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir.i
data/test/java/rmi/Naming/LookupIPv6.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java.i
-data/src/share/classes/javax/swing/text/rtf/package.html.i
-data/src/share/classes/javax/swing/DesktopManager.java.i
+data/src/share/classes/javax/naming/ldap/HasControls.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif.i
+data/src/share/classes/com/sun/media/sound/JARSoundbankReader.java.i
data/src/windows/native/java/io/io_util_md.c.i
-data/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java.i
+data/src/share/demo/applets/WireFrame/models/hughes_500.obj.i
data/src/share/classes/org/relaxng/datatype/ValidationContext.java.i
data/src/share/native/sun/java2d/loops/DrawPath.c.i
data/test/java/util/concurrent/locks/Lock/TimedAcquire.java.i
data/src/share/classes/sun/text/resources/FormatData_no.java.i
-data/test/javax/swing/JInternalFrame/6725409/bug6725409.java.i
+data/src/solaris/bin/java_md.h.i
data/src/share/classes/java/nio/file/FileVisitOption.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so.i
data/test/java/util/Arrays/ArrayObjectMethods.java.i
data/src/share/classes/com/sun/net/ssl/SSLContextSpi.java.i
-data/test/java/rmi/MarshalledObject/compare/Compare.java.i
-data/test/sun/rmi/rmic/manifestClassPath/run.sh.i
+data/src/share/classes/java/io/CharArrayWriter.java.i
+data/test/sun/security/mscapi/PublicKeyInterop.java.i
data/src/windows/native/sun/security/pkcs11/j2secmod_md.h.i
-data/src/share/classes/sun/security/krb5/internal/crypto/Nonce.java.i
-data/test/java/net/MulticastSocket/JoinGroup.java.i
+data/src/share/classes/java/awt/doc-files/MultiScreen.gif.i
+data/src/share/native/java/lang/Thread.c.i
data/src/share/classes/sun/io/ByteToCharCp874.java.i
data/test/java/lang/annotation/loaderLeak/LoaderLeak.sh.i
data/test/java/security/spec/EllipticCurveMatch.java.i
data/test/javax/swing/JComponent/6683775/bug6683775.java.i
data/test/javax/swing/LookAndFeel/6474153/bug6474153.java.i
data/test/javax/management/namespace/JMXDomainTest.java.i
-data/src/solaris/native/sun/awt/XDrawingArea.c.i
-data/test/java/awt/Mixing/MixingOnShrinkingHWButton.java.i
-data/src/share/classes/javax/swing/plaf/multi/MultiTreeUI.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java.i
+data/make/javax/swing/plaf/FILES.gmk.i
+data/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties.i
data/src/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java.i
data/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java.i
+data/test/sun/text/resources/Collator/Bug6755060.java.i
data/src/share/classes/java/lang/UnknownError.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java.i
data/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java.i
data/test/java/util/zip/InflaterInputStream/MarkReset.java.i
data/test/sun/security/tools/keytool/NoExtNPE.sh.i
data/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c.i
+data/make/sun/nio/Makefile.i
data/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c.i
data/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java.i
-data/src/share/classes/sun/nio/fs/AbstractWatchKey.java.i
+data/test/java/util/ResourceBundle/Test4314141A__DE.properties.i
data/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp.i
-data/test/java/security/BasicPermission/ExitVMEquals.java.i
-data/test/java/lang/instrument/BootClassPath/Agent.java.i
-data/test/com/sun/jdi/GetLocalVariables.java.i
+data/test/tools/jar/ChangeDir.java.i
+data/src/share/classes/sun/io/CharToByteCp1025.java.i
+data/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java.i
data/src/share/classes/javax/management/event/EventClient.java.i
data/src/windows/native/sun/windows/awt_Color.cpp.i
-data/test/java/net/URLClassLoader/closetest/build2.sh.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanCalls.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/CriticalSubjectAltName.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMBean.java.i
data/src/share/classes/java/awt/im/InputMethodHighlight.java.i
data/make/tools/swing-beans/beaninfo/images/JAppletMono16.gif.i
-data/make/modules/tools/nbproject/project.properties.i
-data/src/windows/back/proc_md.h.i
-data/src/solaris/classes/sun/java2d/xr/XRMaskFill.java.i
-data/src/share/classes/java/io/UTFDataFormatException.java.i
+data/make/tools/CharsetMapping/IBM918.map.i
+data/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp.i
+data/src/share/native/sun/security/ec/impl/ec2_193.c.i
+data/test/java/beans/XMLEncoder/java_io_File.java.i
data/make/sun/security/krb5/Makefile.i
-data/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskBlit.c.i
+data/src/share/classes/javax/swing/plaf/FileChooserUI.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java.i
data/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java.i
data/src/solaris/doc/sun/man/man1/ja/wsimport.1.i
data/src/share/classes/javax/security/auth/package.html.i
data/test/com/sun/servicetag/servicetag4.properties.i
data/test/javax/smartcardio/TestCardPermission.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java.i
-data/src/share/demo/jfc/Font2DTest/resources/TextResources_en.properties.i
+data/src/share/classes/java/util/zip/DeflaterInputStream.java.i
data/src/share/classes/java/security/acl/Owner.java.i
-data/src/share/classes/sun/java2d/pipe/LoopPipe.java.i
+data/src/share/classes/com/sun/pept/encoding/Decoder.java.i
data/src/windows/classes/sun/awt/windows/WRobotPeer.java.i
data/make/common/Library.gmk.i
-data/src/share/classes/sun/nio/cs/ext/MacRomania.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java.i
data/test/java/util/Collections/CheckedSetBash.java.i
-data/src/share/native/java/lang/fdlibm/src/e_asin.c.i
+data/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java.i
+data/test/java/util/Hashtable/ReadObject.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java.i
-data/test/javax/swing/JLabel/7004134/bug7004134.java.i
-data/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java.i
+data/src/share/classes/com/sun/tools/jdi/CommandSender.java.i
+data/src/share/classes/java/awt/PageAttributes.java.i
data/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java.i
data/src/solaris/native/java/net/Inet6AddressImpl.c.i
-data/src/share/classes/sun/tools/tree/BreakStatement.java.i
data/test/java/io/File/GetCanonicalPath.java.i
-data/src/share/native/sun/security/ec/oid.c.i
-data/src/windows/classes/sun/java2d/d3d/D3DTextRenderer.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif.i
+data/test/java/nio/file/WatchService/LotsOfEvents.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java.i
data/test/javax/management/remote/mandatory/notif/policy.negative.i
-data/src/share/classes/java/dyn/LinkagePermission.java.i
+data/src/share/classes/sun/nio/cs/ext/MS1255.java.i
data/src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java.i
data/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java.i
-data/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java.i
data/src/share/classes/sun/security/jgss/GSSHeader.java.i
-data/src/solaris/classes/sun/awt/X11/XListPeer.java.i
+data/src/share/classes/sun/io/CharToByteCp943.java.i
data/src/share/classes/sun/util/locale/StringTokenIterator.java.i
-data/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java.i
+data/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java.i
data/src/share/classes/javax/imageio/stream/ImageInputStream.java.i
data/src/share/bin/java.c.i
data/test/java/net/InterfaceAddress/Equals.java.i
@@ -15147,125 +15103,129 @@ data/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java.i
data/src/share/classes/javax/security/auth/kerberos/ServicePermission.java.i
data/src/share/classes/javax/management/loading/package.html.i
-data/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java.i
+data/src/share/classes/sun/security/ec/ECDHKeyAgreement.java.i
data/test/java/lang/reflect/Proxy/returnTypes/GetSerializable.java.i
-data/test/java/beans/Introspector/6380849/beans/FirstBean.java.i
+data/test/java/beans/PropertyEditor/TestEnumSubclassValue.java.i
+data/src/share/classes/sun/font/FontAccess.java.i
data/src/share/classes/sun/awt/DebugSettings.java.i
data/src/share/back/ReferenceTypeImpl.h.i
data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keyPass.i
+data/src/share/classes/sun/io/ByteToCharUTF8.java.i
data/test/tools/pack200/PackageVersionTest.java.i
+data/make/sun/jpeg/mapfile-vers.i
data/src/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java.i
-data/make/common/Defs-embedded.gmk.i
+data/src/share/classes/sun/nio/cs/UTF_8.java.i
+data/test/sun/nio/cs/SurrogateTestEUCTW.plane4.surrogates.i
data/src/share/classes/sun/awt/resources/awt.properties.i
data/src/share/classes/java/nio/file/DirectoryStream.java.i
-data/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java.i
+data/src/share/classes/javax/swing/text/DateFormatter.java.i
data/test/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java.i
data/src/share/native/java/net/InetAddress.c.i
-data/test/javax/management/loading/DocumentRootTest.java.i
-data/src/share/classes/com/sun/pept/ept/EPTFactory.java.i
+data/src/share/classes/sun/nio/cs/ISO_8859_13.java.i
+data/src/share/classes/com/sun/servicetag/ServiceTag.java.i
data/test/java/awt/FontClass/CreateFont/BigFont.java.i
data/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java.i
+data/make/mkdemo/jfc/SwingApplet/Makefile.i
data/src/share/classes/javax/swing/text/html/FrameView.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java.i
data/test/javax/swing/JFileChooser/6840086/bug6840086.java.i
data/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.html.i
data/src/share/classes/java/util/HashMap.java.i
data/make/netbeans/common/make.xml.i
-data/src/share/classes/sun/security/provider/MD5.java.i
-data/test/sun/security/tools/jarsigner/oldsig.sh.i
+data/src/share/classes/java/security/KeyStoreException.java.i
+data/test/sun/rmi/rmic/extraCompilation/run.sh.i
data/make/mkdemo/management/FullThreadDump/Makefile.i
data/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java.i
data/test/com/sun/tools/attach/ApplicationSetup.sh.i
data/src/share/classes/sun/nio/cs/UTF_32BE.java.i
data/src/solaris/classes/sun/awt/motif/MDataTransferer.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariTables.java.i
-data/test/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java.i
+data/make/java/beans/Makefile.i
+data/test/java/nio/channels/Selector/KeySets.java.i
data/src/share/native/java/io/ObjectStreamClass.c.i
data/test/java/beans/PropertyEditor/TestByteClassValue.java.i
data/src/share/classes/sun/security/provider/MD4.java.i
data/src/windows/native/sun/windows/awt_Mlib.cpp.i
-data/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java.i
-data/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandard.java.i
data/test/org/openjdk/jigsaw/properties.xml.i
-data/src/windows/native/com/sun/management/OperatingSystem_md.c.i
-data/src/share/native/sun/font/layout/GlyphIterator.h.i
+data/make/tools/CharsetMapping/IBM1123.map.i
+data/src/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java.i
data/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java.i
data/src/share/classes/java/lang/Process.java.i
+data/src/share/back/SDE.h.i
data/src/share/demo/scripting/jconsole-plugin/src/scripts/jtop.js.i
data/src/share/classes/java/lang/BootstrapMethodError.java.i
+data/src/share/classes/sun/misc/UUEncoder.java.i
data/test/sun/text/resources/Format/Bug4651568.java.i
data/src/share/native/java/sql/DriverManager.c.i
data/src/solaris/native/sun/xawt/XlibWrapper.c.i
-data/test/sun/security/tools/jarsigner/ec.sh.i
-data/src/share/native/sun/java2d/loops/Ushort555Rgb.h.i
+data/test/sun/security/tools/jarsigner/LargeJarEntry.java.i
+data/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java.i
data/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java.i
-data/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp.i
-data/src/solaris/classes/sun/awt/X11/XTextTransferHelper.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMeta.java.i
+data/test/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector.i
data/src/share/classes/sun/tools/tree/AssignOpExpression.java.i
-data/src/solaris/doc/sun/man/man1/ja/keytool.1.i
+data/make/tools/src/build/tools/jdwpgen/StringObjectTypeNode.java.i
data/test/java/math/BigInteger/ModPow65537.java.i
-data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html.i
+data/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java.i
data/test/java/lang/instrument/ParallelTransformerLoaderApp.java.i
data/make/tools/swing-beans/beaninfo/images/JPopupMenuColor16.gif.i
+data/test/javax/naming/InitialContext/EnvClone.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java.i
data/src/share/classes/java/security/cert/CertPathHelperImpl.java.i
data/src/share/javavm/include/opcodes.h.i
data/src/windows/resource/java.rc.i
data/src/share/classes/sun/awt/im/InputContext.java.i
data/test/javax/management/monitor/MultiMonitorTest.java.i
-data/src/share/classes/com/sun/jdi/TypeComponent.java.i
-data/src/share/classes/java/lang/doc-files/javalang.doc.anc41.gif.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties.i
data/src/share/classes/javax/swing/LayoutFocusTraversalPolicy.java.i
data/src/share/classes/javax/swing/colorchooser/ColorModelCMYK.java.i
-data/test/java/beans/PropertyEditor/TestEnumClassNull.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif.i
-data/test/java/beans/XMLEncoder/java_sql_Time.java.i
+data/test/sun/net/www/protocol/http/ChunkedErrorStream.java.i
+data/src/share/classes/java/rmi/server/RemoteRef.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_de.properties.i
data/test/java/lang/Class/getModifiers/ResolveFrom.java.i
+data/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java.i
data/test/javax/management/mxbean/AmbiguousConstructorTest.java.i
data/src/share/classes/javax/sound/sampled/ReverbType.java.i
-data/test/javax/security/auth/kerberos/KerberosTixDateTest.java.i
+data/src/share/classes/sun/print/PageableDoc.java.i
data/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java.i
-data/test/java/rmi/Naming/RmiIsNoScheme.java.i
+data/src/share/classes/java/lang/reflect/Member.java.i
data/test/javax/xml/crypto/dsig/data/signature-retrievalmethod-rawx509crt.xml.i
-data/src/share/classes/java/nio/channels/AsynchronousFileChannel.java.i
data/src/share/classes/sun/security/krb5/KrbTgsReq.java.i
data/test/javax/security/auth/x500/X500Principal/DerIsConstructor.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java.i
data/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html.i
data/src/share/classes/sun/security/x509/X509CertInfo.java.i
-data/test/java/beans/Introspector/memory/Bean4.java.i
+data/src/solaris/native/sun/awt/awt_Insets.h.i
data/test/java/beans/XMLEncoder/java_sql_Date.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnssckbi.so.i
data/make/tools/sharing/classlist.solaris.i
data/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java.i
-data/src/share/demo/jvmti/minst/minst.c.i
data/src/share/classes/com/sun/tools/example/debug/tty/TTY.java.i
data/test/java/rmi/Naming/DefaultRegistryPort.java.i
data/make/tools/dtdbuilder/Makefile.i
-data/src/share/classes/java/util/logging/LoggingProxyImpl.java.i
-data/src/solaris/native/sun/awt/color.h.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c.i
-data/test/java/util/AbstractList/HasNextAfterException.java.i
+data/test/sun/text/resources/Format/Bug4621320.java.i
+data/src/share/demo/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin.i
+data/test/javax/print/attribute/MediaMappingsTest.java.i
+data/src/share/classes/sun/util/resources/TimeZoneNames_de.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java.i
data/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java.i
data/test/java/lang/reflect/Generics/SignatureTest.java.i
data/src/share/classes/java/lang/invoke/CountingMethodHandle.java.i
data/src/share/demo/jvmti/hprof/jvm.hprof.txt.i
data/src/share/classes/java/awt/peer/DialogPeer.java.i
-data/test/java/beans/Beans/Test4067824.java.i
-data/src/share/native/sun/awt/libpng/pnglibconf.h.i
+data/test/demo/jvmti/gctest/BigHello.java.i
data/src/share/classes/java/rmi/activation/ActivationID.java.i
-data/test/java/nio/channels/SocketChannel/Open.sh.i
+data/test/java/net/SocketPermission/Equals.java.i
+data/make/java/redist/FILES.gmk.i
+data/test/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java.i
data/make/tools/src/build/tools/jdwpgen/ArrayRegionTypeNode.java.i
data/test/sun/security/tools/keytool/DummyProvider.java.i
data/src/solaris/sample/dtrace/hotspot/method_invocation_stat.d.i
data/src/share/native/sun/awt/image/jpeg/jquant2.c.i
data/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.i
data/src/share/classes/java/io/ObjectStreamClass.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/package.html.i
-data/src/share/classes/javax/accessibility/AccessibleRelationSet.java.i
-data/test/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java.i
+data/test/sun/net/www/protocol/http/RelativeRedirect.java.i
+data/test/java/lang/Class/getMethod/NullInParamList.java.i
data/src/share/classes/java/util/prefs/PreferencesFactory.java.i
data/src/share/classes/java/util/TooManyListenersException.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMBean.java.i
@@ -15273,226 +15233,219 @@ data/src/share/classes/java/util/Properties.java.i
data/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java.i
data/src/share/classes/sun/tools/jar/Main.java.i
data/src/share/classes/java/awt/doc-files/GridLayout-2.gif.i
-data/test/javax/swing/JScrollBar/6924059/bug6924059.java.i
-data/test/sun/security/util/PropertyExpander/ExpandAndEncode.java.i
+data/test/java/util/ResourceBundle/Control/XmlRB_ja.xml.i
+data/test/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup.i
data/src/solaris/native/sun/awt/fontconfig.h.i
data/test/java/net/URL/Test.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy24.i
-data/make/sun/security/smartcardio/mapfile-vers.i
+data/make/netbeans/common/shared.xml.i
+data/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider.i
data/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c.i
data/test/com/sun/tools/attach/BadAgent.java.i
-data/src/share/demo/jfc/Metalworks/resources/HelpFiles/metalworks.html.i
-data/test/javax/print/attribute/ServiceDialogTest.java.i
+data/src/share/classes/sun/tools/jstat/Literal.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java.i
data/test/java/lang/reflect/Field/GenericStringTest.java.i
-data/src/share/classes/java/util/CurrencyData.properties.i
+data/test/org/openjdk/jigsaw/cli/signer-prikey.pem.i
data/test/java/beans/XMLEncoder/Test6187118.java.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Signer.java.i
+data/test/com/sun/jndi/ldap/ReadTimeoutTest.java.i
data/src/share/classes/javax/sql/rowset/JoinRowSet.java.i
data/src/share/classes/sun/java2d/pisces/Helpers.java.i
data/test/sun/security/krb5/auto/ok-as-delegate.sh.i
-data/test/java/nio/Buffer/CopyDirect-X-Memory.java.template.i
+data/src/share/classes/java/rmi/activation/UnknownGroupException.java.i
data/src/share/instrument/JarFacade.h.i
data/test/java/rmi/reliability/juicer/AppleUser.java.i
-data/test/java/io/LineNumberInputStream/Skip.java.i
+data/src/windows/native/sun/windows/awt_ScrollPane.h.i
data/test/java/io/RandomAccessFile/ParameterCheck.java.i
-data/src/share/native/sun/reflect/Reflection.c.i
-data/test/sun/nio/cs/TestUni2HKSCS.java.i
-data/src/share/classes/java/awt/print/PrinterJob.java.i
+data/src/share/classes/sun/io/ByteToCharCp1145.java.i
data/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.c.i
-data/src/share/classes/java/awt/print/PrinterIOException.java.i
data/test/java/rmi/reliability/benchmark/runRmiBench.sh.i
data/src/share/native/sun/java2d/loops/DrawRect.c.i
-data/src/share/classes/java/lang/VirtualMachineError.java.i
+data/src/solaris/classes/sun/nio/fs/UnixFileSystem.java.i
data/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java.i
data/test/java/io/PrintWriter/CheckError.java.i
data/test/sun/security/smartcardio/TestTransmit.java.i
data/test/java/util/concurrent/forkjoin/Integrate.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java.i
-data/test/javax/crypto/SealedObject/NullKeySealedObject.java.i
+data/src/solaris/bin/jexec.c.i
data/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c.i
-data/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java.i
+data/src/solaris/doc/sun/man/man1/ja/appletviewer.1.i
data/test/sun/nio/cs/OLD/EUC_CN_OLD.java.i
-data/src/share/classes/sun/tools/tree/BinaryShiftExpression.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpMessage.java.i
data/src/share/classes/java/rmi/activation/ActivationException.java.i
data/test/sun/net/www/protocol/http/B6890349.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java.i
-data/src/solaris/native/java/io/canonicalize_md.c.i
+data/src/share/classes/sun/security/ec/ECDSASignature.java.i
data/make/tools/swing-beans/beaninfo/images/JViewportColor32.gif.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java.i
-data/test/java/io/Serializable/packageAccess/C.java.i
-data/test/java/lang/StringCoding/CheckEncodings.sh.i
-data/src/share/classes/sun/security/pkcs/PKCS7.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/CustomUIDefault.java.i
+data/make/sun/security/pkcs11/mapfile-vers.i
+data/src/share/classes/sun/reflect/generics/tree/BaseType.java.i
+data/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html.i
data/test/java/rmi/registry/classPathCodebase/security.policy.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c.i
data/test/java/net/URLClassLoader/sealing/b/p/B.java.i
-data/src/solaris/classes/sun/nio/fs/UnixPath.java.i
+data/test/org/openjdk/jigsaw/hello-optional.sh.i
data/test/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java.i
-data/test/sun/jvmstat/monitor/VmIdentifier/testcases.i
-data/src/solaris/classes/sun/awt/X11/security-icon-bw48.png.i
+data/src/share/classes/sun/tools/tree/MultiplyExpression.java.i
+data/src/share/classes/java/nio/file/WatchKey.java.i
data/src/share/classes/java/util/logging/Logging.java.i
-data/test/java/io/Serializable/explicitCNFException/ExplicitCNFException.java.i
+data/src/share/classes/sun/security/krb5/KrbApRep.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java.i
-data/src/share/back/eventFilter.h.i
+data/src/share/classes/sun/java2d/loops/DrawLine.java.i
data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_BA.properties.i
-data/test/sun/jvmstat/testlibrary/utils.sh.i
+data/test/java/lang/Class/forName/classes/3.class.i
data/src/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java.i
data/test/javax/security/auth/login/Exceptions/NewExceptions.java.i
data/src/share/classes/sun/nio/cs/CharsetMapping.java.i
-data/make/tools/reorder/tests/LoadJFrame.java.i
+data/test/javax/security/auth/login/Configuration/Synchronize.config.i
data/src/share/classes/java/lang/ref/WeakReference.java.i
data/src/share/classes/java/nio/file/CopyOption.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/DayTimeInterface.java.i
data/make/java/jexec/Makefile.i
data/test/sun/security/provider/KeyStore/TestJKSWithSecretKey.java.i
data/make/tools/swing-beans/beaninfo/images/JOptionPaneMono32.gif.i
-data/src/share/classes/java/awt/Polygon.java.i
-data/make/mkdemo/jvmti/minst/Makefile.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHost.java.i
+data/test/java/nio/channels/Selector/LotsOfCancels.java.i
data/src/windows/classes/sun/awt/windows/WDialogPeer.java.i
data/test/com/sun/jdi/GetLocalVariables3Test.sh.i
data/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java.i
data/src/share/classes/sun/awt/AWTSecurityManager.java.i
data/test/javax/management/Introspector/annot/Name.java.i
data/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java.i
-data/src/share/classes/sun/misc/JavaIODeleteOnExitAccess.java.i
+data/src/share/classes/javax/accessibility/AccessibleEditableText.java.i
data/src/share/classes/sun/text/resources/CollationData.java.i
-data/test/java/util/ResourceBundle/Test4314141A_de_.properties.i
+data/src/share/classes/javax/management/SendNotification.java.i
data/make/sun/awt/Makefile.i
-data/src/share/classes/java/awt/geom/PathIterator.java.i
data/src/share/classes/javax/net/ssl/HostnameVerifier.java.i
-data/make/com/sun/jarsigner/Makefile.i
-data/src/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java.i
-data/test/java/awt/dnd/URIListBetweenJVMsTest/InterprocessMessages.java.i
+data/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java.i
data/src/share/classes/java/nio/file/FileAlreadyExistsException.java.i
-data/test/java/util/ResourceBundle/Control/PackagePrivateRB.java.i
+data/test/java/rmi/registry/interfaceHash/InterfaceHash.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAccess.java.i
data/src/windows/classes/sun/security/provider/NativePRNG.java.i
data/test/javax/crypto/SecretKeyFactory/P2.jar.i
-data/test/java/text/Bidi/BidiConformance.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java.i
-data/src/share/classes/java/rmi/server/RMISocketFactory.java.i
+data/src/share/native/sun/font/layout/SubtableProcessor.cpp.i
+data/src/share/classes/sun/rmi/transport/ConnectionInputStream.java.i
data/src/solaris/classes/java/lang/UNIXProcess.java.linux.i
-data/src/share/demo/README.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain10.txt.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java.i
-data/test/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java.i
+data/src/share/native/sun/font/AccelGlyphCache.c.i
+data/src/solaris/back/linker_md.c.i
+data/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java.i
data/src/share/classes/com/sun/security/sasl/ServerFactoryImpl.java.i
data/src/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java.i
data/test/java/lang/reflect/Assignment/ArrayAssignment.java.i
data/make/tools/swing-beans/beaninfo/images/JTableMono32.gif.i
data/src/solaris/classes/sun/awt/motif/X11DragSourceContextPeer.java.i
-data/src/share/classes/sun/print/ServiceDialog.java.i
+data/make/sun/security/pkcs11/Makefile.i
data/test/sun/security/pkcs11/rsa/TestSignatures.java.i
data/src/share/classes/javax/print/attribute/standard/QueuedJobCount.java.i
-data/test/javax/swing/JColorChooser/Test4380468.java.i
-data/test/java/rmi/Naming/LookupNameWithColon.java.i
+data/src/share/classes/com/sun/jdi/ThreadGroupReference.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFAttribute.java.i
data/test/java/lang/instrument/TestClass2.java.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c.i
-data/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java.i
+data/src/solaris/native/sun/awt/awt_FileDialog.c.i
data/test/javax/swing/JPopupMenu/6691503/bug6691503.java.i
data/test/java/lang/invoke/MethodHandlesTest.java.i
data/src/share/classes/java/util/concurrent/locks/LockSupport.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java.i
data/test/java/net/DatagramSocket/InheritHandle.java.i
+data/src/solaris/native/sun/awt/awt_Selection.c.i
data/test/java/util/Formatter/BasicDouble.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java.i
-data/src/share/sample/nio/server/URLDumper.java.i
-data/src/share/classes/java/rmi/server/Unreferenced.java.i
+data/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java.i
+data/test/javax/swing/border/Test4243289.java.i
+data/test/java/util/concurrent/locks/ReentrantReadWriteLock/LoopHelpers.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java.i
data/test/java/io/FileInputStream/LeadingSlash.java.i
data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldMono16.gif.i
-data/src/windows/classes/sun/java2d/d3d/D3DRenderQueue.java.i
-data/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java.i
+data/src/share/classes/sun/tools/tree/ConditionVars.java.i
+data/src/share/classes/java/lang/Float.java.i
data/make/javax/swing/beaninfo/manifest.i
-data/src/windows/classes/sun/awt/windows/WFontPeer.java.i
+data/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java.i
data/src/share/classes/javax/swing/text/html/parser/DTD.java.i
data/src/share/classes/javax/security/sasl/SaslServerFactory.java.i
data/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java.i
+data/src/share/classes/java/dyn/WrongMethodTypeException.java.i
data/src/share/classes/java/nio/charset/exceptions.i
-data/src/share/demo/jfc/SampleTree/resources/images/expanded.gif.i
-data/src/solaris/classes/sun/nio/ch/FileKey.java.i
+data/src/share/classes/javax/swing/border/AbstractBorder.java.i
+data/src/share/sample/scripting/scriptpad/README.txt.i
data/test/javax/security/auth/x500/X500Principal/EscapedChars.java.i
data/src/share/classes/javax/swing/text/DocumentFilter.java.i
-data/test/sun/security/pkcs11/Provider/Login-nss.txt.i
+data/src/windows/native/sun/windows/stdhdrs.h.i
data/src/solaris/native/sun/java2d/loops/vis_IntArgb.c.i
-data/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp.i
+data/src/share/classes/sun/awt/geom/Order0.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/CheckDeps.java.i
data/test/java/io/File/AccessDenied.java.i
data/src/share/classes/java/awt/geom/Rectangle2D.java.i
data/test/java/rmi/server/clientStackTrace/security.policy.i
-data/test/sun/security/krb5/auto/SSL.java.i
data/src/share/classes/sun/nio/ch/SelectorImpl.java.i
data/test/java/math/BigInteger/ProbablePrime.java.i
data/src/share/classes/sun/nio/cs/UTF_32.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ArgCheck.java.i
+data/src/share/classes/sun/io/ByteToCharCp1253.java.i
data/src/share/classes/sun/security/ssl/HelloExtensions.java.i
data/src/share/classes/sun/security/krb5/internal/APReq.java.i
data/src/share/classes/java/awt/peer/ListPeer.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_it.properties.i
-data/test/org/openjdk/jigsaw/InstallFromRepo.java.i
data/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java.i
-data/src/share/native/common/gdefs.h.i
data/src/windows/classes/sun/nio/ch/SctpServerChannelImpl.java.i
-data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java.i
data/src/solaris/demo/jni/Poller/Poller.java.i
data/src/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java.i
data/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java.i
data/src/share/classes/sun/text/resources/uprops.icu.i
data/src/share/classes/javax/swing/filechooser/FileSystemView.java.i
data/test/com/sun/jdi/HelloWorld.java.i
-data/src/share/classes/sun/misc/BASE64Encoder.java.i
-data/src/share/classes/javax/net/ssl/ExtendedSSLSession.java.i
+data/src/share/classes/com/sun/jndi/ldap/BindingWithControls.java.i
data/test/java/io/charStreams/WriteLengths.java.i
+data/make/sun/xawt/FILES_c_unix.gmk.i
data/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java.i
-data/src/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java.i
+data/src/share/classes/com/sun/jdi/Value.java.i
data/src/share/classes/java/awt/event/MouseEvent.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif.i
-data/src/share/classes/sun/security/jgss/krb5/MicToken.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java.i
+data/make/org/jcp/Makefile.i
data/make/netbeans/jconsole/nbproject/project.xml.i
data/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java.i
data/test/sun/security/provider/MessageDigest/Offsets.java.i
data/test/org/openjdk/jigsaw/cli/signed-module.sh.i
-data/test/java/lang/ClassLoader/Assert.java.i
+data/make/java/invoke/Makefile.i
data/src/share/classes/sun/dyn/MethodHandleImpl.java.i
data/test/java/beans/XMLDecoder/Test4864117.java.i
data/src/share/sample/forkjoin/mergesort/MergeDemo.java.i
-data/test/sun/security/tools/jarsigner/LargeJarEntry.java.i
data/test/sun/net/www/ftptest/FtpCommandHandler.java.i
-data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/ObjectCodeConvertors.java.i
-data/test/java/awt/FileDialog/MultipleMode/MultipleMode.java.i
+data/src/windows/native/sun/java2d/windows/ddrawUtils.h.i
+data/src/share/classes/sun/nio/cs/ext/IBM278.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_de_CH.properties.i
data/test/sun/rmi/rmic/newrmic/equivalence/Task.java.i
-data/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java.i
-data/src/share/classes/sun/awt/AWTAccessor.java.i
+data/test/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java.i
+data/test/java/util/TimSort/README.i
data/test/javax/swing/JEditorPane/6917744/test.html.i
data/src/share/classes/java/awt/Point.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java.i
-data/src/share/classes/javax/swing/LayoutStyle.java.i
+data/src/share/classes/java/net/SocketPermission.java.i
data/test/java/io/File/Unicode.java.i
data/src/share/classes/sun/util/locale/LocaleSyntaxException.java.i
-data/src/share/classes/javax/accessibility/AccessibleBundle.java.i
+data/make/sun/Makefile.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHereContext.java.i
-data/src/share/classes/sun/text/normalizer/ReplaceableString.java.i
+data/make/sun/cmm/lcms/Makefile.i
data/src/share/classes/com/sun/jdi/request/ThreadDeathRequest.java.i
-data/src/windows/native/sun/windows/awt_IconCursor.h.i
+data/src/share/classes/sun/security/krb5/KrbAsReq.java.i
data/test/java/lang/Runtime/exec/Status.java.i
data/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java.i
data/src/share/classes/sun/dyn/anon/AnonymousClassLoader.java.i
-data/test/sun/security/mscapi/RSAEncryptDecrypt.sh.i
-data/src/share/classes/sun/tools/tree/BitNotExpression.java.i
+data/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java.i
+data/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java.i
data/src/share/classes/com/sun/security/sasl/Provider.java.i
-data/test/java/util/ServiceLoader/FooService.java.i
+data/src/share/classes/javax/naming/spi/ResolveResult.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/FloatArrays.java.i
data/test/java/nio/channels/Selector/lots_of_updates.sh.i
-data/test/lib/security/java.policy/Ext_AllPolicy.sh.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java.i
data/test/java/net/InetAddress/SimpleNameService.java.i
+data/src/share/classes/sun/reflect/generics/tree/BottomSignature.java.i
data/src/share/native/sun/security/ec/impl/ecp_521.c.i
-data/src/solaris/instrument/FileSystemSupport_md.c.i
+data/src/share/classes/javax/swing/JCheckBoxMenuItem.java.i
data/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java.i
data/src/share/classes/javax/management/RuntimeOperationsException.java.i
-data/test/javax/management/namespace/RemoveNotificationListenerTest.java.i
-data/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono32.gif.i
-data/src/share/classes/javax/xml/crypto/URIDereferencer.java.i
-data/make/tools/src/build/tools/generatenimbus/Utils.java.i
+data/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java.i
+data/src/share/classes/javax/swing/plaf/TreeUI.java.i
+data/src/share/native/java/util/concurrent/atomic/AtomicLong.c.i
data/src/share/classes/org/ietf/jgss/GSSException.java.i
data/test/javax/naming/ldap/LdapName/EscapeUnescapeTests.java.i
data/test/java/util/LinkedList/Remove.java.i
@@ -15500,13 +15453,13 @@ data/test/com/sun/jdi/DeleteAllBkptsTest.java.i
data/src/windows/classes/sun/awt/windows/WPathGraphics.java.i
data/test/sun/security/provider/PolicyFile/EmailAddress.policy.i
data/test/java/net/URL/abnormal_http_urls.i
-data/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java.i
-data/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java.i
+data/make/tools/swing-beans/beaninfo/images/JToolBarMono16.gif.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c.i
-data/test/java/net/BindException/Test.java.i
-data/test/java/util/EnumSet/RetainAll.java.i
-data/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandardMBean.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Doubles.java.i
+data/src/share/classes/sun/beans/editors/ColorEditor.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java.i
+data/src/share/classes/java/nio/Buffer.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c.i
+data/src/share/classes/sun/util/resources/CalendarData.properties.i
data/src/share/classes/java/util/AbstractMap.java.i
data/src/share/classes/sun/tools/tree/StringExpression.java.i
data/test/java/util/zip/InflaterBufferSize.java.i
@@ -15518,98 +15471,92 @@ data/test/javax/management/loading/mlet1.html.i
data/test/sun/nio/ch/Basic.java.i
data/test/java/io/Serializable/classDescGetField/GetField.java.i
data/test/sun/nio/cs/OLD/IBM930_OLD.java.i
-data/src/share/classes/com/sun/servicetag/RegistrationData.java.i
-data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java.i
+data/make/com/sun/nio/Makefile.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java.i
data/src/share/classes/sun/reflect/annotation/AnnotationType.java.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land.i
+data/src/share/bin/jli_util.h.i
data/src/share/classes/com/sun/media/sound/AbstractDataLine.java.i
-data/test/sun/security/smartcardio/TestConnect.java.i
+data/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c.i
-data/make/netbeans/jconsole/build.xml.i
+data/make/jprt.config.i
data/src/share/classes/sun/tools/tree/BooleanExpression.java.i
-data/test/javax/management/namespace/VirtualPropsTest.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/ReflectionException.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java.i
+data/test/java/awt/Multiscreen/DeviceIdentificationTest/DeviceIdentificationTest.java.i
+data/test/sun/security/ssl/etc/unknown_keystore.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java.i
-data/test/java/lang/String/IndexOfEmptyInEmpty.java.i
+data/test/java/awt/TrayIcon/CtorTest/CtorTest.java.i
data/test/java/beans/Introspector/memory/Bean.java.i
data/src/share/classes/sun/net/httpserver/UndefLengthOutputStream.java.i
data/src/share/classes/javax/imageio/stream/MemoryCache.java.i
data/src/share/classes/sun/io/CharToByteMacRoman.java.i
-data/src/share/classes/javax/management/MBeanConstructorInfo.java.i
+data/src/share/classes/sun/java2d/pipe/BufferedBufImgOps.java.i
data/test/sun/security/pkcs11/fips/secmod.db.i
data/src/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java.i
-data/test/java/lang/StringBuffer/Supplementary.java.i
-data/src/share/classes/com/sun/jndi/ldap/VersionHelper.java.i
-data/test/java/lang/invoke/indify/Indify.java.i
+data/src/share/classes/javax/management/remote/JMXPrincipal.java.i
+data/test/java/rmi/server/useCustomRef/UseCustomRef_Stub.java.i
data/test/java/nio/file/Files/walk_file_tree.sh.i
data/src/share/classes/javax/management/remote/JMXConnector.java.i
data/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java.i
data/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java.i
data/test/java/lang/Float/Extrema.java.i
data/src/share/classes/sun/security/pkcs11/Config.java.i
-data/test/demo/jvmti/hprof/HelloWorld.java.i
-data/src/windows/native/sun/windows/stdhdrs.h.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c.i
+data/src/share/classes/sun/nio/cs/ArrayDecoder.java.i
data/src/share/native/sun/security/ec/ecl-priv.h.i
data/test/java/util/Objects/BasicObjectsTest.java.i
data/src/solaris/doc/sun/man/man1/ja/tnameserv.1.i
data/src/share/native/sun/font/layout/GlyphDefinitionTables.h.i
data/src/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java.i
data/src/windows/native/sun/windows/awt.rc.i
-data/src/share/classes/java/awt/Container.java.i
-data/test/java/nio/file/Files/walkFileTree/WalkWithSecurity.java.i
+data/src/share/classes/java/nio/Direct-X-Buffer.java.i
data/make/sun/font/t2k/Makefile.i
data/src/share/classes/sun/util/resources/CurrencyNames_fi_FI.properties.i
-data/src/share/classes/sun/nio/ch/NativeDispatcher.java.i
data/src/share/classes/javax/swing/JTextField.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif.i
+data/make/com/sun/tracing/Makefile.i
+data/test/javax/crypto/spec/DESKeySpec/CheckWeakKeys.java.i
data/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java.i
data/src/solaris/classes/sun/awt/X11/XRobotPeer.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/Cons.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java.i
-data/test/org/openjdk/jigsaw/cli/keystore.pw.i
-data/src/share/classes/java/security/PermissionCollection.java.i
+data/src/share/classes/javax/swing/plaf/SplitPaneUI.java.i
+data/test/java/util/Formatter/Basic.sh.i
+data/test/sun/security/pkcs11/ec/TestECDSA.java.i
data/src/share/classes/java/awt/peer/DesktopPeer.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U8Func.c.i
-data/test/java/net/URLConnection/RequestProperties.java.i
-data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java.i
-data/test/sun/tools/native2ascii/N2A_4636448.expected.i
-data/test/javax/swing/JInternalFrame/6726866/bug6726866.html.i
+data/src/share/native/java/lang/Shutdown.c.i
+data/make/netbeans/awt2d/nbproject/project.xml.i
+data/src/solaris/demo/jni/Poller/PollingServer.java.i
+data/src/share/classes/java/io/LineNumberInputStream.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S32Func.c.i
data/test/java/lang/Math/TanTests.java.i
-data/src/share/classes/sun/tools/javac/resources/javac.properties.i
+data/src/share/classes/sun/text/resources/FormatData_en_IE.java.i
+data/src/share/classes/java/io/NotSerializableException.java.i
data/src/share/classes/java/lang/AbstractMethodError.java.i
data/test/java/util/concurrent/CountDownLatch/Basic.java.i
-data/src/share/demo/jvmti/index.html.i
+data/src/share/classes/com/sun/management/VMOption.java.i
data/src/share/classes/sun/text/resources/FormatData_it_IT.java.i
data/test/java/util/ResourceBundle/KeySetMessages_zh_CN.java.i
-data/src/share/classes/sun/awt/resources/awt_zh_TW.properties.i
-data/src/share/sample/nio/file/WatchDir.java.i
-data/test/sun/tools/jps/jps-l_2.sh.i
+data/src/share/classes/sun/awt/datatransfer/DataTransferer.java.i
+data/src/share/classes/sun/java2d/opengl/OGLMaskBlit.java.i
+data/make/tools/src/build/tools/jdwpgen/GroupNode.java.i
data/test/javax/print/TestRaceCond.java.i
data/src/share/classes/java/sql/Struct.java.i
data/make/tools/commentchecker/Makefile.i
data/test/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.java.i
-data/test/java/security/cert/pkix/policyChanges/TestPolicy.java.i
-data/src/share/classes/sun/security/pkcs/PKCS9Attributes.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java.i
data/src/share/classes/sun/awt/DefaultMouseInfoPeer.java.i
data/src/windows/native/sun/tools/attach/WindowsAttachProvider.c.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif.i
-data/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpEngine.java.i
+data/test/java/rmi/activation/Activatable/restartService/RestartService_Stub.java.i
data/test/sun/security/ssl/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java.i
-data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html.i
-data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java.i
+data/src/share/classes/sun/tools/jconsole/LabeledComponent.java.i
+data/src/share/classes/sun/security/x509/OIDName.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java.i
-data/src/share/classes/java/lang/module/ModuleInfoReader.java.i
+data/make/modules/tools/Makefile.i
data/src/share/classes/sun/security/pkcs/SignerInfo.java.i
data/test/sun/security/tools/jarsigner/nameclash.sh.i
data/test/sun/net/www/protocol/http/spnegoLog.properties.i
-data/test/java/io/Serializable/unnamedPackageSwitch/Test.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/AgentServerImpl.java.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/InterprocessMessages.java.i
data/test/java/net/Socket/setReuseAddress/Basic.java.i
-data/src/share/classes/sun/management/resources/agent_de.properties.i
-data/test/java/net/Socket/asyncClose/AsyncCloseTest.java.i
+data/test/java/util/ArrayList/IteratorMicroBenchmark.java.i
data/test/java/io/Serializable/proxy/Basic.java.i
data/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java.i
data/src/share/classes/sun/nio/ch/AbstractFuture.java.i
@@ -15617,38 +15564,35 @@ data/src/windows/classes/sun/awt/windows/WTextComponentPeer.java.i
data/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java.i
data/src/share/classes/javax/management/relation/RoleList.java.i
data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevel.java.i
-data/make/sun/font/reorder-sparcv9.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java.i
data/src/share/classes/sun/net/idn/uidna.spp.i
data/test/java/beans/Introspector/Test6707234.java.i
-data/make/javax/Makefile.i
+data/src/share/classes/com/sun/servicetag/resources/javase_servicetag.properties.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain9.txt.i
-data/test/org/openjdk/jigsaw/library.sh.i
data/src/share/classes/java/io/DataInput.java.i
-data/test/javax/management/modelmbean/LoggingExceptionTest.java.i
+data/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java.i
data/src/share/classes/sun/security/util/AuthResources_pt_BR.java.i
data/src/windows/native/java/io/FileOutputStream_md.c.i
-data/test/javax/swing/JComponent/6989617/bug6989617.java.i
-data/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java.i
-data/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java.i
-data/src/share/classes/javax/swing/text/html/parser/DocumentParser.java.i
-data/src/share/classes/java/nio/file/SimpleFileVisitor.java.i
+data/src/share/native/sun/awt/image/jpeg/jdapistd.c.i
+data/test/java/awt/FontClass/FontAccess.java.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c.i
data/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java.i
data/src/share/classes/sun/text/resources/FormatData_zh_HK.java.i
-data/make/tools/src/build/tools/javazic/RuleRec.java.i
-data/test/sun/security/pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12.i
+data/src/share/transport/shmem/shmemBack.c.i
+data/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java.i
data/test/java/rmi/server/RMIClassLoader/getClassLoader/Foo.java.i
data/src/share/classes/sun/text/resources/CollationData_sq.java.i
-data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties.i
+data/src/share/classes/javax/swing/table/TableModel.java.i
data/test/java/util/Locale/LocaleCategory.sh.i
data/test/java/awt/EventDispatchThread/PreserveDispathThread/PreserveDispatchThread.java.i
data/src/share/classes/com/sun/servicetag/BrowserSupport.java.i
data/make/mksample/webservices/EbayServer/Makefile.i
-data/src/windows/native/sun/windows/awt_Brush.h.i
-data/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet_Stub.java.i
+data/make/common/Defs-modules.gmk.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java.i
+data/test/java/util/concurrent/locks/Lock/FlakyMutex.java.i
data/test/sun/misc/JarIndex/metaInfFilenames/Basic.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/README.i
+data/make/tools/src/build/tools/jdwpgen/CommentNode.java.i
data/test/javax/swing/SwingUtilities/7088744/bug7088744.java.i
data/src/share/classes/javax/swing/JProgressBar.java.i
data/test/java/awt/PrintJob/QuoteAndBackslashTest/QuoteAndBackslashTest.java.i
@@ -15657,34 +15601,34 @@ data/src/share/classes/java/dyn/SpreadGeneric.java.i
data/test/sun/rmi/log/ReliableLog/SnapshotSize.java.i
data/src/share/demo/jfc/Metalworks/AquaMetalTheme.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMeta.java.i
-data/src/windows/native/java/net/net_util_md.h.i
+data/src/share/instrument/PathCharsValidator.c.i
data/src/share/classes/com/sun/servicetag/resources/jdk_header.png.i
data/test/java/text/Bidi/Bug7002398.java.i
-data/src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpMsg.java.i
data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider.i
data/test/javax/management/mxbean/PropertyNamesTest.java.i
data/src/share/classes/java/nio/file/Paths.java.i
-data/test/java/util/Locale/serialized/java6locale_ROOT.i
+data/test/java/net/URL/Protocol.java.i
data/src/share/classes/com/sun/tools/jdi/BaseLineInfo.java.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java.i
data/src/share/back/bag.c.i
data/test/java/io/Serializable/class/SerialA_3.java.i
data/src/share/classes/com/sun/tools/hat/Main.java.i
data/test/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java.i
-data/src/windows/native/sun/windows/awt_Brush.cpp.i
+data/src/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif.i
data/test/java/util/ResourceBundle/Control/AbstractRB.java.i
data/src/share/classes/com/sun/pept/ept/Acceptor.java.i
data/src/share/demo/jvmti/mtrace/mtrace.h.i
data/src/share/native/sun/awt/medialib/awt_ImagingLib.c.i
data/test/java/security/Policy/Dynamic/TestDynamicPolicy.java.i
data/src/linux/doc/man/ja/kinit.1.i
-data/src/share/classes/sun/nio/cs/ext/MS949.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/ShortArrayCalls.java.i
data/src/share/classes/java/applet/AppletStub.java.i
data/test/sun/security/pkcs11/tls/keymatdata.txt.i
data/test/java/rmi/reliability/benchmark/bench/rmi/manifest.i
data/test/java/util/Formatter/BasicChar.java.i
data/test/sun/tools/native2ascii/A2N_4630463.expected.i
-data/src/share/classes/sun/rmi/rmic/Names.java.i
+data/src/share/classes/sun/io/ByteToCharCp875.java.i
data/src/share/classes/javax/swing/RowFilter.java.i
data/src/share/classes/sun/awt/ConstrainableGraphics.java.i
data/make/tools/swing-beans/beaninfo/images/JTabbedPaneMono32.gif.i
@@ -15693,48 +15637,46 @@ data/test/sample/chatserver/ChatTest.java.i
data/test/java/io/FileOutputStream/OpsAfterClose.java.i
data/src/share/classes/sun/tools/jps/Jps.java.i
data/src/share/classes/javax/management/RuntimeErrorException.java.i
-data/test/java/util/ResourceBundle/Bug6299235Test.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConvEdge.h.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java.i
data/src/share/demo/nbproject/jfc/Notepad/nbproject/project.xml.i
data/src/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java.i
data/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java.i
-data/test/java/nio/file/Path/FileAttributes.java.i
+data/src/share/classes/sun/net/ftp/FtpDirEntry.java.i
data/test/sun/security/pkcs11/KeyStore/Basic.sh.i
data/src/share/sample/scripting/scriptpad/src/resources/scriptpad.js.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java.i
data/src/share/classes/sun/net/www/MeteredStream.java.i
-data/test/javax/xml/crypto/dsig/data/signature-external-b64-dsa.xml.i
+data/test/java/beans/XMLEncoder/java_awt_ScrollPane.java.i
data/test/sun/management/jmxremote/bootstrap/management_test03_ko.properties.in.i
-data/src/windows/native/sun/windows/ComCtl32Util.cpp.i
+data/src/share/native/java/lang/fdlibm/src/w_atanh.c.i
+data/test/sun/tools/jps/jps-l_2.sh.i
data/test/java/util/EnumSet/InsertWrongType.java.i
data/test/java/net/DatagramSocket/BindFailTest.java.i
data/test/java/rmi/activation/Activatable/restartService/rmid.security.policy.i
-data/src/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java.i
+data/make/com/sun/security/auth/Makefile.i
data/src/share/classes/sun/misc/Ref.java.i
data/src/share/native/sun/font/freetypeScaler.c.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java.i
-data/test/java/awt/dnd/Button2DragTest/Button2DragTest.java.i
+data/test/sun/tools/jps/jps-help.sh.i
+data/src/share/classes/sun/security/ssl/DHClientKeyExchange.java.i
data/src/share/native/sun/awt/image/cvutils/img_fsgray.h.i
data/src/share/classes/sun/security/ec/SunECEntries.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipInfo.java.i
data/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryFactory.java.i
-data/src/share/classes/sun/management/resources/agent_es.properties.i
+data/src/windows/native/sun/java2d/d3d/D3DContext.h.i
data/src/share/classes/sun/security/x509/CertAttrSet.java.i
data/src/windows/native/sun/windows/awt_Frame.cpp.i
-data/src/share/classes/sun/rmi/server/ActivatableServerRef.java.i
+data/src/solaris/doc/sun/man/man1/keytool.1.i
+data/src/share/classes/sun/management/resources/agent_de.properties.i
data/src/share/classes/sun/security/util/Resources_zh_TW.java.i
data/src/share/classes/java/nio/file/ClosedWatchServiceException.java.i
-data/src/share/classes/sun/util/resources/CalendarData_et.properties.i
data/test/com/sun/jdi/RedefineAnnotation.sh.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java.i
data/test/java/io/Serializable/GetField/Read.java.i
data/src/share/classes/sun/rmi/transport/StreamRemoteCall.java.i
-data/src/share/classes/javax/security/auth/callback/NameCallback.java.i
+data/src/share/native/java/lang/fdlibm/src/w_log10.c.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java.i
data/make/sun/security/pkcs11/FILES_c.gmk.i
data/src/share/classes/sun/awt/im/InputMethodManager.java.i
@@ -15743,24 +15685,26 @@ data/src/share/classes/sun/nio/cs/ext/ISO2022.java.i
data/test/demo/jvmti/minst/MinstExample.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelTableMetaImpl.java.i
data/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.h.i
-data/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java.i
+data/make/tools/CharsetMapping/IBM875.map.i
+data/src/share/sample/vm/clr-jvm/Makefile.i
+data/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java.i
data/src/share/classes/sun/dyn/InvokeGeneric.java.i
data/src/share/native/sun/font/layout/SegmentSingleProcessor.h.i
-data/make/tools/reorder/tests/LoadToolkit.java.i
-data/src/share/demo/jfc/Notepad/README.txt.i
-data/src/share/classes/java/awt/dnd/peer/DropTargetPeer.java.i
+data/src/share/sample/vm/clr-jvm/invoker.cs.i
+data/src/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java.i
data/test/java/util/ResourceBundle/Test4314141A.properties.i
+data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/project.xml.i
data/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java.i
data/src/share/native/sun/java2d/loops/Any4Byte.h.i
data/src/share/classes/sun/net/www/protocol/ftp/Handler.java.i
data/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test.java.i
data/src/share/classes/sun/tools/javac/ErrorConsumer.java.i
-data/src/share/classes/javax/accessibility/AccessibleTable.java.i
-data/src/share/classes/java/rmi/UnexpectedException.java.i
-data/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties.i
+data/src/share/native/sun/management/Flag.c.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java.i
+data/make/tools/GenerateCharacter/CharacterData02.java.template.i
data/src/share/native/java/util/zip/zlib-1.2.3/deflate.h.i
data/src/share/classes/sun/nio/cs/standard-charsets.i
-data/test/java/util/ArrayList/Bug6533203.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_CU.properties.i
data/test/java/io/Serializable/classDescHooks/ClassDescHooks.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java.i
data/make/tools/CharsetMapping/IBM870.nr.i
@@ -15768,324 +15712,339 @@ data/src/share/classes/java/lang/module/ModuleInfo.java.i
data/test/java/util/concurrent/Executors/Throws.java.i
data/src/share/native/sun/awt/image/cvutils/img_output16.h.i
data/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java.i
-data/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java.i
-data/make/mkdemo/jvmti/gctest/Makefile.i
+data/src/share/classes/java/lang/Shutdown.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java.i
data/test/javax/management/context/localizable/MBeanDescriptions.properties.i
data/src/share/native/sun/awt/splashscreen/splashscreen_png.c.i
-data/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html.i
-data/src/share/classes/java/util/EventObject.java.i
+data/test/sun/management/jmxremote/bootstrap/management_test01_ok.properties.in.i
+data/test/java/nio/channels/AsynchronousFileChannel/Lock.java.i
data/src/share/classes/sun/nio/cs/ext/DoubleByte.java.i
data/src/windows/classes/sun/awt/windows/awtLocalization_it.properties.i
data/make/java/security/Makefile.i
data/src/share/classes/sun/io/ByteToCharCp869.java.i
data/test/java/net/URL/OpenConnection.java.i
-data/src/share/demo/jvmti/hprof/hprof_string.c.i
+data/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java.i
data/test/com/sun/tools/attach/AgentSetup.sh.i
data/src/share/native/sun/security/ec/logtab.h.i
-data/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java.i
data/test/sun/nio/cs/OLD/IBM950_OLD.java.d
data/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java.i
-data/src/share/sample/vm/jvm-clr/Makefile.i
+data/test/sun/util/resources/Locale/Bug6275682.java.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java.i
+data/make/com/sun/sql/Makefile.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy23.i
-data/test/sun/nio/cs/OLD/IBM950_OLD.java.i
+data/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java.i
data/src/solaris/native/sun/awt/awt_TextArea.c.i
-data/src/share/classes/java/net/CookieHandler.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java.i
+data/make/tools/CharsetMapping/dbcs.i
data/test/java/nio/charset/Charset/CharsetContainmentTest.java.i
data/test/java/net/PortUnreachableException/Test.java.i
data/test/org/openjdk/jigsaw/eg/com/foo/bar/module-info.java.i
data/src/solaris/native/sun/java2d/loops/vis_IntArgbPre.c.i
-data/make/tools/src/build/tools/spp/Spp.java.i
+data/src/share/classes/java/lang/management/PlatformComponent.java.i
data/src/share/classes/java/util/logging/SocketHandler.java.i
-data/src/share/demo/jvmti/hprof/hprof_stack.h.i
+data/test/sun/net/idn/nfsmxp.spp.i
data/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java.i
-data/test/com/sun/jdi/CompatibleConnectors.java.i
+data/src/share/classes/sun/misc/Timer.java.i
data/src/share/classes/com/sun/jndi/ldap/EventQueue.java.i
data/src/share/classes/sun/security/krb5/KrbPriv.java.i
data/test/java/lang/management/RuntimeMXBean/InputArgument.java.i
+data/src/windows/npt/npt_md.h.i
data/src/share/classes/sun/security/util/PolicyUtil.java.i
data/make/com/sun/nio/sctp/Exportedfiles.gmk.i
data/src/share/classes/sun/security/x509/KeyIdentifier.java.i
-data/src/share/demo/jvmti/agent_util/agent_util.c.i
+data/src/share/classes/javax/swing/text/AbstractDocument.java.i
data/test/sun/java2d/cmm/ColorConvertOp/LRGB.png.i
data/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java.i
data/src/share/classes/java/beans/beancontext/BeanContextEvent.java.i
-data/src/share/classes/sun/launcher/resources/launcher_fr.properties.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS.i
-data/src/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java.i
+data/src/share/classes/sun/security/krb5/KdcComm.java.i
+data/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties.i
+data/src/windows/native/java/net/Inet6AddressImpl.c.i
data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java.i
data/src/share/classes/sun/awt/FontConfiguration.java.i
-data/test/sun/security/pkcs11/fips/TrustManagerTest.java.i
+data/test/com/sun/net/httpserver/bugs/B6393710.java.i
data/src/share/classes/javax/crypto/SecretKey.java.i
data/test/java/util/Arrays/Big.java.i
data/test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java.i
-data/test/java/math/BigInteger/ModPow.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_BO.properties.i
data/src/share/classes/com/sun/jmx/namespace/serial/RewritingProcessor.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java.i
-data/test/javax/naming/InitialContext/EnvClone.java.i
+data/src/windows/native/sun/java2d/d3d/D3DShaderGen.c.i
+data/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java.i
data/test/sun/nio/cs/OLD/MS936_OLD.java.i
data/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java.i
data/src/share/back/debugLoop.h.i
data/src/share/classes/java/beans/VetoableChangeListenerProxy.java.i
-data/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider.i
+data/src/share/classes/java/net/SocketImplFactory.java.i
data/src/share/classes/sun/security/krb5/internal/ETypeInfo2.java.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java.i
data/make/mkdemo/applets/WireFrame/Makefile.i
-data/test/sun/net/www/ftptest/FtpFileSystemHandler.java.i
-data/src/share/classes/sun/net/ftp/FtpProtocolException.java.i
+data/test/java/io/Serializable/unshared/Read.java.i
+data/src/share/classes/java/lang/IndexOutOfBoundsException.java.i
data/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.h.i
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/key3.db.i
data/src/share/classes/sun/awt/geom/AreaOp.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h.i
data/test/java/rmi/reliability/benchmark/bench/serial/ObjArrays.java.i
data/test/java/util/ResourceBundle/ResourceBundleTest.java.i
-data/test/java/lang/instrument/NativeMethodPrefixAgent.java.i
+data/src/share/lib/security/java.security.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ja.properties.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java.i
data/src/share/classes/sun/awt/resources/awt_fr.properties.i
-data/test/javax/xml/crypto/dsig/data/signature.xml.i
-data/test/sun/tools/jstatd/usage.out.i
+data/test/java/io/Serializable/evolution/RenamePackage/test/SerialDriver.java.i
+data/test/sun/security/jgss/spnego/NegTokenTargFields.java.i
data/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java.i
+data/src/share/classes/java/dyn/LinkagePermission.java.i
data/test/sun/net/InetAddress/nameservice/chaining/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
-data/test/java/nio/channels/FileChannel/ReadFull.java.i
+data/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java.i
data/src/share/lib/images/cursors/motif_LinkDrop32x32.gif.i
-data/src/share/classes/sun/nio/cs/ISO_8859_4.java.i
+data/src/share/classes/com/sun/tools/jdi/CharValueImpl.java.i
data/src/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java.i
data/test/sun/security/pkcs11/tls/prfdata.txt.i
-data/test/java/lang/ThreadLocal/Basic.java.i
-data/src/share/classes/javax/print/attribute/TextSyntax.java.i
+data/test/java/util/zip/pkware123456789012345.zip.i
+data/src/share/classes/java/util/concurrent/ThreadFactory.java.i
data/src/share/classes/java/util/jar/JarEntry.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.access.in.i
+data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java.i
+data/src/windows/classes/sun/awt/windows/WGlobalCursorManager.java.i
data/make/tools/GenerateCharacter/CharacterDataPrivateUse.java.template.i
+data/test/org/openjdk/jigsaw/cli/SignedModuleFileTest.sh.i
data/test/java/net/Socket/SocketImplTest.java.i
-data/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java.i
+data/src/share/classes/sun/print/PrintJobAttributeException.java.i
data/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java.i
-data/test/java/util/ResourceBundle/Control/BadStaticInitRB.java.i
-data/src/share/classes/java/security/UnrecoverableEntryException.java.i
+data/test/javax/swing/JLayer/6824395/bug6824395.java.i
+data/src/share/classes/java/awt/Adjustable.java.i
+data/src/share/classes/java/security/UnrecoverableEntryException.java.i
data/test/java/rmi/reliability/juicer/OrangeImpl.java.i
data/test/java/io/Serializable/6966692/Victim.java.i
-data/src/share/classes/sun/tools/jstat/Identifier.java.i
data/test/java/io/Serializable/enum/array/Test.java.i
-data/src/share/classes/sun/tools/tree/BinaryAssignExpression.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO2022_CN.java.i
data/test/java/net/DatagramPacket/Constructor.java.i
data/src/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java.i
data/src/windows/native/sun/java2d/d3d/D3DResourceManager.cpp.i
data/test/com/sun/jdi/Redefine-g.sh.i
-data/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java.i
+data/src/share/classes/javax/print/attribute/PrintJobAttribute.java.i
data/src/share/classes/sun/reflect/generics/repository/ConstructorRepository.java.i
data/test/java/lang/StrictMath/Log10Tests.java.i
-data/make/mkdemo/jvmti/waiters/Makefile.i
-data/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java.i
-data/test/javax/print/StreamPrintingOrientation.java.i
-data/make/mkdemo/applets/TicTacToe/Makefile.i
+data/test/java/nio/file/Files/MaxDepth.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames.properties.i
+data/src/share/sample/nio/server/Dispatcher1.java.i
data/test/java/net/Socket/OldSocketImpl.java.i
-data/test/java/net/DatagramSocketImpl/CheckDiscard.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java.i
data/src/share/classes/sun/java2d/pipe/LCDTextRenderer.java.i
data/test/java/security/cert/CertPathBuilder/targetConstraints/sun.cer.i
-data/test/java/util/zip/TestEmptyZip.java.i
-data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup_Stub.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_pt_PT.properties.i
+data/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java.i
data/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java.i
data/src/share/classes/sun/dyn/util/ValueConversions.java.i
data/src/share/classes/sun/io/CharToByteUnicode.java.i
data/test/java/beans/XMLEncoder/6380849/BeanPersistenceDelegate.java.i
data/src/share/classes/com/sun/jndi/ldap/ServiceLocator.java.i
-data/test/javax/swing/JColorChooser/Test4193384.java.i
+data/src/share/classes/sun/awt/image/BytePackedRaster.java.i
data/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java.i
+data/test/sun/nio/cs/EUCJPUnderflowDecodeTest.java.i
data/src/share/native/sun/font/layout/SingleTableProcessor.h.i
data/src/share/classes/java/lang/annotation/Annotation.java.i
-data/test/java/net/URLConnection/GetResponseCode.java.i
data/test/java/nio/channels/Channels/Basic.java.i
-data/test/com/sun/jdi/GenericsTest.java.i
+data/src/share/classes/com/sun/jdi/AbsentInformationException.java.i
data/src/share/classes/sun/tools/tree/BitAndExpression.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java.i
+data/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java.i
data/test/java/net/URL/GetDefaultPort.java.i
+data/src/share/demo/applets/GraphicsTest/AppletFrame.java.i
+data/test/java/lang/Throwable/SuppressedExceptions.java.i
data/src/share/classes/com/sun/beans/decoder/DoubleElementHandler.java.i
-data/test/java/io/InputStream/Skip.java.i
+data/src/share/native/sun/java2d/loops/Index8Gray.c.i
data/src/share/classes/java/awt/FlowLayout.java.i
data/test/javax/script/StringWriterPrintTest.java.i
data/src/share/classes/java/awt/geom/Dimension2D.java.i
data/src/windows/classes/sun/awt/windows/WObjectPeer.java.i
data/make/javax/crypto/policy/unlimited/default_US_export.policy.i
data/src/share/classes/sun/awt/RepaintArea.java.i
-data/src/share/classes/sun/security/ssl/CipherSuite.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pk3.cert.i
-data/src/share/classes/sun/text/resources/FormatData_es_PR.java.i
+data/make/javax/crypto/policy/limited/LIMITED.i
data/src/share/classes/com/sun/nio/sctp/SctpChannel.java.i
data/make/tools/swing-beans/beaninfo/images/JSliderColor32.gif.i
-data/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java.i
-data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java.i
+data/src/share/classes/sun/rmi/log/LogOutputStream.java.i
+data/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolParser.java.i
data/src/share/classes/javax/sound/sampled/AudioSystem.java.i
-data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java.i
-data/test/javax/crypto/SecretKeyFactory/FailOverTest.java.i
+data/src/share/classes/javax/naming/RefAddr.java.i
+data/src/share/native/sun/security/ec/mpi.h.i
data/src/share/classes/java/sql/Wrapper.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert.i
-data/test/javax/crypto/Mac/TestGetInstance.java.i
+data/test/sun/security/ssl/sanity/pluggability/MySSLEngineImpl.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-yellow32.png.i
-data/test/javax/swing/JFileChooser/6484091/bug6484091.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_SG.properties.i
+data/src/share/classes/java/net/MulticastSocket.java.i
+data/src/share/classes/java/io/ObjectStreamConstants.java.i
data/test/com/sun/jdi/JdbLockTest.sh.i
-data/src/share/classes/sun/util/resources/CalendarData_en.properties.i
data/src/share/classes/sun/io/ByteToCharCp037.java.i
-data/test/sun/nio/cs/TestX11JIS0201.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java.i
+data/test/java/util/logging/ClassLoaderLeakTest.java.i
+data/test/java/util/PluggableLocale/providersrc/java.text.spi.NumberFormatProvider.i
+data/test/java/net/CookieHandler/B6791927.java.i
data/make/java/java_crw_demo/mapfile-vers.i
-data/src/share/classes/com/sun/script/util/ScriptEngineFactoryBase.java.i
-data/src/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java.i
-data/src/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMSecurityDefs.java.i
+data/src/share/classes/sun/security/provider/certpath/Vertex.java.i
+data/make/tools/CharsetMapping/IBM1141.c2b.i
+data/test/java/io/Serializable/PutField/Write.java.i
data/src/share/modules/jdk.base/module-info.java.i
data/make/sun/jawt/Depend.mak.i
data/src/share/classes/sun/tools/tree/TryStatement.java.i
data/src/share/classes/java/awt/peer/MenuComponentPeer.java.i
-data/test/java/beans/PropertyEditor/TestEnumSubclass.java.i
-data/src/share/classes/sun/io/CharToByteCp942C.java.i
-data/src/share/native/sun/font/fontscalerdefs.h.i
-data/src/share/demo/jvmti/agent_util/agent_util.h.i
+data/test/sun/security/tools/keytool/readjar.sh.i
+data/test/java/awt/List/SetFontTest/SetFontTest.java.i
+data/src/share/classes/java/security/cert/package.html.i
+data/test/java/io/Serializable/primitiveClasses/PrimitiveClasses.java.i
+data/src/share/classes/sun/io/CharToByteCp970.java.i
data/src/share/classes/sun/reflect/UnsafeStaticByteFieldAccessorImpl.java.i
data/test/sun/util/resources/Calendar/Bug4527203.java.i
data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ActivateMe.java.i
data/src/share/classes/sun/nio/ch/Net.java.i
data/test/java/io/Serializable/classDescHooks/Loopback.java.i
data/test/java/beans/PropertyEditor/TestFloatTypeNull.java.i
-data/test/tools/pack200/MemoryAllocatorTest.java.i
-data/test/com/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider.i
+data/src/share/classes/sun/text/resources/FormatData_th_TH.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c.i
data/src/share/sample/jmx/jmx-scandir/logging.properties.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java.i
+data/test/sun/security/krb5/auto/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
+data/test/lib/security/cacerts/VerifyCACerts.java.i
data/make/tools/CharsetMapping/ISO_8859_8.map.i
data/src/share/classes/sun/misc/resources/Messages.java.i
data/test/java/lang/ClassLoader/UninitializedParent.java.i
data/test/sun/security/tools/policytool/OpenPolicy.sh.i
data/src/share/classes/sun/rmi/rmic/RMIConstants.java.i
data/src/solaris/classes/sun/nio/ch/EPollPort.java.i
-data/test/java/util/ResourceBundle/Bug6355009.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_EmptyList.java.i
+data/test/sun/security/krb5/auto/RRC.java.i
+data/test/tools/pack200/Pack200Props.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM964.java.i
data/src/share/classes/javax/print/attribute/UnmodifiableSetException.java.i
+data/src/share/classes/sun/java2d/DefaultDisposerRecord.java.i
data/test/java/util/concurrent/FutureTask/Throw.java.i
data/test/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions.java.i
data/src/share/classes/sun/io/Converters.java.i
-data/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java.i
+data/src/share/classes/sun/awt/SunHints.java.i
data/test/java/awt/dnd/ImageDecoratedDnD/ImageGenerator.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NewSocketMethods.java.i
+data/test/java/security/Provider/ProviderInfoCheck.java.i
data/test/sun/nio/cs/SurrogateTestHKSCS.java.i
data/test/demo/zipfs/Basic.java.i
data/src/share/classes/sun/java2d/NullSurfaceData.java.i
data/src/share/classes/javax/swing/event/SwingPropertyChangeSupport.java.i
data/test/java/text/Format/DateFormat/Bug6609750.java.i
-data/test/javax/management/Introspector/SetWrongTypeAttributeTest.java.i
+data/test/sun/nio/cs/StrCodingBenchmark.java.i
data/src/share/classes/sun/io/CharToByteMacCroatian.java.i
data/test/java/beans/PropertyEditor/TestShortClass.java.i
data/src/solaris/classes/sun/awt/motif/MMenuBarPeer.java.i
data/src/share/classes/sun/security/x509/CertificateVersion.java.i
-data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl_Stub.java.i
-data/src/share/classes/javax/swing/text/rtf/RTFReader.java.i
-data/test/java/rmi/activation/Activatable/checkActivateRef/ActivateMe.java.i
-data/test/javax/swing/JColorChooser/Test4380468.html.i
-data/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java.i
+data/test/javax/management/modelmbean/DescriptorSupportTest.java.i
+data/make/sun/security/ec/Makefile.i
+data/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/NotificationMBeanSupport.java.i
+data/test/java/awt/dnd/URIListBetweenJVMsTest/InterprocessMessages.java.i
data/src/share/back/ArrayTypeImpl.c.i
data/src/share/native/com/sun/media/sound/MidiInDevice.c.i
data/src/solaris/classes/sun/awt/X11/XWindow.java.i
data/src/share/classes/java/awt/MediaTracker.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java.i
-data/test/java/lang/Float/BitwiseConversion.java.i
-data/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java.i
-data/test/sun/security/provider/PolicyFile/nullDomain.java.i
-data/src/share/classes/sun/security/pkcs11/Secmod.java.i
+data/src/share/native/sun/java2d/loops/UshortIndexed.h.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/FloatCalls.java.i
+data/src/share/classes/sun/tools/tree/ConstantExpression.java.i
+data/src/share/native/sun/awt/image/cvutils/img_ordclruns.h.i
+data/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java.i
data/test/javax/management/remote/mandatory/URLTest.java.i
data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java.i
-data/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java.i
-data/src/solaris/doc/sun/man/man1/idlj.1.i
+data/test/java/nio/file/Files/Misc.java.i
+data/src/share/classes/com/sun/imageio/stream/StreamFinalizer.java.i
data/src/share/classes/sun/reflect/LangReflectAccess.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathFuncHereAPI.java.i
data/test/java/security/BasicPermission/SerialVersion.1.4.i
-data/src/share/classes/java/awt/dnd/DragSourceDropEvent.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy14.i
data/make/tools/CharsetMapping/IBM1141.map.i
data/src/share/classes/sun/net/httpserver/FixedLengthOutputStream.java.i
data/src/solaris/native/java/lang/locale_str.h.i
data/test/java/io/Serializable/enum/constantSubclasses/Write.java.i
-data/src/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java.i
-data/src/share/classes/sun/applet/AppletIOException.java.i
+data/test/java/io/Serializable/packageAccess/C.java.i
+data/src/share/classes/com/sun/security/auth/X500Principal.java.i
+data/src/share/classes/javax/sound/sampled/Port.java.i
+data/test/java/util/ArrayList/Bug6533203.java.i
data/src/share/classes/javax/naming/directory/DirContext.java.i
data/src/share/classes/javax/management/remote/JMXConnectionNotification.java.i
data/src/share/classes/sun/misc/InvalidJarIndexException.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java.i
+data/test/com/sun/security/sasl/util/CheckAccess.java.i
+data/src/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java.i
data/src/share/classes/sun/util/resources/CalendarData_el_CY.properties.i
data/test/java/math/BigDecimal/StringConstructor.java.i
data/src/share/classes/java/lang/invoke/BoundMethodHandle.java.i
data/make/sun/javazic/tzdata/etcetera.i
-data/src/share/classes/java/util/prefs/NodeChangeListener.java.i
+data/src/share/classes/sun/net/TransferProtocolClient.java.i
data/test/java/nio/file/WatchService/SensitivityModifier.java.i
data/make/sun/javazic/Makefile.i
-data/src/share/classes/javax/swing/plaf/LabelUI.java.i
+data/src/share/classes/com/sun/script/util/ScriptEngineFactoryBase.java.i
+data/src/share/classes/sun/io/CharToByteCp942C.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIPaint.java.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c.i
-data/test/java/util/EnumMap/EnumMapBash.java.i
+data/src/share/classes/sun/tools/jconsole/resources/masthead-left.png.i
+data/src/share/classes/sun/tools/tree/AssignExpression.java.i
data/test/java/nio/channels/Selector/SelectNowWhenEmpty.java.i
-data/src/share/classes/java/awt/print/PrinterException.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java.i
+data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html.i
+data/src/share/classes/com/sun/beans/decoder/ClassElementHandler.java.i
data/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java.i
-data/src/share/classes/sun/security/ssl/Krb5Proxy.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressInputStream.java.i
+data/src/share/classes/sun/text/normalizer/UCharacterPropertyReader.java.i
+data/src/share/classes/java/util/AbstractCollection.java.i
+data/src/share/classes/java/security/AlgorithmConstraints.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/Mono.java.i
-data/src/share/native/sun/awt/image/cvutils/img_output8.h.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/RenderTests.java.i
-data/src/share/classes/com/sun/tools/jdi/CommandSender.java.i
-data/test/java/net/URI/RelativeEncoding.java.i
+data/src/share/classes/java/lang/InstantiationError.java.i
+data/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java.i
+data/src/windows/native/sun/java2d/d3d/D3DSurfaceData.h.i
+data/src/share/classes/com/sun/media/sound/ModelStandardTransform.java.i
data/test/java/beans/PropertyEditor/TestShortTypeJava.java.i
-data/src/share/classes/com/sun/tools/jdi/LocationImpl.java.i
+data/src/share/native/sun/java2d/opengl/OGLVertexCache.h.i
data/test/java/security/cert/pkix/policyChanges/anchor.cer.i
data/src/share/classes/sun/net/httpserver/HttpServerImpl.java.i
+data/src/share/classes/sun/nio/cs/CESU_8.java.i
data/test/java/awt/font/Rotate/TestTransform.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM942.java.i
-data/src/share/classes/com/sun/media/sound/AudioSynthesizer.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDimension.java.i
+data/src/share/classes/java/net/Socket.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid.properties.i
data/src/share/classes/com/sun/tracing/Provider.java.i
data/test/java/beans/PropertyEditor/TestShortClassJava.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_pt_BR.properties.i
data/test/java/beans/XMLEncoder/Test4968523.java.i
+data/test/java/beans/EventHandler/Test6788531.java.i
data/src/share/classes/javax/swing/text/html/FormView.java.i
-data/test/java/rmi/activation/Activatable/notSerializable/NotSerializable.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/PixelTests.java.i
+data/src/share/classes/sun/jvmstat/monitor/remote/package.html.i
+data/src/share/classes/sun/tools/jconsole/OverviewPanel.java.i
+data/src/share/sample/jmx/jmx-scandir/src/etc/access.properties.i
data/src/share/classes/java/awt/doc-files/List-1.gif.i
data/src/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java.i
data/test/sun/security/smartcardio/README.txt.i
-data/test/java/util/zip/InterruptibleZip.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java.i
data/src/share/classes/java/security/cert/Extension.java.i
-data/test/java/beans/VetoableChangeSupport/TestEquals.java.i
data/test/java/util/LinkedList/AddAll.java.i
data/src/share/demo/management/MemoryMonitor/MemoryMonitor.java.i
-data/src/windows/javavm/export/jni_md.h.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry.properties.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java.i
data/src/windows/native/sun/windows/awt_TextComponent.h.i
data/src/share/classes/sun/audio/AudioData.java.i
-data/src/share/classes/sun/misc/SharedSecrets.java.i
-data/src/share/back/debugLoop.c.i
+data/make/common/Mapfile-vers.gmk.i
+data/test/sun/security/tools/keytool/newhelp.sh.i
data/src/share/classes/javax/management/MBeanRegistrationException.java.i
data/make/tools/CharsetMapping/IBM1383.c2b.i
-data/test/java/io/RandomAccessFile/Close.java.i
-data/test/java/io/Serializable/sanityCheck/SanityCheck.java.i
+data/test/java/beans/VetoableChangeSupport/TestListeners.java.i
+data/src/solaris/native/sun/awt/awt_LoadLibrary.c.i
data/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java.i
-data/src/share/classes/org/openjdk/jigsaw/ClassInfo.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java.i
+data/src/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java.i
+data/test/java/io/Serializable/packageAccess/A.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_SD.java.i
data/test/javax/swing/text/CSSBorder/6796710/bug6796710.java.i
+data/test/sun/rmi/rmic/covariantReturns/G2Impl.java.i
data/src/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java.i
+data/test/javax/management/namespace/RemoveNotificationListenerTest.java.i
data/test/java/security/ProtectionDomain/NullPerms.java.i
-data/src/share/classes/java/security/DomainCombiner.java.i
-data/test/java/io/Serializable/concurrentClassDescLookup/ConcurrentClassDescLookup.java.i
-data/test/javax/swing/border/Test6625450.java.i
-data/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif.i
+data/make/tools/swing-beans/beaninfo/images/JEditorPaneColor16.gif.i
+data/make/tools/src/build/tools/jdwpgen/CommandNode.java.i
+data/src/share/classes/java/net/PasswordAuthentication.java.i
+data/test/java/lang/invoke/indify/Indify.java.i
data/src/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Encoder.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java.i
data/test/java/math/BigDecimal/ToPlainStringTests.java.i
data/test/java/net/URLConnection/SetIfModifiedSince.java.i
data/src/share/classes/sun/awt/geom/Order1.java.i
@@ -16093,99 +16052,106 @@ data/src/share/classes/sun/tools/java/BinaryExceptionHandler.java.i
data/src/solaris/native/sun/awt/awt_motif12.c.i
data/src/share/sample/jmx/jmx-scandir/keystore.i
data/test/javax/script/PluggableContextTest.java.i
-data/make/tools/swing-beans/beaninfo/images/JEditorPaneColor32.gif.i
-data/src/share/classes/javax/imageio/spi/ImageReaderSpi.java.i
-data/test/java/security/cert/PolicyNode/GetPolicyQualifiers.java.i
+data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java.i
+data/src/share/classes/javax/swing/border/CompoundBorder.java.i
+data/test/sun/security/pkcs11/Cipher/TestRSACipher.java.i
data/test/javax/swing/JSlider/6524424/bug6524424.java.i
+data/make/tools/swing-beans/beaninfo/images/JMenuBarMono32.gif.i
data/src/share/classes/sun/io/ByteToCharMS932DB.java.i
+data/test/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_kyoto.properties.i
data/test/javax/swing/JEditorPane/bug4714674.java.i
data/src/share/classes/java/awt/event/InputMethodListener.java.i
data/src/share/classes/java/lang/invoke/WrongMethodTypeException.java.i
data/test/javax/management/remote/mandatory/notif/NotificationSenderMBean.java.i
-data/src/share/native/sun/awt/image/jpeg/jversion.h.i
+data/make/tools/CharsetMapping/IBM284.map.i
+data/test/java/beans/PropertyEditor/TestByteTypeJava.java.i
data/test/sun/net/InetAddress/nameservice/simple/SimpleNameService.java.i
-data/src/share/classes/sun/management/MemoryUsageCompositeData.java.i
-data/test/java/util/PluggableLocale/ClasspathTest.sh.i
-data/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL.c.i
+data/src/share/classes/sun/java2d/pipe/SolidTextRenderer.java.i
+data/src/share/classes/java/awt/event/ItemEvent.java.i
+data/test/java/net/InetAddress/B5087907.java.i
data/test/sun/net/www/EmbeddedEquals.java.i
-data/src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java.i
+data/src/share/classes/javax/smartcardio/CardChannel.java.i
data/test/javax/management/remote/mandatory/version/policy.i
-data/src/share/classes/javax/swing/text/TextLayoutStrategy.java.i
-data/src/solaris/native/sun/nio/ch/SocketChannelImpl.c.i
-data/test/java/lang/StrictMath/HypotTests.java.i
-data/test/java/nio/channels/etc/NetworkChannelTests.java.i
+data/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java.i
+data/src/share/classes/sun/text/resources/CollationData_hr.java.i
+data/src/share/classes/com/sun/media/sound/SoftMixingMixer.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java.i
data/src/share/classes/javax/swing/event/TableColumnModelListener.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/Echo.java.i
+data/src/share/demo/jfc/TableExample/TableExample.java.i
data/test/javax/security/auth/SubjectDomainCombiner/Optimize.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthStyle.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c.i
-data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java.i
+data/src/share/classes/javax/swing/KeyStroke.java.i
+data/test/com/sun/tools/attach/java.policy.deny.i
+data/src/share/classes/javax/security/auth/callback/PasswordCallback.java.i
data/src/share/native/sun/font/layout/LigatureSubstSubtables.h.i
data/test/java/util/PluggableLocale/LocaleNameProviderTest.sh.i
data/test/sun/security/provider/PolicyFile/CombinedPerms.java.i
data/src/linux/doc/man/ja/orbd.1.i
-data/src/share/classes/sun/nio/ch/ThreadPool.java.i
-data/test/tools/launcher/DefaultLocaleTest.sh.i
-data/src/share/native/java/lang/fdlibm/src/s_expm1.c.i
+data/src/share/classes/sun/nio/ch/Interruptible.java.i
+data/make/tools/CharsetMapping/IBM1026.map.i
+data/test/java/rmi/Naming/RmiIsNoScheme.java.i
+data/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java.i
data/src/share/classes/javax/management/QueryNotificationFilter.java.i
-data/test/javax/print/applet/applet4/Applet4.java.i
-data/test/sun/security/ssl/templates/SSLEngineTemplate.java.i
+data/src/share/bin/java.h.i
+data/src/share/classes/javax/management/MBeanPermission.java.i
data/test/java/nio/channels/Selector/CheckLocking.java.i
data/src/share/classes/javax/swing/plaf/TabbedPaneUI.java.i
data/src/share/classes/com/sun/media/sound/ModelWavetable.java.i
data/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java.i
-data/test/java/text/Format/DateFormat/WeekDateTest.java.i
data/test/java/awt/List/ActionAfterRemove/ActionAfterRemove.java.i
data/src/windows/native/sun/jkernel/kernel_ko.rc.i
-data/src/solaris/classes/java/lang/ProcessEnvironment.java.i
+data/src/share/test/pack200/pack.conf.i
data/test/java/dyn/MethodTypeTest.java.i
data/test/javax/management/Introspector/InvokeGettersTest.java.i
+data/src/share/classes/sun/security/validator/KeyStores.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java.i
data/src/share/classes/com/sun/crypto/provider/BlowfishParameters.java.i
data/test/javax/management/namespace/EventWithNamespaceControlTest.java.i
data/src/solaris/classes/sun/font/FontConfigManager.java.i
-data/src/share/classes/java/rmi/server/RMIServerSocketFactory.java.i
+data/make/common/BuildToolJar.gmk.i
data/src/share/classes/sun/applet/AppletListener.java.i
data/src/share/classes/javax/sql/RowSet.java.i
-data/src/solaris/native/sun/java2d/loops/vis_GlyphList.c.i
-data/src/share/classes/javax/swing/plaf/synth/ImagePainter.java.i
+data/test/org/openjdk/jigsaw/MockLibrary.java.i
+data/test/java/lang/reflect/Constructor/GenericStringTest.java.i
+data/src/solaris/native/sun/java2d/loops/vis_GlyphList.c.i
+data/src/share/classes/javax/security/sasl/AuthenticationException.java.i
data/test/com/sun/security/auth/login/ConfigFile/EmptyOption.java.i
data/src/share/classes/sun/tools/jconsole/OutputViewer.java.i
data/src/share/classes/sun/net/www/content/image/x_xpixmap.java.i
data/src/share/classes/javax/sound/midi/InvalidMidiDataException.java.i
-data/test/java/security/Permission/ToString.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java.i
data/test/sun/security/pkcs11/nss/db/key3.db.i
-data/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java.i
+data/test/javax/management/openmbean/CompositeDataStringTest.java.i
data/src/share/sample/nio/server/FileContent.java.i
-data/src/share/classes/javax/swing/event/TreeExpansionEvent.java.i
+data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java.i
data/src/solaris/native/sun/awt/medialib/vis_asi.h.i
+data/src/share/classes/sun/misc/Cache.java.i
data/src/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java.i
data/test/javax/crypto/spec/GCMParameterSpec/GCMParameterSpecTest.java.i
-data/src/share/sample/scripting/scriptpad/src/scripts/memory.js.i
+data/src/share/classes/sun/io/CharToByteCp857.java.i
data/test/sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java.i
data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy.i
-data/src/solaris/doc/sun/man/man1/javac.1.i
+data/src/share/classes/java/awt/datatransfer/FlavorEvent.java.i
data/test/java/io/PrintStream/NullConstructor.java.i
data/test/sun/net/www/protocol/http/GetOutputStream.java.i
-data/test/com/sun/jdi/sde/testString.i
+data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java.i
data/test/java/beans/VetoableChangeSupport/Test4076065.java.i
data/src/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java.i
-data/test/java/nio/charset/Charset/default.sh.i
+data/test/java/beans/XMLDecoder/spec/TestShort.java.i
data/src/share/classes/java/awt/image/ByteLookupTable.java.i
-data/src/share/classes/javax/management/openmbean/TabularDataSupport.java.i
+data/test/com/sun/jdi/sde/TemperatureTable.jsp.i
data/src/share/classes/sun/reflect/UnsafeQualifiedShortFieldAccessorImpl.java.i
data/src/share/classes/sun/invoke/anon/ConstantPoolVisitor.java.i
data/src/share/classes/sun/net/ApplicationProxy.java.i
+data/src/share/classes/sun/io/ByteToCharCp860.java.i
data/src/share/native/sun/font/layout/StateTables.h.i
data/src/share/classes/sun/tools/tree/ArrayExpression.java.i
data/src/solaris/classes/sun/awt/X11/OwnershipListener.java.i
data/src/share/native/sun/java2d/loops/Ushort4444Argb.h.i
-data/src/share/sample/scripting/scriptpad/src/scripts/linewrap.js.i
data/src/share/classes/com/sun/jmx/snmp/SnmpPduRequest.java.i
data/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java.i
+data/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test1.java.i
data/src/solaris/classes/sun/nio/ch/SctpNet.java.i
data/test/sun/security/mscapi/IsSunMSCAPIAvailable.java.i
data/test/javax/management/mxbean/TigerMXBean.java.i
@@ -16193,63 +16159,64 @@ data/test/java/beans/XMLEncoder/BeanValidator.java.i
data/make/sun/net/spi/Makefile.i
data/src/share/classes/sun/print/resources/serviceui_pt_BR.properties.i
data/src/share/classes/java/util/NavigableMap.java.i
-data/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java.i
+data/src/share/classes/sun/security/util/PathList.java.i
data/src/share/classes/javax/swing/AbstractAction.java.i
data/src/share/classes/com/sun/jdi/FloatType.java.i
data/test/java/util/concurrent/Executors/AutoShutdown.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java.i
-data/src/share/native/sun/font/layout/GDEFMarkFilter.h.i
+data/make/sun/security/smartcardio/Makefile.i
data/test/java/security/KeyRep/DSA.1.5.key.i
data/src/share/classes/sun/awt/WindowClosingListener.java.i
data/test/java/nio/file/Files/denyAll.policy.i
data/test/javax/management/monitor/ThreadPoolAccTest.java.i
data/src/share/classes/com/sun/tools/jdi/ByteTypeImpl.java.i
data/src/share/classes/sun/nio/cs/ext/MacSymbol.java.i
-data/src/share/classes/javax/naming/CannotProceedException.java.i
+data/src/linux/doc/man/ja/javaws.1.i
data/src/share/classes/sun/text/resources/ubidi.icu.i
-data/test/java/util/ResourceBundle/Test4300693.java.i
+data/make/tools/src/build/tools/generatecharacter/CharacterScript.java.i
data/test/java/awt/Frame/ShownOnPack/ShownOnPack.html.i
data/src/share/classes/sun/io/CharToByteEUC_JP.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/question.png.i
data/test/java/lang/Class/forName/NonJavaNames.sh.i
-data/src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java.i
-data/src/share/classes/javax/management/ImmutableDescriptor.java.i
-data/src/share/classes/sun/security/provider/SHA2.java.i
+data/test/java/lang/instrument/basicAgent.mf.i
+data/test/javax/swing/text/html/TableView/7030332/sample1.png.i
+data/src/share/classes/java/lang/Boolean.java.i
data/src/solaris/demo/jigsaw/basic/src/module-info.java.i
data/test/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl.java.i
-data/src/share/classes/sun/io/ByteToCharGBK.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java.i
+data/src/share/classes/java/lang/VirtualMachineError.java.i
+data/src/solaris/classes/sun/awt/motif/MCustomCursor.java.i
+data/src/share/classes/sun/text/resources/FormatData_lt_LT.java.i
data/test/java/security/Security/SecurityPropFile/SecurityPropFile.file.i
-data/make/modules/modularize.i
+data/src/share/classes/javax/accessibility/AccessibleIcon.java.i
+data/src/share/classes/java/util/TreeMap.java.i
data/test/java/awt/Graphics2D/RenderClipTest/RenderClipTest.java.i
-data/src/share/classes/java/text/ChoiceFormat.java.i
-data/make/tools/CharsetMapping/IBM1145.c2b.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java.i
+data/src/share/classes/javax/management/loading/PrivateClassLoader.java.i
+data/test/java/io/Serializable/skipToEndOfBlockData/SkipToEndOfBlockData.java.i
data/test/javax/swing/JFileChooser/6524424/bug6524424.java.i
data/test/java/nio/channels/AsynchronousDatagramChannel/Basic.java.i
-data/test/javax/xml/crypto/dsig/data/signature-x509-ski.xml.i
+data/src/share/classes/java/rmi/server/SkeletonNotFoundException.java.i
data/src/solaris/classes/sun/awt/X11/XBaseWindow.java.i
data/src/share/demo/jfc/Notepad/resources/save.gif.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html.i
-data/make/tools/CharsetMapping/IBM918.map.i
+data/src/share/classes/sun/tools/jconsole/inspector/XTable.java.i
+data/test/java/util/Map/Get.java.i
+data/make/modules/tools/nbproject/project.properties.i
data/test/java/rmi/reliability/juicer/AppleImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java.i
data/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java.i
data/test/sun/rmi/rmic/minimizeWrapperInstances/PImpl.java.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java.i
-data/src/share/classes/sun/security/pkcs/EncodingException.java.i
-data/test/java/nio/channels/DatagramChannel/Sender.java.i
-data/src/share/classes/java/awt/color/package.html.i
+data/test/java/net/URL/OpenStream.java.i
+data/src/share/back/stepControl.h.i
+data/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java.i
+data/src/share/classes/java/awt/JobAttributes.java.i
data/make/tools/CharsetMapping/DoubleByte-X.java.i
data/src/share/classes/java/util/logging/LoggingMXBean.java.i
data/src/share/classes/sun/management/HotspotClassLoadingMBean.java.i
data/src/share/classes/javax/script/SimpleScriptContext.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html.i
-data/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java.i
-data/test/sun/security/pkcs11/Provider/Login.sh.i
+data/test/java/lang/management/ThreadMXBean/ThreadExecutionSynchronizer.java.i
+data/src/share/classes/javax/swing/event/AncestorEvent.java.i
+data/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java.i
data/make/com/sun/java/pack/Makefile.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy.i
-data/src/share/classes/com/sun/security/sasl/CramMD5Server.java.i
data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java.i
data/src/share/classes/sun/text/resources/CollationData_hu.java.i
data/test/java/lang/reflect/Generics/TestParameterizedType.java.i
@@ -16257,177 +16224,176 @@ data/src/share/classes/java/sql/RowIdLifetime.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java.i
data/test/java/lang/StringBuffer/AppendCharSequence.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/Group.java.i
-data/src/share/classes/java/util/RandomAccess.java.i
-data/test/sun/text/resources/Format/Bug4621320.java.i
-data/test/javax/print/attribute/MediaMappingsTest.java.i
+data/src/share/classes/java/awt/im/spi/InputMethod.java.i
+data/src/share/classes/java/util/logging/LoggingProxyImpl.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c.i
data/test/java/util/zip/ZipFile/deletetempjar.sh.i
data/src/windows/native/sun/java2d/windows/ddrawObject.cpp.i
-data/src/share/native/sun/java2d/opengl/OGLVertexCache.h.i
-data/test/java/net/Authenticator/B4769350.java.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h.i
+data/test/sun/tools/native2ascii/test3.i
data/test/java/rmi/transport/checkFQDN/CheckFQDN_Stub.java.i
data/test/sun/security/util/HostnameMatcher/cert4.crt.i
data/test/java/security/Security/SecurityPropFile/SecurityPropFile.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U8Func.c.i
data/make/mkdemo/nio/zipfs/Makefile.i
data/src/share/demo/applets/ArcTest/example1.html.i
data/test/sun/security/util/DerInputBuffer/PaddedBitString.java.i
-data/test/sun/text/resources/Format/Bug4762201.java.i
+data/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java.i
data/src/share/classes/sun/misc/Perf.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java.i
-data/test/sun/security/krb5/NegativeNonce.java.i
-data/src/windows/native/sun/windows/awt_Panel.h.i
+data/make/tools/CharsetMapping/HKSCS2008.c2b.i
+data/src/windows/native/sun/java2d/d3d/D3DResourceManager.h.i
+data/make/tools/GenerateCharacter/Character.c.template.i
data/src/share/classes/com/sun/media/sound/ModelIdentifier.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMBean.java.i
+data/src/share/classes/javax/swing/event/InternalFrameAdapter.java.i
data/src/share/classes/com/sun/tracing/dtrace/FunctionAttributes.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java.i
data/src/share/demo/applets/DitherTest/DitherTest.java.i
data/src/windows/classes/sun/java2d/windows/DDScaleLoops.java.i
-data/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java.i
-data/test/javax/crypto/SecretKeyFactory/Provider2.java.i
-data/test/java/beans/XMLEncoder/Test6921644.java.i
-data/src/windows/native/java/util/logging.c.i
+data/src/share/sample/nio/server/URLDumper.java.i
+data/test/java/io/Serializable/unnamedPackageSwitch/Test.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_nl_BE.properties.i
+data/make/netbeans/common/standard-bindings.ent.i
data/src/solaris/classes/sun/java2d/xr/MaskTile.java.i
data/src/share/classes/java/awt/Panel.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java.i
data/src/share/classes/java/util/concurrent/Future.java.i
-data/src/share/classes/javax/swing/DebugGraphicsInfo.java.i
data/src/share/classes/com/sun/beans/decoder/IntElementHandler.java.i
data/make/tools/swing-beans/beaninfo/images/JViewportMono16.gif.i
data/make/sun/security/mscapi/FILES_cpp.gmk.i
-data/src/solaris/classes/sun/awt/X11/XUtilConstants.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/Main.java.i
-data/test/java/beans/beancontext/Test4132698.java.i
+data/src/linux/doc/man/ja/jrunscript.1.i
+data/test/javax/management/loading/MLetCLR/MLetCommand.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java.i
data/test/java/awt/print/Dialog/DialogCopies.java.i
-data/src/share/classes/javax/xml/crypto/OctetStreamData.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_GT.java.i
+data/src/share/demo/applets/Fractal/example1.html.i
data/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java.i
data/src/share/classes/sun/java2d/loops/FillParallelogram.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionMissingRequiredArgumentException.java.i
-data/make/tools/src/build/tools/charsetmapping/GenerateMapping.java.i
+data/test/sun/nio/cs/OLD/IBM1381_OLD.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java.i
data/test/java/lang/instrument/TestClass3.java.i
-data/test/java/io/RandomAccessFile/ReadWritePrimitives.java.i
-data/test/sun/net/www/protocol/jar/jarbug/src/test/RunAllTests.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_ca.properties.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c.i
+data/test/java/net/HttpURLConnection/getResponseCode.java.i
+data/src/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java.i
data/make/netbeans/jconsole/README.i
data/src/share/classes/sun/java2d/opengl/OGLTextRenderer.java.i
-data/test/sun/security/pkcs11/ec/TestECDSA.java.i
+data/src/share/classes/java/security/PermissionCollection.java.i
data/make/javax/management/Makefile.i
-data/test/java/nio/file/Files/TerminateWalk.java.i
+data/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so.i
+data/src/share/classes/java/security/GeneralSecurityException.java.i
data/test/javax/xml/crypto/dsig/data/certs/bres.crt.i
data/make/com/sun/demo/Makefile.i
data/src/share/classes/sun/applet/AppletSecurity.java.i
-data/src/solaris/native/common/jdk_util_md.c.i
-data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java.i
+data/src/share/classes/sun/font/CompositeFont.java.i
+data/src/share/demo/applets/SortDemo/QSortAlgorithm.java.i
data/src/share/classes/java/awt/event/MouseWheelListener.java.i
data/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java.i
data/test/sun/security/pkcs11/Signature/TestDSA.java.i
data/test/java/lang/annotation/Missing/Marker.java.i
data/src/windows/classes/sun/nio/ch/NativeThread.java.i
-data/test/sun/security/smartcardio/TestExclusive.java.i
+data/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic_proto.h.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java.i
data/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.html.i
data/src/solaris/classes/sun/awt/X11/XChoicePeer.java.i
-data/test/com/sun/jdi/ClassesByName2Test.java.i
+data/src/share/native/sun/awt/libpng/pnginfo.h.i
data/make/mksample/forkjoin/mergesort/Makefile.i
data/src/share/classes/javax/imageio/stream/IIOByteBuffer.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj.i
data/src/share/classes/sun/io/ByteToCharCp1144.java.i
data/test/javax/management/mxbean/MerlinMXBean.java.i
-data/src/solaris/doc/sun/man/man1/keytool.1.i
+data/src/share/classes/sun/io/ByteToCharDBCS_EBCDIC.java.i
data/src/share/classes/com/sun/media/sound/AlawCodec.java.i
data/src/share/classes/com/sun/jdi/event/BreakpointEvent.java.i
+data/test/java/io/Serializable/arraySuidConflict/Write.java.i
data/src/share/sample/forkjoin/mergesort/MergeSort.java.i
data/test/java/rmi/Naming/UnderscoreHost.java.i
data/src/share/classes/java/util/logging/LogManager.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/Restart.java.i
-data/test/sun/management/jmxremote/bootstrap/management_test01_ok.properties.in.i
-data/test/sun/util/resources/Locale/Bug6275682.java.i
-data/test/java/net/URLClassLoader/closetest/CloseTest.java.i
-data/make/tools/CharsetMapping/dbcs.i
-data/test/sun/net/idn/nfsmxp.spp.i
-data/src/share/classes/sun/net/httpserver/Code.java.i
-data/src/share/classes/javax/net/ssl/SSLEngine.java.i
+data/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html.i
+data/test/demo/jvmti/hprof/HeapBinaryFormatTest.java.i
+data/src/share/sample/vm/jvm-clr/Makefile.i
+data/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.i
+data/src/share/classes/java/net/CookieHandler.java.i
+data/src/share/demo/jvmti/hprof/hprof_stack.h.i
+data/src/share/native/sun/font/layout/ExtensionSubtables.h.i
+data/test/java/security/KeyStore/KeyStoreBuilder.java.i
data/test/java/util/concurrent/Executors/PrivilegedCallables.java.i
-data/test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java.i
-data/src/share/classes/sun/dyn/Access.java.i
+data/src/share/classes/com/sun/jdi/ByteValue.java.i
data/test/java/io/Serializable/serialver/nested/Test.java.i
-data/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java.i
-data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/Dummy.java.i
+data/test/sun/java2d/cmm/ProfileOp/SetDataTest.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java.i
-data/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java.i
data/src/share/lib/management/jmxremote.password.template.i
data/test/java/lang/management/ThreadMXBean/LockedMonitors.java.i
-data/test/java/nio/file/Files/MaxDepth.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java.i
data/src/share/classes/java/nio/charset/Charset.java.i
data/test/javax/swing/JSlider/6918861/bug6918861.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java.i
+data/test/com/sun/tools/attach/BasicTests.sh.i
data/src/share/classes/sun/font/LayoutPathImpl.java.i
data/test/sun/net/www/protocol/http/spnegoTest.i
data/make/tools/swing-beans/beaninfo/images/BoxColor32.gif.i
-data/src/solaris/native/sun/awt/colordata.h.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libplc4.so.i
-data/src/share/classes/javax/management/event/EventClientDelegateMBean.java.i
+data/src/share/classes/javax/management/timer/TimerAlarmClockNotification.java.i
data/src/share/classes/sun/io/CharToByteCp939.java.i
data/test/javax/management/ObjectInstance/ToStringMethodTest.java.i
data/src/share/native/sun/security/ec/mpi.c.i
data/make/tools/CharsetMapping/IBM1123.nr.i
data/make/java/nio/reorder-sparc.i
-data/src/share/classes/sun/util/calendar/CalendarUtils.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFReader.java.i
data/src/share/classes/sun/net/www/content/text/Generic.java.i
-data/src/share/classes/sun/management/snmp/package.html.i
+data/test/javax/crypto/SecretKeyFactory/P1.jar.i
data/src/share/classes/sun/tools/asm/StringConstantData.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageCopy.h.i
-data/test/java/util/Locale/data/deflocale.rhel5.i
-data/src/solaris/classes/sun/awt/X11/XAtom.java.i
+data/test/java/rmi/activation/Activatable/checkActivateRef/ActivateMe.java.i
data/src/share/demo/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml.i
data/src/share/native/java/lang/fdlibm/src/e_j0.c.i
-data/src/share/classes/sun/tools/tree/IfStatement.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy14.i
-data/src/share/demo/jfc/Notepad/resources/Notepad.properties.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/LoopbackSSLSocket.java.i
+data/src/share/classes/java/awt/dnd/DragSourceDropEvent.java.i
+data/src/share/classes/sun/awt/event/IgnorePaintEvent.java.i
+data/src/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java.i
data/src/share/classes/javax/management/monitor/MonitorMBean.java.i
-data/test/java/nio/channels/Selector/ConnectWrite.java.i
+data/src/share/classes/java/net/DatagramSocketImpl.java.i
data/test/javax/swing/JTextArea/Test6593649.java.i
data/test/java/net/URLClassLoader/extdir/extention.jar.i
data/src/solaris/native/sun/awt/extutil.h.i
data/src/share/classes/java/awt/datatransfer/ClipboardOwner.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java.i
-data/make/java/hpi/windows/Makefile.i
+data/test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java.i
+data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/project.xml.i
data/test/java/beans/Introspector/6380849/infos/ThirdBeanBeanInfo.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/Ints.java.i
data/src/share/classes/javax/naming/directory/ModificationItem.java.i
-data/test/sun/rmi/rmic/covariantReturns/G2Impl.java.i
-data/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java.i
+data/src/share/classes/java/util/RandomAccess.java.i
+data/src/share/back/debugLoop.c.i
+data/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaDouble.java.i
+data/src/windows/bin/amd64/jvm.cfg.i
data/test/java/awt/MenuBar/DeadlockTest1/DeadlockTest1.java.i
data/src/share/native/sun/awt/image/jpeg/README.i
-data/test/java/nio/file/Files/ContentType.java.i
-data/src/share/classes/com/sun/imageio/plugins/common/I18NImpl.java.i
-data/src/share/classes/sun/tools/jconsole/Version-template.java.i
+data/src/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java.i
+data/src/share/classes/javax/swing/text/TextLayoutStrategy.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthStyle.java.i
data/test/java/util/ResourceBundle/Control/TestResourceRB.java.i
-data/make/sun/rmi/rmic/FILES.gmk.i
data/src/share/classes/sun/awt/PlatformFont.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_NZ.properties.i
-data/src/share/classes/sun/io/ByteToCharCp1112.java.i
+data/src/share/classes/javax/management/loading/MLetParser.java.i
data/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak_Stub.java.i
-data/test/sun/tools/jhat/hprof.bin.i
-data/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy.i
+data/test/java/util/concurrent/atomic/VMSupportsCS8.java.i
+data/src/share/classes/javax/swing/JPasswordField.java.i
+data/test/sun/nio/cs/X11CNS11643.java.i
+data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor32.gif.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/CanvasMapper.java.i
-data/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/Node.java.i
data/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java.i
-data/test/java/util/Locale/data/deflocale.input.i
+data/src/share/classes/java/beans/package.html.i
+data/test/java/lang/Runtime/exec/setcwd.sh.i
+data/test/sun/misc/Encode/DecodeBuffer.java.i
data/test/java/net/Authenticator/B4921848.java.i
data/src/windows/native/sun/windows/awt_Scrollbar.h.i
data/src/share/classes/sun/tools/serialver/serialver_zh_CN.properties.i
data/test/java/nio/file/FileStore/Basic.java.i
data/src/share/classes/sun/util/resources/CalendarData_hi.properties.i
data/src/windows/native/sun/windows/awt_Label.h.i
-data/src/share/demo/nbproject/scripting/jconsole-plugin/build.properties.i
-data/test/sun/tools/jstat/jstatLineCounts3.sh.i
+data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java.i
+data/test/java/io/PipedWriter/ConnectAfterReaderClose.java.i
+data/src/share/classes/java/util/prefs/PreferenceChangeListener.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.java.i
data/test/com/sun/jdi/ResumeOneThreadTest.java.i
data/src/share/classes/java/text/spi/CollatorProvider.java.i
@@ -16435,48 +16401,49 @@ data/test/sun/misc/CopyMemory.java.i
data/test/java/beans/Introspector/4168475/Test4168475.java.i
data/test/javax/management/eventService/LeaseManagerDeadlockTest.java.i
data/src/windows/native/sun/windows/awt_Rectangle.h.i
-data/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java.i
+data/test/java/beans/beancontext/Test4132698.java.i
data/src/share/classes/sun/util/resources/CalendarData_sl.properties.i
-data/make/altclasses/Makefile.i
+data/src/share/classes/java/lang/Comparable.java.i
data/test/sun/net/www/protocol/file/NonUTF8EncodedChar.java.i
data/src/share/classes/sun/net/www/content/image/jpeg.java.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java.i
+data/src/share/classes/java/nio/file/SimpleFileVisitor.java.i
+data/src/share/classes/javax/management/openmbean/MXBeanMappingFactoryClass.java.i
data/test/java/util/Formatter/BasicBigInteger.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java.i
-data/src/share/native/sun/font/layout/ExtensionSubtables.h.i
+data/test/java/io/LineNumberInputStream/Skip.java.i
+data/src/share/classes/sun/net/httpserver/Code.java.i
data/src/share/classes/sun/security/rsa/RSASignature.java.i
data/src/share/classes/sun/tools/native2ascii/A2NFilter.java.i
data/test/java/rmi/server/RemoteServer/AddrInUse.java.i
-data/src/share/classes/javax/management/timer/TimerAlarmClockNotification.java.i
+data/src/share/classes/javax/management/event/EventClientDelegateMBean.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/ChangeLog.i
-data/test/javax/crypto/SecretKeyFactory/P1.jar.i
-data/src/solaris/native/sun/java2d/loops/vis_AlphaMaskBlit.c.i
+data/src/share/classes/sun/management/snmp/package.html.i
+data/test/java/beans/Performance/TestPropertyChangeSupport.java.i
data/src/share/native/sun/security/jgss/wrapper/NativeUtil.c.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java.i
-data/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.java.i
+data/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmspcs.c.i
-data/src/share/classes/javax/swing/JPasswordField.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java.i
data/src/share/classes/sun/java2d/loops/TransformHelper.java.i
data/test/sun/awt/image/ImageRepresentation/LUTCompareTest.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.fail.i
-data/test/java/net/InetAddress/WhiteSpaceHostTest.java.i
-data/test/java/lang/instrument/AppendToBootstrapClassPathTest.java.i
-data/src/share/classes/javax/management/remote/package.html.i
+data/src/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java.i
+data/src/share/classes/javax/naming/event/NamingEvent.java.i
+data/test/sun/security/provider/SeedGenerator/Priority_Inversion.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduBulk.java.i
data/test/java/net/Authenticator/BasicTest4.java.i
data/src/windows/hpi/src/system_md.c.i
-data/test/java/awt/event/MouseEvent/SmoothWheel/SmoothWheel.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java.i
data/src/share/native/com/sun/java/util/jar/pack/bands.cpp.i
data/src/solaris/native/common/jni_util_md.c.i
data/src/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java.i
-data/src/share/classes/sun/util/logging/PlatformLogger.java.i
+data/src/share/classes/java/nio/file/attribute/AclEntryType.java.i
data/test/java/lang/StrictMath/Log1pTests.java.i
data/src/solaris/native/sun/awt/gtk2_interface.h.i
-data/src/share/classes/sun/util/resources/CurrencyNames_mt_MT.properties.i
-data/test/javax/swing/JSlider/6278700/bug6278700.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java.i
+data/test/java/beans/PropertyEditor/TestDoubleClass.java.i
data/test/java/io/Serializable/subclassGC/SubclassOfOOS.java.i
-data/src/share/instrument/JPLISAgent.h.i
-data/src/share/classes/sun/security/jgss/krb5/Krb5Token.java.i
+data/test/sun/net/www/ParseUtil_6478588.java.i
+data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.policy.i
data/test/javax/crypto/NullCipher/TestNPE.java.i
data/src/share/classes/com/sun/jdi/event/VMDeathEvent.java.i
data/test/sun/tools/jps/jps-l_Output2.awk.i
@@ -16484,68 +16451,67 @@ data/test/java/beans/XMLEncoder/java_beans_Expression.java.i
data/src/share/demo/jfc/SampleTree/SampleTreeModel.java.i
data/src/share/classes/sun/print/resources/serviceui_zh_CN.properties.i
data/test/org/openjdk/jigsaw/_Configurator.java.i
-data/src/share/classes/sun/reflect/misc/ConstructorUtil.java.i
+data/src/share/classes/javax/accessibility/AccessibleTable.java.i
data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport_Stub.java.i
data/test/java/security/ProtectionDomain/AllPerm.java.i
data/src/share/classes/java/io/DeleteOnExitHook.java.i
data/test/com/sun/net/httpserver/Test1.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java.i
-data/src/share/native/sun/font/layout/CanonShaping.h.i
data/test/sun/rmi/rmic/newrmic/equivalence/TestInterface.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java.i
-data/test/java/security/KeyStore/keystore.jks.i
+data/src/share/classes/sun/util/logging/PlatformLogger.java.i
+data/src/solaris/native/sun/nio/ch/SctpNet.c.i
data/src/share/native/sun/font/fontscaler.h.i
data/src/share/classes/com/sun/servicetag/resources/register.html.i
-data/src/share/demo/jvmti/heapViewer/sample.makefile.txt.i
+data/test/sun/security/pkcs11/KeyGenerator/DESParity.java.i
data/src/share/classes/javax/swing/MutableComboBoxModel.java.i
data/test/java/net/URLClassLoader/sealing/CheckSealed.java.i
data/src/windows/classes/java/net/DualStackPlainSocketImpl.java.i
-data/test/com/sun/security/sasl/digest/AuthRealms.java.i
+data/test/java/rmi/activation/CommandEnvironment/NullOptions.java.i
data/test/java/io/File/Mkdir.java.i
-data/src/share/classes/java/awt/Choice.java.i
+data/src/windows/native/java/net/NetworkInterface_win9x.c.i
data/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies_Stub.java.i
+data/test/java/nio/Buffer/BasicChar.java.i
data/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java.i
-data/src/share/classes/sun/print/resources/serviceui_it.properties.i
+data/src/share/classes/javax/swing/plaf/ColorUIResource.java.i
data/src/share/classes/com/sun/tools/jdi/ShortTypeImpl.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_mt_MT.properties.i
data/test/java/lang/StringBuffer/SetLength.java.i
data/test/sun/security/krb5/auto/CrossRealm.java.i
data/src/share/classes/sun/management/resources/agent_zh_TW.properties.i
data/src/share/classes/sun/text/resources/FormatData_sr_BA.java.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h.i
-data/src/share/classes/javax/swing/plaf/ComponentUI.java.i
+data/test/javax/swing/JSlider/6278700/bug6278700.java.i
data/src/solaris/classes/sun/misc/OSEnvironment.java.i
data/test/java/security/CodeSource/Implies.java.i
data/test/javax/swing/border/Test4129681.html.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c.i
data/src/share/classes/java/awt/event/MouseWheelEvent.java.i
data/test/sun/security/x509/X509CRLImpl/UnexpectedNPE.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java.i
+data/src/share/classes/sun/io/MalformedInputException.java.i
data/test/java/rmi/MarshalledObject/compare/annotatedRef.i
data/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sr_CS.properties.i
-data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java.i
+data/test/java/security/IdentityScope/NoDefaultSystemScope.java.i
data/test/java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java.i
-data/src/share/classes/sun/security/krb5/internal/HostAddress.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/SpecListener.java.i
data/src/share/demo/jfc/TableExample/TableExample2.java.i
data/test/sun/net/www/ParseUtil_6306697.java.i
data/test/javax/security/auth/PrivateCredentialPermission/Serial.java.i
data/test/java/lang/instrument/AddTransformerTest.java.i
-data/test/java/nio/channels/FileChannel/Size.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/spi/ProviderInit.java.i
+data/src/share/classes/sun/dyn/util/VerifyAccess.java.i
data/src/share/classes/sun/text/resources/CollationData_da.java.i
data/src/share/npt/utf.h.i
data/src/share/classes/sun/nio/cs/ext/DelegatableDecoder.java.i
-data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java.i
+data/test/com/sun/tools/attach/RedefineAgent.java.i
+data/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl.java.i
data/src/share/classes/sun/tools/jar/resources/jar_it.properties.i
data/src/solaris/classes/sun/awt/motif/MMenuItemPeer.java.i
-data/src/share/classes/java/security/cert/CertStore.java.i
-data/src/share/classes/sun/tools/jstat/OptionLister.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/EffectUtils.java.i
+data/src/share/classes/javax/naming/CannotProceedException.java.i
+data/test/javax/management/MBeanServer/NewMBeanListenerTest.java.i
+data/test/java/nio/channels/Channels/ShortWrite.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java.i
data/src/share/classes/java/awt/doc-files/GridLayout-1.gif.i
data/test/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/RadialGradient.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/SelectOneKeyOutOfMany.java.i
data/test/sun/rmi/rmic/covariantReturns/G5.java.i
data/test/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java.i
@@ -16554,76 +16520,78 @@ data/test/java/util/ResourceBundle/Bug6299235Test.sh.i
data/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java.i
data/test/java/beans/Introspector/Test6447751.java.i
data/test/sun/net/www/protocol/http/TunnelThroughProxy.java.i
-data/make/tools/CharsetMapping/IBM871.nr.i
+data/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SamePackageCtor.java.i
+data/test/java/util/concurrent/Exchanger/ExchangeLoops.java.i
data/test/java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java.i
-data/src/share/classes/sun/io/ByteToCharCp948.java.i
+data/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java.i
data/test/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java.i
-data/src/solaris/native/sun/java2d/loops/vis_ByteIndexed.c.i
+data/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstXor.c.i
data/src/share/classes/sun/net/httpserver/HttpsExchangeImpl.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java.i
+data/test/java/util/concurrent/ScheduledThreadPoolExecutor/DecorateTask.java.i
data/src/share/classes/sun/text/resources/CollationData_ca.java.i
data/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java.i
data/src/share/classes/sun/security/x509/DistributionPoint.java.i
-data/test/com/sun/jdi/CountFilterTest.java.i
+data/test/java/util/Locale/serialized/java6locale_th_TH_TH.i
data/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.java.i
data/src/share/classes/sun/io/ByteToCharCp500.java.i
data/make/tools/makeclasslist/Makefile.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java.i
+data/src/share/demo/management/VerboseGC/README.txt.i
data/make/java/text/base/Makefile.i
data/test/java/awt/Window/WindowType/WindowType.java.i
data/src/share/native/sun/security/smartcardio/pcsc.c.i
-data/src/share/demo/scripting/jconsole-plugin/src/scripts/hello.js.i
+data/src/share/classes/javax/sound/sampled/spi/MixerProvider.java.i
data/test/java/util/EnumMap/SimpleSerialization.java.i
data/src/share/classes/java/lang/reflect/Array.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocketException.java.i
-data/src/share/classes/java/awt/print/Printable.java.i
+data/src/share/native/sun/awt/image/jpeg/jquant1.c.i
data/src/share/classes/java/util/concurrent/TimeUnit.java.i
-data/make/com/sun/tools/attach/Makefile.i
+data/src/share/classes/sun/tools/jar/resources/jar_fr.properties.i
data/test/java/nio/file/Path/Links.java.i
data/src/share/classes/sun/nio/cs/ext/Big5_Solaris.java.i
-data/src/share/classes/java/lang/management/PlatformComponent.java.i
data/src/windows/native/sun/windows/awt_InputTextInfor.cpp.i
data/src/share/classes/javax/swing/text/doc-files/editor.gif.i
data/test/sun/tools/native2ascii/test2.i
+data/make/tools/swing-beans/beaninfo/images/JSplitPaneMono32.gif.i
data/src/share/classes/javax/swing/plaf/synth/DefaultMenuLayout.java.i
data/test/java/util/ResourceBundle/Control/Chinese_zh_TW.properties.i
+data/test/java/awt/geom/Arc2D/SerializationTest.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java.i
data/test/sun/awt/font/ClassLoaderLeakTest.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c.i
-data/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java.i
-data/make/modules/modules.properties.i
-data/src/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java.i
+data/src/share/classes/javax/swing/tree/AbstractLayoutCache.java.i
+data/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java.i
+data/test/java/net/DatagramSocket/LocalSocketAddress.java.i
+data/test/javax/management/mxbean/TypeNameTest.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java.i
data/src/share/classes/sun/io/ByteToCharEUC_JP_LINUX.java.i
data/src/solaris/classes/sun/nio/fs/LinuxWatchService.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy33.i
data/src/share/classes/sun/util/resources/CurrencyNames_it_CH.properties.i
-data/src/share/classes/java/rmi/ServerError.java.i
+data/test/com/sun/jdi/MixedSuspendTest.sh.i
data/test/javax/swing/SwingWorker/6493680/bug6493680.java.i
-data/src/share/classes/java/awt/image/RasterFormatException.java.i
data/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java.i
-data/src/windows/native/sun/windows/awt_Checkbox.cpp.i
+data/src/solaris/classes/sun/awt/X11/XWINProtocol.java.i
+data/src/share/classes/sun/beans/editors/IntegerEditor.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeySocket.java.i
-data/src/share/sample/nio/server/RequestHandler.java.i
+data/test/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java.i
data/src/share/native/java/lang/fdlibm/src/e_acos.c.i
data/test/java/lang/Math/Tests.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties.i
data/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java.i
data/src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java.i
-data/src/share/native/java/lang/Throwable.c.i
+data/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java.i
data/src/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java.i
data/src/share/classes/java/awt/Graphics2D.java.i
data/test/javax/swing/plaf/synth/Test6660049.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/ClosedStreams.java.i
data/src/windows/native/sun/windows/awt_Pen.h.i
data/src/linux/doc/man/ja/pack200.1.i
-data/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c.i
+data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall_Stub.java.i
data/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java.i
-data/src/share/classes/java/awt/geom/FlatteningPathIterator.java.i
+data/make/tools/CharsetMapping/IBM273.c2b.i
data/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java.i
-data/src/share/classes/sun/print/SunAlternateMedia.java.i
-data/src/share/classes/java/util/regex/package.html.i
+data/src/share/classes/java/util/concurrent/CopyOnWriteArraySet.java.i
+data/test/java/io/Serializable/stopCustomDeserialization/Read.java.i
data/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java.i
data/test/java/io/Serializable/lookupInterfaceDesc/LookupInterfaceDesc.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/internal/ColumnWidthCalculator.java.i
@@ -16633,9 +16601,9 @@ data/src/share/classes/java/beans/VetoableChangeSupport.java.i
data/test/java/lang/management/MXBean/MXBeanBehavior.java.i
data/test/java/lang/Class/getDeclaredClasses/TypeTag.java.i
data/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties.i
-data/src/share/classes/sun/io/CharToByteMacThai.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java.i
data/test/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java.i
-data/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java.i
+data/src/share/demo/jvmti/heapViewer/sample.makefile.txt.i
data/test/java/io/charStreams/LineLengths.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/IIOTests.java.i
data/src/share/classes/javax/swing/text/GapVector.java.i
@@ -16647,13 +16615,13 @@ data/src/share/classes/sun/util/BuddhistCalendar.java.i
data/src/share/classes/sun/text/resources/FormatData_sq_AL.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c.i
data/test/com/sun/jdi/LineNumberInfo.java.i
-data/src/share/classes/java/awt/event/ActionEvent.java.i
+data/src/linux/doc/man/ja/jmap.1.i
data/test/javax/smartcardio/TestCommandAPDU.java.i
data/src/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java.i
data/src/share/classes/java/awt/font/TextJustifier.java.i
data/src/share/classes/java/lang/ClassCastException.java.i
data/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericBlockCipher.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_EmptySet.java.i
+data/src/share/classes/java/awt/ScrollPane.java.i
data/test/java/net/PortUnreachableException/Concurrent.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1149.java.i
data/test/java/text/Collator/Bug5047314.java.i
@@ -16661,81 +16629,86 @@ data/src/share/classes/java/nio/channels/Channels.java.i
data/test/java/util/ResourceBundle/Bug4179766Resource.java.i
data/src/solaris/back/path_md.h.i
data/test/java/beans/XMLDecoder/spec/TestArray.java.i
-data/test/org/openjdk/jigsaw/MockLibrary.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html.i
+data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml.i
+data/test/sun/tools/jps/jps-Vvml_2.sh.i
data/src/share/demo/applets/MoleculeViewer/models/ethane.xyz.i
data/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html.i
data/test/javax/management/eventService/ReconnectableConnectorTest.java.i
-data/make/tools/src/build/tools/automulti/README.txt.i
+data/src/share/classes/sun/nio/ch/Invoker.java.i
data/test/com/sun/jdi/AfterThreadDeathTest.java.i
-data/src/share/classes/sun/security/action/LoadLibraryAction.java.i
-data/test/java/util/Currency/PropertiesTest.sh.i
+data/src/share/classes/sun/text/resources/FormatData_ar_JO.java.i
+data/src/share/native/sun/java2d/loops/MaskBlit.c.i
+data/src/share/native/sun/misc/VMSupport.c.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java.i
data/src/windows/classes/sun/nio/ch/SourceChannelImpl.java.i
data/src/linux/doc/man/jrunscript.1.i
data/src/share/classes/sun/font/Type1GlyphMapper.java.i
data/src/solaris/demo/jni/Poller/Client.java.i
data/make/com/sun/jndi/ldap/Makefile.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java.i
+data/src/solaris/classes/sun/nio/fs/UnixFileKey.java.i
data/test/java/awt/FontClass/FontPrivilege.java.i
data/test/sun/tools/jstat/jstatTimeStamp1.sh.i
data/src/share/native/sun/awt/debug/debug_trace.h.i
data/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c.i
data/test/java/lang/Float/Constants.java.i
-data/src/share/classes/java/awt/dnd/DropTargetListener.java.i
data/test/java/security/ProtectionDomain/Recursion.policy.i
data/src/share/classes/java/nio/file/attribute/FileTime.java.i
+data/src/share/classes/javax/management/monitor/GaugeMonitorMBean.java.i
data/test/java/util/PluggableLocale/providersrc/TimeZoneNameProviderImpl.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressOutputStream.java.i
-data/test/java/util/zip/Bounds.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java.i
data/src/share/classes/java/lang/StringIndexOutOfBoundsException.java.i
+data/test/javax/management/MBeanInfo/NullInfoArraysTest.java.i
data/src/share/classes/sun/security/krb5/internal/HostAddresses.java.i
data/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java.i
data/test/javax/script/Test8.js.i
-data/test/sun/tools/jstat/lineCounts4.awk.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java.i
-data/src/share/classes/com/sun/media/sound/ModelSource.java.i
+data/src/share/classes/java/security/acl/LastOwnerException.java.i
data/src/solaris/native/sun/xawt/XWindow.c.i
data/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav.i
data/test/java/util/logging/LoggingMXBeanTest2.java.i
-data/test/javax/script/DummyScriptEngine.java.i
+data/src/share/classes/javax/management/remote/package.html.i
data/test/java/lang/Boolean/ParseBoolean.java.i
data/src/share/classes/java/awt/font/FontRenderContext.java.i
data/src/solaris/native/sun/nio/ch/SctpServerChannelImpl.c.i
data/src/share/classes/sun/util/resources/CalendarData_sq.properties.i
data/src/share/classes/javax/crypto/Mac.java.i
data/src/share/demo/applets/WireFrame/example3.html.i
+data/test/com/sun/jdi/TemplateTest.java.i
data/test/sun/management/jmxremote/bootstrap/rmiregistry.properties.i
data/src/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java.i
+data/src/windows/classes/sun/awt/windows/WToolkit.java.i
data/src/share/classes/java/text/DictionaryBasedBreakIterator.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java.i
-data/src/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java.i
+data/src/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java.i
+data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java.i
data/test/com/sun/servicetag/SvcTagClient.java.i
data/src/share/classes/javax/print/event/PrintServiceAttributeEvent.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM856.java.i
+data/src/share/classes/com/sun/security/sasl/digest/SecurityCtx.java.i
data/test/javax/script/GetInterfaceTest.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java.i
+data/src/windows/native/sun/windows/awt_new.cpp.i
data/make/tools/src/build/tools/javazic/Simple.java.i
-data/src/share/native/sun/java2d/opengl/OGLRenderQueue.c.i
-data/src/linux/doc/man/ja/jinfo.1.i
+data/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java.i
+data/src/share/classes/com/sun/java/swing/SwingUtilities3.java.i
data/src/share/classes/sun/awt/image/ByteBandedRaster.java.i
data/src/share/native/sun/font/layout/KhmerReordering.h.i
data/src/share/classes/sun/io/ByteToCharCp1122.java.i
data/test/java/util/Formatter/BasicDoubleObject.java.i
-data/make/tools/src/build/tools/fontchecker/README.txt.i
data/src/share/classes/sun/rmi/server/resources/rmid_es.properties.i
data/test/java/rmi/reliability/benchmark/bench/rmi/NullCalls.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionArgumentConversionException.java.i
-data/test/java/util/Locale/Bug4184873_yi.i
-data/src/solaris/native/java/io/io_util_md.h.i
-data/test/java/awt/font/NumericShaper/EqualsTest.java.i
+data/test/com/sun/jdi/connect/spi/Foo.java.i
+data/test/com/sun/net/httpserver/Test5.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java.i
data/test/com/sun/jdi/RedefinePop.sh.i
-data/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h.i
data/src/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java.i
data/src/share/classes/javax/print/attribute/standard/JobHoldUntil.java.i
data/src/share/classes/java/awt/image/DataBufferFloat.java.i
data/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java.i
-data/src/share/classes/com/sun/security/sasl/ExternalClient.java.i
+data/src/share/classes/sun/nio/fs/DynamicFileAttributeView.java.i
+data/test/java/net/URL/TestRFC2732.java.i
data/src/share/classes/com/sun/crypto/provider/DESConstants.java.i
data/test/com/sun/jdi/redefine/Different_RedefineSubTarg.java.i
data/src/share/classes/sun/applet/AppletObjectInputStream.java.i
@@ -16747,33 +16720,33 @@ data/src/share/demo/jfc/SwingApplet/SwingApplet.html.i
data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html.i
data/test/org/openjdk/jigsaw/cli/JpkgArgsTest.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c.i
-data/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java.i
+data/src/windows/native/sun/java2d/d3d/D3DTestRaster.h.i
data/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java.i
-data/make/tools/src/build/tools/javazic/Zoneinfo.java.i
+data/src/share/classes/com/sun/jmx/namespace/RoutingConnectionProxy.java.i
data/src/share/classes/javax/crypto/ExemptionMechanism.java.i
data/src/solaris/native/sun/awt/awt_PopupMenu.h.i
-data/src/windows/bin/java-rmi.c.i
-data/test/java/rmi/reliability/benchmark/bench/HtmlReporter.java.i
+data/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java.i
data/test/java/util/ResourceBundle/Bug4257318Res.java.i
data/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java.i
-data/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java.i
+data/test/javax/management/eventService/SharingThreadTest.java.i
data/test/com/sun/jdi/sde/MangleStepTest.java.i
data/test/java/util/Formatter/BasicBoolean.java.i
data/src/share/classes/sun/invoke/package-info.java.i
-data/src/share/classes/javax/swing/DebugGraphicsFilter.java.i
-data/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java.i
+data/src/share/classes/java/lang/IllegalStateException.java.i
+data/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java.i
data/src/share/classes/java/awt/font/TextLine.java.i
data/test/java/beans/EventHandler/Test6277266.java.i
-data/src/share/classes/sun/misc/Sort.java.i
+data/src/share/classes/sun/util/resources/CalendarData_vi.properties.i
data/test/javax/imageio/metadata/BooleanAttributes.java.i
data/src/share/classes/javax/print/attribute/standard/MediaTray.java.i
data/src/share/classes/com/sun/jdi/connect/package.html.i
data/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java.i
data/test/java/lang/ProcessBuilder/Zombies.java.i
-data/src/share/classes/java/lang/management/MemoryManagerMXBean.java.i
+data/test/javax/management/mxbean/RandomMXBeanTest.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so.d
-data/src/share/back/eventHandlerRestricted.h.i
-data/src/share/classes/sun/tools/jconsole/inspector/XMBean.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java.i
+data/src/share/classes/javax/management/NotificationFilterSupport.java.i
+data/src/share/classes/javax/print/attribute/standard/PagesPerMinute.java.i
data/test/sun/nio/cs/OLD/MS950_OLD.java.i
data/test/java/text/BreakIterator/ExceptionTest.java.i
data/src/windows/native/sun/jkernel/DownloadHelper.cpp.i
@@ -16785,11 +16758,11 @@ data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceTableMeta.jav
data/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java.i
data/test/java/util/zip/FlaterTest.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java.i
-data/src/share/classes/com/sun/media/sound/SoftLimiter.java.i
+data/src/solaris/native/sun/jdga/dgalock.c.i
data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so.i
data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java.i
data/test/javax/swing/JLabel/6596966/bug6596966.java.i
-data/src/share/classes/com/sun/tools/jdi/BooleanValueImpl.java.i
+data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java.i
data/test/sun/net/www/protocol/http/B6660405.java.i
data/test/sun/security/smartcardio/TestChannel.java.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in.i
@@ -16803,26 +16776,25 @@ data/test/java/io/Serializable/accessConstants/AccessConstants.java.i
data/test/java/io/File/IsHidden.java.i
data/src/solaris/native/com/sun/security/auth/module/Solaris.c.i
data/src/windows/native/sun/windows/awt_TextField.h.i
-data/test/java/lang/management/ThreadMXBean/AllThreadIds.java.i
+data/src/share/classes/sun/security/krb5/internal/HostAddress.java.i
data/test/java/lang/System/System.policy.i
data/src/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java.i
data/test/java/security/cert/CertificateFactory/openssl/OpenSSLCert.java.i
data/test/java/awt/EventQueue/6638195/bug6638195.java.i
data/src/share/classes/sun/tools/tree/PostDecExpression.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java.i
+data/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java.i
data/src/windows/native/sun/io/Win32ErrorMode.c.i
data/src/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java.i
data/test/java/awt/im/4959409/bug4959409.html.i
data/test/org/openjdk/jigsaw/cli/ee-cert.pem.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html.i
-data/test/sun/net/www/ParseUtil_6274990.java.i
-data/src/share/classes/java/nio/file/spi/FileSystemProvider.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java.i
+data/src/share/classes/java/awt/AttributeValue.java.i
+data/src/share/classes/sun/management/Agent.java.i
data/src/share/classes/sun/awt/datatransfer/SunClipboard.java.i
data/.hgtags.i
data/src/windows/native/sun/nio/ch/FileChannelImpl.c.i
data/src/share/classes/javax/management/relation/InvalidRoleInfoException.java.i
data/src/share/classes/sun/security/util/PermissionFactory.java.i
-data/make/sun/awt/mapfile-mawt-vers.i
data/test/java/nio/file/Path/PassThroughFileSystem.java.i
data/src/share/classes/sun/security/util/ObjectIdentifier.java.i
data/src/share/classes/java/lang/ThreadGroup.java.i
@@ -16831,65 +16803,62 @@ data/test/sun/net/www/http/HttpClient/ProxyTest.java.i
data/src/share/classes/java/awt/PrintJob.java.i
data/test/javax/security/auth/login/Configuration/ConfigFileWithBlank.java.i
data/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java.i
+data/test/sun/net/www/http/HttpClient/StreamingRetry.java.i
data/test/java/lang/Runtime/exec/ExecWithDir.java.i
data/test/org/openjdk/jigsaw/cli/ImportPrivateKey.java.i
-data/test/java/awt/im/4490692/bug4490692.html.i
-data/test/sun/java2d/XRenderBlitsTest.java.i
+data/test/javax/sound/midi/Gervill/DLSSoundbankReader/ding.dls.i
+data/make/modules/imagine.sh.i
data/src/share/classes/sun/reflect/UnsafeStaticIntegerFieldAccessorImpl.java.i
-data/test/java/nio/charset/RemovingSunIO/SunioAlias.java.i
+data/src/share/classes/java/nio/channels/MembershipKey.java.i
data/make/common/Release-embedded.gmk.i
data/src/share/classes/javax/swing/plaf/basic/package.html.i
data/test/sun/tools/jrunscript/dash-f.out.i
data/test/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java.i
data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.h.i
data/test/java/lang/instrument/PremainClass/PremainClassTest.sh.i
-data/test/java/util/ResourceBundle/Bug4083270Test.properties.i
+data/src/share/classes/javax/swing/plaf/nimbus/ImageCache.java.i
data/src/share/demo/nbproject/jfc/Font2DTest/build.properties.i
-data/make/tools/CharsetMapping/MS932.map.i
-data/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java.i
-data/src/share/classes/javax/swing/CellRendererPane.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/spi/ProviderInit.java.i
data/test/sun/tools/jhat/HelloWorld.java.i
-data/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java.i
data/src/windows/hpi/src/sys_api_md.c.i
data/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java.i
data/src/share/demo/jvmti/java_crw_demo/README.txt.i
-data/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java.i
data/src/share/native/java/lang/fdlibm/src/w_sinh.c.i
-data/src/solaris/native/sun/awt/awt_dnd.h.i
+data/src/share/classes/java/nio/channels/ReadableByteChannel.java.i
data/src/share/classes/sun/rmi/runtime/NewThreadAction.java.i
-data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java.i
+data/test/java/rmi/testlibrary/RegistryRunner.java.i
data/src/windows/native/sun/windows/awt_TextComponent.cpp.i
data/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c.i
data/test/java/security/KeyRep/Serial.policy.i
-data/src/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java.i
+data/src/share/classes/java/dyn/package-info.java.i
data/src/share/classes/java/util/SortedMap.java.i
data/src/share/classes/javax/net/ssl/package.html.i
+data/test/java/rmi/Naming/UnderscoreHost_Stub.java.i
data/test/java/io/FileInputStream/Available.java.i
data/src/windows/classes/sun/security/mscapi/RSASignature.java.i
-data/test/java/io/Serializable/evolution/AddedSuperClass/README.i
+data/src/solaris/native/common/jdk_util_md.c.i
data/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java.i
-data/test/sun/security/ec/keystore.i
+data/src/share/classes/sun/security/provider/certpath/ForwardState.java.i
+data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java.i
+data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy.i
data/src/share/classes/sun/print/resources/serviceui_es.properties.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java.i
data/src/share/native/sun/awt/image/jpeg/jdct.h.i
-data/src/share/classes/sun/util/logging/resources/logging_sv.properties.i
-data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.cpp.i
data/test/com/sun/jdi/InvokeHangTest.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties.i
data/test/java/util/concurrent/FutureTask/LoopHelpers.java.i
data/src/share/native/sun/security/ec/ECC_JNI.cpp.i
-data/src/share/classes/sun/nio/cs/ext/IBM1026.java.i
+data/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java.i
data/test/sun/tools/jps/jps-v_Output1.awk.i
data/src/share/classes/sun/print/BackgroundLookupListener.java.i
data/src/share/classes/sun/tools/java/ClassType.java.i
-data/test/java/lang/instrument/RedefineMethodAddInvokeTarget_1.java.i
+data/src/share/classes/java/security/cert/CertStore.java.i
data/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java.i
-data/test/javax/script/VersionTest.java.i
+data/src/linux/doc/man/orbd.1.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java.i
data/src/share/demo/jfc/Metalworks/resources/MyTheme.theme.i
-data/test/java/nio/channels/Channels/Write.java.i
+data/src/share/classes/sun/tools/jstat/OptionLister.java.i
data/test/java/net/Authenticator/B4933582.java.i
data/src/share/classes/sun/print/resources/serviceui_ja.properties.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/MyKeyManager.java.i
@@ -16897,21 +16866,19 @@ data/src/share/classes/sun/security/provider/certpath/URICertStore.java.i
data/test/java/net/URL/RelativeURL.java.i
data/test/javax/management/remote/mandatory/connectorServer/StandardForwardersTest.java.i
data/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java.i
-data/test/sun/awt/image/DrawByteBinary.java.i
data/src/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java.i
data/src/share/classes/sun/text/resources/CollationData_uk.java.i
-data/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java.i
+data/src/share/classes/java/awt/font/TextMeasurer.java.i
data/src/share/classes/java/lang/annotation/Target.java.i
data/test/java/lang/Long/GetLong.java.i
data/test/java/beans/Introspector/Test4948761.java.i
data/src/share/demo/jvmti/minst/Minst.java.i
data/src/share/native/sun/awt/image/cvutils/img_output8_16_32.h.i
-data/src/share/classes/javax/swing/filechooser/FileFilter.java.i
data/src/share/classes/sun/rmi/rmic/resources/rmic.properties.i
data/test/sun/java2d/X11SurfaceData/DrawImageBgTest/DrawImageBgTest.java.i
-data/test/javax/script/ProviderTest.sh.i
+data/src/share/classes/javax/security/cert/CertificateEncodingException.java.i
data/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java.i
+data/src/share/classes/sun/security/pkcs/PKCS9Attributes.java.i
data/src/share/classes/sun/java2d/pipe/PixelFillPipe.java.i
data/test/java/awt/dnd/DnDFileGroupDescriptor/DnDTarget.java.i
data/src/share/native/sun/awt/image/cvutils/img_output32.h.i
@@ -16921,7 +16888,7 @@ data/make/common/shared/Compiler-sun.gmk.i
data/src/share/classes/sun/text/resources/CollationData_zh_TW.java.i
data/src/windows/native/sun/security/mscapi/security.cpp.i
data/test/java/util/Formatter/Flush.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif.i
+data/src/share/classes/javax/swing/plaf/LabelUI.java.i
data/test/java/beans/PropertyEditor/TestShortTypeNull.java.i
data/src/share/classes/sun/swing/SwingLazyValue.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh.i
@@ -16929,13 +16896,12 @@ data/test/start-Xvfb.sh.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ObjTreeCalls.java.i
data/src/windows/native/sun/windows/awt_Checkbox.h.i
data/src/windows/classes/sun/awt/windows/WChoicePeer.java.i
-data/test/java/util/logging/SimpleFormatterFormat.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionMissingRequiredArgumentException.java.i
data/test/javax/management/notification/FilterExceptionTest.java.i
-data/src/share/classes/sun/swing/icon/SortArrowIcon.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java.i
+data/src/windows/native/sun/windows/awt_Brush.h.i
+data/src/share/classes/com/sun/tools/jdi/PacketStream.java.i
data/test/com/sun/net/httpserver/bugs/B6339483.java.i
-data/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java.i
+data/src/share/classes/javax/swing/text/TabExpander.java.i
data/src/share/classes/javax/swing/ClientPropertyKey.java.i
data/test/javax/swing/Security/6938813/bug6938813.java.i
data/src/share/native/java/net/Inet4Address.c.i
@@ -16952,7 +16918,7 @@ data/make/mkdemo/applets/CardTest/Makefile.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java.i
data/test/sun/tools/jhat/README.TXT.i
data/src/share/native/sun/awt/image/jpeg/jcsample.c.i
-data/src/share/classes/java/sql/Blob.java.i
+data/src/share/native/java/net/net_util.c.i
data/test/java/lang/Class/forName/Z.java.i
data/src/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java.i
data/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java.i
@@ -16965,7 +16931,7 @@ data/src/share/classes/sun/awt/geom/Crossings.java.i
data/test/javax/management/namespace/NamespaceNotificationsTest.java.i
data/src/share/classes/sun/io/CharToByteCp921.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java.i
-data/test/java/nio/channels/Selector/Wakeup.java.i
+data/test/java/util/Hashtable/IllegalLoadFactor.java.i
data/test/javax/management/remote/mandatory/provider/ProviderTest.java.i
data/src/share/classes/java/lang/doc-files/capsigma.gif.i
data/src/share/native/sun/java2d/loops/Index12Gray.c.i
@@ -16973,37 +16939,38 @@ data/test/java/util/zip/ZipFile/Assortment.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c.i
data/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java.i
data/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java.i
-data/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java.i
+data/src/share/classes/com/sun/net/ssl/SSLPermission.java.i
data/src/share/demo/jfc/Notepad/resources/copy.gif.i
+data/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java.i
data/src/share/classes/sun/io/ByteToCharCp937.java.i
data/make/netbeans/jarzip/build.properties.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties.i
+data/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java.i
+data/src/share/classes/sun/beans/editors/FloatEditor.java.i
data/test/com/sun/jdi/AnyDebuggeeTest.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java.i
data/src/solaris/doc/sun/man/man1/jarsigner.1.i
data/test/java/io/Serializable/class/NonSerialA_1.java.i
data/src/share/demo/jvmti/hprof/hprof_string.h.i
-data/src/share/classes/java/lang/Character.java.i
+data/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java.i
data/src/share/classes/java/awt/color/CMMException.java.i
data/test/javax/management/namespace/JMXRemoteNamespaceTest.java.i
-data/test/java/beans/XMLDecoder/spec/TestInt.java.i
-data/src/share/classes/java/awt/font/GlyphMetrics.java.i
+data/src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h.i
data/test/java/security/cert/GetInstance.java.i
data/src/share/classes/java/security/cert/CertPathBuilder.java.i
-data/src/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/Column.java.i
data/test/java/io/pathNames/win32/BadDriveLetter.java.i
data/test/java/beans/PropertyEditor/TestFloatClass.java.i
data/test/java/security/SecureClassLoader/TestClass.java.i
+data/test/javax/crypto/CryptoPermission/RC4AliasPermCheck.java.i
data/make/tools/CharsetMapping/IBM424.c2b.i
data/make/tools/GenerateCharacter/CharacterDataUndefined.java.template.i
-data/test/sun/nio/cs/TestIBM1364.java.i
+data/test/java/nio/channels/TestUtil.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java.i
data/src/share/classes/java/awt/image/DataBufferInt.java.i
data/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java.i
data/src/share/classes/com/sun/tools/jdi/VMListener.java.i
data/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java.i
-data/test/java/nio/channels/FileChannel/MapAssertions.java.i
+data/test/java/net/URLConnection/UNCTest.java.i
data/src/share/classes/sun/io/CharToByteISO8859_6.java.i
data/make/netbeans/common/java-data-native.ent.i
data/src/share/classes/sun/tools/tree/DivideExpression.java.i
@@ -17012,19 +16979,20 @@ data/src/windows/hpi/src/linker_md.c.i
data/src/share/classes/sun/text/bidi/BidiLine.java.i
data/src/share/classes/sun/jvmstat/monitor/LongMonitor.java.i
data/src/share/classes/sun/util/resources/LocaleNames_bg.properties.i
-data/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/CloseTest.java.i
data/test/java/io/charStreams/ABCReader.java.i
-data/make/tools/CharsetMapping/IBM285.c2b.i
+data/src/share/native/java/lang/fdlibm/src/s_matherr.c.i
data/test/sun/tools/jps/jps-V_Output2.awk.i
-data/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java.i
data/src/share/classes/sun/util/resources/CalendarData_hr.properties.i
data/src/share/classes/javax/print/MultiDocPrintService.java.i
-data/src/share/classes/sun/java2d/DefaultDisposerRecord.java.i
-data/src/windows/classes/sun/java2d/windows/WinVolatileSurfaceManager.java.i
+data/make/sun/javazic/tzdata/antarctica.i
+data/src/share/classes/sun/nio/cs/ext/IBM1383.java.i
data/make/sun/dcpr/mapfile-vers.i
data/src/share/classes/java/util/concurrent/AbstractExecutorService.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java.i
+data/src/share/classes/com/sun/jndi/dns/Header.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM856.java.i
data/test/java/lang/instrument/RedefineMethodAddInvokeAgent.java.i
data/src/solaris/doc/sun/man/man1/ja/jps.1.i
data/test/java/net/DatagramSocket/B6411513.java.i
@@ -17032,46 +17000,44 @@ data/test/java/lang/instrument/ilib/Injector.java.i
data/src/windows/native/common/jdk_util_md.h.i
data/src/share/classes/java/dyn/BoundMethodHandle.java.i
data/src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java.i
-data/test/java/security/ProtectionDomain/RecursionDebug.java.i
data/test/javax/security/auth/Subject/Generic.java.i
data/test/javax/management/ObjectName/SerialCompatTest.java.i
data/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java.i
data/src/share/classes/sun/tools/tree/RemainderExpression.java.i
data/src/share/classes/sun/java2d/pipe/LoopBasedPipe.java.i
data/test/sun/security/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java.i
-data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh.i
+data/test/java/util/TreeMap/NullAtEnd.java.i
data/test/java/beans/Introspector/6380849/infos/SecondBeanBeanInfo.java.i
data/src/solaris/native/sun/java2d/loops/vis_IntRgbx.c.i
data/test/java/util/Formattable/StockName.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_el_GR.properties.i
data/test/sun/management/AgentCheckTest.java.i
data/src/share/classes/sun/management/counter/perf/PerfLongCounter.java.i
-data/test/com/sun/jdi/SourceNameFilterTest.java.i
+data/src/share/native/sun/font/sunFont.c.i
data/test/javax/management/namespace/JMXRemoteTargetNamespace.java.i
-data/make/netbeans/common/architectures/name-Linux.properties.i
-data/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp.i
-data/test/javax/management/remote/mandatory/version/ImplVersionTest.java.i
+data/test/com/sun/net/httpserver/SimpleSSLContext.java.i
+data/src/share/classes/sun/tools/tree/WhileStatement.java.i
data/make/com/sun/nio/sctp/mapfile-vers.i
data/make/tools/CharsetMapping/MacRomania.map.i
data/make/javax/crypto/policy/limited/exempt_local.policy.i
-data/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapClientFactory.java.i
+data/src/share/classes/javax/management/DescriptorKey.java.i
+data/src/share/native/sun/java2d/loops/FillSpans.c.i
+data/test/java/net/Socket/setReuseAddress/Restart.java.i
+data/test/java/text/Format/DateFormat/WeekDateTest.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CheckMethods.java.i
data/test/java/lang/Double/ToString.java.i
data/test/java/beans/PropertyEditor/TestBooleanClassValue.java.i
data/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java.i
data/test/java/nio/file/attribute/FileStoreAttributeView/Basic.java.i
-data/test/java/lang/management/ThreadMXBean/Utils.java.i
data/test/javax/print/PrintSE/PrintSE.java.i
data/test/java/net/ResponseCache/getResponseCode.java.i
data/test/com/sun/jdi/RedefineIntConstantToLong.sh.i
data/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java.i
data/src/windows/classes/sun/net/www/protocol/http/NTLMAuthSequence.java.i
data/test/java/io/Serializable/readObjectNoData/Write.java.i
-data/src/share/classes/sun/tools/tree/BinaryLogicalExpression.java.i
+data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassSyntax.java.i
data/make/sun/awt/FILES_export_windows.gmk.i
-data/test/java/net/Socket/FDClose.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/TestThread.java.i
data/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java.i
data/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java.i
data/test/java/nio/channels/ConfigureBlocking.java.i
@@ -17079,90 +17045,94 @@ data/make/java/verify/reorder-sparc.i
data/src/share/classes/java/lang/management/MemoryType.java.i
data/test/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java.i
data/src/share/sample/nio/server/MalformedRequestException.java.i
-data/src/share/classes/com/sun/media/sound/DLSInstrument.java.i
-data/test/java/util/PluggableLocale/ClasspathTest.java.i
-data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password.i
+data/src/share/classes/java/util/concurrent/locks/package-info.java.i
+data/test/org/openjdk/jigsaw/_JigsawVersionQuery.java.i
+data/src/share/native/sun/font/layout/LookupProcessor.h.i
data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/MyActivationGroupImpl.java.i
-data/src/share/classes/javax/swing/plaf/ListUI.java.i
+data/src/share/classes/java/rmi/activation/ActivationGroup.java.i
data/make/sun/font/t2k/FILES_c.gmk.i
data/src/share/demo/jfc/CodePointIM/resources/codepoint_ja.properties.i
-data/src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java.i
data/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java.i
data/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java.i
-data/src/share/classes/sun/nio/ch/AllocatedNativeObject.java.i
+data/test/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java.i
data/src/share/classes/sun/awt/InputMethodSupport.java.i
data/test/java/security/Policy/Root/Root.policy.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.d
-data/src/share/classes/com/sun/tools/hat/README.txt.i
+data/src/share/classes/sun/util/resources/CalendarData_fi.properties.i
+data/make/templates/gpl-cp-header.i
data/src/share/classes/javax/swing/tree/TreeModel.java.i
data/test/java/beans/PropertyEditor/TestLongTypeValue.java.i
data/test/java/util/PriorityQueue/ForgetMeNot.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java.i
data/test/sun/security/krb5/ktab/HighestKvno.java.i
data/src/windows/native/sun/windows/awt_Window.h.i
-data/test/sun/security/krb5/auto/BadKdc4.java.i
-data/make/tools/src/build/tools/jdwpgen/TypeNode.java.i
+data/src/share/classes/sun/security/krb5/Checksum.java.i
+data/make/java/zip/Makefile.i
data/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/Classes.java.i
-data/src/share/classes/java/util/prefs/NodeChangeEvent.java.i
+data/src/share/classes/sun/tools/jar/resources/jar_ja.properties.i
+data/src/share/classes/com/sun/net/ssl/TrustManagerFactory.java.i
data/test/java/nio/channels/Selector/WakeupAfterClose.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressConstants.java.i
data/make/java/nio/FILES_c.gmk.i
data/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh.i
-data/src/share/classes/javax/print/attribute/standard/RequestingUserName.java.i
+data/src/share/classes/com/sun/jndi/ldap/Ber.java.i
data/test/java/rmi/server/RMIClassLoader/useGetURLs/Dummy.java.i
data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.java.i
data/make/java/nio/mapfile-linux.i
+data/make/com/sun/tools/attach/Makefile.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java.i
data/src/share/classes/javax/swing/text/html/parser/Element.java.i
data/test/java/nio/channels/Selector/SelectWrite.java.i
-data/src/share/classes/sun/security/krb5/internal/KrbApErrException.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFGenerator.java.i
+data/test/java/util/PluggableLocale/providersrc/java.text.spi.DecimalFormatSymbolsProvider.i
data/src/windows/native/sun/jkernel/stdafx.h.i
data/test/sun/security/x509/AVA/EmptyValue.java.i
-data/src/share/classes/java/util/concurrent/BlockingDeque.java.i
+data/test/com/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider.i
data/src/windows/classes/sun/awt/windows/WFontConfiguration.java.i
data/src/share/classes/java/util/concurrent/CountDownLatch.java.i
data/src/share/demo/nbproject/jfc/TableExample/build.xml.i
data/test/java/awt/Container/isRemoveNotifyNeeded/JInternalFrameTest.java.i
-data/src/share/classes/sun/reflect/generics/scope/ClassScope.java.i
+data/test/javax/swing/text/html/TableView/7030332/bug7030332.java.i
data/src/share/classes/javax/swing/event/MenuKeyEvent.java.i
data/src/share/classes/com/sun/jndi/ldap/DigestClientId.java.i
data/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java.i
-data/src/share/classes/java/util/concurrent/locks/package-info.java.i
-data/src/share/classes/javax/swing/SingleSelectionModel.java.i
+data/test/java/io/Serializable/subclassGC/security.policy.i
data/make/com/sun/java/pack/mapfile-vers-unpack200.i
+data/src/windows/classes/sun/nio/ch/PollArrayWrapper.java.i
data/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java.i
data/src/solaris/native/java/util/TimeZone_md.h.i
data/test/com/sun/servicetag/servicetag1.properties.i
-data/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.i
+data/test/com/sun/jdi/CatchPatternTest.sh.i
data/test/com/sun/jdi/RedefineMulti.sh.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java.i
-data/src/share/native/sun/font/layout/LayoutEngine.cpp.i
+data/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh.i
data/src/share/classes/sun/reflect/generics/scope/DummyScope.java.i
data/src/share/native/java/util/zip/Deflater.c.i
data/src/share/classes/sun/java2d/loops/DrawPath.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpPduBulkType.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java.i
data/test/java/io/File/DeleteOnExitNPE.java.i
data/src/share/classes/com/sun/media/sound/SoftSynthesizer.java.i
data/src/share/classes/java/security/spec/InvalidKeySpecException.java.i
-data/src/share/classes/javax/security/auth/x500/package.html.i
+data/test/com/sun/crypto/provider/TLS/TestMasterSecret.java.i
+data/test/sun/security/pkcs11/fips/TrustManagerTest.java.i
data/test/java/util/jar/TestExtra.java.i
-data/test/java/util/Locale/Bug4184873_id.i
+data/src/share/classes/javax/security/sasl/SaslException.java.i
data/src/share/classes/sun/security/provider/certpath/ReverseState.java.i
-data/src/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties.i
+data/test/java/beans/PropertyEditor/TestEnumClassNull.java.i
data/src/share/classes/java/util/Timer.java.i
data/make/tools/swing-beans/beaninfo/images/BoxColor16.gif.i
-data/src/share/classes/com/sun/media/sound/SoftProcess.java.i
+data/test/javax/imageio/plugins/jpeg/WritingInterruptionTest.java.i
data/test/javax/management/openmbean/TabularDataOrderTest.java.i
data/src/share/classes/javax/print/MultiDocPrintJob.java.i
data/test/tools/launcher/6842838/Test6842838.sh.i
data/src/share/lib/security/cacerts.i
data/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties.i
-data/test/java/nio/Buffer/CopyDirectMemory.java.i
+data/test/sun/tools/jrunscript/jrunscript-helpTest.sh.i
data/make/tools/src/build/tools/generatenimbus/Paint.java.i
data/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java.i
data/src/solaris/javavm/export/jvm_md.h.i
+data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.sh.i
data/src/share/classes/javax/swing/Scrollable.java.i
data/test/java/lang/Runtime/shutdown/ShutdownHooks.sh.i
data/src/share/classes/java/lang/module/UnsupportedElementTypeException.java.i
@@ -17171,7 +17141,6 @@ data/src/share/classes/com/sun/pept/protocol/Interceptors.java.i
data/src/share/classes/java/lang/doc-files/upsilon.gif.i
data/src/share/classes/sun/io/ByteToCharJISAutoDetect.java.i
data/src/share/classes/sun/io/ByteToCharJIS0212.java.i
-data/test/javax/management/namespace/VirtualNamespaceQueryTest.java.i
data/src/share/classes/javax/naming/ldap/InitialLdapContext.java.i
data/test/javax/management/monitor/CounterMonitorTest.java.i
data/src/share/native/sun/management/HotspotThread.c.i
@@ -17181,82 +17150,79 @@ data/test/com/sun/crypto/provider/Mac/HmacPBESHA1.java.i
data/src/share/classes/javax/management/ObjectName.java.i
data/src/share/native/java/lang/fdlibm/src/s_significand.c.i
data/src/share/classes/sun/misc/Lock.java.i
-data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java.i
+data/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java.i
data/test/java/util/zip/ZipFile/DeleteTempJar.java.i
-data/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties.i
-data/src/share/sample/scripting/scriptpad/nbproject/netbeans-targets.xml.i
-data/src/share/classes/sun/io/CharToByteBig5_HKSCS.java.i
-data/src/share/classes/sun/text/resources/CollationData_fr.java.i
+data/src/share/classes/com/sun/pept/presentation/Tie.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java.i
+data/src/share/classes/com/sun/media/sound/AiffFileReader.java.i
data/src/share/classes/sun/security/util/Resources_it.java.i
-data/make/mksample/Makefile.i
-data/src/share/classes/sun/io/ByteToCharCp1147.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java.i
-data/make/netbeans/jmx/build.properties.i
+data/src/share/classes/javax/smartcardio/CardException.java.i
+data/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java.i
+data/test/java/beans/XMLEncoder/java_util_Date.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U8Func.c.i
data/src/share/classes/javax/swing/plaf/BorderUIResource.java.i
data/src/share/classes/sun/io/ByteToCharISCII91.java.i
-data/test/javax/management/MBeanInfo/SerializationTest.java.i
+data/src/share/sample/nio/file/Xdd.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties.i
data/make/tools/CharsetMapping/IBM1122.c2b.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java.i
+data/test/java/beans/Introspector/memory/Bean4.java.i
data/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono16.gif.i
data/src/windows/transport/socket/socket_md.c.i
-data/src/share/classes/java/beans/Expression.java.i
data/test/java/lang/management/ThreadMXBean/SynchronizerDeadlock.java.i
-data/test/java/io/PipedInputStream/CloseAndAvailableRC.java.i
+data/src/share/classes/sun/text/resources/CollationData_ko.java.i
data/src/share/native/java/lang/ref/Finalizer.c.i
-data/src/share/demo/jvmti/hprof/hprof_tracker.h.i
-data/test/java/lang/Class/getMethod/NullInParamList.java.i
-data/test/java/text/Format/DateFormat/ISO8601ZoneTest.java.i
+data/src/share/classes/java/nio/ByteOrder.java.i
+data/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java.i
+data/test/java/util/zip/ZipFile/GetDirEntry.java.i
data/src/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java.i
-data/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java.i
-data/test/sun/security/pkcs11/Provider/ConfigShortPath.java.i
+data/test/java/util/Locale/serialized/java6locale_en.i
+data/make/com/sun/java/browser/Makefile.i
data/src/share/classes/sun/util/resources/LocaleNames_el_CY.properties.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java.i
-data/test/java/util/zip/StreamIOAfterClose.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java.i
data/test/sun/tools/jstatd/jstatGcutilOutput1.awk.i
-data/test/java/nio/file/WatchService/WithSecurityManager.java.i
+data/src/share/native/sun/reflect/ConstantPool.c.i
data/make/tools/swing-beans/beaninfo/images/JLabelMono16.gif.i
-data/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java.i
-data/test/javax/print/applet/applet3/Applet3PrintService.java.i
+data/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java.i
+data/make/sun/jawt/mapfile-vers.i
data/test/javax/swing/text/WrappedPlainView/6857057/StubBranchElement.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java.i
-data/src/share/classes/java/awt/font/OpenType.java.i
+data/test/com/sun/net/httpserver/Test10.java.i
data/src/share/native/sun/java2d/loops/Any3Byte.c.i
data/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java.i
-data/src/share/classes/sun/security/rsa/RSACore.java.i
-data/test/java/awt/image/BufferedImage/TinyScale.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/HttpsURLConnectionLocalCertificateChain.java.i
-data/src/share/demo/java2d/J2DBench/resources/images/photo.jpg.i
-data/src/share/classes/javax/crypto/CryptoAllPermission.java.i
-data/test/com/sun/net/httpserver/Test12.java.i
-data/src/share/classes/sun/text/resources/FormatData_hr_HR.java.i
-data/test/java/lang/ClassLoader/GetPackage.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java.i
-data/src/solaris/classes/sun/awt/X11/XWarningWindow.java.i
+data/src/share/classes/sun/io/ByteToCharCp1147.java.i
+data/make/com/sun/jarsigner/Makefile.i
+data/src/solaris/bin/ergo_i586.c.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java.i
+data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.storePass.i
+data/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono16.gif.i
+data/test/sun/nio/cs/TestUni2HKSCS.java.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java.i
data/test/sun/tools/jrunscript/jrunscript-DTest.sh.i
data/src/share/classes/sun/util/calendar/Era.java.i
data/src/windows/native/sun/windows/awt_Robot.h.i
-data/src/share/classes/com/sun/media/sound/SoftVoice.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java.i
data/test/com/sun/net/httpserver/docs/test1/smallfile.txt.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/ActivateMe.java.i
data/src/share/classes/java/lang/invoke/package-info.java.i
-data/test/java/io/Externalizable/definesWriteObject/DefinesWriteObject.java.i
+data/make/tools/src/build/tools/javazic/RuleRec.java.i
+data/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/textcolor.js.i
data/src/share/native/sun/security/ec/ecl_gf.c.i
-data/test/java/lang/instrument/ExampleForClassPath.java.i
-data/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleConfig.java.i
+data/src/share/classes/sun/tools/java/ArrayType.java.i
data/src/share/classes/sun/util/resources/CalendarData_lv.properties.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_es.properties.i
-data/src/share/native/sun/security/ec/impl/mpprime.h.i
+data/test/java/awt/dnd/ImageDecoratedDnD/MyCursor.java.i
+data/src/windows/native/sun/windows/awt_Checkbox.cpp.i
data/src/windows/classes/sun/awt/Win32GraphicsDevice.java.i
data/test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java.i
-data/src/solaris/classes/sun/java2d/xr/XRColor.java.i
+data/test/java/lang/Boolean/GetBoolean.java.i
data/test/sun/security/tools/jarsigner/crl.sh.i
data/src/share/classes/javax/management/InvalidApplicationException.java.i
-data/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java.i
data/src/share/classes/java/sql/Connection.java.i
data/test/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeMetaImpl.java.i
@@ -17265,89 +17231,90 @@ data/src/solaris/doc/sun/man/man1/xjc.1.i
data/test/sun/security/ec/certs/sunlabscerts.pem.i
data/test/sun/security/ssl/sun/net/www/httpstest/HttpServer.java.i
data/src/share/classes/java/awt/geom/ArcIterator.java.i
-data/src/solaris/classes/com/sun/management/UnixOperatingSystem.java.i
-data/src/windows/native/sun/jkernel/DownloadDialog.h.i
-data/src/share/sample/nio/file/DiskUsage.java.i
+data/src/share/lib/images/cursors/motif_CopyDrop32x32.gif.i
+data/src/share/classes/sun/misc/JavaIOFileDescriptorAccess.java.i
+data/test/sun/java2d/cmm/ProfileOp/MTReadProfileTest.java.i
data/make/sun/nio/FILES_java.gmk.i
data/test/java/rmi/reliability/benchmark/bench/serial/LongArrays.java.i
data/src/windows/classes/sun/misc/FileURLMapper.java.i
data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/RuntimeExceptionParameter.java.i
-data/src/share/native/sun/java2d/opengl/OGLFuncMacros.h.i
-data/src/share/native/sun/font/layout/ExtensionSubtables.cpp.i
+data/src/share/classes/javax/swing/plaf/ComponentUI.java.i
+data/src/share/classes/sun/java2d/loops/ProcessPath.java.i
data/test/sun/tools/jstat/classloadOutput1.awk.i
-data/src/share/native/sun/awt/image/jpeg/jdhuff.h.i
+data/src/share/classes/javax/print/attribute/standard/Sides.java.i
data/test/sun/nio/cs/SurrogateTestEUCTW.plane15.surrogates.i
-data/src/windows/instrument/FileSystemSupport_md.c.i
+data/src/share/classes/sun/util/resources/CalendarData_el.properties.i
+data/src/share/sample/nio/server/RequestHandler.java.i
data/src/share/classes/javax/script/Bindings.java.i
-data/test/java/nio/channels/Selector/OutOfBand.java.i
-data/test/javax/swing/RepaintManager/7013453/bug7013453.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/report/IIOComparator.java.i
-data/test/java/io/Serializable/longString/LongString.java.i
+data/src/share/classes/sun/util/resources/CalendarData_en.properties.i
+data/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java.i
+data/src/windows/hpi/export/hpi_md.h.i
data/test/com/sun/crypto/provider/Cipher/AES/Test4512524.java.i
data/test/com/sun/jdi/TestScaffold.java.i
-data/src/share/sample/vm/jvm-clr/invoker.h.i
+data/src/solaris/native/sun/awt/cursor.c.i
data/src/solaris/classes/sun/nio/ch/NativeThread.java.i
-data/src/share/classes/sun/security/tools/PolicyTool.java.i
+data/test/java/rmi/testlibrary/ActivationLibrary.java.i
data/test/java/nio/file/Files/delete_on_close.sh.i
data/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/compress.c.i
data/test/java/util/TreeMap/SubMap.java.i
data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java.i
data/test/sun/net/www/http/ChunkedOutputStream/Test.java.i
-data/test/java/net/Socket/RST.java.i
-data/src/windows/native/sun/windows/awt_DataTransferer.cpp.i
-data/test/java/awt/dnd/URIListBetweenJVMsTest/TargetFileListFrame.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/manifest.mf.i
-data/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java.i
-data/src/share/classes/sun/text/resources/FormatData_en.java.i
+data/src/share/classes/sun/rmi/transport/WeakRef.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM1046.java.i
+data/src/solaris/classes/sun/awt/X11/XKeySymConstants.java.i
+data/src/share/classes/javax/swing/text/html/ListView.java.i
+data/make/netbeans/common/share-sources.ent.i
+data/test/java/beans/PropertyChangeSupport/Test4985020.java.i
+data/test/java/security/cert/CertPath/Serialize.java.i
data/test/javax/naming/ldap/LdapName/LdapNameConstruction.java.i
-data/src/share/classes/com/sun/crypto/provider/DESedeKey.java.i
+data/src/share/classes/com/sun/media/sound/AuFileWriter.java.i
data/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java.i
data/src/share/native/common/check_code.c.i
-data/make/modules/bootmodule.roots.i
-data/src/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java.i
+data/test/java/net/DatagramSocketImpl/CheckDiscard.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java.i
+data/src/share/classes/javax/swing/plaf/synth/ImagePainter.java.i
data/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java.i
data/src/share/classes/javax/swing/plaf/PanelUI.java.i
-data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html.i
+data/src/share/native/java/lang/Throwable.c.i
+data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java.i
data/test/sun/security/provider/PolicyParser/p004.policy.i
-data/src/solaris/classes/sun/awt/X11/XMouseInfoPeer.java.i
+data/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java.i
data/test/java/io/File/ToURL.java.i
-data/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy.i
+data/src/share/classes/javax/sound/midi/Sequence.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageLookUp.h.i
data/src/share/classes/com/sun/net/httpserver/Headers.java.i
data/src/share/classes/javax/swing/undo/AbstractUndoableEdit.java.i
-data/src/share/classes/javax/swing/tree/TreeCellEditor.java.i
+data/test/java/nio/channels/Selector/SelectorTest.java.i
data/src/share/classes/sun/security/krb5/internal/TicketFlags.java.i
-data/src/share/classes/sun/tools/jinfo/JInfo.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java.i
data/src/share/classes/sun/tools/jstat/Closure.java.i
-data/src/share/classes/sun/text/resources/FormatData_mk_MK.java.i
-data/src/share/classes/javax/print/attribute/standard/PagesPerMinute.java.i
+data/src/share/classes/javax/swing/text/rtf/charsets/cpg850.txt.i
+data/src/share/native/sun/java2d/opengl/OGLPaints.c.i
data/src/share/classes/java/awt/BasicStroke.java.i
data/test/java/util/Collections/CheckedNull.java.i
data/src/windows/classes/sun/print/Win32PrintService.java.i
data/test/sun/nio/cs/TestX11CNS.java.i
-data/src/share/classes/com/sun/tools/jdi/VMState.java.i
+data/src/share/classes/java/awt/image/renderable/RenderableImage.java.i
data/src/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java.i
data/src/share/classes/sun/tools/jconsole/inspector/Utils.java.i
-data/test/java/nio/file/WatchService/denyAll.policy.i
-data/src/share/classes/javax/print/attribute/Size2DSyntax.java.i
+data/src/share/javavm/include/opcodes.weight.i
data/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java.i
-data/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java.i
+data/src/share/classes/sun/tools/java/IdentifierToken.java.i
data/src/solaris/classes/sun/font/NativeFont.java.i
-data/test/java/nio/channels/FileChannel/Transfers.java.i
-data/src/share/classes/com/sun/security/auth/X500Principal.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties.i
+data/test/java/io/Serializable/defaulted/GetFieldWrite.java.i
+data/test/java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java.i
+data/src/share/native/sun/awt/image/dither.c.i
data/src/share/classes/javax/print/attribute/standard/Severity.java.i
data/make/tools/CharsetMapping/IBM277.c2b.i
-data/src/share/classes/com/sun/security/auth/NTUserPrincipal.java.i
+data/make/sun/text/FILES_properties.gmk.i
data/src/share/classes/sun/util/resources/CurrencyNames_uk_UA.properties.i
-data/test/javax/management/modelmbean/InfoSupportTest.java.i
+data/src/share/classes/java/awt/geom/GeneralPath.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthListUI.java.i
data/src/share/classes/java/net/SocketInputStream.java.i
data/test/java/nio/file/FileSystem/Basic.java.i
data/make/netbeans/jdwpgen/build.xml.i
-data/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java.i
data/test/javax/crypto/Cipher/ByteBuffers.java.i
data/test/java/util/logging/LoggingDeadlock3.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/infcodes.c.i
@@ -17355,41 +17322,41 @@ data/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif.i
data/src/share/native/sun/awt/medialib/mlib_ImageDivTables.h.i
data/test/com/sun/tools/attach/agent.mf.i
data/test/java/io/StreamTokenizer/Reset.java.i
-data/test/java/security/Provider/CertStoreConstructorParam.java.i
+data/test/java/beans/EventHandler/Test6277246.java.i
data/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java.i
-data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java.i
+data/src/share/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml.i
data/src/share/classes/sun/tools/jconsole/AboutDialog.java.i
-data/test/java/awt/Modal/LWModalTest/LWModalTest.java.i
-data/test/java/net/SocketPermission/Equals.java.i
-data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java.i
-data/src/share/demo/jvmti/hprof/hprof_event.c.i
-data/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java.i
+data/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html.i
+data/make/sun/javazic/tzdata/zone.tab.i
+data/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.h.i
+data/src/share/native/sun/font/layout/GXLayoutEngine.cpp.i
+data/make/sun/image/vis/FILES_c.gmk.i
+data/src/solaris/native/java/lang/UNIXProcess_md.c.i
data/test/javax/swing/JSlider/4987336/cupanim.gif.i
-data/test/java/security/Security/signedfirst/Static.sh.i
+data/src/share/classes/javax/swing/table/TableColumnModel.java.i
data/src/share/classes/sun/swing/text/html/FrameEditorPaneTag.java.i
-data/src/share/classes/sun/security/jgss/LoginConfigImpl.java.i
-data/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java.i
+data/test/java/nio/channels/Channels/ReadOffset.java.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnspr4.so.i
data/src/share/native/sun/font/layout/SimpleArrayProcessor.h.i
data/src/share/classes/sun/nio/cs/ext/IBM1141.java.i
-data/test/java/util/AbstractList/CheckForComodification.java.i
+data/src/share/classes/sun/io/CharToByteCp1047.java.i
data/src/share/classes/sun/text/resources/CollationData_sl.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloped-dsa.xml.i
-data/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java.i
+data/src/share/classes/sun/swing/PrintingStatus.java.i
+data/make/netbeans/README.i
data/test/javax/management/eventService/SubUnsubTest.java.i
data/src/share/native/sun/awt/libpng/CHANGES.i
-data/src/share/classes/java/awt/event/AdjustmentListener.java.i
-data/src/share/classes/sun/tools/asm/NameAndTypeData.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif.i
-data/test/java/beans/PropertyEditor/TestFloatClassNull.java.i
-data/src/share/classes/javax/swing/undo/UndoableEditSupport.java.i
-data/test/com/sun/jdi/sde/FilterMangleTest.java.i
+data/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider.i
+data/src/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java.i
+data/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java.i
+data/test/java/nio/channels/FileChannel/Write.java.i
+data/src/share/demo/jvmti/hprof/hprof_reference.h.i
data/test/java/net/URLClassLoader/sealing/b.jar.i
data/test/java/nio/channels/DatagramChannel/SendToUnresolved.java.i
-data/test/java/awt/Modal/SupportedTest/SupportedTest.java.i
+data/src/share/native/java/lang/fdlibm/src/s_frexp.c.i
data/src/share/native/sun/java2d/loops/AnyShort.h.i
data/test/sun/net/www/protocol/jar/jarbug/src/jar1/LoadResourceBundle.java.i
-data/test/javax/imageio/CachePremissionsTest/w.policy.i
+data/make/javax/imageio/Makefile.i
data/src/share/classes/sun/tools/java/MethodType.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_util.c.i
data/src/share/classes/java/nio/file/AccessMode.java.i
@@ -17399,53 +17366,55 @@ data/test/java/util/PluggableLocale/NumberFormatProviderTest.sh.i
data/src/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties.i
data/src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java.i
data/src/share/classes/sun/font/FontStrikeDesc.java.i
-data/src/share/classes/sun/security/ssl/ClientHandshaker.java.i
-data/test/sun/security/provider/PolicyFile/getinstance/GetInstance.policy.i
-data/src/share/classes/com/sun/jmx/event/ReceiverBuffer.java.i
+data/src/share/classes/com/sun/media/sound/Printer.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/LongCalls.java.i
+data/src/share/classes/javax/swing/plaf/DesktopPaneUI.java.i
data/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java.i
data/src/share/classes/javax/management/relation/Relation.java.i
data/src/share/classes/sun/reflect/ConstantPool.java.i
-data/test/java/security/KeyPairGenerator/SolarisShortDSA.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerHandler.java.i
-data/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java.i
-data/src/share/native/java/lang/fdlibm/src/w_remainder.c.i
+data/src/share/classes/sun/io/ByteToCharCp1025.java.i
+data/test/org/openjdk/jigsaw/cli/keystore.pw.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java.i
+data/test/java/lang/String/Supplementary.java.i
data/src/windows/resource/unpack200_proto.exe.manifest.i
data/src/share/classes/org/openjdk/jigsaw/ModuleFileVerifier.java.i
-data/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java.i
data/test/javax/crypto/JceSecurity/SunJCE_BC_LoadOrdering.java.i
data/test/java/rmi/activation/Activatable/restartService/group.security.policy.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java.i
data/test/java/util/logging/RacingThreadsTest.java.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init2.java.i
-data/test/javax/management/remote/mandatory/connectorServer/ForwarderChainTest.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java.i
data/src/windows/classes/sun/awt/windows/WLabelPeer.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostInform.java.i
data/test/java/security/cert/PolicyNode/speech2speech.i
data/test/java/lang/management/MemoryMXBean/LowMemoryTestParallelGC.sh.i
data/test/java/io/Serializable/enum/badResolve/Write.java.i
-data/src/share/classes/sun/io/CharToByteCp930.java.i
-data/src/share/classes/sun/reflect/SignatureIterator.java.i
+data/src/share/classes/javax/script/Invocable.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownMsgProcModelException.java.i
+data/src/solaris/hpi/src/memory_md.c.i
data/src/share/classes/java/security/interfaces/ECKey.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpInt.java.i
+data/src/share/classes/javax/management/monitor/StringMonitor.java.i
+data/test/java/lang/Compare.java.i
data/test/java/util/zip/ZipFile/Comment.java.i
-data/src/share/classes/sun/text/IntHashtable.java.i
data/src/solaris/lib/flavormap.properties.i
data/src/share/classes/org/openjdk/jigsaw/Catalog.java.i
data/test/java/rmi/server/RMIClassLoader/noSecurityManager/Dummy.java.i
data/src/share/classes/sun/security/x509/SubjectInfoAccessExtension.java.i
-data/test/java/io/File/WinMaxPath.java.i
+data/test/javax/imageio/EmptyFileTest.java.i
data/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java.i
-data/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java.i
-data/make/sun/security/jgss/Makefile.i
+data/src/share/classes/java/awt/event/ComponentEvent.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java.i
+data/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp.i
data/test/com/sun/net/httpserver/docs/test1/largefile.txt.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0201.java.i
data/make/com/sun/jmx/snmp/Makefile.i
-data/src/share/classes/javax/print/CancelablePrintJob.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.i
+data/src/share/classes/java/lang/management/MemoryPoolMXBean.java.i
data/src/share/classes/java/security/UnresolvedPermissionCollection.java.i
-data/src/share/classes/javax/management/openmbean/CompositeData.java.i
-data/test/com/sun/tools/attach/badagent.mf.i
+data/test/com/sun/security/sasl/digest/AuthRealms.java.i
+data/src/share/classes/java/dyn/AdapterMethodHandle.java.i
data/test/java/net/MulticastSocket/MulticastAddresses.java.i
-data/test/java/security/Policy/Dynamic/setpolicy.jp.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpDecryptedPdu.java.i
data/src/share/classes/java/beans/Visibility.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTest.java.i
data/src/share/classes/sun/io/ByteToCharCp1026.java.i
@@ -17459,406 +17428,406 @@ data/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java.i
data/test/java/io/Serializable/maskSyntheticModifier/Foo.class.i
data/src/share/classes/sun/net/NetworkClient.java.i
data/src/share/classes/java/sql/SQLWarning.java.i
-data/src/share/native/sun/security/ec/impl/ecp.h.i
-data/src/share/classes/java/io/FilenameFilter.java.i
+data/src/solaris/doc/sun/man/man1/ja/jhat.1.i
data/test/sun/nio/cs/TestCp93xSISO.java.i
data/src/share/classes/java/awt/dnd/DragSourceDragEvent.java.i
data/src/share/classes/sun/tools/jar/resources/jar_es.properties.i
data/test/java/lang/management/ManagementFactory/MXBeanException.java.i
-data/test/java/nio/channels/DatagramChannel/EmptyBuffer.java.i
-data/src/share/classes/com/sun/crypto/provider/PCBC.java.i
+data/src/share/classes/javax/swing/text/html/parser/Parser.java.i
+data/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java.i
data/src/share/classes/java/awt/LayoutManager2.java.i
-data/test/java/awt/Mixing/MixingInHwPanel.java.i
+data/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy.i
data/src/solaris/sample/dtrace/hotspot/monitors.d.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunity.java.i
data/test/java/net/URLEncoder/SurrogatePairs.java.i
data/src/share/classes/java/io/FileInputStream.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c.i
data/src/share/classes/java/util/InvalidPropertiesFormatException.java.i
data/src/share/classes/sun/jkernel/DigestOutputStream.java.i
-data/test/java/net/MulticastSocket/Leave.java.i
+data/src/share/classes/com/sun/media/sound/AbstractMixer.java.i
data/src/share/classes/javax/naming/InsufficientResourcesException.java.i
data/test/java/io/charStreams/LineNumbers.java.i
-data/src/share/classes/sun/tools/java/Environment.java.i
+data/test/java/util/ResourceBundle/Test4314141B_en.properties.i
data/src/share/demo/nbproject/jfc/TableExample/nbproject/jdk.xml.i
-data/test/sun/management/jmxremote/bootstrap/management_ssltest10_ok.properties.in.i
-data/src/share/classes/java/awt/image/BufferedImage.java.i
-data/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java.i
+data/src/share/classes/sun/swing/plaf/synth/SynthUI.java.i
+data/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java.i
+data/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp.i
data/test/java/util/PluggableLocale/DateFormatProviderTest.java.i
data/test/java/util/BitSet/BSMethods.java.i
-data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java.i
+data/src/share/demo/applets/MoleculeViewer/XYZApp.java.i
data/test/java/util/zip/FileBuilder.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMask.java.i
-data/src/share/classes/javax/swing/text/AsyncBoxView.java.i
+data/src/share/classes/javax/swing/border/EtchedBorder.java.i
data/src/share/classes/com/sun/tracing/dtrace/package-info.java.i
-data/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive_Stub.java.i
+data/src/share/native/sun/font/layout/LigatureSubstProc.cpp.i
data/test/java/util/ResourceBundle/Control/XMLResourceBundleTest.java.i
-data/src/share/classes/java/beans/XMLEncoder.java.i
-data/src/share/native/java/util/zip/zip_util.c.i
-data/test/java/nio/channels/FileChannel/MapTest.java.i
-data/test/sun/security/pkcs11/KeyStore/ClientAuthData/README.i
-data/src/share/classes/java/util/ListIterator.java.i
-data/src/share/classes/java/awt/Adjustable.java.i
+data/src/solaris/bin/sparcv9/jvm.cfg.i
+data/test/java/awt/geom/Path2D/FillPPathTest.java.i
+data/make/tools/CharsetMapping/IBM970.c2b.i
+data/src/windows/native/sun/windows/awt_PrintDialog.cpp.i
+data/src/share/classes/javax/crypto/CryptoAllPermission.java.i
+data/src/share/classes/sun/io/CharToByteMS932DB.java.i
+data/src/share/classes/javax/naming/NamingException.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java.i
data/test/com/sun/nio/sctp/SctpChannel/Bind.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java.i
data/src/share/npt/npt.c.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java.i
-data/test/java/util/Formatter/Basic.sh.i
-data/src/share/classes/sun/nio/cs/ext/GB18030.java.i
+data/src/share/native/sun/font/layout/CanonShaping.h.i
+data/src/share/classes/javax/security/sasl/package.html.i
+data/test/javax/print/applet/applet4/Applet4PrintServiceLookup.java.i
+data/src/share/classes/java/util/zip/CRC32.java.i
data/test/java/lang/management/CompositeData/OpenTypeConverter.java.i
-data/src/share/classes/java/security/Provider.java.i
data/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so.i
data/src/share/classes/sun/nio/cs/MS1253.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/ReachableQuery.java.i
-data/src/share/classes/javax/management/MalformedObjectNameException.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java.i
+data/src/share/demo/jvmti/agent_util/agent_util.c.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java.i
data/src/share/classes/sun/nio/cs/ext/GB18030.java.d
-data/test/java/util/jar/JarFile/MevNPE.java.i
-data/src/windows/back/mutex_md.h.i
+data/src/share/classes/com/sun/jmx/event/LeaseManager.java.i
+data/src/share/classes/sun/text/UCompactIntArray.java.i
data/test/sun/security/tools/policytool/Alias.html.i
data/src/share/native/java/lang/fdlibm/src/e_pow.c.i
data/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java.i
data/src/solaris/doc/sun/man/man1/ja/pack200.1.i
-data/src/share/classes/sun/nio/cs/ext/HKSCS_2001.java.i
+data/src/share/classes/sun/applet/AppletEventMulticaster.java.i
data/test/java/util/ResourceBundle/Bug4168625Test.java.i
-data/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java.i
-data/src/share/back/ClassObjectReferenceImpl.c.i
+data/src/share/classes/sun/font/FontScaler.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java.i
data/src/share/classes/sun/text/resources/CollationData_lt.java.i
-data/test/java/io/Serializable/class/SerialA_1.java.i
+data/src/share/classes/javax/swing/event/DocumentListener.java.i
data/src/share/classes/com/sun/net/ssl/HostnameVerifier.java.i
-data/src/share/classes/sun/awt/image/PNGImageDecoder.java.i
-data/src/share/classes/sun/text/resources/CollationData_en.java.i
-data/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh.i
-data/src/share/classes/sun/io/ByteToCharCp852.java.i
+data/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java.i
+data/src/share/classes/sun/security/x509/CertificateSerialNumber.java.i
+data/test/javax/script/Helper.java.i
data/src/share/classes/sun/nio/cs/ext/MS950_HKSCS.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java.i
+data/src/share/classes/java/awt/event/ActionEvent.java.i
data/test/java/net/MulticastSocket/Test.java.i
-data/src/share/classes/sun/tools/jstat/ExpressionExecuter.java.i
+data/test/java/lang/ProcessBuilder/Basic.java.i
data/src/share/classes/javax/sql/rowset/serial/SerialClob.java.i
data/src/share/classes/com/sun/imageio/plugins/png/RowFilter.java.i
data/test/javax/swing/JFileChooser/6570445/bug6570445.java.i
data/src/share/native/java/lang/fdlibm/src/s_floor.c.i
data/test/java/nio/channels/FileChannel/ExpandingMap.java.i
data/src/windows/native/sun/windows/awt_AWTEvent.h.i
-data/src/share/classes/sun/util/resources/CalendarData_iw.properties.i
+data/src/share/classes/java/util/spi/LocaleServiceProvider.java.i
data/test/java/util/ResourceBundle/Bug6204853.properties.i
-data/src/share/classes/sun/rmi/server/Dispatcher.java.i
+data/src/share/classes/sun/io/CharToByteMacRomania.java.i
data/make/java/hpi/native/Makefile.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c.i
data/src/windows/classes/sun/nio/fs/WindowsPath.java.i
data/src/share/instrument/InvocationAdapter.c.i
data/src/share/classes/java/nio/Direct-X-Buffer-bin.java.i
data/test/javax/swing/text/LayoutQueue/Test6588003.java.i
data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor16.gif.i
-data/test/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java.i
+data/src/share/classes/sun/management/resources/agent_it.properties.i
data/src/share/classes/sun/net/ProgressMeteringPolicy.java.i
data/test/sun/tools/jinfo/Basic.sh.i
-data/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java.i
+data/src/share/classes/sun/rmi/server/ActivatableServerRef.java.i
data/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/DisplayModeChanger.java.i
data/test/com/sun/security/auth/login/ConfigFile/Override.java.i
data/src/windows/native/sun/windows/awt_TextField.cpp.i
data/test/sun/tools/native2ascii/A2N_4701617.i
-data/src/solaris/demo/jigsaw/basic/setup.sh.i
-data/test/sun/security/pkcs11/rsa/TestCACerts.java.i
+data/src/share/native/sun/font/layout/KhmerReordering.cpp.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java.i
data/test/javax/management/MustBeValidMBeanInfo/logging.properties.i
data/src/share/classes/sun/rmi/server/MarshalOutputStream.java.i
-data/test/java/beans/PropertyEditor/TestByteTypeNull.java.i
+data/src/share/classes/sun/io/ByteToCharCp33722.java.i
data/test/sun/net/www/http/ChunkedInputStream/test.txt.i
-data/test/sun/security/tools/keytool/CloseFile.java.i
+data/make/netbeans/jdwpgen/nbproject/project.xml.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml.i
+data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java.i
data/test/java/awt/Window/PropertyChangeListenerLockSerialization/PropertyChangeListenerLockSerialization.java.i
data/src/share/classes/java/nio/charset/Charset-X-Coder.java.template.i
data/test/sun/net/www/protocol/jar/jarbug/src/test/TestBug4523159.java.i
-data/test/sun/net/www/http/ChunkedInputStream/test.txt.d
+data/src/share/demo/jvmti/hprof/hprof_ioname.h.i
data/test/java/beans/XMLEncoder/Test6437265.java.i
data/make/tools/CharsetMapping/ISO_8859_2.map.i
data/src/share/classes/sun/awt/image/JPEGImageDecoder.java.i
data/test/sun/security/tools/jarsigner/JarSigning_RU.jar.i
-data/src/share/native/sun/font/layout/MorphStateTables.h.i
+data/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-dsa.xml.i
data/src/share/classes/java/awt/font/StyledParagraph.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java.i
-data/test/java/rmi/reliability/juicer/Apple.java.i
-data/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c.i
+data/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java.i
+data/make/tools/CharsetMapping/IBM273.map.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java.i
+data/make/sun/javazic/tzdata/systemv.i
data/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java.i
-data/test/com/sun/jdi/connect/spi/GeneratedConnectors.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java.i
data/src/share/sample/nio/multicast/Sender.java.i
data/test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java.i
data/src/windows/classes/sun/awt/windows/WPrinterJob.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pkcs11_softtoken/objstore_info.i
data/make/tools/CharsetMapping/IBM297.nr.i
-data/src/share/classes/javax/accessibility/AccessibleIcon.java.i
+data/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java.i
data/src/share/classes/sun/security/krb5/internal/EncASRepPart.java.i
data/test/java/util/ResourceBundle/Bug4195978Test.java.i
-data/test/java/util/concurrent/Phaser/Basic.java.i
+data/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java.i
data/test/javax/swing/border/Test4124729.java.i
-data/test/java/util/Locale/bug4123285.java.i
-data/test/java/util/Collections/Enum.java.i
-data/src/solaris/classes/sun/awt/motif/X11Selection.java.i
-data/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html.i
+data/src/share/classes/java/nio/channels/ScatteringByteChannel.java.i
+data/src/share/classes/java/net/CookieStore.java.i
+data/make/jpda/jdwp/jdwp.spec.i
data/test/java/lang/annotation/PackageMain.java.i
data/test/tools/jar/index/jarcontents/META-INF/services/A.i
-data/test/java/lang/instrument/PremainClass/InheritAgent0101.java.i
+data/src/share/classes/sun/io/ByteToCharSJIS.java.i
data/src/solaris/doc/sun/man/man1/serialver.1.i
data/src/share/classes/javax/swing/text/html/TableView.java.i
-data/src/share/classes/sun/tools/jconsole/OverviewTab.java.i
+data/test/java/rmi/testlibrary/RMID.java.i
data/src/share/native/sun/security/ec/ecl-exp.h.i
data/src/share/classes/sun/util/locale/ParseStatus.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java.i
-data/test/java/net/DatagramPacket/CheckBoundaries.java.i
-data/src/share/native/com/sun/media/sound/DirectAudioDevice.c.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java.i
+data/test/javax/xml/crypto/dsig/data/signature-x509-ski.xml.i
data/src/share/classes/sun/util/resources/LocaleNames_ja.properties.i
-data/test/sun/net/TelnetTest.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/PainterGenerator.java.i
data/test/sun/util/resources/Locale/Bug4429024.java.i
-data/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthContext.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java.i
-data/src/share/classes/com/sun/media/sound/JSSecurityManager.java.i
+data/test/sun/management/jmxremote/bootstrap/management_test02_ok.properties.in.i
data/src/share/classes/java/text/ParsePosition.java.i
-data/test/java/beans/PropertyEditor/Test4968709.java.i
+data/test/sun/security/validator/certreplace.sh.i
data/test/com/sun/tools/attach/BasicTests.java.i
data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java.i
-data/src/share/classes/javax/swing/ListCellRenderer.java.i
-data/make/java/main/java/Makefile.i
-data/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java.i
+data/make/com/sun/org/Makefile.i
+data/src/solaris/doc/sun/man/man1/ja/jstatd.1.i
+data/make/jdk_generic_profile.sh.i
+data/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java.i
+data/test/java/lang/ThreadGroup/Suspend.java.i
data/src/share/classes/java/security/CodeSource.java.i
data/test/sun/security/pkcs11/fips/JSSEServer.java.i
data/test/java/rmi/server/Unmarshal/PrimitiveClasses.java.i
data/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_hr.properties.i
+data/src/share/classes/sun/font/CMap.java.i
data/make/tools/swing-beans/beaninfo/images/JSpinnerColor16.gif.i
-data/src/share/classes/sun/net/httpserver/ServerImpl.java.i
+data/src/share/classes/sun/misc/BASE64Encoder.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so.i
data/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java.i
-data/src/solaris/native/sun/awt/awt_ScrollPane.c.i
+data/src/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java.i
data/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so.d
+data/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html.i
+data/src/share/classes/com/sun/java/browser/dom/DOMService.java.i
data/src/share/classes/sun/text/resources/FormatData_sl_SI.java.i
data/test/java/lang/instrument/RedefineClassWithNativeMethodAgent.java.i
data/src/share/classes/java/nio/channels/SocketChannel.java.i
-data/test/java/beans/PropertyEditor/TestByteTypeJava.java.i
+data/src/share/classes/javax/swing/FocusManager.java.i
data/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java.i
-data/test/sun/nio/cs/EuroConverter.java.i
+data/test/java/lang/ref/ReferenceEnqueue.java.i
data/test/sun/tools/jrunscript/common.sh.i
data/test/sun/tools/jstat/gcCapacityOutput1.awk.i
data/src/share/classes/sun/io/ByteToCharCp871.java.i
data/src/share/classes/com/sun/jmx/interceptor/DispatchInterceptor.java.i
-data/src/windows/native/java/net/NetworkInterface_win9x.c.i
-data/src/share/classes/sun/util/resources/TimeZoneNames_de.java.i
-data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java.i
+data/src/share/classes/javax/management/event/RMIPushServer.java.i
+data/test/java/awt/print/PrinterJob/GetMediasTest.java.i
+data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java.i
data/test/java/awt/image/IncorrectSampleMaskTest.java.i
data/make/modules/tools/src/com/sun/classanalyzer/ShowDeps.java.i
-data/test/java/awt/Graphics2D/DrawString/RotTransText.java.i
+data/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java.i
data/test/javax/management/namespace/Wombat.java.i
data/src/share/classes/sun/security/provider/DSAKeyPairGenerator.java.i
data/test/java/io/Serializable/resolveClass/consTest/Test.java.i
data/test/sun/security/provider/PolicyParser/ExtDirs3.policy.i
data/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy.i
-data/src/share/sample/jmx/jmx-scandir/src/etc/access.properties.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sr_ME.properties.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java.i
data/src/share/classes/sun/nio/ch/ExtendedSocketOption.java.i
data/test/java/util/Observable/ClearChanged.java.i
-data/src/share/classes/java/awt/TexturePaint.java.i
+data/src/solaris/doc/sun/man/man1/ja/jvisualvm.1.i
data/test/java/util/NavigableMap/LockStep.java.i
-data/test/sun/util/calendar/Bug6653944.java.i
-data/src/share/classes/java/io/ByteArrayInputStream.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c.i
+data/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties.i
data/test/java/security/cert/CertPathBuilder/NoExtensions.java.i
data/test/java/util/ServiceLoader/basic.sh.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain10.txt.i
+data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java.i
data/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java.i
-data/test/java/net/URLClassLoader/B6896088.java.i
-data/src/share/classes/sun/io/ByteToCharCp277.java.i
+data/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c.i
data/src/share/classes/javax/sound/midi/SysexMessage.java.i
-data/test/java/util/PluggableLocale/ProviderTest.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java.i
-data/src/share/native/sun/awt/debug/debug_mem.h.i
+data/make/tools/swing-beans/beaninfo/images/JScrollBarColor16.gif.i
+data/src/share/classes/com/sun/tools/jdi/SocketTransportService.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java.i
+data/test/sun/security/provider/KeyStore/CaseSensitiveAliases.java.i
data/test/com/sun/jdi/UnloadEventTarg.java.i
-data/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.i
-data/src/solaris/doc/sun/man/man1/ja/apt.1.i
-data/src/windows/native/sun/windows/awt_Frame.h.i
-data/src/share/classes/java/io/ObjectInput.java.i
-data/test/javax/management/eventService/EventClientExecutorTest.java.i
-data/src/solaris/native/sun/awt/awt_Window.h.i
+data/src/share/classes/java/security/URIParameter.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java.i
+data/test/java/security/cert/CertPathValidatorException/GetMessage.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthArrowButton.java.i
+data/src/share/classes/javax/accessibility/AccessibleStreamable.java.i
+data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java.i
+data/src/share/classes/javax/management/remote/rmi/RMIConnection.java.i
data/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java.i
-data/src/windows/native/sun/security/smartcardio/pcsc_md.c.i
data/src/share/native/java/util/zip/zlib-1.2.3/gzio.c.i
+data/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java.i
data/test/sun/net/www/httptest/HttpCallback.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalBorders.java.i
-data/src/share/native/sun/java2d/loops/IntArgbPre.c.i
-data/test/java/beans/PropertyEditor/TestDoubleClassNull.java.i
-data/src/windows/classes/sun/java2d/windows/Win32OffScreenSurfaceData.java.i
+data/src/share/classes/javax/accessibility/AccessibleRelationSet.java.i
+data/src/share/classes/sun/tools/tree/NewInstanceExpression.java.i
data/src/share/classes/sun/awt/image/URLImageSource.java.i
-data/test/java/util/zip/ConstructDeflaterInput.java.i
-data/test/java/net/InetSocketAddress/CreateUnresolved.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java.i
+data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java.i
data/src/share/native/sun/java2d/loops/IntBgr.h.i
data/test/java/awt/PrintJob/SaveDialogTitleTest.java.i
data/src/share/classes/java/security/KeyException.java.i
-data/test/org/openjdk/jigsaw/pubrepo.sh.i
-data/test/java/io/Serializable/GetField/Read2.java.i
-data/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/RadialGradient.java.i
+data/make/sun/security/action/Makefile.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_LY.properties.i
-data/src/share/classes/sun/dyn/util/BytecodeDescriptor.java.i
+data/test/java/nio/Buffer/BasicDouble.java.i
data/test/sun/java2d/cmm/ColorConvertOp/MTColConvTest.java.i
-data/src/share/demo/applets/SortDemo/BubbleSortAlgorithm.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java.i
data/test/java/lang/instrument/NativeMethodPrefixApp.java.i
-data/src/share/classes/sun/io/ByteToCharCp1123.java.i
+data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java.i
data/src/share/classes/javax/swing/colorchooser/package.html.i
-data/src/share/classes/javax/naming/TimeLimitExceededException.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostServer.java.i
data/src/share/classes/sun/tools/jstack/JStack.java.i
data/src/solaris/classes/sun/nio/ch/InheritedChannel.java.i
data/test/java/io/BufferedInputStream/Fill.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/etsi.xsd.i
data/test/sun/util/logging/PlatformLoggerTest.java.i
data/src/share/classes/sun/awt/HKSCS.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.key.i
-data/src/share/classes/java/awt/Frame.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest13_ok.ssl.in.i
+data/src/share/classes/com/sun/tools/jdi/JNITypeParser.java.i
data/make/tools/CharsetMapping/MS936.map.d
data/test/com/sun/jdi/ClassesByName.java.i
-data/test/java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java.i
+data/test/sun/security/pkcs11/fips/certs/ca.cer.i
data/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h.i
data/src/share/classes/java/sql/SQLNonTransientException.java.i
-data/test/sun/security/provider/SecureRandom/SelfSeed.java.i
-data/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java.i
-data/src/share/classes/sun/java2d/pipe/BufferedTextPipe.java.i
+data/src/share/classes/sun/util/logging/resources/logging_sv.properties.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java.i
data/test/java/beans/XMLEncoder/java_lang_reflect_Field.java.i
-data/src/share/native/sun/font/bidi/ubidi.h.i
-data/test/tools/pack200/T7007157.java.i
-data/src/share/classes/sun/security/krb5/internal/Authenticator.java.i
+data/test/sun/awt/image/DrawByteBinary.java.i
+data/src/share/classes/java/sql/ClientInfoStatus.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/Des3.java.i
-data/test/java/beans/XMLEncoder/Test5023557.java.i
-data/src/share/classes/sun/rmi/server/Util.java.i
+data/src/solaris/classes/sun/awt/X11/XScrollbar.java.i
+data/make/tools/CharsetMapping/IBM1025.c2b.i
+data/test/javax/swing/JFileChooser/6688203/bug6688203.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java.i
data/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java.i
-data/test/java/util/ResourceBundle/Control/PackagePrivateTest.java.i
+data/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java.i
data/test/sun/text/resources/Format/Bug4442855.java.i
data/test/sun/nio/cs/ReadZero.java.i
data/test/sun/security/tools/policytool/ChangeUI.java.i
data/src/share/classes/java/net/UnknownServiceException.java.i
data/src/share/classes/java/beans/beancontext/package.html.i
-data/src/share/native/sun/awt/image/cvutils/img_icm.h.i
+data/src/share/native/java/lang/fdlibm/src/k_tan.c.i
data/test/java/util/Currency/Bug6807534.java.i
data/test/java/lang/ClassLoader/package1/package3/Class3.java.i
-data/src/share/classes/java/awt/event/TextEvent.java.i
-data/make/sun/xawt/FILES_c_unix.gmk.i
+data/test/javax/swing/JTable/6735286/bug6735286.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c.i
data/src/share/classes/java/lang/SecurityException.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Chars.java.i
+data/src/share/modules/jdk.awt/module-info.java.i
data/src/share/classes/sun/nio/cs/ISO_8859_5.java.i
-data/test/sun/security/ssl/sanity/pluggability/MySSLEngineImpl.java.i
+data/make/java/main/java/mapfile-sparc.i
data/make/com/sun/security/auth/module/FILES_c_solaris.gmk.i
data/src/share/classes/java/util/logging/StreamHandler.java.i
+data/src/share/classes/java/lang/IllegalThreadStateException.java.i
data/src/share/classes/javax/security/auth/callback/Callback.java.i
data/make/tools/CharsetMapping/IBM284.nr.i
-data/src/share/classes/javax/sound/sampled/spi/MixerProvider.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/package.html.i
+data/src/share/demo/scripting/jconsole-plugin/src/scripts/hello.js.i
+data/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java.i
data/src/solaris/native/sun/awt/awt_Plugin.c.i
-data/src/share/classes/java/lang/IncompatibleClassChangeError.java.i
-data/src/windows/classes/sun/nio/fs/WindowsException.java.i
+data/src/share/classes/sun/applet/resources/MsgAppletViewer_ko.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariTables.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java.i
-data/test/java/dyn/InvokeGenericTest.java.i
-data/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java.i
+data/make/sun/font/Makefile.i
+data/src/share/classes/sun/tools/asm/Assembler.java.i
+data/test/sun/security/tools/jarsigner/ec.sh.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/package.html.i
data/src/share/classes/sun/nio/cs/ext/ISO_8859_6.java.i
-data/test/java/lang/invoke/InvokeDynamicPrintArgs.java.i
-data/test/java/util/Locale/bug4123285.html.i
+data/src/share/native/java/lang/fdlibm/src/w_remainder.c.i
+data/src/share/classes/sun/java2d/StateTrackableDelegate.java.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedMap.java.i
data/src/share/classes/javax/swing/undo/UndoManager.java.i
data/make/java/jli/Makefile.i
-data/test/java/net/URLConnection/Connect.java.i
+data/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java.i
data/test/java/io/File/createTempFile/Patterns.java.i
-data/test/java/dyn/indify/Indify.java.i
+data/test/java/util/logging/LoggingDeadlock4.java.i
data/src/share/demo/jvmti/minst/README.txt.i
-data/src/share/classes/com/sun/tools/example/debug/gui/ClassManager.java.i
+data/src/share/classes/java/awt/image/ImageConsumer.java.i
data/make/sun/net/FILES_java.gmk.i
data/src/share/classes/javax/management/InstanceNotFoundException.java.i
data/make/tools/CharsetMapping/IBM1146.c2b.i
data/src/share/native/sun/java2d/opengl/OGLBufImgOps.c.i
data/src/share/classes/sun/nio/cs/UTF_16.java.i
-data/src/share/classes/java/util/zip/ZipInputStream.java.i
-data/test/java/net/Socket/TrafficClass.java.i
-data/test/java/rmi/reliability/benchmark/bench/ConfigFormatException.java.i
+data/test/java/util/ResourceBundle/Control/StressOut_ja_JP.properties.i
+data/src/share/classes/java/beans/MetaData.java.i
+data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono32.gif.i
data/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java.i
data/src/share/demo/applets.html.i
-data/src/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java.i
data/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties.i
-data/test/java/lang/instrument/NoTransformerAddedTest.java.i
+data/test/java/util/PluggableLocale/providersrc/java.util.spi.CurrencyNameProvider.i
data/src/share/classes/sun/text/resources/FormatData_hr.java.i
-data/src/share/classes/java/lang/reflect/TypeVariable.java.i
data/src/share/demo/jfc/Font2DTest/resources/TextResources_ja.properties.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunities.java.i
+data/src/share/classes/java/util/jar/package.html.i
+data/src/share/classes/java/awt/geom/package.html.i
data/test/java/util/ResourceBundle/Bug4177489Test.java.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java.i
+data/test/sun/security/ssl/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java.i
data/src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java.i
data/test/sun/security/pkcs11/ec/ReadCertificates.java.i
data/test/javax/xml/crypto/dsig/data/certs/xmldsig.jks.i
-data/src/share/demo/jvmti/minst/sample.makefile.txt.i
-data/src/share/classes/sun/tools/tree/LengthExpression.java.i
-data/test/java/security/cert/CertificateFactory/SlowStream.java.i
+data/src/windows/back/mutex_md.h.i
+data/src/windows/native/sun/windows/awt_PrintControl.h.i
data/src/share/classes/java/util/logging/package.html.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java.i
-data/src/share/classes/javax/swing/plaf/TextUI.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties.i
+data/make/tools/CharsetMapping/JIS_X_0201.map.i
+data/test/java/lang/instrument/PremainClass/InheritAgent1011.java.i
+data/test/sun/tools/jstat/lineCounts4.awk.i
data/test/java/beans/PropertyEditor/TestEnumSubclassNull.java.i
-data/test/java/lang/Throwable/SuppressedExceptions.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java.i
+data/src/share/native/sun/java2d/loops/DrawParallelogram.c.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/ObjArrayCalls.java.i
data/test/com/sun/tools/attach/Application.java.i
-data/src/solaris/classes/sun/net/spi/SdpProvider.java.i
+data/src/share/classes/sun/rmi/transport/DGCAckHandler.java.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethod.java.i
-data/src/share/classes/sun/management/MethodInfo.java.i
+data/src/share/native/sun/management/MemoryImpl.c.i
data/src/share/classes/java/util/Set.java.i
data/src/share/native/sun/awt/image/jpeg/jmemmgr.c.i
-data/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java.i
+data/test/javax/management/Introspector/ParameterNameTest.java.i
data/src/share/classes/java/lang/Long.java.i
data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear.c.i
-data/src/share/classes/javax/security/auth/SubjectDomainCombiner.java.i
data/src/share/classes/com/sun/jdi/ReferenceType.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java.i
-data/src/share/classes/sun/net/httpserver/HttpsServerImpl.java.i
+data/test/java/nio/file/WatchService/grantDirOnly.policy.i
data/src/share/classes/sun/management/HotspotClassLoading.java.i
data/src/share/native/sun/awt/medialib/j2d_names.h.i
-data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh.i
+data/src/share/classes/java/awt/dnd/DropTargetListener.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/AppleImpl.java.i
data/src/share/classes/sun/java2d/pipe/BufferedMaskBlit.java.i
data/src/solaris/classes/sun/awt/motif/X11JIS0208.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c.i
+data/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java.i
data/src/share/classes/com/sun/crypto/provider/DESedeCipher.java.i
-data/test/javax/print/PrintSE/PrintSE.sh.i
-data/test/sun/security/ssl/sun/net/www/httpstest/ClosedChannelList.java.i
+data/src/share/native/sun/security/ec/ecp_jac.c.i
+data/src/share/native/java/lang/fdlibm/src/e_cosh.c.i
data/src/share/classes/javax/management/NotCompliantMBeanException.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java.i
+data/src/share/classes/com/sun/media/sound/ModelSource.java.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java.i
-data/src/share/classes/sun/tools/java/CompilerError.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties.i
data/test/com/sun/security/sasl/gsskerb/log.properties.i
-data/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java.i
+data/src/share/classes/sun/security/x509/GeneralNameInterface.java.i
data/src/share/demo/nbproject/management/VerboseGC/build.xml.i
-data/src/share/classes/java/beans/XMLDecoder.java.i
+data/make/mkdemo/jvmti/mtrace/Makefile.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java.i
data/src/share/classes/java/text/CollationRules.java.i
data/src/share/classes/javax/management/InstanceOfQueryExp.java.i
data/src/share/classes/sun/io/CharToByteCp1145.java.i
-data/test/javax/swing/JOptionPane/6464022/bug6464022.java.i
-data/src/share/native/sun/security/ec/impl/secoidt.h.i
+data/test/java/awt/im/InputContext/InputContextTest.java.i
+data/src/share/classes/java/lang/invoke/MutableCallSite.java.i
data/src/share/classes/sun/io/ByteToCharUnicode.java.i
data/test/sun/tools/native2ascii/NativeErrors.java.i
data/src/share/classes/java/lang/invoke/Invokers.java.i
+data/src/share/classes/javax/swing/JToolBar.java.i
data/src/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleInfo.java.i
+data/src/share/classes/java/lang/reflect/TypeVariable.java.i
data/make/netbeans/common/architectures/README.i
data/src/share/classes/sun/management/MappedMXBeanType.java.i
data/src/share/classes/java/awt/ActiveEvent.java.i
data/src/share/native/com/sun/java/util/jar/pack/unpack.cpp.i
-data/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c.i
+data/src/share/native/java/lang/java_props.h.i
data/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java.i
+data/src/share/classes/java/io/ByteArrayOutputStream.java.i
data/src/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java.i
data/src/share/classes/sun/text/resources/FormatData_pt_BR.java.i
data/test/java/util/BitSet/MemoryLeak.java.i
-data/src/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java.i
+data/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java.i
data/make/tools/swing-beans/beaninfo/images/JTextAreaColor32.gif.i
data/test/java/security/AccessControlContext/NullCombinerEquals.java.i
data/src/share/classes/sun/security/smartcardio/PCSCException.java.i
@@ -17867,167 +17836,162 @@ data/make/sun/text/Makefile.i
data/src/share/classes/javax/swing/text/html/MuxingAttributeSet.java.i
data/src/share/classes/java/awt/MouseInfo.java.i
data/src/share/classes/sun/io/CharToByteCp1147.java.i
-data/src/windows/native/sun/windows/awt_Desktop.cpp.i
+data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html.i
data/src/share/classes/sun/text/resources/FormatData_nl_BE.java.i
data/test/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh.i
-data/src/share/classes/sun/misc/ProxyGenerator.java.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Librarian.java.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarB/b/B.java.i
+data/src/share/classes/com/sun/jmx/namespace/RoutingServerProxy.java.i
data/test/sun/java2d/pisces/Renderer/TestNPE.java.i
data/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java.i
-data/src/share/classes/org/relaxng/datatype/DatatypeException.java.i
+data/make/java/zip/reorder-sparc.i
data/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java.i
-data/test/java/nio/Buffer/CopyDirectByteMemory.java.i
+data/src/share/classes/org/openjdk/jigsaw/RemoteRepository.java.i
data/src/share/classes/java/nio/file/DirectoryIteratorException.java.i
data/src/share/classes/com/sun/tools/hat/internal/parser/FileReadBuffer.java.i
-data/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java.i
+data/test/java/nio/charset/coders/ResetISO2022JP.java.i
data/test/java/awt/font/Rotate/Shear.java.i
data/src/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java.i
-data/test/java/lang/Thread/UncaughtExceptions.sh.i
-data/src/windows/native/sun/windows/ShellFolder2.cpp.i
+data/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java.i
+data/src/share/classes/sun/net/httpserver/HttpExchangeImpl.java.i
data/test/sun/nio/cs/SurrogateTestEUCTW.plane7.surrogates.i
data/src/share/classes/java/rmi/server/RemoteServer.java.i
-data/src/share/classes/java/security/cert/CertPathValidator.java.i
+data/src/share/classes/javax/swing/WindowConstants.java.i
data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageGenerator.java.i
data/test/com/sun/jdi/Unload1Targ.java.i
data/test/javax/management/Introspector/NotAnMBeanTest.java.i
+data/src/share/native/sun/java2d/loops/UshortGray.c.i
data/make/common/shared/Defs.gmk.i
-data/src/share/classes/sun/text/normalizer/NormalizerBase.java.i
+data/src/share/classes/java/awt/event/FocusAdapter.java.i
data/src/share/classes/javax/swing/text/DefaultFormatter.java.i
data/test/java/net/Authenticator/B4722333.java.i
data/src/solaris/native/sun/awt/randr.h.i
data/src/share/native/java/lang/fdlibm/src/e_lgamma.c.i
-data/src/share/classes/javax/swing/ProgressMonitorInputStream.java.i
-data/make/sun/javazic/tzdata/systemv.i
-data/src/share/classes/sun/nio/cs/ext/MacCroatian.java.i
+data/src/solaris/classes/sun/awt/X11/security-icon-yellow24.png.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/Application.java.i
data/src/share/classes/sun/rmi/server/ActivationGroupImpl.java.i
-data/test/javax/swing/JFileChooser/4847375/bug4847375.java.i
-data/test/java/util/concurrent/Exchanger/ExchangeLoops.java.i
-data/test/java/util/PriorityQueue/RemoveContains.java.i
-data/src/share/classes/sun/nio/ch/OptionKey.java.i
-data/test/javax/management/Introspector/UnDescribed.java.i
-data/test/sun/security/util/HostnameMatcher/cert2.crt.i
+data/src/solaris/native/sun/java2d/loops/vis_FourByteAbgrPre.c.i
+data/src/solaris/classes/sun/font/FcFontConfiguration.java.i
+data/src/share/native/sun/awt/libpng/pnglibconf.h.i
+data/src/share/classes/sun/io/ByteToCharSingleByte.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java.i
+data/src/share/classes/sun/awt/image/ImagingLib.java.i
data/test/java/beans/PropertyEditor/TestEditor.java.i
data/src/share/classes/java/util/concurrent/Phaser.java.i
data/test/sun/rmi/rmic/classFileVersion/run.sh.i
-data/test/com/sun/jdi/UnpreparedByName.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libnspr4.so.i
data/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java.i
-data/test/java/io/Serializable/NoClassDefFoundErrorTrap/NoClassDefFoundErrorTrap.java.i
+data/src/share/native/sun/font/layout/MorphTables.h.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U8Func.c.i
data/test/sun/java2d/pipe/Test7027667.java.i
data/test/java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java.i
data/src/share/classes/java/security/spec/package.html.i
data/test/org/openjdk/jigsaw/cli/expired-signer-prikey.pem.i
data/make/java/Makefile.i
-data/src/windows/npt/npt_md.h.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties.i
data/test/java/util/Formatter/FailingConstructors.java.i
data/test/javax/management/remote/mandatory/provider/provider/JMXConnectorServerProviderImpl.java.i
-data/src/share/classes/javax/management/IntrospectionException.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U16Func.c.i
data/test/java/lang/StringBuffer/IndexOf.java.i
data/src/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S16Func.c.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c.i
-data/src/share/classes/sun/tools/tree/ReturnStatement.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java.i
data/src/windows/demo/jvmti/hprof/hprof_md.c.i
data/src/share/demo/jvmti/hprof/hprof_b_spec.h.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ca_ES.properties.i
-data/test/javax/security/auth/login/LoginContext/DefaultHandlerImpl.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java.i
-data/src/share/classes/sun/io/ByteToCharCp865.java.i
+data/src/share/classes/sun/security/pkcs11/JarVerifier.java.i
+data/src/share/classes/javax/management/event/NotificationManager.java.i
+data/test/sun/security/smartcardio/TestConnect.java.i
data/test/java/io/Serializable/resolveClass/MethodTest.java.i
data/test/java/beans/PropertyEditor/TestIntegerTypeValue.java.i
+data/src/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java.i
-data/make/netbeans/world/nbproject/project.xml.i
+data/test/java/net/URLConnection/xml/not-xml1.i
data/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java.i
data/src/share/classes/sun/nio/cs/ext/IBM838.java.i
data/src/share/classes/sun/util/logging/resources/logging_it.properties.i
-data/src/share/native/java/lang/fdlibm/src/w_lgamma_r.c.i
+data/src/share/classes/java/nio/file/FileRef.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/Omni.java.i
data/src/share/classes/javax/management/loading/MLetContent.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/inffixed.h.i
-data/src/share/classes/javax/sql/ConnectionEventListener.java.i
data/src/share/classes/sun/util/resources/CalendarData_hu.properties.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/package.html.i
-data/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java.i
+data/make/jpda/expr/Makefile.i
data/test/java/io/Serializable/resolveClass/deserializeButton/run.sh.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java.i
-data/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c.i
+data/test/java/lang/Runtime/exec/WinCommand.java.i
+data/src/share/classes/sun/text/resources/FormatData_ga_IE.java.i
data/src/share/classes/java/security/spec/DSAPublicKeySpec.java.i
data/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java.i
+data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/jdk.xml.i
data/src/windows/native/sun/java2d/d3d/D3DPaints.h.i
data/make/mkdemo/applets/Clock/Makefile.i
data/test/java/util/zip/ZipFile/CopyJar.java.i
-data/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java.i
+data/src/share/classes/sun/security/provider/certpath/AdjacencyList.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java.i
data/src/share/classes/sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.PCMM.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java.i
data/test/java/util/concurrent/Semaphore/RacingReleases.java.i
-data/src/windows/native/sun/windows/img_util_md.h.i
-data/src/share/classes/com/sun/media/sound/RIFFReader.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/DoubleBean.java.i
+data/make/mkdemo/applets/NervousText/Makefile.i
data/src/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java.i
data/test/java/lang/Float/ParseFloat.java.i
data/src/share/classes/javax/management/DescriptorRead.java.i
-data/test/sun/nio/cs/OLD/IBM949C_OLD.java.i
-data/test/sun/rmi/rmic/extraCompilation/run.sh.i
+data/src/solaris/native/com/sun/security/auth/module/Unix.c.i
data/test/com/sun/tools/attach/application.mf.i
+data/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.h.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java.i
-data/test/com/sun/servicetag/servicetag2.properties.i
data/src/solaris/classes/sun/awt/X11/XAwtState.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh.i
-data/test/com/sun/crypto/provider/Mac/MacClone.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java.i
data/make/sun/javazic/tzdata/solar89.i
data/test/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java.i
-data/src/share/demo/jvmti/agent_util/README.txt.i
data/src/share/classes/javax/naming/directory/BasicAttributes.java.i
-data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-start.jpg.i
-data/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java.i
-data/test/java/lang/management/MemoryMXBean/MemoryUtil.java.i
+data/src/share/classes/sun/security/jgss/krb5/Krb5Util.java.i
+data/test/java/lang/instrument/StressGetObjectSizeTest.sh.i
data/src/share/classes/javax/naming/directory/AttributeInUseException.java.i
data/test/java/beans/XMLEncoder/Test6531597.java.i
data/test/java/io/Serializable/writeReplace/WriteReplace.java.i
-data/test/javax/swing/JFileChooser/6688203/bug6688203.java.i
-data/test/java/lang/StrictMath/HyperbolicTests.java.i
-data/test/java/util/ResourceBundle/TestResource_it.java.i
+data/test/javax/imageio/plugins/png/MergeStdCommentTest.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java.i
data/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java.i
data/test/java/awt/font/TextLayout/AttributeValuesCastTest.java.i
-data/test/javax/swing/JColorChooser/Test4759934.java.i
-data/src/share/classes/sun/security/krb5/internal/TGSRep.java.i
-data/src/share/classes/sun/net/www/protocol/http/NegotiatorImpl.java.i
+data/test/javax/swing/JColorChooser/Test6827032.java.i
+data/test/com/sun/awt/Translucency/TranslucentJAppletTest/TranslucentJAppletTest.java.i
+data/src/share/native/sun/security/jgss/wrapper/gssapi.h.i
data/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java.i
+data/src/share/classes/sun/reflect/misc/ConstructorUtil.java.i
data/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java.i
data/src/share/classes/javax/management/monitor/StringMonitorMBean.java.i
data/src/share/classes/sun/text/resources/FormatData_el_GR.java.i
-data/LICENSE.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy.i
-data/test/java/io/Serializable/oldTests/ArrayOpsTest.java.i
-data/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl.java.i
+data/src/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java.i
+data/src/share/native/sun/font/layout/AlternateSubstSubtables.h.i
data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader.i
data/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java.i
-data/test/java/beans/Introspector/Test4634390.java.i
-data/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java.i
+data/src/share/classes/sun/text/resources/FormatData_ca.java.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModelLcd.java.i
+data/test/java/util/ResourceBundle/Bug4168625Resource3.java.i
data/make/tools/CharsetMapping/IBM1364.map.i
-data/test/java/util/Vector/IllegalConstructorArgs.java.i
+data/test/java/util/Locale/Bug4184873_yi.i
+data/src/share/demo/jvmti/hprof/hprof_tracker.h.i
data/src/share/classes/com/sun/jdi/request/StepRequest.java.i
data/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java.i
data/src/share/demo/jvmti/hprof/hprof_error.h.i
-data/test/com/sun/net/httpserver/bugs/B6526913.java.i
+data/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp.i
data/test/java/beans/XMLEncoder/java_util_HashMap.java.i
data/test/java/util/zip/ZipCoding.java.i
-data/test/java/awt/geom/Arc2D/SerializationTest.java.i
+data/test/java/awt/font/NumericShaper/EqualsTest.java.i
data/make/tools/reorder/tests/Exit.java.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in.i
-data/test/com/sun/jdi/UnpreparedClasses.java.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java.i
+data/test/java/lang/ref/SoftReference/Bash.java.i
+data/test/java/beans/PropertyEditor/TestEnumSubclass.java.i
data/test/java/net/DatagramPacket/Unresolved.java.i
data/src/share/classes/sun/io/CharToByteCp1124.java.i
-data/test/java/io/Serializable/lookupAnyInvocation/LookupAnyInvocation.java.i
+data/test/java/util/Locale/data/deflocale.sh.i
data/src/share/back/log_messages.c.i
data/src/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java.i
@@ -18035,30 +17999,29 @@ data/test/java/io/StreamTokenizer/QuoteTest.java.i
data/src/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java.i
data/test/com/sun/jdi/DoubleAgentTest.java.i
data/test/java/lang/ClassLoader/findSystemClass/Loader.java.i
-data/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy.i
+data/src/share/classes/javax/xml/crypto/dom/package.html.i
data/test/java/lang/Math/IeeeRecommendedTests.java.i
-data/test/java/lang/instrument/TransformMethodTest.java.i
+data/src/share/classes/sun/util/resources/CalendarData_et.properties.i
data/test/java/util/ResourceBundle/Bug4396021SpecialMessages.java.i
-data/src/share/classes/sun/net/www/http/ChunkedInputStream.java.i
-data/src/solaris/classes/sun/awt/UNIXToolkit.java.i
+data/src/share/classes/java/io/StreamCorruptedException.java.i
data/src/solaris/classes/sun/awt/X11/XQueryTree.java.i
-data/src/share/classes/javax/swing/text/html/default.css.i
+data/src/share/classes/javax/swing/border/MatteBorder.java.i
+data/test/com/sun/security/sasl/Cram.java.i
data/test/java/io/FileOutputStream/FileOpen.sh.i
data/make/tools/CharsetMapping/MS1257.map.i
data/src/share/classes/javax/management/openmbean/InvalidOpenTypeException.java.i
data/src/windows/native/sun/java2d/d3d/D3DPipeline.cpp.i
-data/test/javax/management/Introspector/MBeanDescriptionTest.java.i
-data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipCoder.java.i
-data/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.h.i
+data/src/share/back/ClassObjectReferenceImpl.h.i
+data/test/java/rmi/reliability/benchmark/bench/serial/DoubleArrays.java.i
data/src/share/native/sun/security/ec/ecp_192.c.i
data/src/share/classes/sun/swing/plaf/synth/StyleAssociation.java.i
data/make/mkdemo/applets/BarChart/Makefile.i
-data/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java.i
+data/src/solaris/native/sun/awt/medialib/vis_32.il.i
data/test/java/lang/annotation/RecursiveAnnotation.java.i
-data/test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so.d
-data/test/sun/security/pkcs11/Secmod/TrustAnchors.java.i
-data/src/share/native/sun/awt/image/cvutils/img_input8.h.i
+data/test/java/security/cert/CertPathValidator/nameConstraints/openssl.cnf.i
+data/src/share/classes/sun/util/resources/CalendarData_in_ID.properties.i
data/src/share/classes/sun/io/ByteToCharMacArabic.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java.i
data/test/javax/imageio/plugins/png/GrayPngTest.java.i
data/test/java/lang/instrument/Counter.java.i
data/src/share/demo/jfc/Font2DTest/README.txt.i
@@ -18066,174 +18029,177 @@ data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/sortUp.png.i
data/src/share/native/sun/security/ec/impl/mplogic.h.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/info.png.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java.i
+data/make/modules/jdk.awt.ls.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS932_Encoder.java.i
data/make/netbeans/world/build.properties.i
data/test/java/rmi/reliability/benchmark/bench/serial/Booleans.java.i
-data/src/share/classes/java/lang/UnsatisfiedLinkError.java.i
+data/src/share/classes/java/lang/reflect/InvocationTargetException.java.i
+data/src/share/classes/com/sun/beans/finder/Signature.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted_Stub.java.i
data/src/share/classes/com/sun/tools/jdi/VoidTypeImpl.java.i
-data/test/sun/nio/cs/TestIBMBugs.java.i
-data/test/sun/nio/cs/OLD/X11KSC5601_OLD.java.i
+data/test/java/io/StreamTokenizer/ReadAhead.java.i
+data/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java.i
data/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/Test.java.i
-data/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java.i
+data/make/sun/font/mapfile-vers.openjdk.i
+data/src/share/classes/javax/naming/event/NamespaceChangeListener.java.i
data/test/java/util/Locale/data/deflocale.winxp.i
-data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java.i
+data/test/com/sun/security/auth/callback/DialogCallbackHandler/Default.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java.i
-data/src/share/lib/images/cursors/win32_LinkNoDrop32x32.gif.i
-data/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java.i
-data/test/java/io/Serializable/backRefCNFException/Write.java.i
+data/test/sun/nio/cs/OLD/IBM949C_OLD.java.i
+data/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java.i
+data/test/java/beans/PropertyChangeSupport/TestMethods.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java.i
data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java.i
data/src/windows/native/sun/windows/awt_Canvas.h.i
data/test/javax/management/remote/mandatory/subjectDelegation/SimpleStandardMBean.java.i
data/src/share/classes/java/nio/file/attribute/FileAttribute.java.i
data/src/share/classes/javax/swing/ToolTipManager.java.i
data/src/solaris/native/sun/awt/medialib/vis_64.il.i
-data/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java.i
data/src/share/classes/java/awt/Dimension.java.i
-data/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java.i
+data/src/share/classes/java/awt/peer/FileDialogPeer.java.i
data/src/share/classes/sun/print/OpenBook.java.i
data/test/java/io/Serializable/oldTests/PrimitivesTest.java.i
data/test/java/io/BufferedReader/ReadLine.java.i
data/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java.i
-data/src/windows/classes/sun/java2d/windows/WindowsFlags.java.i
data/src/solaris/classes/sun/nio/ch/SctpSendFailed.java.i
data/src/share/bin/splashscreen_stubs.c.i
-data/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java.i
-data/test/sun/security/krb5/auto/CleanState.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif.i
+data/src/share/native/java/lang/reflect/Proxy.c.i
data/src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java.i
data/src/share/native/com/sun/media/sound/SoundDefs.h.i
data/src/share/classes/java/security/spec/ECFieldFp.java.i
data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java.i
-data/src/share/classes/javax/swing/JMenuItem.java.i
+data/make/tools/CharsetMapping/IBM943.map.i
data/src/share/classes/sun/tools/jstat/Alignment.java.i
-data/test/javax/management/context/localizable/WhatsitMBean.java.i
data/src/windows/classes/sun/awt/windows/WButtonPeer.java.i
data/src/share/classes/sun/util/resources/CalendarData_ms_MY.properties.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java.i
-data/test/sun/net/www/http/HttpClient/ProxyFromCache.java.i
-data/test/sun/security/mscapi/SignUsingNONEwithRSA.java.i
+data/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java.i
+data/test/com/sun/crypto/provider/TLS/TestPRF12.java.i
data/src/share/classes/java/awt/dnd/DropTargetEvent.java.i
data/src/share/classes/javax/management/relation/RelationServiceMBean.java.i
data/test/java/nio/MappedByteBuffer/Basic.java.i
-data/src/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav.i
+data/test/sun/security/pkcs11/Provider/Login.sh.i
data/src/share/classes/sun/text/resources/FormatData_fr_FR.java.i
-data/test/java/net/URLEncoder/URLEncoderEncodeArgs.java.i
-data/test/java/util/Collections/AsLifoQueue.java.i
+data/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java.i
+data/src/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif.i
+data/test/sun/security/krb5/ParseCAPaths.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java.i
data/src/solaris/native/java/net/net_util_md.h.i
data/src/windows/native/sun/windows/awt_List.h.i
data/src/share/classes/sun/security/jgss/krb5/WrapToken.java.i
data/test/java/util/concurrent/ConcurrentMap/ConcurrentModification.java.i
-data/src/share/classes/java/awt/print/PrinterGraphics.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java.i
+data/test/java/util/logging/LoggerWeakRefLeak.java.i
data/src/share/classes/java/awt/image/RasterOp.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java.i
-data/src/share/classes/sun/management/FileSystem.java.i
data/test/javax/management/query/QueryParseTest.java.i
-data/test/java/lang/instrument/NamedBuffer.java.i
+data/src/share/classes/java/awt/doc-files/Scrollbar-2.gif.i
data/test/java/lang/instrument/PremainClass/InheritAgent1000.java.i
-data/test/sun/net/util/IPAddressUtilTest.java.i
-data/test/java/lang/String/Split.java.i
+data/src/share/classes/java/awt/Composite.java.i
+data/src/share/classes/javax/print/Doc.java.i
+data/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java.i
data/src/solaris/classes/sun/awt/motif/MDialogPeer.java.i
-data/src/share/classes/sun/rmi/transport/WeakRef.java.i
-data/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java.i
+data/src/share/classes/javax/security/auth/RefreshFailedException.java.i
data/test/java/security/Signature/TestInitSignWithMyOwnRandom.java.i
data/src/linux/doc/man/idlj.1.i
data/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java.i
-data/test/javax/crypto/Cipher/Turkish.java.i
+data/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java.i
data/src/share/classes/javax/swing/event/CaretEvent.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c.i
-data/src/windows/native/sun/java2d/d3d/D3DShaders.h.i
+data/src/share/native/sun/awt/image/jpeg/jcmarker.c.i
data/test/com/sun/tools/attach/CommonSetup.sh.i
data/test/com/sun/nio/sctp/SctpMultiChannel/Send.java.i
data/test/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java.i
data/test/java/lang/management/ThreadMXBean/ThreadStateTest.java.i
data/test/java/io/Serializable/class/NonSerialA_2.java.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java.i
+data/src/share/classes/java/awt/color/ICC_ProfileRGB.java.i
data/src/solaris/native/sun/awt/awt_Insets.c.i
data/src/share/native/sun/font/layout/GlyphLookupTables.h.i
data/src/share/classes/sun/text/resources/FormatData_th.java.i
data/src/share/classes/com/sun/jdi/event/VMDisconnectEvent.java.i
-data/src/share/classes/sun/io/ByteToCharEUC2.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java.i
+data/src/linux/doc/man/ja/jstack.1.i
+data/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java.i
+data/src/share/native/java/util/zip/ZipEntry.c.i
data/test/sun/security/pkcs11/KeyStore/BasicData/random.cert.i
data/src/share/native/java/util/zip/zlib-1.2.3/inflate.h.i
data/test/com/sun/security/sasl/digest/AuthNoUtf8.java.i
data/test/java/io/OutputStreamWriter/BoundsCheck.java.i
data/src/share/classes/sun/tools/jar/SignatureFile.java.i
data/src/share/classes/java/util/ResourceBundle.java.i
-data/test/java/math/BigDecimal/ZeroScalingTests.java.i
+data/test/java/awt/Graphics2D/DrawString/EmptyAttrString.java.i
data/test/java/net/URLConnection/B5052093.java.i
data/test/com/sun/jdi/ImmutableResourceTest.java.i
data/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html.i
data/src/share/classes/javax/accessibility/AccessibleSelection.java.i
-data/test/java/lang/Double/ToHexString.java.i
-data/src/share/classes/sun/io/CharToByteEUC_JP_LINUX.java.i
+data/src/share/classes/com/sun/beans/decoder/FloatElementHandler.java.i
+data/src/share/classes/sun/tools/java/AmbiguousClass.java.i
data/src/share/native/sun/awt/image/cvutils/img_globals.c.i
data/make/sun/splashscreen/Makefile.i
-data/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java.i
-data/src/share/classes/sun/management/manifest.i
+data/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL.c.i
+data/test/java/io/Serializable/ClassCastExceptionDetail/Read.java.i
data/test/sun/security/tools/jarsigner/onlymanifest.sh.i
data/src/share/classes/javax/management/event/RMIPushEventRelay.java.i
data/src/solaris/classes/sun/awt/X11/XPanelPeer.java.i
data/src/share/classes/javax/management/relation/MBeanServerNotificationFilter.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java.i
-data/src/share/classes/sun/tools/java/Scanner.java.i
+data/src/share/classes/javax/swing/text/Document.java.i
data/src/share/classes/sun/tools/jstat/ColumnFormat.java.i
data/make/sun/headless/mapfile-vers.i
data/src/share/classes/sun/java2d/pipe/ValidatePipe.java.i
-data/test/com/sun/security/sasl/digest/Privacy.java.i
+data/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java.i
data/src/share/classes/sun/io/ByteToCharCp862.java.i
data/test/java/util/concurrent/LinkedBlockingQueue/ToArray.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java.i
-data/test/sun/security/pkcs11/KeyStore/ClientAuthData/server.keystore.i
+data/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java.i
+data/test/java/beans/VetoableChangeSupport/TestEquals.java.i
data/make/tools/CharsetMapping/IBM1046.map.i
data/src/share/classes/sun/io/CharToByteCp1148.java.i
data/src/share/classes/java/awt/event/WindowEvent.java.i
-data/make/common/shared/Defs-versions.gmk.i
-data/src/share/classes/sun/rmi/registry/RegistryImpl.java.i
+data/src/share/classes/sun/io/ByteToCharISO8859_3.java.i
+data/src/share/classes/javax/swing/text/html/parser/DocumentParser.java.i
data/test/sun/rmi/rmic/covariantReturns/G2.java.i
data/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java.i
data/src/share/demo/jfc/SampleTree/resources/images/collapsed.gif.i
-data/src/share/classes/sun/security/krb5/Credentials.java.i
-data/test/java/util/ResourceBundle/Test4314141A__DE.properties.i
+data/src/share/classes/java/awt/dnd/DropTargetAdapter.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java.i
data/src/share/classes/sun/management/counter/perf/StringCounterSnapshot.java.i
-data/src/share/classes/sun/nio/ch/MembershipRegistry.java.i
-data/test/sun/net/InetAddress/nameservice/chaining/Providers.java.i
+data/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java.i
+data/src/windows/native/sun/windows/awt_MMStub.h.i
data/make/modules/tools/nbproject/project.xml.i
data/src/share/classes/sun/text/resources/FormatData_mk.java.i
data/src/share/classes/sun/tools/java/ClassDefinition.java.i
data/test/com/sun/net/httpserver/bugs/B6341616.java.i
-data/src/share/classes/com/sun/beans/finder/Signature.java.i
-data/src/share/classes/java/nio/channels/InterruptibleChannel.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java.i
-data/src/share/classes/sun/text/resources/FormatData_nl.java.i
-data/test/java/util/Locale/bug4122700.java.i
-data/src/share/native/sun/awt/medialib/mlib_image.h.i
+data/test/java/nio/charset/spi/FooProvider.java.i
+data/test/javax/print/LookupServices.java.i
+data/test/sun/security/krb5/auto/SSL.java.i
+data/src/share/classes/java/awt/doc-files/DesktopProperties.html.i
+data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html.i
+data/src/share/classes/sun/swing/AccessibleMethod.java.i
data/make/com/sun/xml/Makefile.i
data/src/share/classes/java/util/prefs/PreferenceChangeEvent.java.i
data/src/share/classes/javax/print/attribute/standard/PrinterStateReason.java.i
data/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java.i
-data/src/share/native/sun/security/ec/ec.c.i
+data/src/share/classes/sun/awt/HeadlessToolkit.java.i
+data/src/share/native/sun/management/MemoryPoolImpl.c.i
data/src/share/classes/java/rmi/activation/Activator.java.i
data/src/share/classes/java/dyn/VolatileCallSite.java.i
+data/make/tools/src/build/tools/automulti/TestALFGenerator.java.i
data/test/javax/management/remote/mandatory/socketFactories/RMIClientFactory.java.i
data/src/solaris/classes/sun/awt/X11/XClipboard.java.i
-data/src/windows/native/sun/windows/awt_Label.cpp.i
+data/test/java/nio/file/Files/PassThroughFileSystem.java.i
data/src/share/classes/org/openjdk/jigsaw/cli/package-info.java.i
data/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java.i
data/src/share/native/sun/awt/libpng/pngtest.c.i
data/src/share/classes/sun/management/snmp/jvminstr/package.html.i
data/src/share/classes/sun/util/resources/TimeZoneNames_hi.java.i
data/src/windows/classes/sun/java2d/windows/DDRenderer.java.i
-data/test/java/beans/Introspector/Test5102804.java.i
+data/src/share/classes/javax/management/namespace/VirtualEventManager.java.i
data/test/sun/nio/cs/TestISCII91.java.i
-data/src/share/classes/sun/text/resources/FormatData_ar_JO.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java.i
data/src/share/classes/org/openjdk/jigsaw/SignedModule.java.i
-data/src/windows/native/common/locale_str.h.i
+data/src/share/classes/sun/text/normalizer/UCharacter.java.i
+data/src/share/classes/java/text/spi/DateFormatSymbolsProvider.java.i
data/src/share/classes/org/openjdk/jigsaw/KernelLoader.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_IE.properties.i
data/test/java/nio/file/Path/UriImportExport.java.i
@@ -18242,19 +18208,19 @@ data/make/ASSEMBLY_EXCEPTION.i
data/test/java/net/URLClassLoader/sealing/a/p/A.java.i
data/test/java/io/Serializable/class/Test.java.i
data/test/java/lang/reflect/Module/ModuleAnnotationTest.java.i
+data/src/solaris/classes/java/net/PlainSocketImpl.java.i
data/src/share/classes/java/beans/EventSetDescriptor.java.i
data/test/java/util/concurrent/ConcurrentHashMap/toArray.java.i
data/test/javax/swing/GroupLayout/7071166/bug7071166.java.i
-data/src/solaris/native/sun/java2d/x11/X11SurfaceData.h.i
+data/src/share/classes/javax/sql/RowSetMetaData.java.i
data/test/com/sun/servicetag/ValidRegistrationData.java.i
-data/test/com/sun/management/OperatingSystemMXBean/GetTotalSwapSpaceSize.java.i
+data/src/solaris/classes/sun/nio/fs/UnixException.java.i
data/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java.i
data/test/sun/net/idn/NFS4StringPrep.java.i
data/src/share/classes/java/lang/UnsupportedOperationException.java.i
-data/test/org/openjdk/jigsaw/cli/tsa-prikey.pem.i
+data/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java.i
data/src/share/native/sun/security/ec/impl/ecc_impl.h.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java.i
data/src/share/classes/javax/swing/filechooser/package.html.i
data/src/share/classes/javax/swing/text/html/OptionListModel.java.i
data/test/java/io/Serializable/unresolvedClassDesc/Write.java.i
@@ -18263,178 +18229,182 @@ data/test/java/lang/invoke/6987555/Test6987555.java.i
data/src/windows/classes/sun/java2d/d3d/D3DMaskFill.java.i
data/test/java/security/Security/SecurityPropFile/SecurityPropFile.policy.i
data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TSFrame.java.i
-data/make/mksample/scripting/Makefile.i
-data/test/java/beans/PropertyEditor/TestLongClassJava.java.i
-data/test/com/sun/servicetag/SystemRegistryTest.java.i
-data/test/java/security/KeyRep/AES.pre.1.5.key.i
+data/src/share/classes/javax/management/DescriptorAccess.java.i
+data/test/java/security/Provider/CaseSensitiveServices.java.i
+data/make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java.i
+data/src/share/classes/java/lang/IllegalMonitorStateException.java.i
+data/src/windows/native/sun/windows/awt_Event.cpp.i
data/test/tools/pack200/CommandLineTests.java.i
-data/src/share/classes/sun/text/resources/FormatData_ko.java.i
+data/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java.i
data/test/tools/pack200/AttributeTests.java.i
data/src/windows/native/sun/windows/awt_TrayIcon.h.i
-data/test/sun/security/provider/PolicyParser/UnresolvedProperty.policy.i
+data/src/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java.i
data/src/share/classes/java/dyn/InvokeDynamic.java.i
-data/src/share/classes/javax/sound/sampled/Line.java.i
+data/make/tools/CharsetMapping/MS936.map.i
data/src/share/classes/sun/misc/ExtensionInstallationProvider.java.i
data/src/share/classes/sun/security/tools/policytool/PolicyTool.java.i
-data/test/java/security/SecureRandom/GetAlgorithm.java.i
+data/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java.i
data/test/java/lang/reflect/Generics/StringsAndBounds.java.i
data/src/share/back/ThreadGroupReferenceImpl.c.i
data/src/share/classes/sun/tools/tree/CodeContext.java.i
-data/src/share/classes/java/nio/channels/SeekableByteChannel.java.i
+data/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.java.i
data/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java.i
data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiOut.c.i
data/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java.i
-data/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test1.java.i
+data/src/share/classes/javax/security/auth/login/CredentialNotFoundException.java.i
data/src/share/classes/javax/sound/sampled/package.html.i
-data/test/javax/swing/JLayer/6872503/bug6872503.java.i
+data/test/java/nio/channels/FileChannel/ReadToLimit.java.i
data/test/java/net/URL/runconstructor.sh.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipDirectoryStream.java.i
data/test/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java.i
+data/src/share/classes/sun/text/resources/FormatData_en_PH.java.i
data/make/tools/src/build/tools/stripproperties/StripProperties.java.i
-data/src/solaris/classes/sun/java2d/x11/X11VolatileSurfaceManager.java.i
+data/src/share/classes/sun/font/GlyphDisposedListener.java.i
+data/src/share/classes/java/awt/peer/TextComponentPeer.java.i
data/src/share/classes/sun/net/SocksProxy.java.i
data/src/share/classes/sun/security/util/PropertyExpander.java.i
data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageGenerator.java.i
data/src/share/classes/sun/font/ScriptRun.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/generate.sh.i
+data/src/share/classes/java/rmi/Remote.java.i
+data/test/javax/crypto/SecretKeyFactory/Provider2.java.i
+data/test/java/awt/PrintJob/EdgeTest/EdgeTest.java.i
data/src/share/classes/javax/swing/Autoscroller.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XMBean.java.i
data/test/java/security/Provider/ChangeProviders.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java.i
-data/src/share/bin/version_comp.c.i
+data/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp.i
+data/src/share/classes/java/awt/RenderingHints.java.i
data/src/share/native/sun/awt/image/cvutils/img_fsutil.h.i
data/test/com/sun/jdi/ClassLoaderTarg.java.i
-data/src/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java.i
-data/src/share/classes/javax/print/attribute/standard/Fidelity.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/StackTrace.java.i
data/test/sun/tools/jhat/HatRun.java.i
data/src/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif.i
data/src/share/classes/sun/util/resources/LocaleNames_da.properties.i
data/src/share/native/com/sun/java/util/jar/pack/defines.h.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c.i
data/src/share/back/ThreadReferenceImpl.c.i
+data/test/java/io/File/ToURI.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java.i
-data/make/tools/src/build/tools/generatenimbus/SynthModel.java.i
data/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java.i
-data/test/com/sun/net/httpserver/SelCacheTest.java.i
-data/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java.i
-data/test/java/util/Vector/SimpleSerialization.java.i
+data/src/share/bin/parse_manifest.c.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java.i
data/src/share/classes/java/security/Principal.java.i
-data/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java.i
+data/test/javax/swing/JLabel/6501991/bug6501991.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java.i
+data/test/sun/security/validator/CertReplace.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.password.in.i
-data/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java.i
+data/src/share/classes/java/awt/peer/MenuItemPeer.java.i
data/test/sun/nio/cs/StreamEncoderClose.java.i
data/test/javax/security/sasl/Sasl/PassSysProps.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java.i
data/src/share/classes/sun/rmi/rmic/RMIGenerator.java.i
-data/src/share/native/sun/awt/libpng/png.h.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/Main.java.i
data/src/share/lib/cmm/lcms/sRGB.pf.i
data/src/linux/doc/man/ja/jstatd.1.i
data/make/sun/javazic/tzdata/australasia.i
-data/test/sun/net/InetAddress/nameservice/chaining/Simple1NameServiceDescriptor.java.i
+data/make/java/java/FILES_java.gmk.i
data/test/javax/security/auth/x500/X500Principal/KeywordMap.java.i
-data/src/share/classes/sun/tools/tree/BitOrExpression.java.i
data/src/share/classes/sun/security/util/SignatureFileVerifier.java.i
data/src/share/classes/sun/text/resources/CollationData_ru.java.i
+data/test/javax/swing/JTable/6777378/bug6777378.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java.i
-data/test/sun/net/www/protocol/http/ProxyTunnelServer.java.i
+data/src/share/classes/java/awt/PopupMenu.java.i
data/src/windows/native/sun/windows/awt_dlls.h.i
-data/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java.i
+data/src/share/classes/java/rmi/server/ServerNotActiveException.java.i
+data/src/share/classes/com/sun/media/sound/DLSInfo.java.i
data/src/share/demo/java2d/J2DBench/build.xml.i
+data/test/java/lang/annotation/Missing/MissingTest.java.i
+data/test/java/rmi/testlibrary/README.jcov.i
data/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java.i
data/test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh.i
data/test/sun/nio/cs/OLD/IBM942_OLD.java.i
-data/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java.i
+data/test/java/nio/channels/FileChannel/Read.java.i
data/src/share/demo/nbproject/jfc/SampleTree/build.xml.i
-data/test/sun/security/x509/X500Name/AllAttribs.java.i
-data/src/share/classes/java/awt/image/DataBufferByte.java.i
-data/test/java/nio/channels/SocketChannel/ConnectState.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java.i
+data/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java.i
+data/test/java/io/Serializable/maskSyntheticModifier/Foo.java.i
data/src/share/classes/com/sun/tracing/dtrace/ModuleName.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/NamedObject.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c.i
-data/src/share/classes/sun/net/www/MimeLauncher.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c.i
data/test/javax/swing/JColorChooser/Test6977726.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiPanelUI.java.i
data/test/java/math/BigDecimal/SerializationTests.java.i
-data/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties.i
-data/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif.i
+data/src/share/classes/javax/swing/event/MenuListener.java.i
data/src/share/javavm/include/sys_api.h.i
-data/src/share/classes/javax/security/sasl/package.html.i
+data/src/share/classes/java/security/AlgorithmParametersSpi.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java.i
-data/src/share/classes/sun/reflect/generics/tree/BottomSignature.java.i
+data/src/share/classes/sun/text/resources/FormatData_sk_SK.java.i
data/test/com/sun/jdi/GetLocalVariables4Test.sh.i
data/src/share/classes/sun/io/CharToByteCp1383.java.i
data/test/java/nio/MappedByteBuffer/Force.java.i
-data/test/sun/nio/cs/TestStringCoding.java.i
-data/src/share/native/java/util/zip/ZipEntry.c.i
-data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java.i
+data/test/java/rmi/Naming/legalRegistryNames/Legal.java.i
+data/src/share/classes/java/util/concurrent/ThreadLocalRandom.java.i
data/src/solaris/classes/sun/net/NetHooks.java.i
data/src/share/classes/javax/naming/ldap/SortResponseControl.java.i
-data/src/share/classes/java/io/BufferedOutputStream.java.i
-data/src/share/classes/sun/net/NetworkServer.java.i
+data/src/share/classes/sun/management/counter/perf/PerfDataType.java.i
data/test/sun/security/pkcs11/KeyStore/ClientAuth.sh.i
data/test/java/util/prefs/SerializeExceptions.java.i
-data/make/tools/swing-beans/beaninfo/images/AbstractButtonColor16.gif.i
+data/test/java/io/InputStreamReader/One.java.i
data/make/com/sun/sql/FILES_java.gmk.i
-data/src/share/classes/com/sun/media/sound/SoftShortMessage.java.i
-data/src/share/classes/sun/tools/jconsole/resources/mbean.gif.i
-data/src/share/classes/com/sun/media/sound/AiffFileFormat.java.i
+data/test/javax/imageio/CachePremissionsTest/w.policy.i
+data/test/java/util/Locale/ThaiGov.java.i
data/test/javax/management/loading/SystemClassLoaderTest.java.i
-data/src/share/classes/com/sun/crypto/provider/CipherTextStealing.java.i
-data/test/java/awt/FontClass/CreateFont/DeleteFont.sh.i
+data/test/com/sun/nio/sctp/SctpChannel/Connect.java.i
+data/test/java/io/charStreams/RandomLines.java.i
data/test/sun/security/ssl/javax/net/ssl/GetInstance.java.i
-data/src/share/classes/sun/io/ByteToCharCp1098.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_iw_IL.properties.i
data/src/share/classes/com/sun/jdi/ClassNotLoadedException.java.i
data/test/sun/security/ssl/etc/keystore.i
data/src/share/demo/nbproject/jfc/TableExample/nbproject/file-targets.xml.i
data/test/sun/net/www/ParseUtil_6380332.java.i
data/test/javax/swing/JColorChooser/Test4887836.html.i
-data/test/sun/security/provider/PolicyFile/TrustedCert.keystore.i
+data/src/solaris/classes/sun/awt/X11/XCustomCursor.java.i
+data/make/modules/jdk.depconfig.i
data/test/java/io/PrintWriter/ClearErrorWriter.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSet.java.i
-data/test/sun/net/idn/nfscss.spp.i
+data/test/com/sun/crypto/provider/Cipher/PBE/DecryptWithoutParameters.java.i
data/src/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java.i
data/test/java/io/Serializable/6966692/README.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java.i
-data/test/java/util/zip/ZipFile/crash.jar.i
+data/test/java/rmi/activation/Activatable/checkActivateRef/security.policy.i
data/test/java/io/BufferedInputStream/ReadZeroBytes.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java.i
-data/test/java/util/Arrays/Sorting.java.i
+data/src/share/demo/jfc/Metalworks/resources/HelpFiles/metalworks.html.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c.i
-data/src/share/classes/javax/naming/ldap/ExtendedRequest.java.i
-data/src/solaris/native/sun/awt/awt_Label.c.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java.i
+data/test/java/io/File/GetXSpace.sh.i
data/src/share/demo/jfc/TableExample/README.txt.i
data/test/java/nio/channels/DatagramChannel/NetworkConfiguration.java.i
-data/test/java/nio/channels/Selector/TemporarySelector.java.i
-data/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h.i
-data/test/javax/swing/JPopupMenu/6690791/bug6690791.java.i
-data/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java.i
+data/src/share/classes/sun/tools/tree/Context.java.i
+data/src/share/classes/sun/font/FileFontStrike.java.i
+data/test/java/security/KeyPairGenerator/SolarisShortDSA.java.i
+data/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h.i
+data/make/common/Rules-SCCS.gmk.i
data/src/share/classes/javax/sound/midi/Soundbank.java.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ModifyCorePoolSize.java.i
+data/test/com/sun/java/swing/plaf/windows/Test6824600.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java.i
data/src/windows/classes/sun/awt/windows/WWindowPeer.java.i
-data/test/java/rmi/server/RMIClassLoader/spi/security.policy.i
+data/test/com/sun/net/httpserver/bugs/6725892/Test.java.i
+data/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c.i
data/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java.i
data/src/share/classes/java/net/ProtocolFamily.java.i
data/src/share/classes/sun/util/logging/resources/logging_ko.properties.i
-data/test/javax/naming/spi/DirectoryManager/DummyContext.java.i
-data/src/share/classes/sun/security/provider/VerificationProvider.java.i
+data/src/share/classes/java/util/jar/JarOutputStream.java.i
+data/make/tools/swing-beans/beaninfo/images/JRootPaneColor16.gif.i
data/test/sun/security/util/DerInputBuffer/TimeParsing.java.i
-data/src/windows/native/sun/windows/awt_Color.h.i
-data/src/share/classes/sun/tools/jconsole/VMInternalFrame.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/p11-activcard.txt.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDefault.java.i
data/test/java/net/URLConnection/xml/not-xml2.i
data/test/org/openjdk/jigsaw/_RemoteRepository.java.i
data/src/share/classes/javax/crypto/interfaces/DHPublicKey.java.i
-data/test/java/io/CharArrayReader/Constructor.java.i
-data/test/java/lang/instrument/TransformerManagementThreadAddTests.java.i
+data/src/share/demo/applets/DrawTest/example1.html.i
+data/src/share/classes/javax/print/StreamPrintServiceFactory.java.i
data/src/share/classes/sun/reflect/ConstructorAccessorImpl.java.i
-data/src/share/classes/sun/security/krb5/internal/MethodData.java.i
+data/test/java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java.i
data/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java.i
-data/src/share/lib/security/java.policy.i
+data/src/share/classes/javax/management/Query.java.i
data/src/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java.i
data/src/share/classes/sun/io/CharToByteCp1252.java.i
data/src/share/classes/sun/util/resources/LocaleNames_sv.properties.i
@@ -18446,7 +18416,7 @@ data/src/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java.i
data/src/share/back/VirtualMachineImpl.h.i
data/src/solaris/classes/sun/awt/X11InputMethodDescriptor.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/Commands.java.i
+data/src/share/lib/images/cursors/motif_MoveNoDrop32x32.gif.i
data/test/sun/security/tools/policytool/UpdatePermissions.sh.i
data/src/share/native/sun/font/layout/ThaiStateTables.cpp.i
data/make/sun/javazic/tzdata/africa.i
@@ -18454,59 +18424,57 @@ data/test/java/awt/Focus/NonFocusableResizableTooSmall/NonFocusableResizableTooS
data/test/java/io/StringReader/ClosedReady.java.i
data/src/share/classes/java/applet/Applet.java.i
data/src/share/classes/javax/sound/sampled/spi/AudioFileReader.java.i
-data/test/java/nio/channels/SocketChannel/Bind.java.i
-data/src/share/classes/javax/net/ssl/SSLException.java.i
+data/test/java/beans/XMLEncoder/java_lang_reflect_Method.java.i
+data/src/share/classes/java/lang/StringBuffer.java.i
data/src/share/native/java/lang/fdlibm/src/s_ldexp.c.i
data/src/share/classes/javax/smartcardio/ResponseAPDU.java.i
data/test/java/net/URLClassLoader/GetURLsTest.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/Attack.java.i
-data/test/tools/launcher/ExecutionEnvironment.java.i
data/src/share/classes/sun/nio/cs/UTF_32LE.java.i
-data/src/solaris/native/sun/security/pkcs11/j2secmod_md.h.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif.i
data/src/share/classes/javax/crypto/interfaces/PBEKey.java.i
data/src/share/native/java/lang/fdlibm/src/w_j1.c.i
data/test/javax/management/openmbean/IsValueTest.java.i
-data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/rmid.security.policy.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_f.c.i
+data/src/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/etsi.xsd.i
data/src/share/native/sun/java2d/opengl/OGLBufImgOps.h.i
data/test/sun/security/provider/PolicyParser/p003.policy.i
-data/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM420.java.i
+data/test/javax/management/eventService/CustomForwarderTest.java.i
+data/test/java/io/Serializable/oldTests/WritePrimitive.java.i
data/src/share/classes/java/awt/doc-files/GridBagLayout-2.gif.i
-data/src/share/classes/javax/sound/midi/SoundbankResource.java.i
-data/test/java/nio/file/DirectoryStream/Basic.java.i
+data/test/java/net/ipv6tests/UdpTest.java.i
data/make/tools/swing-beans/beaninfo/images/JSeparatorColor16.gif.i
-data/src/share/classes/java/rmi/server/ObjID.java.i
+data/test/java/io/OutputStreamWriter/NullCreate.java.i
data/src/share/native/sun/rmi/server/MarshalInputStream.c.i
data/test/sun/security/tools/jarsigner/oldsig/A.class.i
-data/src/share/classes/com/sun/media/sound/SoftLinearResampler.java.i
-data/test/java/io/Serializable/noSuchFieldClarification/NoSuchFieldClarification.java.i
+data/src/share/back/eventFilter.c.i
data/make/tools/src/build/tools/javazic/Checksum.java.i
data/test/sun/security/pkcs11/ec/TestECGenSpec.java.i
data/src/share/classes/java/security/GuardedObject.java.i
data/test/com/sun/awt/Translucency/WindowOpacity.java.i
data/src/share/classes/sun/security/ec/SunEC.java.i
-data/test/javax/management/MBeanServer/NewMBeanListenerTest.java.i
+data/src/share/demo/jvmti/heapViewer/heapViewer.c.i
data/test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
data/test/sun/nio/cs/X11CNS11643P3.java.i
data/src/share/classes/sun/security/pkcs11/P11KeyGenerator.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthBorder.java.i
-data/src/windows/native/sun/java2d/d3d/D3DRenderer.h.i
+data/src/share/demo/jvmti/hprof/hprof_cpu.h.i
+data/test/sun/management/jmxremote/bootstrap/management_ssltest13_ko.properties.in.i
+data/src/solaris/native/sun/awt/awt_KeyboardFocusManager.c.i
data/src/share/classes/java/util/SortedSet.java.i
data/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java.i
-data/src/share/classes/sun/util/logging/resources/logging_de.properties.i
+data/src/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java.i
data/src/share/classes/java/sql/SQLTimeoutException.java.i
data/src/share/classes/sun/security/action/GetIntegerAction.java.i
data/src/share/classes/java/net/HttpCookie.java.i
data/make/tools/src/build/tools/jdwpgen/RepeatNode.java.i
data/src/share/classes/com/sun/awt/AWTUtilities.java.i
data/make/tools/src/build/tools/charsetmapping/CharsetMapping.java.i
-data/src/share/classes/sun/invoke/util/BytecodeDescriptor.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/inffast.h.i
+data/src/solaris/doc/sun/man/man1/javac.1.i
+data/src/share/demo/nbproject/project.xml.i
data/test/javax/swing/JLayer/6994419/bug6994419.java.i
data/src/share/native/sun/misc/Version.c.i
-data/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html.i
+data/src/share/classes/javax/swing/filechooser/FileFilter.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_CL.java.i
data/test/java/util/PluggableLocale/providersrc/DecimalFormatSymbolsProviderImpl.java.i
data/test/javax/print/applet/applet1/Applet1PrintService.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java.i
@@ -18514,15 +18482,14 @@ data/src/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java.i
data/make/sun/javazic/tzdata_jdk/jdk11_backward.i
data/src/share/classes/sun/rmi/server/LoaderHandler.java.i
data/test/javax/management/monitor/InstantiateMonitorNotificationTest.java.i
-data/test/java/util/WeakHashMap/ZeroInitCap.java.i
-data/src/windows/classes/sun/awt/windows/WSystemTrayPeer.java.i
-data/src/solaris/classes/java/net/PlainSocketImpl.java.i
+data/make/tools/CharsetMapping/EUC_CN.map.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties.i
+data/src/share/classes/sun/util/resources/LocaleNamesBundle.java.i
data/src/share/classes/com/sun/tools/jdi/LongTypeImpl.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8ext.c.i
data/test/sun/security/util/asn1StringTypes/StringTypes.java.i
data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod_Stub.java.i
-data/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java.i
data/make/tools/src/build/tools/jdwpgen/NameNode.java.i
data/test/java/util/zip/ZipInputStream/Skip.java.i
@@ -18532,18 +18499,19 @@ data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain4.txt.i
data/src/share/classes/javax/naming/NamingEnumeration.java.i
data/test/com/sun/net/httpserver/bugs/B6744329.java.i
data/src/share/classes/javax/naming/spi/ContinuationContext.java.i
-data/src/solaris/classes/sun/awt/X11/XMenuWindow.java.i
-data/test/sun/security/rsa/TestSignatures.java.i
+data/src/share/classes/sun/text/resources/CollationData_is.java.i
+data/src/share/classes/javax/swing/CellRendererPane.java.i
data/src/solaris/classes/sun/java2d/x11/X11Renderer.java.i
+data/src/share/classes/java/awt/print/Printable.java.i
data/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp.i
data/src/share/classes/javax/swing/event/package.html.i
data/src/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM871.java.i
-data/src/share/lib/images/cursors/motif_MoveNoDrop32x32.gif.i
-data/src/share/classes/javax/swing/JToolBar.java.i
-data/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.java.i
-data/src/share/classes/java/util/AbstractCollection.java.i
-data/test/java/awt/xembed/server/RunTestXEmbed.java.i
+data/make/tools/CharsetMapping/IBM1145.c2b.i
+data/src/share/native/sun/awt/medialib/mlib_ImageCreate.h.i
+data/make/netbeans/common/jtreg-view.ent.i
+data/src/share/classes/sun/font/FontUtilities.java.i
+data/src/share/classes/javax/swing/text/html/parser/DTDConstants.java.i
+data/src/share/classes/sun/security/x509/CertificateAlgorithmId.java.i
data/test/java/text/Collator/Bug6970930.java.i
data/src/share/classes/com/sun/jdi/event/EventSet.java.i
data/src/share/classes/java/awt/dnd/peer/package.html.i
@@ -18552,126 +18520,130 @@ data/make/tools/swing-beans/beaninfo/images/JSliderMono32.gif.i
data/src/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java.i
data/make/tools/src/build/tools/generatenimbus/Shape.java.i
data/src/share/classes/javax/net/ssl/X509KeyManager.java.i
-data/src/share/classes/sun/io/CharToByteISO8859_2.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirs1.policy.i
+data/src/share/classes/java/nio/file/spi/FileSystemProvider.java.i
+data/src/share/native/sun/font/layout/HangulLayoutEngine.h.i
data/make/tools/swing-beans/beaninfo/images/JTextAreaMono16.gif.i
data/test/java/io/Serializable/writeObjectMemory/WriteObjectMemory.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EmptyExtensionData.java.i
-data/test/javax/swing/JFileChooser/6489130/bug6489130.java.i
+data/src/share/classes/javax/print/event/PrintEvent.java.i
+data/make/tools/swing-beans/beaninfo/images/JMenuColor16.gif.i
+data/test/java/util/WeakHashMap/GCDuringIteration.java.i
+data/src/share/classes/sun/awt/image/ImageFormatException.java.i
data/src/solaris/native/sun/xawt/awt_Desktop.c.i
data/src/solaris/sample/dtrace/hotspot/method_invocation_tree.d.i
data/test/java/util/prefs/ConflictInFlush.java.i
data/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java.i
-data/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java.i
-data/test/java/net/SocketPermission/ActionSpace.java.i
+data/src/share/classes/java/nio/file/attribute/FileAttributeView.java.i
+data/test/java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java.i
data/test/java/io/Serializable/proxy/skipMissing/Read.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/zlib.h.i
data/test/java/awt/geom/CubicCurve2D/SolveCubicTest.java.i
data/make/sun/awt/Depend.mak.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so.i
data/src/share/demo/jvmti/hprof/hprof_site.c.i
data/src/share/classes/java/lang/instrument/ClassFileTransformer.java.i
data/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java.i
data/src/share/classes/sun/rmi/server/MarshalInputStream.java.i
data/src/share/classes/com/sun/jmx/namespace/RoutingProxy.java.i
data/test/java/nio/charset/coders/IsLegalReplacement.java.i
-data/src/share/sample/nio/server/RequestServicer.java.i
+data/test/java/util/PluggableLocale/ProviderTest.java.i
data/src/share/demo/jvmti/hprof/hprof_init.c.i
data/src/share/demo/nbproject/jfc/Notepad/build.properties.i
data/test/com/sun/security/auth/login/ConfigFile/InconsistentError.config.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java.i
+data/src/share/classes/sun/io/CharToByteMacTurkish.java.i
data/src/share/classes/javax/smartcardio/TerminalFactorySpi.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XPlotter.java.i
-data/test/sun/security/pkcs11/Cipher/ReinitCipher.java.i
-data/src/share/classes/javax/accessibility/AccessibleResourceBundle.java.i
-data/src/share/classes/com/sun/tools/hat/MANIFEST.mf.i
+data/make/mksample/nbproject/Makefile.i
+data/src/share/classes/java/beans/ExceptionListener.java.i
+data/src/share/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz.i
data/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java.i
data/src/share/classes/java/awt/peer/MouseInfoPeer.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_1.c.i
-data/src/share/classes/com/sun/nio/sctp/Notification.java.i
-data/src/share/classes/java/io/LineNumberReader.java.i
-data/src/share/classes/sun/io/ByteToCharEUC_JP_Solaris.java.i
+data/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java.i
+data/test/java/util/Vector/LastIndexOf.java.i
+data/src/share/classes/java/lang/reflect/UndeclaredThrowableException.java.i
data/test/java/net/DatagramSocket/TestAfterClose.java.i
-data/test/javax/management/query/CustomQueryTest.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java.i
-data/make/modules/BuildPackages.gmk.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java.i
+data/test/com/sun/jdi/PopSynchronousTest.java.i
+data/src/solaris/classes/sun/nio/ch/Port.java.i
+data/src/share/classes/javax/management/event/EventReceiver.java.i
data/test/sun/security/pkcs11/Secmod/key3.db.i
data/test/java/io/PushbackInputStream/ClosedStream.java.i
data/test/tools/launcher/PrintVersion.java.i
data/src/share/classes/javax/imageio/ImageTranscoder.java.i
data/test/com/sun/security/auth/CreateLdapPrincipals.java.i
-data/src/share/classes/sun/net/www/http/KeepAliveCache.java.i
+data/src/share/classes/sun/dyn/Access.java.i
data/test/com/sun/jdi/sde/TemperatureTableTest.java.i
data/test/java/nio/Buffer/BasicLong.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java.i
-data/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java.i
+data/test/com/sun/jdi/connect/spi/NullTransportService.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/README.update.i
data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java.i
data/test/javax/swing/border/Test7034614.java.i
-data/src/windows/back/util_md.h.i
-data/src/solaris/native/sun/java2d/loops/vis_ByteGray_FromRgb.c.i
-data/src/share/classes/sun/text/resources/FormatData_ru.java.i
+data/src/share/classes/com/sun/beans/decoder/BooleanElementHandler.java.i
+data/src/share/classes/javax/imageio/ImageWriteParam.java.i
+data/src/share/classes/javax/net/ssl/SSLEngine.java.i
data/src/share/classes/javax/swing/text/html/ImageView.java.i
data/test/com/sun/jdi/FramesTest.java.i
-data/test/java/security/cert/CertificateFactory/ReturnStream.java.i
+data/make/mkdemo/management/MemoryMonitor/Makefile.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributes.java.i
data/src/share/classes/com/sun/security/auth/PrincipalComparator.java.i
data/src/share/classes/com/sun/management/GarbageCollectorMXBean.java.i
data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_ASCII_Decoder.java.i
data/src/share/classes/javax/swing/undo/CompoundEdit.java.i
-data/test/com/sun/crypto/provider/Cipher/PBE/PBEInvalidParamsTest.java.i
-data/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/GetResponseCode.java.i
data/src/share/classes/java/util/jar/JarVerifier.java.i
-data/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh.i
+data/src/share/classes/sun/security/x509/CertificatePolicySet.java.i
data/test/java/io/Serializable/oldTests/CheckForException.java.i
data/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java.i
-data/src/share/classes/sun/text/resources/FormatData_fi.java.i
+data/src/share/classes/com/sun/jmx/snmp/BerEncoder.java.i
data/src/share/classes/sun/reflect/DelegatingMethodAccessorImpl.java.i
-data/test/java/lang/System/SecurityRace.java.i
-data/test/sun/misc/Version/Version.java.i
-data/src/share/classes/sun/io/CharToByteUnicodeBig.java.i
+data/src/share/classes/javax/swing/text/doc-files/Document-remove.gif.i
+data/test/com/sun/jdi/RedefineFinal.sh.i
+data/test/java/beans/XMLEncoder/Test6852574.java.i
data/make/tools/swing-beans/beaninfo/images/JRootPaneMono16.gif.i
data/src/share/native/java/lang/fdlibm/src/w_jn.c.i
-data/src/share/classes/java/io/FilterInputStream.java.i
+data/src/share/classes/sun/management/FileSystem.java.i
data/src/share/classes/javax/management/relation/RoleUnresolvedList.java.i
-data/test/java/lang/Throwable/NewChainedExceptions.java.i
+data/src/share/classes/java/security/AuthProvider.java.i
data/src/share/classes/javax/swing/plaf/nimbus/DerivedColor.java.i
-data/src/windows/classes/sun/security/mscapi/RSAPrivateKey.java.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.h.i
+data/src/solaris/classes/sun/management/FileSystemImpl.java.i
+data/src/solaris/classes/sun/print/UnixPrintJob.java.i
data/make/netbeans/common/unix-sources.ent.i
data/src/share/classes/javax/xml/crypto/URIReferenceException.java.i
-data/src/share/native/sun/font/layout/MorphTables.cpp.i
-data/test/java/net/URLConnection/GetLastModified.java.i
+data/make/tools/src/build/tools/javazic/BackEnd.java.i
+data/src/share/classes/sun/io/ByteToCharCp1143.java.i
data/src/share/classes/sun/misc/Timeable.java.i
data/test/com/sun/jndi/ldap/LdapName/Case.java.i
data/test/java/net/Socket/GetLocalAddress.java.i
-data/test/com/sun/net/httpserver/bugs/B6433018.java.i
+data/make/netbeans/common/share-view.ent.i
+data/make/sun/org/mozilla/Makefile.i
data/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java.i
-data/src/share/classes/javax/management/NotificationInfos.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java.i
data/src/share/native/sun/awt/image/jpeg/jchuff.h.i
data/test/javax/crypto/SecretKeyFactory/P2SecretKeyFactory.java.i
data/test/java/lang/StringBuilder/EnsureCapacity.java.i
-data/src/share/classes/sun/tools/tree/LocalMember.java.i
-data/src/windows/classes/sun/awt/windows/WFontMetrics.java.i
-data/make/tools/swing-beans/beaninfo/images/JTextPaneMono32.gif.i
-data/test/javax/management/MBeanInfo/NullInfoArraysTest.java.i
-data/src/share/classes/sun/text/resources/thai_dict.d
-data/src/share/javavm/export/jvmticmlr.h.i
+data/src/share/classes/sun/security/util/Password.java.i
+data/src/share/classes/sun/tools/jstat/Arguments.java.i
+data/src/share/classes/java/awt/datatransfer/Clipboard.java.i
+data/src/share/classes/javax/swing/text/ParagraphView.java.i
+data/src/share/classes/java/awt/ComponentOrientation.java.i
+data/src/share/classes/sun/net/httpserver/ContextList.java.i
data/src/share/classes/sun/beans/editors/LongEditor.java.i
-data/src/share/classes/sun/text/resources/FormatData_cs_CZ.java.i
-data/test/com/sun/jdi/StepTest.java.i
+data/src/share/classes/sun/text/resources/thai_dict.i
+data/test/java/util/ArrayList/EnsureCapacity.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java.i
data/src/share/classes/java/util/Comparator.java.i
data/src/share/classes/sun/text/resources/FormatData_sk.java.i
-data/src/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java.i
+data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java.i
data/src/share/classes/com/sun/management/package.html.i
-data/src/share/classes/java/lang/AssertionStatusDirectives.java.i
+data/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java.i
data/src/share/native/sun/font/bidi/ubidi.c.i
-data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java.i
+data/test/sun/net/InetAddress/nameservice/chaining/Providers.java.i
data/src/share/classes/javax/management/openmbean/OpenType.java.i
data/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java.i
-data/src/share/classes/java/net/HttpRetryException.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java.i
-data/test/javax/management/openmbean/OpenTypeDescriptorTest.java.i
+data/make/java/java/reorder-sparc.i
+data/make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java.i
+data/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java.i
+data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password.i
data/src/share/classes/sun/management/counter/perf/InstrumentationException.java.i
data/src/share/classes/java/awt/event/WindowAdapter.java.i
data/src/solaris/bin/ergo.h.i
@@ -18679,64 +18651,66 @@ data/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass1.java.i
data/test/java/lang/management/ThreadMXBean/SynchronizerLockingThread.java.i
data/src/share/classes/javax/print/attribute/SetOfIntegerSyntax.java.i
data/test/sun/security/ssl/etc/truststore.i
-data/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java.i
-data/test/tools/launcher/Test7029048.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif.i
+data/src/share/classes/javax/swing/text/doc-files/Document-insert.gif.i
data/src/share/classes/java/security/acl/AclNotFoundException.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_5.java.i
data/make/tools/dtdbuilder/dtds/public.map.i
data/test/sun/security/tools/keytool/printssl.sh.i
data/src/share/classes/sun/text/resources/FormatData_ar_DZ.java.i
data/src/share/native/sun/font/layout/HanLayoutEngine.h.i
-data/test/java/util/logging/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
-data/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh.i
+data/test/java/util/IdentityHashMap/ToArray.java.i
+data/src/share/native/sun/java2d/loops/IntArgbPre.c.i
data/test/java/net/MulticastSocket/SetLoopbackMode.java.i
data/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_SA.properties.i
-data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml.i
-data/test/java/io/charStreams/LineLengthsSource.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapName.java.i
data/test/java/util/PluggableLocale/providersrc/java.util.spi.TimeZoneNameProvider.i
-data/src/share/sample/nio/chatserver/NameReader.java.i
-data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.config.i
+data/src/share/classes/sun/font/FontScalerException.java.i
+data/test/java/beans/PropertyEditor/TestFloatClassNull.java.i
data/src/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java.i
-data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor32.gif.i
-data/src/share/classes/java/awt/geom/package.html.i
+data/src/share/classes/javax/sql/ConnectionEventListener.java.i
+data/test/java/nio/channels/FileChannel/Size.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml.i
-data/test/org/openjdk/jigsaw/repocat.sh.i
+data/src/share/native/java/util/zip/zlib-1.1.3/inftrees.h.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S32Func.c.i
+data/test/java/awt/Toolkit/HeadlessTray/HeadlessTray.java.i
+data/test/sun/tools/jstat/usage.out.i
data/test/java/lang/instrument/PremainClass/Agent.jar.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java.i
+data/src/share/native/sun/awt/giflib/gif_err.c.i
data/make/netbeans/jarzip/README.i
-data/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java.i
+data/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java.i
data/test/java/dyn/6991596/Test6991596.java.i
-data/test/java/nio/channels/SocketChannel/GetChannel.java.i
+data/test/sun/rmi/rmic/manifestClassPath/Util.sh.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_SD.properties.i
data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/Shutdown.java.i
data/test/java/nio/channels/FileChannel/MapReadOnly.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c.i
+data/src/share/lib/audio/soundbank.gm.i
+data/test/java/beans/XMLEncoder/Test5023550.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.password.in.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.c.i
+data/src/share/lib/audio/soundbank.gm.d
+data/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c.i
data/test/java/lang/reflect/Field/4490864/StaticFieldTest.java.i
data/test/sun/security/pkcs11/Mac/ReinitMac.java.i
-data/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java.i
+data/test/sun/security/krb5/auto/W83.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so.d
-data/src/windows/native/sun/windows/jawt.cpp.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest11_ok.ssl.in.i
+data/test/java/io/Serializable/6559775/README.i
+data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties.i
data/make/tools/swing-beans/beaninfo/images/JButtonColor16.gif.i
-data/src/share/classes/java/io/InvalidObjectException.java.i
-data/src/share/demo/jvmti/hprof/hprof_trace.h.i
+data/test/javax/management/modelmbean/InfoSupportTest.java.i
data/test/javax/imageio/plugins/wbmp/CanDecodeTest.java.i
-data/test/java/io/Serializable/PutField/Write2.java.i
+data/src/share/classes/sun/text/resources/FormatData_is_IS.java.i
data/src/share/classes/java/awt/datatransfer/MimeTypeParseException.java.i
-data/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so.i
-data/src/solaris/native/sun/awt/swing_GTKEngine.c.i
+data/src/windows/native/common/gdefs_md.h.i
+data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties.i
data/make/tools/src/build/tools/charsetmapping/EUC_TW.java.i
-data/test/java/lang/Thread/GenerifyStackTraces.java.i
+data/src/share/native/sun/awt/image/cvutils/img_output16_32.h.i
data/test/java/rmi/server/useCustomRef/Ping.java.i
-data/test/java/lang/Class/forName/classes/period.class.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/TestEnvironment.java.i
data/test/java/io/Serializable/enum/mismatchedTypecode/Test.java.i
data/test/java/util/ResourceBundle/Bug4353454.java.i
-data/test/java/io/pathNames/unix/TrailingSlash.java.i
+data/src/share/classes/sun/rmi/transport/tcp/TCPConnection.java.i
data/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java.i
data/test/sun/security/krb5/ktab/KeyTabIndex.java.i
data/test/java/net/MulticastSocket/SetTTLTo0.java.i
@@ -18744,124 +18718,129 @@ data/src/share/classes/com/sun/jmx/snmp/tasks/TaskServer.java.i
data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java.i
data/src/share/classes/java/nio/channels/AsynchronousByteChannel.java.i
data/src/windows/native/sun/windows/awt_Component.h.i
-data/src/solaris/classes/sun/awt/motif/MRobotPeer.java.i
-data/src/linux/doc/man/apt.1.i
-data/src/share/classes/sun/nio/cs/ext/HKSCS.java.i
-data/src/share/classes/javax/swing/JWindow.java.i
-data/src/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java.i
-data/src/solaris/classes/sun/java2d/xr/XRPaints.java.i
-data/test/java/util/StringTokenizer/ResetPos.java.i
+data/src/share/classes/sun/security/util/DerIndefLenConverter.java.i
+data/src/share/classes/javax/imageio/ImageReader.java.i
+data/src/share/classes/sun/invoke/empty/Empty.java.i
+data/src/share/classes/sun/awt/image/PNGImageDecoder.java.i
+data/src/share/classes/sun/jkernel/BackgroundDownloader.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ca_ES.properties.i
data/test/sun/tools/jstat/gcNewCapacityOutput1.awk.i
data/src/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java.i
-data/src/share/classes/com/sun/media/sound/SF2Instrument.java.i
-data/src/share/classes/sun/java2d/loops/DrawRect.java.i
+data/src/share/classes/java/security/spec/RSAPrivateKeySpec.java.i
+data/test/java/net/Inet6Address/IPv6AddressTypes.java.i
data/src/share/classes/javax/management/namespace/JMXDomain.java.i
-data/test/java/rmi/testlibrary/TestParams.java.i
-data/src/solaris/native/sun/net/spi/SdpProvider.c.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties.i
+data/src/share/classes/sun/nio/fs/AbstractWatchKey.java.i
data/test/java/io/PrintStream/EncodingConstructor.java.i
data/src/share/classes/javax/swing/OverlayLayout.java.i
-data/src/share/classes/sun/rmi/transport/Channel.java.i
+data/test/java/beans/XMLEncoder/Test4646747.java.i
+data/src/windows/classes/sun/awt/windows/WFontPeer.java.i
data/test/sun/tools/jps/jps-Vm_2.sh.i
data/test/javax/swing/border/Test6981576.java.i
data/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java.i
+data/test/javax/management/eventService/EventClientThreadTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java.i
data/src/share/classes/sun/nio/cs/ext/MS932.java.i
-data/src/share/classes/sun/tools/tree/ConditionalExpression.java.i
-data/src/share/native/java/lang/fdlibm/src/w_exp.c.i
+data/test/sun/security/krb5/RFC396xTest.java.i
+data/make/java/sql/Makefile.i
+data/src/share/classes/javax/security/auth/login/AccountLockedException.java.i
data/src/share/classes/org/openjdk/jigsaw/ContextBuilder.java.i
data/src/share/classes/sun/tools/asm/ArrayData.java.i
-data/src/share/native/sun/font/layout/ContextualGlyphSubstitution.h.i
+data/src/share/native/sun/awt/image/imageInitIDs.h.i
data/test/java/beans/XMLEncoder/javax_swing_JSplitPane.java.i
data/test/com/sun/security/auth/callback/TextCallbackHandler/Confirm.java.i
-data/test/java/security/cert/pkix/nameConstraintsMinMax/labs2isrg2.cer.i
-data/test/java/lang/reflect/Method/InheritedMethods.java.i
-data/src/share/classes/sun/java2d/pipe/RegionIterator.java.i
+data/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java.i
+data/test/com/sun/servicetag/SystemRegistryTest.java.i
+data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono32.gif.i
data/test/java/net/URLClassLoader/URLParsing.java.i
data/test/java/security/cert/CertPathBuilder/selfIssued/generate.sh.i
data/test/java/lang/management/MemoryMXBean/MemoryManagement.java.i
data/make/tools/swing-beans/beaninfo/images/JToggleButtonMono32.gif.i
data/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java.i
-data/src/share/classes/com/sun/net/ssl/TrustManager.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java.i
data/src/share/classes/javax/management/openmbean/MXBeanMapping.java.i
data/test/tools/pack200/TimeStamp.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/QueryListener.java.i
-data/src/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java.i
+data/src/share/native/sun/awt/image/cvutils/img_icm.h.i
data/src/solaris/classes/sun/awt/X11/XModalityProtocol.java.i
-data/make/tools/CharsetMapping/IBM1026.map.i
-data/test/java/net/URLClassLoader/closetest/Common.java.i
+data/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java.i
+data/src/share/classes/java/awt/peer/MenuBarPeer.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java.i
data/test/javax/swing/JTextArea/6925473/bug6925473.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapNum.java.i
+data/src/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java.i
data/test/sun/management/jmxremote/bootstrap/management_test04_ok.properties.in.i
data/test/sun/java2d/cmm/ColorConvertOp/ColCvtIntARGB.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ga_IE.properties.i
-data/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java.i
data/src/share/classes/sun/rmi/transport/ConnectionOutputStream.java.i
data/src/share/classes/javax/crypto/spec/DHPublicKeySpec.java.i
-data/test/java/util/ResourceBundle/Bug4177489_Resource_jf_JF.properties.i
-data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java.i
+data/src/share/classes/com/sun/jdi/LongType.java.i
+data/test/java/io/File/WinSpecialFiles.java.i
+data/src/share/classes/javax/swing/plaf/ListUI.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/inflate.c.i
data/src/solaris/classes/sun/awt/X11/XRepaintArea.java.i
+data/test/com/sun/net/httpserver/Test2.java.i
data/test/com/sun/jdi/BreakpointTest.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java.i
data/src/share/classes/java/util/concurrent/Semaphore.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmssamp.c.i
data/src/solaris/doc/sun/man/man1/jdb.1.i
-data/test/javax/swing/JDialog/6639507/bug6639507.java.i
-data/test/java/io/Serializable/classDescFlagConflict/Read.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java.i
+data/src/share/classes/org/ietf/jgss/GSSName.java.i
data/test/org/openjdk/jigsaw/circular-deps.sh.i
data/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java.i
-data/src/share/classes/javax/swing/DefaultListModel.java.i
+data/make/common/internal/Defs-corba.gmk.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java.i
-data/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport2.java.i
+data/test/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java.i
data/src/share/classes/java/security/PrivilegedExceptionAction.java.i
-data/test/java/net/InetSocketAddress/ToString.java.i
+data/src/share/native/sun/awt/image/jpeg/jdcolor.c.i
data/src/share/classes/sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIState.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/ObjectCodeConvertors.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/AgentServer.java.i
data/src/share/classes/sun/tools/attach/HotSpotVirtualMachine.java.i
data/src/share/classes/java/text/CharacterIterator.java.i
data/src/share/classes/javax/sound/midi/MidiDeviceReceiver.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java.i
data/test/javax/script/Test3.js.i
-data/test/javax/crypto/CryptoPermission/RC4AliasPermCheck.java.i
+data/src/share/classes/javax/sound/sampled/Clip.java.i
+data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties.i
data/test/java/util/ArrayList/AddAll.java.i
data/test/sun/security/provider/PolicyFile/getinstance/OneArgPermission.java.i
data/src/solaris/native/java/net/PlainDatagramSocketImpl.c.i
data/src/share/classes/sun/security/util/SignatureFileManifest.java.i
data/test/javax/management/loading/MLetContentTest.java.i
data/src/share/native/sun/awt/image/cvutils/img_output8_16_24.h.i
-data/test/java/io/File/HashCodeEquals.java.i
-data/test/java/beans/Introspector/Test6194788.java.i
-data/test/sun/security/smartcardio/TestMultiplePresent.java.i
-data/test/java/security/Security/removing/RemoveStaticProvider.java.i
-data/src/share/classes/sun/java2d/pipe/TextRenderer.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java.i
-data/test/java/io/Reader/SkipNegative.java.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java.i
+data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java.i
+data/src/share/classes/java/awt/event/FocusListener.java.i
+data/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java.i
+data/test/java/beans/PropertyEditor/TestFloatTypeJava.java.i
+data/src/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java.i
+data/src/windows/classes/sun/java2d/windows/WindowsFlags.java.i
data/make/tools/src/build/tools/dtdbuilder/README.txt.i
+data/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c.i
data/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java.i
-data/test/sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java.i
+data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.cpp.i
data/src/share/sample/vm/jvm-clr/invoker.cpp.i
data/src/share/classes/java/dyn/FromGeneric.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-rsa.xml.i
data/src/solaris/native/sun/awt/splashscreen/splashscreen_config.h.i
-data/test/java/rmi/reliability/benchmark/bench/serial/ObjTrees.java.i
+data/test/org/openjdk/jigsaw/pubrepo.sh.i
data/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java.i
data/test/java/io/InputStreamReader/NullCreate.java.i
data/src/share/classes/com/sun/java/swing/Painter.java.i
-data/src/windows/native/sun/windows/awt_MouseEvent.cpp.i
+data/src/share/classes/sun/misc/resources/Messages_fr.java.i
data/src/share/classes/java/awt/font/GlyphVector.java.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so.i
-data/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java.i
-data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java.i
-data/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java.i
+data/test/javax/naming/ldap/LdapName/RdnToAttrsTest.java.i
+data/src/share/classes/sun/tools/jstat/resources/jstat_options.i
+data/test/java/nio/charset/spi/charsetProvider.sp.i
+data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java.i
data/src/share/classes/javax/swing/colorchooser/SmartGridLayout.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html.i
data/src/solaris/native/com/sun/management/SolarisOperatingSystem.c.i
data/src/share/classes/sun/tracing/package-info.java.i
data/test/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.java.i
-data/test/sun/security/rsa/TestKeyPairGeneratorLength.java.i
+data/test/java/text/Bidi/Bug7041232.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Designer.jibx.xml.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.i
data/src/share/classes/sun/security/provider/certpath/KeyChecker.java.i
@@ -18869,196 +18848,200 @@ data/test/java/net/PortUnreachableException/OneExceptionOnly.java.i
data/test/java/util/LinkedHashMap/EmptyMapIterator.java.i
data/src/share/classes/java/awt/font/ImageGraphicAttribute.java.i
data/src/share/classes/javax/crypto/NullCipher.java.i
-data/test/sun/tools/jstatd/jstatdUsage1.sh.i
+data/src/solaris/native/sun/awt/awt_Font.c.i
data/test/sun/security/provider/PolicyFile/getinstance/TwoArgNullActionsPermission.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java.i
data/test/javax/management/ImplementationVersion/ImplVersionReader.java.i
-data/src/share/classes/sun/util/ResourceBundleEnumeration.java.i
+data/src/share/classes/sun/io/ByteToCharISO2022CN.java.i
data/test/java/security/Policy/GetInstance/GetInstancePolicySpi.java.i
-data/make/tools/swing-beans/beaninfo/images/JMenuBarMono32.gif.i
+data/src/share/sample/nio/server/RequestServicer.java.i
data/make/modules/tools/src/com/sun/classanalyzer/ResourceFile.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/infblock.c.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java.i
-data/test/sun/security/tools/keytool/newhelp.sh.i
-data/test/javax/management/namespace/NamespaceCreationTest.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowDeps.java.i
+data/test/javax/security/auth/kerberos/KerberosTixDateTest.java.i
+data/src/share/classes/java/nio/charset/Charset-X-Coder.java.i
+data/src/share/classes/sun/security/util/DerEncoder.java.i
+data/src/share/classes/sun/io/CharToByteBig5_Solaris.java.i
data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.c.i
-data/test/java/text/Format/MessageFormat/Bug7003643.java.i
+data/src/share/classes/sun/security/ssl/CipherSuite.java.i
data/src/share/classes/sun/misc/BASE64Decoder.java.i
-data/src/share/classes/sun/nio/cs/ISO_8859_9.java.i
+data/src/share/classes/sun/management/GcInfoCompositeData.java.i
data/src/share/native/sun/java2d/loops/AlphaMath.c.i
-data/make/com/sun/jndi/Makefile.i
data/test/java/nio/charset/coders/Errors.java.i
data/src/share/hpi/include/vm_calls.h.i
-data/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java.i
-data/make/netbeans/common/file-view.ent.i
-data/test/java/net/SocketPermission/NoAction.java.i
-data/test/sun/security/tools/keytool/CloneKeyAskPassword.sh.i
+data/test/java/nio/channels/DatagramChannel/EmptyBuffer.java.i
+data/src/share/classes/sun/tools/asm/NameAndTypeData.java.i
+data/src/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java.i
+data/src/share/classes/sun/tools/tree/UnaryExpression.java.i
data/test/javax/management/mxbean/MXBeanFlagTest.java.i
data/test/sun/tools/jstat/compilerOutput1.awk.i
-data/src/share/native/sun/awt/libpng/pngerror.c.i
+data/src/share/classes/java/lang/instrument/package.html.i
data/test/sun/security/tools/policytool/SaveAs.java.i
data/src/windows/native/sun/security/pkcs11/j2secmod_md.c.i
data/test/javax/swing/border/Test4760089.html.i
data/src/share/classes/sun/io/CharToByteUTF8.java.i
data/test/java/util/prefs/CommentsInXml.java.i
-data/test/java/util/zip/GZIP/GZIPInputStreamRead.java.i
+data/src/share/classes/javax/management/namespace/JMXNamespace.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java.i
data/src/share/classes/sun/awt/image/ImageAccessException.java.i
data/make/tools/CharsetMapping/IBM1148.map.i
data/make/common/Subdirs.gmk.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java.i
-data/src/share/classes/java/io/InterruptedIOException.java.i
+data/src/share/classes/java/net/CookiePolicy.java.i
+data/test/java/io/pathNames/unix/TrailingSlash.java.i
data/make/tools/swing-beans/beaninfo/images/JTextFieldColor32.gif.i
-data/test/sun/security/validator/CertReplace.java.i
-data/test/java/security/cert/CertPathValidatorException/cert_file.i
-data/src/solaris/classes/sun/awt/X11/XAtomList.java.i
-data/test/sun/security/ssl/sanity/pluggability/MySSLContextImpl.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_8nw.c.i
+data/src/share/demo/jvmti/hprof/hprof_trace.h.i
+data/src/share/classes/java/dyn/MethodHandleImpl.java.i
+data/src/share/native/java/lang/fdlibm/src/s_cbrt.c.i
+data/make/tools/swing-beans/beaninfo/images/JScrollBarMono32.gif.i
+data/src/solaris/doc/sun/man/man1/ja/rmic.1.i
data/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java.i
-data/test/java/io/PushbackInputStream/MarkReset.java.i
+data/src/share/classes/com/sun/jdi/request/package.html.i
data/test/java/lang/ClassLoader/LoadNullClass.java.i
-data/src/share/classes/java/nio/file/StandardWatchEventKinds.java.i
-data/src/share/classes/javax/swing/plaf/InsetsUIResource.java.i
+data/src/share/classes/sun/io/CharToByteCp1097.java.i
data/test/sun/tools/native2ascii/A2N_4630971.i
data/test/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass.java.i
-data/test/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java.i
-data/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java.i
+data/src/share/classes/javax/swing/ScrollPaneConstants.java.i
+data/test/java/nio/file/Files/TerminateWalk.java.i
data/test/java/nio/channels/Selector/WakeupSpeed.java.i
data/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java.i
-data/src/windows/native/java/net/net_util_md.c.i
+data/src/share/instrument/PathCharsValidator.h.i
data/make/tools/CharsetMapping/Big5.map.i
data/src/share/classes/com/sun/security/ntlm/NTLM.java.i
data/test/sun/tools/jps/jps-Vm_Output2.awk.i
-data/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java.i
-data/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java.i
-data/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.html.i
+data/src/share/classes/java/awt/BorderLayout.java.i
+data/make/tools/src/build/tools/javazic/Rule.java.i
+data/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.html.i
data/src/share/classes/sun/io/ByteToCharCp1146.java.i
data/src/share/classes/sun/awt/image/NativeLibLoader.java.i
-data/test/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java.i
-data/src/share/classes/com/sun/tools/jdi/VoidValueImpl.java.i
-data/src/share/classes/com/sun/jmx/namespace/package.html.i
-data/test/javax/smartcardio/HistoricalBytes.java.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_ja.properties.i
+data/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html.i
+data/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java.i
data/src/solaris/sample/dtrace/hotspot/method_invocation_stat_filter.d.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMBean.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerTableMetaImpl.java.i
data/test/javax/security/auth/Subject/Synch2.java.i
-data/test/javax/swing/text/GlyphView/6539700/bug6539700.java.i
-data/test/sun/security/krb5/auto/DynamicKeytab.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java.i
+data/src/share/classes/java/awt/HeadlessException.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java.i
-data/test/java/util/Locale/serialized/java6locale_th_TH_TH.i
+data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java.i
data/test/javax/script/META-INF/services/javax.script.ScriptEngineFactory.i
-data/src/share/classes/javax/management/remote/JMXConnectorFactory.java.i
+data/src/share/classes/javax/sound/midi/MetaMessage.java.i
data/src/share/classes/java/awt/peer/WindowPeer.java.i
data/src/share/native/java/lang/fdlibm/src/w_lgamma.c.i
-data/src/windows/classes/java/io/FileDescriptor.java.i
+data/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java.i
data/make/sun/beans/Makefile.i
data/test/sun/net/www/protocol/http/Modified.java.i
+data/make/mksample/scripting/Makefile.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlModel.java.i
data/src/share/classes/sun/nio/ch/SocketOptsImpl.java.i
-data/test/java/net/DatagramSocket/LocalSocketAddress.java.i
-data/test/java/rmi/server/RMIClassLoader/noSecurityManager/LocalDummy.java.i
+data/test/javax/management/relation/NonArrayListTest.java.i
+data/src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java.i
data/src/share/classes/javax/sound/midi/spi/SoundbankReader.java.i
data/src/share/classes/java/awt/peer/ScrollbarPeer.java.i
-data/test/java/security/cert/CertPathBuilder/targetConstraints/ee.cer.i
+data/src/share/classes/java/io/Bits.java.i
data/src/share/native/sun/font/layout/GlyphLookupTables.cpp.i
data/test/java/lang/Runtime/exec/SleepyCat.java.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest06_ok.properties.in.i
data/src/windows/native/sun/java2d/d3d/D3DMaskBlit.h.i
data/test/javax/security/auth/Subject/Serial.policy.i
-data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/project.xml.i
-data/test/java/lang/Class/IsAnnotationType.java.i
-data/test/java/lang/Double/Constants.java.i
-data/src/share/native/sun/security/ec/impl/ecl_curve.c.i
-data/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html.i
+data/test/sun/nio/cs/TestUTF_16.java.i
+data/test/javax/print/attribute/ServiceDialogTest.java.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServerMBean.java.i
+data/src/share/classes/sun/io/CharToByteISO2022CN_GB.java.i
+data/src/share/classes/sun/security/provider/PolicySpiFile.java.i
data/src/windows/classes/sun/awt/windows/WInputMethodDescriptor.java.i
-data/test/java/io/File/Cons.java.i
-data/test/java/util/Collections/RacingCollections.java.i
-data/src/share/classes/sun/reflect/generics/tree/ReturnType.java.i
+data/test/java/lang/instrument/RedefineMethodAddInvokeTarget_1.java.i
+data/src/share/classes/javax/swing/event/TreeModelEvent.java.i
+data/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java.i
+data/src/share/classes/java/util/concurrent/RejectedExecutionHandler.java.i
data/make/tools/CharsetMapping/MacCentralEurope.map.i
-data/test/com/sun/net/httpserver/Test6.java.i
+data/make/java/java/reflect/Makefile.i
data/src/share/demo/jfc/FileChooserDemo/ExampleFileSystemView.java.i
-data/src/solaris/native/sun/awt/awt_util.c.i
-data/test/javax/management/Introspector/ChangingNotifsTest.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/Makefile.i
+data/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html.i
data/src/share/classes/sun/misc/resources/Messages_zh_TW.java.i
+data/make/common/shared/Defs-solaris.gmk.i
data/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties.i
-data/src/share/classes/sun/security/x509/X509CertImpl.java.i
-data/src/share/transport/socket/sysSocket.h.i
+data/src/share/classes/sun/security/krb5/internal/UDPClient.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_is_IS.properties.i
data/src/share/classes/sun/nio/cs/ISO_8859_7.java.i
data/test/java/net/PlainSocketImpl/SetBufferSize.java.i
data/src/share/classes/java/awt/peer/ButtonPeer.java.i
-data/test/java/io/Serializable/enum/badResolve/Read.java.i
+data/src/share/classes/sun/tracing/dtrace/JVM.java.i
data/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java.i
data/src/share/classes/com/sun/media/sound/SoftMainMixer.java.i
data/src/share/classes/sun/tools/tree/ArrayAccessExpression.java.i
data/src/share/classes/javax/net/ssl/SSLSocket.java.i
-data/test/com/sun/crypto/provider/Mac/HmacSaltLengths.java.i
-data/test/sun/java2d/pisces/Renderer/Test7019861.java.i
+data/src/windows/native/sun/windows/awt_MenuItem.cpp.i
+data/src/solaris/bin/java-rmi.cgi.sh.i
data/src/share/classes/sun/util/calendar/AbstractCalendar.java.i
-data/test/java/util/ResourceBundle/Control/LoadingStrategiesTest.java.i
-data/test/sun/tools/jstatd/jstatdPort.sh.i
+data/src/share/classes/java/io/StringBufferInputStream.java.i
+data/test/javax/script/VersionTest.java.i
data/src/windows/native/sun/windows/awt_Event.h.i
data/make/java/java/genlocales.gmk.i
-data/test/java/util/TimeZone/OldIDMappingTest.sh.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java.i
data/test/sun/pisces/ScaleTest.java.i
-data/test/java/net/URLConnection/GetFileNameMap.java.i
-data/make/tools/swing-beans/beaninfo/images/JPanelColor32.gif.i
-data/src/share/classes/sun/nio/cs/FastCharsetProvider.java.i
+data/src/share/native/sun/font/layout/GlyphPositioningTables.h.i
+data/src/share/classes/sun/dyn/util/BytecodeDescriptor.java.i
+data/make/javax/security/Makefile.i
+data/src/share/classes/sun/net/www/protocol/http/Handler.java.i
data/test/javax/security/auth/Subject/doAs/Test.sh.i
data/src/share/native/sun/awt/image/jpeg/jmorecfg.h.i
data/test/java/beans/Introspector/6380849/TestBeanInfo.java.i
-data/test/sun/net/www/protocol/http/B6518816.java.i
+data/src/share/classes/javax/sound/midi/SoundbankResource.java.i
data/test/javax/rmi/ssl/truststore.i
-data/test/java/io/Serializable/oldTests/AnnotateClass.java.i
+data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml.i
data/test/java/io/Serializable/illegalHandle/negativeHandle.ser.i
data/test/javax/management/ImplementationVersion/ImplVersionTest.java.i
-data/src/solaris/classes/sun/awt/X11InputMethod.java.i
+data/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties.i
data/src/share/classes/javax/management/relation/RelationNotFoundException.java.i
data/src/share/native/sun/security/ec/mpmontg.c.i
-data/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java.i
-data/test/sun/security/jgss/CtorTests2.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c.i
-data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java.i
-data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/FileListTransferable.java.i
+data/src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java.i
+data/src/share/demo/nbproject/management/VerboseGC/nbproject/file-targets.xml.i
+data/make/tools/swing-beans/beaninfo/images/JScrollPaneMono32.gif.i
+data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor16.gif.i
+data/test/java/nio/channels/Channels/Write.java.i
+data/src/solaris/native/sun/awt/swing_GTKStyle.c.i
data/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java.i
-data/src/solaris/demo/jigsaw/basic/Makefile.i
+data/make/tools/swing-beans/beaninfo/images/JSplitPaneColor16.gif.i
data/src/share/classes/javax/management/GenericMBeanException.java.i
data/make/java/hpi/Makefile.i
-data/test/java/beans/XMLEncoder/java_awt_Rectangle.java.i
data/make/java/instrument/Makefile.i
data/src/share/classes/sun/tracing/PrintStreamProviderFactory.java.i
data/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java.i
-data/test/javax/security/auth/Subject/Synch2.policy.i
+data/src/solaris/doc/sun/man/man1/rmiregistry.1.i
data/src/share/classes/sun/text/resources/FormatData_es_PE.java.i
data/src/share/classes/java/io/IOException.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.h.i
data/src/share/demo/applets/Blink/Blink.java.i
data/src/solaris/doc/sun/man/man1/jar.1.i
-data/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c.i
+data/test/com/sun/jdi/ShellScaffold.sh.i
+data/src/share/native/sun/awt/splashscreen/splashscreen_gfx.h.i
data/test/sun/security/krb5/tools/ktmissing.sh.i
data/src/share/classes/java/awt/dnd/DnDConstants.java.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java.i
+data/test/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java.i
-data/src/share/native/sun/awt/medialib/mlib_sys.h.i
-data/test/sun/tools/jstat/jstatClassloadOutput1.sh.i
+data/test/java/nio/channels/FileChannel/Lock.java.i
+data/src/share/javavm/export/classfile_constants.h.i
data/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java.i
+data/test/com/sun/net/httpserver/bugs/B6526913.java.i
data/src/share/classes/java/awt/event/HierarchyListener.java.i
data/test/javax/crypto/EncryptedPrivateKeyInfo/GetAlgName.java.i
-data/src/share/classes/sun/java2d/cmm/CMSManager.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduRequest.java.i
data/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJob.java.i
-data/test/java/util/TreeMap/EmptyMapAndNulls.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/inffast.c.i
+data/src/share/native/sun/java2d/pipe/RenderBuffer.c.i
+data/test/sun/security/pkcs11/Cipher/TestRawRSACipher.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM500.java.i
data/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java.i
-data/src/share/classes/sun/misc/PerformanceLogger.java.i
-data/test/java/beans/Introspector/Test4984912.java.i
+data/src/share/classes/java/lang/reflect/package-info.java.i
+data/src/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java.i
data/src/solaris/native/sun/awt/XDrawingArea.h.i
-data/src/share/classes/sun/util/resources/LocaleNames_no.properties.i
-data/test/java/awt/FullScreen/SetFSWindow/FSFrame.java.i
-data/test/javax/print/attribute/PSCopiesFlavorTest.java.i
-data/src/share/classes/sun/io/ByteToCharCp737.java.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/A.1.i
+data/src/share/classes/javax/management/remote/JMXProviderException.java.i
+data/src/solaris/classes/sun/awt/X11/XUtilConstants.java.i
data/src/solaris/native/sun/xawt/XToolkit.c.i
data/src/share/classes/sun/util/resources/LocaleNames_mk.properties.i
-data/test/java/io/PushbackReader/MarkReset.java.i
+data/test/com/sun/security/sasl/digest/pw.properties.i
data/src/share/javavm/export/jvm.h.i
data/test/java/lang/Math/AbsPositiveZero.java.i
data/make/common/shared/Compiler-gcc.gmk.i
@@ -19066,251 +19049,253 @@ data/src/share/sample/scripting/scriptpad/src/scripts/README.txt.i
data/src/share/classes/sun/util/resources/LocaleNames_sl.properties.i
data/src/share/classes/sun/security/krb5/internal/ccache/Tag.java.i
data/test/java/beans/Introspector/memory/SimpleClassLoader.java.i
-data/test/sun/security/util/DerInputBuffer/BigInteger0.java.i
+data/src/share/classes/com/sun/naming/internal/NamedWeakReference.java.i
data/test/sun/net/www/protocol/jar/jarbug/run.sh.i
-data/test/sun/nio/cs/OLD/IBM1381_OLD.java.i
+data/test/java/io/RandomAccessFile/OpsAfterClose.java.i
data/src/share/classes/com/sun/crypto/provider/ConstructKeys.java.i
-data/test/java/beans/EventHandler/Test6788531.java.i
+data/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java.i
data/src/share/classes/java/util/logging/ErrorManager.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/p11-sca1000.txt.i
-data/test/java/nio/channels/Selector/CloseThenRegister.java.i
+data/src/share/classes/javax/swing/tree/TreeCellEditor.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_PY.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java.i
+data/src/share/classes/javax/management/MBeanConstructorInfo.java.i
data/test/com/sun/crypto/provider/Cipher/AES/TestShortBuffer.java.i
-data/test/java/util/Vector/SerializationDeadlock.java.i
+data/make/sun/jdga/Makefile.i
data/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java.i
-data/src/share/native/sun/awt/image/BufImgSurfaceData.h.i
-data/src/share/sample/nio/multicast/MulticastAddress.java.i
-data/make/common/shared/Compiler.gmk.i
+data/src/share/demo/applets/Fractal/CLSFractal.java.i
+data/src/share/classes/sun/security/util/ManifestEntryVerifier.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c.i
+data/src/share/classes/sun/reflect/ReflectionFactory.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java.i
-data/src/share/classes/javax/swing/text/rtf/charsets/cpg437.txt.i
-data/test/java/security/SecureRandom/sha1prng-new.bin.i
-data/test/com/sun/net/httpserver/bugs/B6401598.java.i
+data/src/solaris/native/sun/awt/awt_util.c.i
data/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java.i
data/src/share/classes/sun/reflect/misc/FieldUtil.java.i
-data/src/share/native/sun/security/ec/impl/ecp_aff.c.i
-data/test/java/lang/management/MemoryMXBean/LowMemoryTestSerialGC.sh.i
-data/src/share/native/common/jdk_util.c.i
+data/make/sun/security/ec/FILES_c.gmk.i
+data/src/share/classes/javax/naming/ReferralException.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/package.html.i
+data/test/sun/nio/cs/Test6254467.java.i
+data/src/solaris/native/sun/java2d/loops/vis_UshortGray_FromRgb.c.i
data/test/sun/security/krb5/confplusprop.conf.i
-data/make/tools/CharsetMapping/MacDingbat.map.i
-data/make/tools/swing-beans/beaninfo/images/JRadioButtonColor32.gif.i
-data/test/java/nio/channels/SocketChannel/BufferSize.java.i
+data/src/share/classes/java/util/StringTokenizer.java.i
+data/test/java/security/Security/signedfirst/Dyn.sh.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclItem.java.i
data/test/java/beans/Introspector/memory/Bean2.java.i
data/test/java/nio/channels/Selector/ByteServer.java.i
-data/test/sun/security/tools/policytool/i18n.sh.i
-data/src/share/native/java/lang/Float.c.i
-data/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java.i
+data/test/sun/net/www/http/KeepAliveCache/B5045306.java.i
+data/src/share/classes/sun/io/ByteToCharMS932.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif.i
data/test/java/io/PipedInputStream/ClosedWriter.java.i
data/src/share/classes/sun/management/counter/ByteArrayCounter.java.i
data/src/share/classes/javax/imageio/metadata/IIOMetadataNode.java.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties.i
data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java.i
data/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java.i
-data/src/share/classes/java/awt/PageAttributes.java.i
-data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.sh.i
-data/make/tools/jarreorder/Makefile.i
+data/test/java/lang/Math/Expm1Tests.java.i
+data/test/javax/swing/JColorChooser/Test4193384.java.i
+data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java.i
+data/src/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java.i
data/test/sun/net/www/protocol/http/HttpInputStream.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8.c.i
data/test/sun/security/ssl/sun/net/www/httpstest/HttpCallback.java.i
-data/test/java/nio/MappedByteBuffer/Truncate.java.i
+data/src/share/classes/java/lang/ref/FinalReference.java.i
data/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy.i
data/src/share/classes/java/text/Annotation.java.i
data/test/java/lang/instrument/PremainClass/NoPremainAgent.java.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java.i
data/test/javax/security/auth/x500/X500Principal/Parse.java.i
data/src/share/classes/sun/misc/CompoundEnumeration.java.i
-data/src/share/classes/javax/naming/ldap/PagedResultsResponseControl.java.i
+data/test/javax/script/ProviderTest.sh.i
data/src/share/native/sun/security/ec/ecp_aff.c.i
-data/src/solaris/doc/sun/man/man1/jrunscript.1.i
-data/test/sun/security/pkcs11/Signature/ReinitSignature.java.i
+data/src/share/classes/javax/swing/text/StyleConstants.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_CheckedList.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java.i
-data/src/share/classes/sun/awt/im/CompositionAreaHandler.java.i
+data/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh.i
data/src/share/classes/sun/util/resources/CurrencyNames_zh_HK.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java.i
data/src/share/classes/sun/java2d/loops/CompositeType.java.i
-data/src/share/classes/org/openjdk/jigsaw/Launcher.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthParser.java.i
data/test/sun/security/pkcs11/sslecc/truststore.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecTokenizer.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java.i
-data/test/sun/security/provider/DSA/TestDSA.java.i
-data/src/share/native/sun/font/layout/KhmerReordering.cpp.i
-data/src/windows/classes/sun/awt/windows/WDefaultFontCharset.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java.i
+data/test/java/net/URLConnection/UNCTest.sh.i
+data/test/java/lang/ClassLoader/deadlock/SupBob.java.i
+data/src/share/classes/sun/text/IntHashtable.java.i
+data/src/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java.i
+data/test/java/beans/XMLEncoder/java_awt_Rectangle.java.i
data/src/share/classes/javax/smartcardio/package.html.i
-data/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c.i
+data/make/tools/jarsplit/Makefile.i
data/test/java/math/RoundingMode/RoundingModeTests.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/Agent.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_test06_ok.password.in.i
-data/src/share/classes/sun/io/CharToByteUnicodeLittle.java.i
+data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.SuSE.properties.i
+data/src/share/native/sun/awt/libpng/pngwtran.c.i
data/src/share/classes/javax/print/attribute/DateTimeSyntax.java.i
-data/test/java/lang/Math/CubeRootTests.java.i
-data/test/javax/sound/sampled/AudioFormat/Matches_NOT_SPECIFIED.java.i
-data/test/java/io/Serializable/superclassDataLoss/A.java.i
-data/test/java/nio/file/attribute/FileTime/Basic.java.i
+data/src/share/native/sun/java2d/loops/ByteBinary4Bit.c.i
+data/test/javax/swing/JFileChooser/6489130/bug6489130.java.i
+data/make/tools/swing-beans/beaninfo/images/JMenuBarColor32.gif.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java.i
data/make/sun/motif12/reorder-sparcv9.i
data/src/share/classes/java/nio/channels/DatagramChannel.java.i
-data/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java.i
-data/test/sun/nio/cs/SurrogateTestEUCTW.plane4.surrogates.i
+data/src/share/classes/com/sun/pept/presentation/MessageStruct.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java.i
data/test/java/lang/Integer/Decode.java.i
data/test/java/util/zip/GZIP/ReadUByte.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionException.java.i
-data/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java.i
+data/test/java/util/Currency/PropertiesTest.sh.i
data/src/share/classes/java/rmi/server/Skeleton.java.i
+data/src/share/classes/org/openjdk/jigsaw/ContextFactory.java.i
data/test/java/security/cert/CertPathValidatorException/ReasonTest.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java.i
-data/test/sun/security/pkcs11/Cipher/TestRSACipher.java.i
+data/src/share/classes/sun/util/locale/LanguageTag.java.i
+data/make/common/BuildPackages.gmk.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java.i
-data/src/share/classes/sun/tools/tree/AssignDivideExpression.java.i
+data/src/share/classes/java/lang/SuppressWarnings.java.i
data/test/java/lang/Class/getDeclaringClass/Sanity.java.i
+data/make/netbeans/swing/nbproject/project.xml.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java.i
-data/src/share/classes/sun/io/CharToByteCp949C.java.i
+data/test/javax/management/mxbean/CustomTypeTest.java.i
data/src/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java.i
-data/src/solaris/native/sun/awt/list.h.i
+data/test/sun/net/sdp/ProbeIB.java.i
data/src/share/classes/java/lang/module/ModuleSystem.java.i
-data/test/java/util/logging/GetGlobalTest.java.i
+data/make/netbeans/common/windows-view.ent.i
data/src/share/classes/java/text/spi/BreakIteratorProvider.java.i
-data/src/share/classes/sun/java2d/SunGraphics2D.java.i
+data/src/share/classes/java/nio/file/StandardWatchEventKinds.java.i
data/test/javax/management/monitor/NonComparableAttributeValueTest.java.i
-data/src/share/classes/sun/tools/jconsole/ProxyClient.java.i
+data/test/java/net/CookieHandler/CookieHandlerTest.java.i
data/test/javax/management/timer/StartTest.java.i
data/test/java/nio/channels/FileChannel/Mode.java.i
-data/test/java/net/Socket/setReuseAddress/Restart.java.i
-data/make/tools/CharsetMapping/IBM868.map.i
+data/src/share/classes/com/sun/java/util/jar/pack/Instruction.java.i
+data/test/java/io/Serializable/nonserializable/ExceptionDetail.java.i
data/test/java/lang/instrument/NullTransformerAddTest.java.i
-data/src/solaris/native/sun/java2d/loops/mlib_v_ImageXor.c.i
-data/test/javax/management/eventService/UsingEventService.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif.i
+data/src/solaris/native/java/io/UnixFileSystem_md.c.i
+data/src/windows/native/sun/windows/awt_Toolkit.cpp.i
data/src/share/classes/java/security/cert/CRL.java.i
data/src/share/native/sun/font/layout/NonContextualGlyphSubst.h.i
-data/test/java/security/Security/Nulls.java.i
-data/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java.i
-data/test/java/awt/font/NumericShaper/ShapingTest.java.i
-data/src/share/back/stream.c.i
-data/test/java/rmi/transport/checkFQDN/CheckFQDN.java.i
-data/src/share/classes/javax/security/auth/PrivateCredentialPermission.java.i
-data/src/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java.i
-data/test/sun/security/tools/jarsigner/diffend.sh.i
+data/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java.i
+data/src/share/native/sun/font/layout/LookupProcessor.cpp.i
+data/src/share/classes/javax/management/ValueExp.java.i
+data/src/share/back/invoker.h.i
+data/test/com/sun/jdi/GetLocalVariables.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid_ja.properties.i
+data/src/share/classes/java/awt/TextComponent.java.i
+data/src/share/classes/sun/security/util/AuthResources.java.i
data/src/share/classes/javax/naming/LinkException.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandardMBean.java.i
+data/make/sun/awt/FILES_c_windows.gmk.i
data/src/share/lib/net.properties.i
data/src/share/native/sun/font/layout/LELanguages.h.i
-data/src/share/classes/org/openjdk/jigsaw/Repository.java.i
+data/make/modules/modules.properties.i
data/src/share/classes/javax/swing/plaf/basic/BasicHTML.java.i
data/src/share/sample/vm/clr-jvm/jinvokerExp.h.i
data/src/share/classes/com/sun/jmx/mbeanserver/package.html.i
data/test/javax/swing/JEditorPane/6917744/bug6917744.java.i
-data/src/share/classes/sun/java2d/SurfaceData.java.i
-data/src/share/classes/java/awt/KeyEventPostProcessor.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM964.java.i
+data/src/share/classes/sun/font/TextLabelFactory.java.i
+data/test/com/sun/jdi/DebuggerThreadTest.java.i
+data/test/javax/script/Test8.java.i
data/src/share/native/sun/font/layout/Features.h.i
data/test/javax/naming/Name/Serialized13Name.java.i
data/src/share/classes/java/awt/image/ImageObserver.java.i
data/test/javax/swing/plaf/metal/MetalBorders/Test6657026.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_U16.c.i
-data/src/share/classes/sun/nio/cs/MS1254.java.i
+data/src/share/classes/javax/security/sasl/RealmChoiceCallback.java.i
data/test/sun/security/pkcs11/Signature/ByteBuffers.java.i
data/test/java/io/Serializable/unresolvedClassDesc/Foo.java.i
data/test/java/nio/charset/coders/ref.windows-31j.i
-data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java.i
data/test/java/math/BigInteger/BigIntegerTest.java.i
data/src/share/classes/sun/text/resources/FormatData_hu_HU.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpIpAddress.java.i
data/src/solaris/classes/sun/nio/ch/SolarisEventPort.java.i
-data/test/java/io/DataInputStream/ReadUTF.java.i
-data/test/javax/swing/JScrollPane/6559589/bug6559589.java.i
+data/src/share/classes/sun/net/idn/StringPrepDataReader.java.i
+data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java.i
data/test/java/io/File/SetReadOnly.java.i
-data/test/javax/swing/JColorChooser/Test4759934.html.i
-data/src/share/classes/java/security/cert/PKIXReason.java.i
+data/test/java/util/logging/SimpleFormatterFormat.java.i
data/src/share/classes/javax/print/attribute/standard/JobSheets.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java.i
-data/src/share/classes/sun/font/AttributeMap.java.i
+data/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp.i
data/src/share/classes/javax/management/openmbean/CompositeType.java.i
data/src/share/classes/sun/awt/FocusingTextField.java.i
+data/src/share/classes/sun/swing/icon/SortArrowIcon.java.i
data/src/share/native/com/sun/java/util/jar/pack/jni.cpp.i
-data/test/java/lang/annotation/Missing/MissingTest.java.i
+data/make/tools/CharsetMapping/MacDingbat.map.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java.i
-data/src/windows/classes/sun/awt/windows/WToolkit.java.i
-data/src/solaris/sample/dtrace/hotspot/method_compile_stat.d.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethodImpl.java.i
+data/src/share/classes/javax/swing/event/ListSelectionListener.java.i
data/test/java/lang/invoke/RicochetTest.java.i
-data/src/share/classes/sun/reflect/UTF8.java.i
-data/test/java/util/logging/LoggingDeadlock.java.i
+data/src/share/classes/sun/rmi/transport/tcp/MultiplexOutputStream.java.i
+data/src/share/classes/sun/io/CharToByteMacIceland.java.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain1.txt.i
data/test/javax/management/MBeanInfo/TooManyFooTest.java.i
-data/src/share/native/java/lang/fdlibm/src/k_sin.c.i
+data/make/netbeans/swing/build.properties.i
data/src/share/classes/sun/invoke/anon/InvalidConstantPoolFormatException.java.i
data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java.i
data/src/share/classes/java/awt/doc-files/Scrollbar-1.gif.i
-data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.i
-data/src/share/classes/sun/io/CharToByteCp1144.java.i
-data/make/tools/src/build/tools/dtdbuilder/PublicMapping.java.i
+data/src/share/demo/management/JTop/JTopPlugin.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java.i
+data/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java.i
data/test/java/lang/invoke/JavaDocExamplesTest.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.d
-data/src/share/native/sun/management/GarbageCollectorImpl.c.i
-data/test/sun/tools/jconsole/ResourceCheckTest.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO_8859_8.java.i
+data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password-alt.i
+data/src/share/classes/javax/accessibility/AccessibleExtendedText.java.i
data/test/java/io/Serializable/evolution/AddedField/ReadAddedField.java.i
-data/test/javax/sound/midi/Gervill/SF2SoundbankReader/ding.sf2.i
+data/src/share/classes/javax/swing/JWindow.java.i
data/src/share/classes/com/sun/servicetag/UnauthorizedAccessException.java.i
data/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java.i
data/test/java/beans/XMLEncoder/java_awt_Dimension.java.i
-data/test/java/security/cert/pkix/policyChanges/ee.cer.i
-data/src/share/classes/java/dyn/MethodType.java.i
-data/src/share/classes/com/sun/net/httpserver/HttpsExchange.java.i
-data/src/share/classes/sun/reflect/generics/tree/TypeSignature.java.i
-data/test/java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java.i
+data/test/java/io/Serializable/noSuchFieldClarification/NoSuchFieldClarification.java.i
+data/src/share/classes/com/sun/media/sound/SoftSincResampler.java.i
+data/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy22.i
+data/make/tools/strip_properties/Makefile.i
data/src/windows/classes/com/sun/tools/jdi/SunSDK.java.i
data/test/java/rmi/registry/checkusage/CheckUsage.java.i
data/test/java/io/charStreams/SmallReads.java.i
-data/test/com/sun/net/httpserver/Test7a.java.i
data/src/windows/native/sun/windows/awt_BitmapUtil.h.i
data/test/java/lang/annotation/loaderLeak/B.java.i
data/src/solaris/classes/sun/awt/motif/MFontPeer.java.i
-data/test/java/nio/channels/Selector/ReadAfterConnect.java.i
+data/make/tools/src/build/tools/generatecharacter/CharacterName.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java.i
data/test/java/net/URLConnection/6212146/test.sh.i
-data/test/javax/crypto/CryptoPermission/AllPermCheck.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/SmallObjTrees.java.i
data/test/java/lang/reflect/Array/ExceedMaxDim.java.i
data/test/java/beans/PropertyEditor/6380849/FirstBeanEditor.java.i
data/test/javax/management/eventService/LeaseTest.java.i
-data/src/windows/native/sun/windows/awt_MenuBar.cpp.i
+data/src/share/classes/sun/util/resources/CalendarData_be.properties.i
data/src/share/classes/javax/swing/DefaultComboBoxModel.java.i
-data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ActivateMe.java.i
-data/src/share/classes/javax/swing/colorchooser/CenterLayout.java.i
+data/src/share/classes/java/util/BitSet.java.i
data/src/share/classes/java/security/spec/ECPoint.java.i
-data/test/sun/tools/jrunscript/jrunscript-fTest.sh.i
-data/src/share/classes/sun/io/ByteToCharCp970.java.i
-data/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java.i
+data/test/sun/nio/cs/OLD/IBM933_OLD.java.i
+data/src/share/classes/com/sun/beans/finder/ClassFinder.java.i
+data/test/sun/nio/cs/SurrogateTestEUCTW.plane3.surrogates.i
data/src/share/classes/sun/misc/JarFilter.java.i
data/src/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java.i
+data/src/share/classes/javax/swing/text/html/BlockView.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java.i
data/test/sun/security/tools/policytool/SaveAs.html.i
data/test/sun/text/resources/Format/Bug5096553.java.i
-data/src/share/classes/sun/rmi/transport/TransportConstants.java.i
+data/src/share/classes/javax/imageio/spi/IIOServiceProvider.java.i
data/test/java/net/InetAddress/Simple1NameServiceDescriptor.java.i
-data/test/sun/misc/Encode/DecodeBuffer.java.i
-data/test/org/openjdk/jigsaw/ModuleInfoBuilder.java.i
+data/src/share/demo/README.i
+data/src/share/native/sun/awt/image/cvutils/README.i
data/src/solaris/native/sun/management/FileSystemImpl.c.i
data/test/java/lang/annotation/UnitTest.java.i
-data/src/share/classes/sun/print/PSStreamPrintJob.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java.i
data/src/share/classes/sun/security/ssl/SSLContextImpl.java.i
-data/src/share/classes/com/sun/jdi/VoidType.java.i
-data/make/java/zip/reorder-i586.i
-data/src/share/classes/sun/util/resources/CalendarData_lt.properties.i
+data/src/share/native/sun/font/FontInstanceAdapter.cpp.i
+data/src/share/classes/sun/awt/resources/awt_ko.properties.i
data/src/share/sample/jmx/jmx-scandir/nbproject/netbeans-targets.xml.i
data/test/sun/security/tools/keytool/i18n.sh.i
data/src/share/native/java/lang/fdlibm/src/s_ilogb.c.i
data/src/share/classes/overview-bundled.html.i
-data/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java.i
+data/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java.i
data/src/share/classes/sun/security/provider/DSAPublicKey.java.i
-data/test/java/nio/channels/Pipe/EmptyRead.java.i
+data/src/share/classes/java/security/interfaces/DSAPrivateKey.java.i
data/src/solaris/doc/sun/man/man1/policytool.1.i
data/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java.i
data/src/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java.i
-data/test/java/io/Serializable/packageAccess/A.java.i
+data/src/solaris/hpi/include/largefile_linux.h.i
data/test/java/beans/XMLDecoder/4676532/Test4676532.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh.i
data/src/share/classes/sun/text/resources/FormatData_iw_IL.java.i
-data/src/share/classes/sun/reflect/ClassDefiner.java.i
+data/src/share/classes/javax/management/NotificationEmitter.java.i
data/src/share/classes/javax/naming/NameImpl.java.i
data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.java.i
data/test/java/io/Serializable/enum/constantSubclasses/Read.java.i
@@ -19319,159 +19304,164 @@ data/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java.i
data/test/java/net/ProxySelector/NullArguments.java.i
data/src/windows/hpi/src/memory_md.c.i
data/test/sun/java2d/cmm/ColorConvertOp/SRGB.png.d
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java.i
+data/test/java/awt/FileDialog/MultipleMode/MultipleMode.html.i
data/src/share/sample/jmx/jmx-scandir/truststore.i
data/test/javax/imageio/plugins/gif/GifTransparencyTest.java.i
-data/src/share/classes/com/sun/media/sound/AbstractLine.java.i
+data/src/share/demo/jfc/CodePointIM/README_ja.html.i
data/src/share/classes/sun/nio/ch/NativeObject.java.i
data/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java.i
data/make/javax/swing/html32dtd/Makefile.i
-data/make/common/Program.gmk.i
+data/src/solaris/classes/sun/font/XMap.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java.i
-data/test/javax/management/MBeanServer/MBeanServerNotificationTest.java.i
-data/test/sun/security/pkcs11/Secmod/secmod.db.i
+data/test/java/net/Socket/asyncClose/AsyncCloseTest.java.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/DynamicTest.java.i
data/make/tools/swing-beans/beaninfo/images/JFileChooserMono16.gif.i
-data/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/RemoveMarkReset.java.i
+data/src/share/classes/javax/management/remote/JMXConnectorServer.java.i
data/test/java/net/InetAddress/CheckJNI.java.i
data/src/share/classes/sun/java2d/SunGraphicsEnvironment.java.i
data/test/sun/security/rsa/GenKeyStore.java.i
data/test/tools/launcher/libraryCaller.java.i
-data/test/sun/net/www/MarkResetTest.java.i
+data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/rmid.security.policy.i
data/test/java/io/Serializable/validate/Validate.java.i
-data/test/java/beans/Beans/6669869/TestDesignTime.java.i
-data/test/java/io/Serializable/subclass/Test.java.i
-data/src/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java.i
+data/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.i
+data/src/share/classes/java/sql/Blob.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java.i
+data/test/java/awt/font/NumericShaper/ShapingTest.java.i
data/src/share/classes/com/sun/crypto/provider/KeyProtector.java.i
-data/src/share/classes/sun/security/jgss/krb5/SubjectComber.java.i
+data/src/share/classes/java/awt/peer/package.html.i
data/src/share/classes/sun/misc/resources/Messages_sv.java.i
-data/src/share/classes/javax/management/DescriptorKey.java.i
-data/test/sun/nio/cs/EUCJPUnderflowDecodeTest.java.i
-data/src/share/classes/java/beans/SimpleBeanInfo.java.i
+data/src/share/classes/com/sun/jmx/snmp/tasks/Task.java.i
+data/test/javax/xml/crypto/dsig/data/certs/lugh.crt.i
+data/test/org/openjdk/jigsaw/optional-base.sh.i
data/src/share/classes/javax/xml/crypto/dsig/spec/XPathType.java.i
data/src/share/classes/java/security/cert/CertStoreSpi.java.i
data/test/java/nio/channels/DatagramChannel/SocketOptionTests.java.i
data/test/javax/swing/UIDefaults/6795356/SwingLazyValueTest.java.i
data/src/share/classes/sun/tools/tree/LongExpression.java.i
-data/test/java/io/Serializable/superclassDataLoss/run.sh.i
+data/test/java/awt/Toolkit/Headless/AWTEventListener/AWTListener.java.i
data/src/windows/native/sun/windows/DllUtil.h.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html.i
data/test/java/lang/instrument/PremainClass/InheritAgent1100.java.i
data/src/share/classes/java/awt/event/ContainerAdapter.java.i
data/src/share/classes/sun/tools/jstat/SymbolResolutionClosure.java.i
-data/src/solaris/doc/sun/man/man1/ja/native2ascii.1.i
+data/test/java/lang/instrument/ManifestTestAgent.java.i
data/test/java/nio/Buffer/CopyDirectCharMemory.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java.i
data/test/java/net/URLConnection/Redirect307Test.java.i
-data/test/com/sun/nio/sctp/SctpChannel/Connect.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_GT.properties.i
data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.java.i
-data/src/share/classes/sun/io/CharToByteCp420.java.i
-data/test/java/security/KeyRep/SerialOld.policy.i
+data/test/java/beans/Introspector/Test4918902.java.i
+data/test/java/math/BigDecimal/DivideMcTests.java.i
data/src/share/classes/sun/tools/jconsole/Utilities.java.i
-data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.c.i
-data/src/share/instrument/Utilities.h.i
-data/src/share/native/sun/font/layout/HanLayoutEngine.cpp.i
+data/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java.i
+data/src/share/classes/sun/io/CharToByteCp870.java.i
+data/src/share/classes/javax/sql/rowset/spi/XmlWriter.java.i
+data/src/share/classes/java/awt/geom/Arc2D.java.i
data/src/share/classes/javax/management/JMRuntimeException.java.i
data/test/java/security/Security/signedfirst/DynSignedProvFirst.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java.i
data/src/share/classes/java/sql/DriverPropertyInfo.java.i
data/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java.i
data/src/share/classes/org/openjdk/jigsaw/Manifest.java.i
-data/src/share/demo/jfc/Font2DTest/resources/TextResources_en_GB.properties.i
+data/src/share/classes/javax/swing/text/BoxView.java.i
data/src/share/classes/sun/security/x509/CertificateIssuerUniqueIdentity.java.i
data/test/java/nio/file/Files/grantTopOnly.policy.i
data/src/share/classes/java/sql/BatchUpdateException.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libplds4.so.i
-data/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java.i
+data/src/share/classes/sun/nio/ch/NativeDispatcher.java.i
data/src/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java.i
data/src/share/classes/com/sun/jmx/remote/internal/Unmarshal.java.i
-data/src/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java.i
-data/test/tools/launcher/CreatePlatformFile.java.i
+data/test/java/security/KeyStore/keystore.jks.i
data/src/share/classes/javax/swing/event/ChangeEvent.java.i
+data/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java.i
data/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c.i
data/src/share/classes/javax/xml/crypto/package.html.i
-data/test/javax/management/Introspector/ImmutableNotificationInfoTest.java.i
-data/test/sun/tools/jrunscript/hello.js.i
+data/src/windows/native/sun/windows/awt_Multimon.h.i
+data/test/com/sun/servicetag/InvalidServiceTag.java.i
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/ibutton.cert.i
data/test/java/beans/Introspector/BeanUtils.java.i
-data/src/share/classes/sun/launcher/resources/launcher_ja.properties.i
+data/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java.i
data/test/java/io/PipedInputStream/WriterLoop.java.i
-data/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/package.html.i
+data/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java.i
data/src/windows/native/sun/tools/attach/WindowsVirtualMachine.c.i
data/src/share/classes/sun/tools/jconsole/Tab.java.i
-data/src/share/classes/sun/java2d/pipe/AAShapePipe.java.i
-data/src/share/classes/sun/security/x509/AVA.java.i
-data/src/share/demo/jfc/Metalworks/resources/HelpFiles/javalogo.gif.i
-data/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java.i
-data/src/share/classes/sun/text/CodePointIterator.java.i
+data/make/common/Defs-solaris.gmk.i
+data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_RS.properties.i
+data/test/javax/swing/JScrollPane/Test6526631.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java.i
data/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMBean.java.i
data/src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java.i
data/src/share/classes/sun/security/ssl/RandomCookie.java.i
-data/test/javax/rmi/ssl/SSLSocketParametersTest.sh.i
-data/src/solaris/native/sun/awt/awt_Button.c.i
+data/src/share/classes/javax/sound/sampled/AudioInputStream.java.i
+data/src/share/native/com/sun/media/sound/DirectAudioDevice.c.i
data/test/java/io/Serializable/unnamedPackageSwitch/run.sh.i
-data/test/sun/security/provider/certpath/ReverseBuilder/BuildPath.java.i
-data/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so.i
data/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java.i
+data/src/share/native/sun/java2d/opengl/OGLFuncs.h.i
data/test/sun/nio/cs/TestMiscEUC_JP.java.i
-data/src/share/native/sun/font/layout/ContextualSubstSubtables.h.i
+data/test/java/beans/Introspector/memory/Test4508780.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java.i
data/src/share/native/sun/java2d/opengl/OGLSurfaceData.h.i
-data/src/share/classes/java/awt/image/BandCombineOp.java.i
+data/src/share/lib/security/java.security-solaris.i
+data/src/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java.i
data/test/sun/nio/cs/Test6275027.java.i
data/src/share/classes/sun/tools/jconsole/HTMLPane.java.i
data/src/share/classes/sun/util/calendar/CalendarDate.java.i
-data/make/com/sun/security/auth/module/FILES_export_windows.gmk.i
+data/make/mkdemo/applets/SpreadSheet/Makefile.i
data/test/java/net/DatagramSocket/DatagramTimeout.java.i
data/test/sun/security/pkcs12/PKCS12SameKeyId.java.i
data/src/share/demo/jvmti/compiledMethodLoad/README.txt.i
-data/src/share/classes/sun/security/x509/IPAddressName.java.i
+data/test/javax/print/attribute/PSCopiesFlavorTest.java.i
data/test/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java.i
data/src/share/classes/com/sun/jdi/IncompatibleThreadStateException.java.i
data/src/share/classes/javax/naming/directory/InvalidSearchFilterException.java.i
-data/test/sun/tools/jps/jps-Vvml_Output1.awk.i
-data/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java.i
+data/src/solaris/native/sun/awt/awt_xembed_server.c.i
+data/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java.i
data/make/tools/src/build/tools/compileproperties/CompileProperties.java.i
-data/src/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java.i
+data/src/share/classes/com/sun/net/httpserver/Filter.java.i
data/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_de_GR.properties.i
-data/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java.i
+data/test/com/sun/jdi/ControlFlow.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c.i
data/test/sun/security/pkcs11/Secmod/nss.cfg.i
data/test/java/awt/font/NumericShaper/MTTest.java.i
data/test/java/util/LinkedHashMap/Cache.java.i
-data/test/java/net/URL/TestRFC2732.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties.i
+data/src/share/classes/sun/util/resources/LocaleNames_ca.properties.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java.i
data/src/share/native/com/sun/media/sound/MidiOutDeviceProvider.c.i
data/src/share/classes/javax/swing/plaf/LayerUI.java.i
-data/src/solaris/classes/sun/awt/X11/XRootWindow.java.i
-data/src/share/classes/java/security/spec/MGF1ParameterSpec.java.i
+data/src/share/classes/javax/swing/AbstractSpinnerModel.java.i
+data/src/share/classes/sun/awt/image/ImageWatched.java.i
data/test/com/sun/jdi/FinalizerTest.java.i
-data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java.i
-data/src/share/classes/com/sun/media/sound/SimpleSoundbank.java.i
-data/test/com/sun/security/sasl/PropertiesFileCallbackHandler.java.i
+data/test/java/awt/Graphics2D/DrawString/AlphaSurfaceText.java.i
+data/src/share/classes/java/nio/file/LinkPermission.java.i
+data/test/java/awt/Modal/NpeOnClose/NpeOnCloseTest.java.i
data/src/share/classes/com/sun/jdi/connect/spi/TransportService.java.i
-data/test/javax/sound/midi/File/SMPTESequence.java.i
-data/src/share/classes/sun/security/x509/X509CRLEntryImpl.java.i
+data/test/javax/print/applet/applet0/Applet0.java.i
+data/test/java/io/DataInputStream/ReadUTF.java.i
data/test/java/lang/module/module-info-annotation.sh.i
data/src/windows/native/sun/java2d/windows/Win32SurfaceData.h.i
-data/src/share/classes/sun/util/resources/CurrencyNames_tr_TR.properties.i
-data/src/share/classes/sun/net/www/content/text/plain.java.i
-data/test/java/nio/Buffer/BasicChar.java.i
-data/src/share/classes/javax/swing/text/MaskFormatter.java.i
-data/make/tools/CharsetMapping/IBM863.map.i
+data/src/share/classes/sun/tools/asm/LocalVariableTable.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java.i
+data/test/java/nio/file/DirectoryStream/Basic.java.i
+data/make/sun/rmi/rmi/mapfile-vers.i
+data/test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java.i
+data/src/share/classes/sun/security/x509/CRLDistributionPointsExtension.java.i
data/src/share/classes/sun/management/snmp/AdaptorBootstrap.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/AnnotationParser.java.i
-data/test/java/util/Locale/icuLocales.txt.i
+data/src/share/classes/sun/nio/cs/ext/IBM285.java.i
data/src/share/native/common/jio.c.i
-data/test/sun/java2d/cmm/ColorConvertOp/GRAY.png.i
-data/src/share/classes/javax/naming/LinkRef.java.i
+data/src/share/classes/sun/security/ssl/Record.java.i
data/src/share/native/sun/font/layout/SunLayoutEngine.cpp.i
data/src/windows/native/sun/jkernel/kernel_sv.rc.i
-data/src/solaris/native/sun/font/X11FontScaler.c.i
-data/src/share/instrument/EncodingSupport.c.i
-data/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java.i
-data/src/share/classes/java/sql/Date.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java.i
+data/src/share/back/eventHandler.h.i
+data/src/share/classes/sun/java2d/pipe/LoopPipe.java.i
+data/src/share/classes/java/nio/channels/AsynchronousChannel.java.i
data/test/java/nio/file/Files/probeContentType/SimpleFileTypeDetector.java.i
data/src/share/classes/org/openjdk/jigsaw/cli/Packager.java.i
data/test/java/util/ResourceBundle/Control/StressTest.java.i
@@ -19479,322 +19469,345 @@ data/src/share/classes/javax/management/MBeanServerInvocationHandler.java.i
data/src/windows/native/sun/jkernel/kernel.rc.i
data/src/share/classes/java/util/ConcurrentModificationException.java.i
data/src/solaris/native/sun/net/spi/DefaultProxySelector.c.i
-data/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java.i
-data/src/share/classes/java/dyn/FilterOneArgument.java.i
-data/test/java/awt/PrintJob/MultipleEnd/MultipleEnd.java.i
-data/make/netbeans/common/unix-view.ent.i
+data/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java.i
+data/src/share/classes/java/nio/channels/InterruptibleChannel.java.i
+data/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d.i
+data/test/java/security/Policy/Dynamic/setpolicy.jp.i
data/src/share/classes/javax/naming/spi/NamingManager.java.i
-data/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java.i
+data/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java.i
data/test/sun/net/www/protocol/http/B6641309.java.i
-data/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup.i
-data/src/share/classes/sun/nio/cs/ext/IBM1148.java.i
+data/src/share/classes/sun/tools/jar/resources/jar.properties.i
+data/make/java/zip/reorder-i586.i
data/test/sun/security/krb5/auto/NewSalt.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java.i
-data/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java.i
+data/test/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java.i
+data/test/sun/security/pkcs11/Secmod/Crypto.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent0100.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java.i
-data/src/windows/native/sun/java2d/windows/ddrawObject.h.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientTimeout.java.i
+data/src/share/classes/java/nio/channels/Selector.java.i
+data/src/share/classes/sun/reflect/ByteVectorFactory.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java.i
-data/test/java/io/pathNames/GeneralWin32.java.i
-data/src/windows/native/sun/windows/security_warning_bw.ico.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsxform.c.i
data/src/windows/classes/sun/misc/OSEnvironment.java.i
-data/src/share/native/sun/security/ec/ecp_jac.c.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/font/Typeface.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh.i
data/src/windows/classes/sun/awt/windows/fontconfig.properties.i
-data/src/share/classes/sun/io/CharToByteUnicodeLittleUnmarked.java.i
+data/src/share/classes/sun/nio/cs/ext/MacCroatian.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java.i
data/test/javax/swing/JFileChooser/6738668/security.policy.i
-data/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java.i
+data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java.i
data/src/share/classes/javax/management/namespace/package-info.java.i
-data/test/java/beans/XMLEncoder/Test5023550.java.i
+data/src/share/classes/javax/imageio/metadata/package.html.i
data/src/share/classes/javax/swing/text/DefaultHighlighter.java.i
-data/test/javax/crypto/spec/DESKeySpec/CheckWeakKeys.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java.i
data/src/share/classes/java/awt/Canvas.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ja.properties.i
-data/src/share/native/sun/font/layout/LETypes.h.i
-data/test/java/io/charStreams/StringGenerator.java.i
+data/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java.i
+data/make/tools/src/build/tools/jarsplit/JarSplit.java.i
+data/make/sun/xawt/mapfile-vers.i
data/src/share/classes/javax/security/auth/callback/TextInputCallback.java.i
-data/src/share/classes/java/lang/IllegalThreadStateException.java.i
-data/src/share/classes/sun/reflect/MethodAccessor.java.i
+data/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java.i
+data/src/linux/doc/man/rmic.1.i
data/src/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java.i
data/test/java/beans/XMLEncoder/javax_swing_tree_TreePath.java.i
data/test/java/io/Serializable/evolution/AddedExternField/ReadAddedField.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S16Func.c.i
-data/src/share/classes/com/sun/security/ntlm/Client.java.i
+data/test/java/security/KeyRep/SerialOld.policy.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java.i
-data/test/javax/swing/JInternalFrame/6726866/bug6726866.java.i
+data/src/share/classes/sun/io/CharToByteCp277.java.i
data/src/share/classes/java/security/interfaces/package.html.i
data/src/share/demo/management/JTop/META-INF/services/com.sun.tools.jconsole.JConsolePlugin.i
-data/test/java/lang/reflect/Proxy/ClassRestrictions.java.i
+data/src/share/classes/java/lang/ArrayStoreException.java.i
data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java.i
data/test/javax/security/auth/Subject/Synch3.java.i
-data/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java.i
+data/src/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java.i
data/src/share/classes/sun/io/ByteToCharCp857.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/RemoveMarkReset.java.i
-data/src/share/classes/javax/management/AttributeChangeNotificationFilter.java.i
+data/test/org/openjdk/jigsaw/InstallFromRepo.java.i
+data/src/share/classes/java/util/Enumeration.java.i
data/src/share/classes/com/sun/jndi/ldap/BasicControl.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load6.java.i
-data/make/README.i
-data/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java.i
+data/src/share/native/sun/awt/image/jpeg/jcdctmgr.c.i
+data/src/share/classes/com/sun/beans/finder/AbstractFinder.java.i
data/src/share/classes/java/io/BufferedWriter.java.i
data/test/java/security/MessageDigest/ByteBuffers.java.i
-data/src/share/native/sun/java2d/loops/MaskBlit.c.i
-data/test/javax/management/ImplementationVersion/policy.i
+data/src/share/classes/com/sun/jdi/request/BreakpointRequest.java.i
+data/test/java/beans/XMLDecoder/spec/TestInt.java.i
data/src/share/classes/java/awt/im/InputMethodRequests.java.i
data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils.java.i
data/test/sun/net/www/http/ChunkedOutputStream/checkError.java.i
-data/src/share/classes/sun/font/TextLineComponent.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java.i
+data/src/share/native/java/lang/fdlibm/src/s_cos.c.i
data/src/share/classes/com/sun/tools/hat/internal/oql/ObjectVisitor.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_DO.properties.i
-data/test/java/text/Format/DateFormat/Bug4396385.java.i
-data/test/java/security/cert/CertificateFactory/invalidEncodedCerts/invalidcert.pem.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingResponse.java.i
+data/src/share/native/java/lang/Runtime.c.i
+data/src/share/classes/sun/nio/ch/FileLockImpl.java.i
+data/test/tools/launcher/ChangeDataModel.sh.i
data/src/share/classes/java/awt/image/ConvolveOp.java.i
data/src/share/classes/sun/security/pkcs/PKCS8Key.java.i
-data/test/javax/imageio/plugins/jpeg/ConcurrentReadingTest.java.i
+data/test/sun/security/krb5/NegativeNonce.java.i
data/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java.i
data/test/sun/tools/jhat/ParseTest.sh.i
-data/src/share/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml.i
+data/test/javax/security/auth/Subject/doAs/policy.i
+data/test/javax/crypto/Mac/TestGetInstance.java.i
data/test/sun/security/x509/AVA/Allow.policy.i
data/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java.i
data/test/tools/jar/index/MetaInf.java.i
data/src/share/classes/java/security/cert/CertStoreException.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/Column.java.i
-data/test/com/sun/servicetag/environ.properties.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java.i
-data/test/demo/jvmti/hprof/StackMapTableTest.java.i
-data/test/java/io/Serializable/duplicateSerialFields/Setup.java.i
+data/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java.i
+data/src/share/classes/java/beans/PropertyChangeSupport.java.i
+data/make/java/jli/mapfile-vers.i
+data/test/java/net/URLClassLoader/sealing/Makefile.i
+data/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java.i
data/test/java/nio/channels/FileChannel/ScatteringRead.java.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ko.properties.i
data/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java.i
data/src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java.i
-data/test/sun/nio/cs/SurrogateTestEUCTW.plane6.surrogates.i
+data/src/share/classes/com/sun/nio/sctp/Notification.java.i
+data/src/share/classes/com/sun/media/sound/SF2Instrument.java.i
data/test/java/util/Timer/Args.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_9.java.i
-data/test/java/rmi/server/RMIClassLoader/spi/TestProvider.java.i
+data/src/share/classes/sun/text/resources/FormatData_sq.java.i
data/test/sun/util/resources/TimeZone/Bug6271396.java.i
data/test/com/sun/crypto/provider/Cipher/DES/DesAPITest.java.i
-data/test/sun/security/pkcs11/fips/certs/anchor.cer.i
-data/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java.i
-data/test/java/security/UnresolvedPermission/AccessorMethods.signer1.i
-data/test/sun/tools/native2ascii/A2N_4630463.i
-data/test/com/sun/tools/attach/java.policy.allow.i
+data/src/share/classes/sun/print/resources/serviceui_it.properties.i
+data/src/share/classes/java/util/prefs/package.html.i
+data/src/share/classes/sun/security/tools/JarSignerResources_ja.java.i
+data/src/share/classes/javax/net/ssl/TrustManagerFactory.java.i
+data/test/java/io/File/Create.java.i
data/src/share/native/common/jlong.h.i
data/src/share/native/sun/awt/image/cvutils/img_orddither.h.i
data/test/sun/security/krb5/auto/MoreKvno.java.i
data/src/solaris/classes/sun/nio/ch/SctpResultContainer.java.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c.i
+data/src/share/classes/java/lang/Character.java.i
+data/src/share/classes/com/sun/jmx/defaults/package.html.i
+data/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java.i
data/test/java/util/Formatter/BasicShort.java.i
-data/test/java/rmi/registry/interfaceHash/InterfaceHash.java.i
+data/src/share/demo/nbproject/jfc/SwingApplet/build.xml.i
data/test/java/util/Formatter/BasicCharObject.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadKSProvider.java.i
-data/src/share/demo/jvmti/hprof/hprof_tag.h.i
-data/src/windows/native/sun/windows/awt_PrintDialog.cpp.i
+data/src/share/classes/java/lang/OutOfMemoryError.java.i
+data/src/share/classes/java/awt/doc-files/CheckboxGroup-1.gif.i
data/src/share/classes/sun/util/resources/CalendarData_is.properties.i
data/test/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html.i
-data/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java.i
-data/test/java/lang/instrument/bootreporter/StringIdCallbackReporter.java.i
-data/test/java/nio/file/Files/walkFileTree/MaxDepth.java.i
+data/src/share/classes/java/math/package-info.java.i
+data/src/share/classes/com/sun/crypto/provider/DESParameters.java.i
+data/test/com/sun/tools/extcheck/TestExtcheckArgs.java.i
data/test/java/lang/Class/getMethods/StarInheritance.java.i
-data/test/java/awt/Color/OpacityChange/OpacityChange.java.i
+data/make/tools/CharsetMapping/KOI8_R.map.i
+data/test/java/io/PushbackReader/MarkReset.java.i
data/src/share/classes/sun/font/FileFont.java.i
-data/test/sun/management/jmxremote/bootstrap/Utils.java.i
+data/test/java/io/charStreams/LineLengthsSource.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties.i
-data/src/solaris/native/sun/awt/awt_Selection.c.i
-data/test/java/rmi/activation/CommandEnvironment/NullOptions.java.i
+data/src/share/classes/java/awt/color/ColorSpace.java.i
+data/make/tools/src/build/tools/jdwpgen/ArrayObjectTypeNode.java.i
data/src/share/classes/java/awt/EventFilter.java.i
-data/src/share/classes/sun/security/ssl/Alerts.java.i
-data/src/share/classes/sun/io/ByteToCharCp424.java.i
+data/test/com/sun/jdi/RedefineImplementor.sh.i
+data/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java.i
data/test/java/nio/charset/coders/Surrogate.java.i
data/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java.i
data/src/share/classes/sun/awt/resources/awt_es.properties.i
+data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh.i
data/test/javax/crypto/SecretKeyFactory/Provider1.java.i
data/src/share/back/StringReferenceImpl.c.i
+data/test/sun/nio/cs/TestIBM1364.java.i
data/src/share/native/sun/awt/image/cvutils/img_scaleloop.h.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java.i
+data/src/share/classes/sun/util/resources/CalendarData_pt.properties.i
+data/src/share/classes/java/util/TimerTask.java.i
data/test/sun/security/krb5/tools/KtabCheck.java.i
data/src/share/classes/sun/rmi/server/UnicastServerRef2.java.i
-data/test/java/util/PluggableLocale/providersrc/DateFormatProviderImpl.java.i
+data/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java.i
data/src/share/classes/sun/security/provider/SHA.java.i
data/make/sun/awt/FILES_c_unix.gmk.i
-data/src/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java.i
-data/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java.i
-data/src/share/classes/sun/net/smtp/SmtpClient.java.i
+data/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java.i
+data/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java.i
+data/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java.i
+data/src/share/classes/sun/security/ssl/Krb5Proxy.java.i
data/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMaskV6.java.i
-data/test/java/net/URLEncoder/URLEncodeDecode.java.i
-data/src/share/classes/sun/security/provider/certpath/ForwardState.java.i
+data/src/share/classes/sun/reflect/generics/repository/MethodRepository.java.i
+data/src/share/classes/sun/management/VMManagement.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java.i
data/src/share/classes/javax/swing/event/InternalFrameEvent.java.i
-data/test/java/nio/channels/Selector/KeysReady.java.i
-data/test/com/sun/crypto/provider/TLS/TestMasterSecret.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java.i
+data/src/share/native/sun/font/layout/SegmentSingleProcessor.cpp.i
data/test/java/io/StringWriter/NegativeBufferSize.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java.i
+data/test/java/lang/Double/Constants.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java.i
-data/src/share/classes/sun/text/normalizer/UnicodeMatcher.java.i
-data/src/share/sample/nio/server/BP.java.i
+data/src/share/classes/javax/sql/rowset/Joinable.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java.i
data/test/com/sun/security/sasl/gsskerb/AuthOnly.java.i
-data/test/java/io/Serializable/InvalidClassException/noargctor/DefaultPackage.java.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java.i
-data/src/share/classes/sun/text/bidi/BidiRun.java.i
-data/test/java/util/ResourceBundle/Bug6204853_Utf8.properties.i
+data/src/share/native/sun/java2d/opengl/OGLRenderQueue.c.i
+data/src/share/classes/javax/swing/border/BevelBorder.java.i
+data/src/share/classes/java/awt/GridLayout.java.i
+data/src/share/classes/sun/java2d/FontSupport.java.i
+data/src/share/instrument/InstrumentationImplNativeMethods.c.i
data/test/javax/management/namespace/QueryNamesTest.java.i
data/src/share/classes/sun/net/idn/UCharacterEnums.java.i
-data/src/solaris/native/sun/awt/fontpath.c.i
+data/src/share/classes/sun/tools/tree/ByteExpression.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/OrangeImpl.java.i
-data/test/java/beans/XMLEncoder/6380849/TestPersistenceDelegate.java.i
data/test/java/lang/instrument/bootreporter/StringIdCallback.java.i
-data/test/java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java.i
+data/src/share/classes/sun/util/calendar/CalendarUtils.java.i
data/src/share/native/sun/font/layout/GlyphSubstLookupProc.h.i
-data/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java.i
-data/test/java/security/BasicPermission/PermClass.1.4.i
+data/src/windows/classes/sun/security/smartcardio/PlatformPCSC.java.i
+data/test/java/net/SocketInputStream/SocketClosedException.java.i
data/test/java/beans/PropertyChangeSupport/Test4682386.java.i
-data/test/sun/nio/cs/NIOJISAutoDetectTest.java.i
+data/src/solaris/native/sun/awt/awt_Plugin.h.i
data/test/com/sun/security/sasl/ntlm/NTLMTest.java.i
-data/test/sun/management/jmxremote/bootstrap/rmiregistryssl.properties.i
-data/test/sun/security/provider/PolicyParser/ExtDirs.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif.i
+data/src/share/back/eventHandlerRestricted.h.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java.i
data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/IntArrayCalls.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java.i
+data/src/share/classes/sun/net/httpserver/HttpsServerImpl.java.i
+data/src/share/classes/javax/naming/ldap/ManageReferralControl.java.i
data/test/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java.i
+data/make/tools/CharsetMapping/IBM871.nr.i
data/src/share/classes/sun/util/resources/CurrencyNames_fr_BE.properties.i
data/test/javax/management/loading/GetMBeansFromURLTest.java.i
-data/make/com/sun/jndi/cosnaming/Makefile.i
+data/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java.i
+data/make/tools/swing-beans/beaninfo/images/JProgressBarColor16.gif.i
data/test/java/nio/channels/SocketChannel/CloseTimeoutChannel.java.i
data/src/share/demo/jfc/TableExample/OldJTable.java.i
data/src/share/classes/sun/io/CharToByteCp1251.java.i
-data/src/share/classes/com/sun/naming/internal/VersionHelper.java.i
-data/make/netbeans/common/closed-share-view.ent.i
+data/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
+data/src/share/classes/java/awt/doc-files/Checkbox-1.gif.i
data/test/com/sun/nio/sctp/SctpMultiChannel/Branch.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ClientThread.java.i
-data/test/com/sun/jdi/RedefineCrossStart.java.i
-data/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java.i
+data/test/sun/security/rsa/TestKeyPairGeneratorLength.java.i
+data/test/com/sun/net/httpserver/Test8a.java.i
data/src/share/classes/org/ietf/jgss/package.html.i
data/test/java/beans/PropertyEditor/6380849/ThirdBean.java.i
data/src/share/classes/java/beans/PropertyDescriptor.java.i
-data/src/share/classes/java/sql/Driver.java.i
-data/test/java/io/LineNumberReader/ReadReadLine.java.i
-data/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java.i
+data/src/share/demo/jfc/Metalworks/UISwitchListener.java.i
data/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp.i
-data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_8nw.c.i
data/src/share/sample/nio/server/Sendable.java.i
data/src/solaris/classes/sun/nio/ch/SinkChannelImpl.java.i
data/src/share/classes/com/sun/java/util/jar/pack/PropMap.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c.i
-data/test/java/math/BigDecimal/StrippingZerosTest.java.i
-data/test/java/nio/Buffer/BasicShort.java.i
+data/src/solaris/native/java/io/io_util_md.h.i
+data/src/solaris/native/sun/awt/CUPSfuncs.c.i
data/src/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java.i
-data/src/share/classes/javax/swing/JMenuBar.java.i
-data/src/solaris/classes/sun/awt/X11/XDesktopPeer.java.i
+data/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java.i
+data/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java.i
data/make/sun/javazic/tzdata_jdk/gmt.i
data/src/share/native/java/lang/fdlibm/src/s_erf.c.i
-data/src/share/classes/sun/io/ByteToCharUnicodeBig.java.i
+data/test/javax/management/context/localizable/WhatsitMBean.java.i
data/test/sample/mergesort/MergeSortTest.java.i
-data/test/com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java.i
+data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties.i
-data/src/windows/classes/sun/awt/windows/WMenuBarPeer.java.i
+data/test/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java.i
data/src/share/classes/sun/security/pkcs/PKCS9Attribute.java.i
data/test/tools/launcher/DefaultLocaleTest.java.i
+data/test/java/io/PushbackInputStream/MarkReset.java.i
data/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java.i
data/test/java/net/URL/ParseURL.java.i
-data/src/share/classes/sun/util/resources/CalendarData_el.properties.i
+data/test/javax/management/mxbean/customtypes/IntegerIsStringFactory.java.i
data/test/java/awt/regtesthelpers/process/ProcessResults.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so.i
+data/src/share/classes/sun/tools/tree/BreakStatement.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java.i
-data/src/share/native/sun/java2d/opengl/OGLFuncs.h.i
-data/test/java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java.i
+data/src/share/demo/jvmti/hprof/hprof_table.h.i
+data/test/com/sun/net/httpserver/Test12.java.i
data/src/solaris/classes/sun/nio/fs/UnixUriUtils.java.i
data/src/share/classes/java/beans/DefaultPersistenceDelegate.java.i
-data/test/org/openjdk/jigsaw/_Library.java.i
-data/test/org/openjdk/jigsaw/remrepo.sh.i
+data/src/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java.i
+data/test/java/nio/file/Files/ContentType.java.i
+data/src/share/classes/sun/font/AttributeMap.java.i
data/src/windows/classes/sun/awt/windows/WTextFieldPeer.java.i
data/make/tools/swing-beans/beaninfo/images/JMenuBarMono16.gif.i
-data/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java.i
+data/src/share/classes/java/security/PolicySpi.java.i
data/src/share/classes/sun/text/resources/FormatData_es_CR.java.i
data/src/share/classes/com/sun/jdi/ClassLoaderReference.java.i
data/test/com/sun/jdi/SuspendThreadTest.java.i
-data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy.i
-data/test/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java.i
-data/test/demo/jvmti/hprof/HeapBinaryFormatTest.java.i
-data/test/javax/smartcardio/Serialize.java.i
+data/make/java/java/reorder-sparcv9.i
+data/src/share/classes/sun/nio/cs/ext/IBM942.java.i
+data/make/tools/CharsetMapping/IBM285.c2b.i
+data/src/windows/native/common/jlong_md.h.i
+data/src/share/classes/javax/naming/NameClassPair.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_GB.properties.i
data/test/javax/management/namespace/SerialParamProcessorTest.java.i
+data/src/solaris/native/sun/java2d/loops/mlib_v_ImageXor.c.i
data/make/tools/CharsetMapping/IBM1026.c2b.i
-data/src/share/classes/javax/naming/ldap/HasControls.java.i
-data/src/share/classes/com/sun/tools/attach/AgentInitializationException.java.i
+data/test/com/sun/tools/attach/SimpleProvider.java.i
data/src/share/classes/java/util/concurrent/ExecutorCompletionService.java.i
data/test/sun/net/www/http/HttpClient/OpenServer.java.i
data/src/share/native/java/lang/fdlibm/src/w_atan2.c.i
data/test/javax/naming/ldap/LdapName/RdnMisc.java.i
data/src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java.i
-data/test/javax/print/attribute/GetCopiesSupported.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java.i
+data/src/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java.i
+data/src/share/classes/javax/swing/text/NavigationFilter.java.i
data/test/sun/java2d/cmm/ColorConvertOp/ImageComparator.java.i
-data/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java.i
+data/src/share/classes/sun/instrument/InstrumentationImpl.java.i
data/src/share/javavm/include/typedefs.h.i
-data/src/share/classes/sun/rmi/server/WeakClassHashMap.java.i
-data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java.i
+data/src/share/classes/com/sun/beans/WeakCache.java.i
+data/src/windows/native/sun/windows/awt_DrawingSurface.cpp.i
data/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java.i
data/test/java/lang/reflect/Proxy/nonJavaNames/Test.java.i
-data/src/share/classes/sun/util/calendar/ZoneInfoFile.java.i
-data/test/javax/script/CommonSetup.sh.i
+data/src/share/classes/java/awt/DisplayMode.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java.i
data/src/share/classes/javax/swing/event/DocumentEvent.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java.i
-data/src/share/native/java/lang/fdlibm/src/e_gamma_r.c.i
-data/test/java/net/URLConnection/xml/xml3.i
-data/src/share/classes/javax/security/auth/login/AccountNotFoundException.java.i
-data/src/share/classes/com/sun/jdi/InvalidStackFrameException.java.i
-data/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java.i
+data/src/share/native/sun/font/layout/TrimmedArrayProcessor.h.i
+data/test/java/beans/Statement/Test6224433.java.i
+data/test/javax/management/monitor/MBeanServerForwarderInvocationHandler.java.i
+data/src/share/classes/com/sun/security/sasl/CramMD5Server.java.i
+data/test/java/awt/Mixing/MixingInHwPanel.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/JarFileSystemProvider.java.i
data/src/share/classes/sun/io/CharToByteEUC_CN.java.i
data/src/share/classes/sun/dyn/JavaMethodHandle.java.i
-data/test/javax/management/modelmbean/SimpleModelMBean/logging.properties.i
+data/src/share/classes/sun/security/acl/AllPermissionsImpl.java.i
data/test/sun/tools/common/CommonTests.sh.i
-data/test/java/rmi/activation/Activatable/restartLatecomer/rmid.security.policy.i
-data/test/java/beans/XMLEncoder/6329581/Test6329581.java.i
-data/src/share/classes/sun/tools/javac/BatchParser.java.i
-data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono32.gif.i
-data/test/java/util/ResourceBundle/Test4314141.java.i
-data/src/share/native/sun/security/ec/impl/ec.c.i
-data/src/share/native/sun/java2d/loops/IntArgbBm.h.i
+data/make/tools/src/build/tools/fontchecker/README.txt.i
+data/src/share/classes/java/lang/CloneNotSupportedException.java.i
+data/test/javax/management/namespace/NamespaceCreationTest.java.i
+data/src/share/classes/java/net/URL.java.i
+data/src/solaris/doc/sun/man/man1/jinfo.1.i
+data/src/share/classes/sun/tools/tree/ForStatement.java.i
+data/src/share/classes/java/util/regex/package.html.i
+data/src/share/instrument/JPLISAgent.c.i
+data/test/java/beans/PropertyEditor/TestFontClassNull.java.i
+data/test/java/util/ResourceBundle/TestResource_it.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmserr.c.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/DoubleCalls.java.i
+data/src/windows/classes/sun/java2d/windows/WinVolatileSurfaceManager.java.i
data/make/sun/javazic/tzdata/asia.i
-data/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java.i
-data/test/java/awt/regtesthelpers/AbstractTest.java.i
+data/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java.i
+data/src/share/classes/sun/tools/jconsole/OverviewTab.java.i
+data/src/share/native/sun/awt/image/jpeg/jcapistd.c.i
data/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.spi.TransportService.i
+data/src/share/classes/sun/nio/cs/UTF_16LE.java.i
data/make/netbeans/common/closed-share-sources.ent.i
data/make/com/sun/inputmethods/Makefile.i
-data/src/share/classes/java/security/Guard.java.i
+data/src/share/classes/java/awt/print/PrinterJob.java.i
data/test/java/rmi/server/RMIClassLoader/spi/TestProvider2.java.i
-data/src/share/native/sun/nio/ch/genSocketOptionRegistry.c.i
+data/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java.i
+data/src/solaris/classes/sun/java2d/xr/XRColor.java.i
data/src/share/classes/java/awt/Component.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java.i
data/src/share/classes/java/dyn/JavaMethodHandle.java.i
data/make/tools/swing-beans/beaninfo/images/JSpinnerColor32.gif.i
-data/test/org/openjdk/jigsaw/tester.sh.i
-data/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java.i
-data/src/share/classes/sun/management/jmxremote/SingleEntryRegistry.java.i
+data/src/share/native/sun/security/ec/impl/secitem.c.i
+data/src/share/classes/sun/text/resources/FormatData_en_IN.java.i
data/src/share/native/sun/font/layout/IndicReordering.cpp.i
data/src/solaris/classes/java/lang/UNIXProcess.java.solaris.i
data/src/share/demo/nbproject/management/FullThreadDump/nbproject/file-targets.xml.i
data/src/solaris/classes/sun/awt/motif/MComponentPeer.java.i
data/test/java/io/PipedOutputStream/DeadReader.java.i
-data/src/solaris/native/common/jlong_md.h.i
-data/test/java/security/UnresolvedPermission/Equals.policy.i
+data/src/share/native/common/jni_util.h.i
+data/test/com/sun/security/auth/callback/TextCallbackHandler/Default.java.i
data/src/share/classes/sun/security/util/DerValue.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/crisubn.jks.i
-data/src/share/classes/javax/swing/table/TableColumn.java.i
-data/test/sun/tools/jconsole/ImmutableResourceTest.sh.i
+data/test/java/security/cert/CertPathValidator/targetConstraints/ValidateTargetConstraints.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_SV.properties.i
+data/src/share/native/java/lang/fdlibm/src/w_lgamma_r.c.i
+data/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ja_JP.properties.i
data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.policy.i
-data/make/tools/src/build/tools/jdwpgen/CommandNode.java.i
+data/src/share/classes/javax/management/event/EventConsumer.java.i
data/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties.i
data/test/java/io/Externalizable/compatibility/ExternalizableBlockData.java.i
-data/src/share/classes/sun/net/www/protocol/http/Negotiator.java.i
+data/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html.i
data/make/sun/security/smartcardio/FILES_c.gmk.i
+data/src/share/classes/javax/management/remote/JMXServiceURL.java.i
data/src/share/hpi/export/dll.h.i
data/test/java/util/Hashtable/EqualsCast.java.i
data/test/java/awt/Mixing/NonOpaqueInternalFrame.java.i
@@ -19803,834 +19816,844 @@ data/test/java/lang/Math/MinMax.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java.i
data/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java.i
data/test/java/io/Serializable/resolveClassException/ResolveClassException.java.i
-data/src/windows/native/sun/windows/awt_BitmapUtil.cpp.i
+data/src/share/classes/sun/tools/javac/BatchEnvironment.java.i
data/test/sun/security/provider/PolicyFile/TrustedCert.keystore1.i
data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.horizontal.gif.i
data/src/share/classes/java/awt/peer/MenuPeer.java.i
-data/make/com/sun/servicetag/Makefile.i
-data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java.i
-data/make/tools/CharsetMapping/IBM875.map.i
+data/test/javax/management/mxbean/PreRegisterNameTest.java.i
+data/src/share/demo/nbproject/management/MemoryMonitor/build.xml.i
+data/src/share/classes/sun/java2d/Spans.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java.i
-data/test/java/io/DataInputStream/ReadFully.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif.i
data/test/java/io/FileOutputStream/FinalizeShdCallClose.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties.i
-data/test/java/nio/channels/FileChannel/AtomicAppend.java.i
-data/src/windows/classes/sun/net/NetHooks.java.i
-data/src/share/classes/java/awt/package.html.i
-data/test/javax/security/auth/login/LoginContext/ResetConfigModule.java.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java.i
-data/test/java/io/BufferedReader/ReadLineSync.java.i
+data/src/share/classes/sun/java2d/cmm/CMSManager.java.i
+data/src/share/demo/nbproject/management/JTop/nbproject/project.xml.i
+data/src/solaris/native/sun/java2d/loops/vis_ByteIndexed.c.i
+data/src/share/classes/javax/swing/KeyboardManager.java.i
+data/test/java/net/URLConnection/GetXmlContentType.java.i
+data/test/java/util/ResourceBundle/Bug6355009.java.i
+data/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c.i
data/src/windows/native/sun/windows/GDIHashtable.h.i
data/src/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java.i
data/test/java/security/BasicPermission/SerialVersion.1.3.1.i
data/src/share/native/java/lang/ClassLoader.c.i
-data/src/solaris/lib/sdp/sdp.conf.template.i
data/test/java/util/ResourceBundle/TestBug4179766.java.i
data/src/solaris/native/sun/awt/awt_PopupMenu.c.i
data/test/java/rmi/server/getRemoteClass/GetRemoteClass.java.i
data/test/sun/nio/cs/SJISCanEncode.java.i
data/src/share/classes/javax/swing/SpinnerDateModel.java.i
data/src/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java.i
-data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java.i
+data/src/share/classes/java/util/ArrayDeque.java.i
data/test/java/util/zip/NoExtensionSignature.java.i
-data/src/share/classes/javax/management/monitor/GaugeMonitorMBean.java.i
-data/src/share/classes/javax/swing/ListModel.java.i
+data/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java.i
+data/src/share/classes/javax/print/attribute/URISyntax.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c.i
data/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java.i
data/src/share/classes/sun/security/validator/EndEntityChecker.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java.i
+data/src/share/demo/jvmti/hprof/hprof_init.h.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java.i
data/test/java/lang/instrument/RedefineMethodAddInvokeApp.java.i
-data/test/javax/script/Test4.js.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java.i
+data/test/java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java.i
+data/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy.i
data/test/org/openjdk/jigsaw/cli/tsca-cert.pem.i
-data/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java.i
+data/src/share/classes/com/sun/crypto/provider/HmacCore.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java.i
data/make/tools/CharsetMapping/IBM277.nr.i
data/test/java/lang/instrument/NullTransformerRemoveTest.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java.i
data/src/share/classes/javax/security/auth/login/CredentialExpiredException.java.i
data/test/java/rmi/reliability/scripts/create_benchmark_jars.ksh.i
-data/make/sun/nio/Makefile.i
+data/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java.i
data/src/share/classes/javax/swing/plaf/synth/ColorType.java.i
data/src/windows/classes/sun/awt/windows/fontconfig.Me.properties.i
data/make/modules/jdk7.depconfig.i
data/src/windows/classes/com/sun/management/OperatingSystem.java.i
data/src/windows/instrument/FileSystemSupport_md.h.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so.d
-data/test/java/lang/ClassLoader/resource.jar.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so.i
-data/test/javax/management/namespace/JMXNamespaceViewTest.java.i
+data/test/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java.i
+data/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp.i
data/src/share/classes/javax/management/namespace/JMXRemoteNamespace.java.i
-data/test/javax/management/MBeanServer/PreRegisterTest.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java.i
data/test/com/sun/net/httpserver/Test.java.i
+data/src/share/classes/sun/io/ByteToCharGBK.java.i
data/test/java/util/ResourceBundle/Control/Bug6530694_de_DE.properties.i
-data/test/java/rmi/registry/interfaceHash/ReferenceRegistryStub.java.i
-data/src/share/classes/sun/nio/cs/UTF_16LE.java.i
+data/src/share/classes/java/security/interfaces/DSAParams.java.i
+data/src/share/classes/sun/io/CharToByteISO8859_5.java.i
data/src/share/classes/javax/swing/plaf/MenuBarUI.java.i
data/src/share/classes/sun/nio/ch/SocketChannelImpl.java.i
-data/src/share/classes/sun/text/normalizer/UCharacterPropertyReader.java.i
+data/src/share/native/java/lang/fdlibm/src/e_exp.c.i
data/test/java/security/UnresolvedPermission/AccessorMethods.java.i
data/src/share/classes/java/nio/file/AtomicMoveNotSupportedException.java.i
-data/src/share/classes/java/lang/reflect/ParameterizedType.java.i
+data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ActivateMe.java.i
data/src/share/classes/javax/security/cert/package.html.i
-data/src/share/classes/sun/beans/editors/IntegerEditor.java.i
+data/src/share/classes/javax/crypto/BadPaddingException.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java.i
-data/test/java/awt/EventQueue/SecondaryLoopTest/SecondaryLoopTest.java.i
-data/src/share/classes/javax/swing/WindowConstants.java.i
+data/src/share/classes/com/sun/jmx/namespace/package.html.i
+data/make/com/sun/java/pack/mapfile-vers.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy15.i
data/src/share/classes/java/util/MissingFormatArgumentException.java.i
data/test/java/security/KeyPairGenerator/GenerateRSAKeyPair.java.i
data/src/share/classes/sun/dyn/SpreadGeneric.java.i
data/src/share/back/debugDispatch.c.i
data/src/solaris/demo/jigsaw/basic/env.sh.i
-data/src/share/classes/java/awt/geom/IllegalPathStateException.java.i
+data/src/share/classes/sun/security/provider/MD5.java.i
data/test/java/lang/Byte/Decode.java.i
data/make/sun/awt/mawt.gmk.i
-data/src/share/classes/java/nio/charset/StandardCharset.java.i
+data/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java.i
data/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java.i
-data/test/org/openjdk/jigsaw/cli/prikey.pem.i
-data/src/share/sample/scripting/scriptpad/src/META-INF/manifest.mf.i
-data/src/windows/classes/sun/awt/windows/WScrollPanePeer.java.i
+data/test/java/security/ProtectionDomain/RecursionDebug.java.i
+data/make/tools/CharsetMapping/IBM930.nr.i
+data/src/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java.i
data/src/share/classes/sun/tools/tree/AssignBitXorExpression.java.i
-data/make/tools/fontchecker/Makefile.i
-data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java.i
+data/make/modules/jdk.swing.ls.i
data/test/javax/imageio/stream/StreamCloserLeak/testapp/Main.java.i
-data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java.i
+data/src/share/classes/sun/net/www/http/ChunkedInputStream.java.i
data/src/share/classes/java/awt/font/ShapeGraphicAttribute.java.i
data/test/org/openjdk/jigsaw/install-repo.sh.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java.i
data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java.i
-data/src/share/classes/javax/management/Description.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/package.html.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java.i
-data/src/share/classes/sun/management/LazyCompositeData.java.i
+data/test/com/sun/jdi/SourceNameFilterTest.java.i
+data/src/linux/doc/man/appletviewer.1.i
+data/src/share/classes/sun/launcher/resources/launcher_ja.properties.i
data/test/javax/swing/SwingUtilities/6797139/bug6797139.java.i
data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java.i
data/src/share/classes/sun/reflect/generics/scope/MethodScope.java.i
-data/src/share/classes/sun/security/ssl/SSLSessionImpl.java.i
+data/test/org/openjdk/jigsaw/resource.sh.i
data/src/share/classes/sun/jvmstat/monitor/event/VmListener.java.i
-data/src/share/native/sun/security/ec/impl/ecl-curve.h.i
+data/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java.i
data/test/sun/net/www/protocol/http/StackTraceTest.java.i
data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java.i
data/test/java/util/ResourceBundle/Test4314141B.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpParams.java.i
-data/test/java/lang/Short/ByteSwap.java.i
data/src/solaris/doc/sun/man/man1/apt.1.i
+data/test/javax/management/context/localizable/Whatsit.java.i
data/src/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java.i
data/test/java/io/BufferedWriter/Cleanup.java.i
-data/src/share/classes/sun/rmi/transport/ConnectionInputStream.java.i
+data/src/share/classes/sun/rmi/runtime/RuntimeUtil.java.i
data/test/java/awt/PrintJob/Text/stringwidth.sh.i
data/src/share/native/sun/management/ClassLoadingImpl.c.i
-data/src/share/classes/sun/print/PSPathGraphics.java.i
+data/make/tools/swing-beans/beaninfo/images/JScrollBarColor32.gif.i
data/src/share/classes/sun/util/calendar/TzIDOldMapping.java.i
data/test/java/lang/instrument/RedefineMethodAddInvokeTarget_2.java.i
data/test/sun/management/HotspotThreadMBean/GetInternalThreads.java.i
-data/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java.i
+data/test/sun/security/pkcs11/Provider/Login-nss.txt.i
data/test/java/beans/XMLEncoder/EnumPrivate.java.i
data/test/javax/security/auth/login/Configuration/GetInstance.java.i
-data/src/share/classes/sun/io/ByteToCharCp1253.java.i
-data/src/share/classes/sun/print/PrintJob2D.java.i
-data/test/java/util/ArrayList/EnsureCapacity.java.i
+data/test/javax/management/loading/DocumentRootTest.java.i
+data/src/share/native/sun/java2d/loops/IntRgb.c.i
+data/src/share/native/common/gdefs.h.i
data/src/share/classes/sun/java2d/pisces/LineSink.java.i
-data/test/sun/net/www/http/HttpClient/StreamingRetry.java.i
-data/test/java/lang/ThreadLocal/ImmutableLocal.java.i
+data/src/share/native/sun/java2d/loops/AnyInt.c.i
+data/make/netbeans/common/file-view.ent.i
data/make/java/redist/fonts/Makefile.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java.i
data/src/windows/native/sun/jkernel/graphics/java-icon.ico.i
-data/test/java/util/TimSort/README.i
-data/make/sun/Makefile.i
+data/src/share/classes/sun/awt/AWTAccessor.java.i
+data/src/share/classes/java/lang/UnsatisfiedLinkError.java.i
+data/src/share/classes/javax/accessibility/AccessibleBundle.java.i
data/src/share/classes/sun/security/provider/ParameterCache.java.i
data/src/windows/native/sun/security/smartcardio/pcsc_md.h.i
-data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java.i
-data/src/share/classes/com/sun/jdi/LongType.java.i
+data/test/java/security/cert/CertPathBuilder/GetInstance.java.i
+data/make/tools/CharsetMapping/IBM420.map.i
data/src/share/classes/java/security/NoSuchAlgorithmException.java.i
data/src/share/classes/javax/swing/SpringLayout.java.i
data/src/windows/classes/sun/awt/windows/WPageDialog.java.i
data/test/java/net/Socket/DeadlockTest.java.i
-data/test/javax/script/RhinoExceptionTest.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java.i
data/make/tools/src/build/tools/javazic/Timezone.java.i
data/src/share/classes/sun/io/CharToByteCp1142.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java.i
-data/test/java/rmi/server/useCustomRef/UseCustomRef_Stub.java.i
+data/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java.i
+data/src/share/classes/com/sun/jndi/ldap/VersionHelper.java.i
data/src/share/classes/sun/security/krb5/internal/Krb5.java.i
data/src/share/classes/sun/reflect/generics/visitor/Visitor.java.i
-data/make/tools/src/build/tools/generatenimbus/UIStyle.java.i
+data/src/share/classes/javax/naming/ConfigurationException.java.i
data/test/java/lang/management/ManagementFactory/ProxyExceptions.java.i
-data/src/share/classes/javax/swing/plaf/SplitPaneUI.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java.i
data/test/java/beans/Statement/Test6707226.java.i
data/test/java/lang/Class/forName/classes/plus.class.i
-data/test/java/io/File/FileMethods.java.i
+data/src/solaris/demo/jigsaw/basic/setup.sh.i
data/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java.i
data/src/share/classes/sun/text/resources/CollationData_zh.java.i
data/test/java/io/Serializable/enum/classObject/Test.java.i
data/src/share/classes/javax/sound/midi/VoiceStatus.java.i
-data/src/solaris/classes/sun/awt/motif/MButtonPeer.java.i
-data/src/share/classes/java/awt/image/ReplicateScaleFilter.java.i
+data/test/java/nio/channels/Selector/LotsOfUpdates.java.i
+data/src/share/classes/com/sun/media/sound/SoftLinearResampler.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html.i
data/test/javax/script/Test2.js.i
-data/src/windows/native/sun/nio/ch/SocketChannelImpl.c.i
+data/test/sun/nio/cs/OLD/X11GB2312_OLD.java.i
+data/test/sun/tools/jps/jps-Vvml_Output1.awk.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/PackageInfo.java.i
data/src/windows/native/sun/windows/awt_Font.cpp.i
data/make/tools/reorder/Makefile.i
data/src/share/classes/com/sun/java/browser/dom/DOMAction.java.i
data/src/share/demo/applets/BarChart/example1.html.i
data/test/java/nio/channels/FileChannel/Pwrite.java.i
+data/test/java/security/SecureClassLoader/DefineClassByteBuffer.java.i
data/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java.i
data/src/share/classes/com/sun/media/sound/Toolkit.java.i
data/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java.i
data/src/windows/classes/sun/nio/fs/WindowsSecurity.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.dtd.i
+data/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java.i
data/src/solaris/classes/sun/awt/X11/XMSelection.java.i
data/src/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java.i
-data/src/solaris/classes/sun/awt/X11/XSelection.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/rsa/BrokenRSAPrivateCrtKey.java.i
+data/src/share/classes/java/rmi/server/RMISocketFactory.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java.i
data/test/sun/net/ftp/B6427768.java.i
-data/src/share/sample/vm/clr-jvm/invoker.cs.i
-data/make/tools/CharsetMapping/ISO_8859_6.map.i
+data/src/share/demo/jfc/Notepad/README.txt.i
+data/src/share/classes/java/io/FilenameFilter.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnspr4.so.i
data/src/share/native/sun/security/ec/impl/ecp_224.c.i
-data/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java.i
data/test/java/net/URLClassLoader/ClassPathTest.java.i
data/test/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java.i
-data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java.i
-data/make/com/sun/sql/Makefile.i
+data/src/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java.i
+data/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java.i
data/test/java/lang/Class/getEnclosingClass/EnclosingClass.java.i
-data/src/share/classes/sun/swing/text/TextComponentPrintable.java.i
+data/make/tools/src/build/tools/spp/Spp.java.i
data/test/java/rmi/transport/dgcDeadLock/security.policy.i
-data/test/java/rmi/activation/Activatable/restartCrashedService/ActivateMe.java.i
+data/test/java/lang/Double/ParseHexFloatingPoint.java.i
data/test/java/lang/instrument/ExampleRedefine.java.i
-data/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java.i
data/test/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java.i
data/src/share/classes/java/awt/image/CropImageFilter.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapResult.java.i
data/test/sun/security/tools/policytool/UpdatePermissions.java.i
-data/test/javax/swing/JLayer/6824395/bug6824395.java.i
-data/test/javax/management/eventService/EventClientThreadTest.java.i
-data/src/windows/native/sun/nio/ch/FileDispatcherImpl.c.i
-data/src/share/classes/sun/management/HotspotThreadMBean.java.i
+data/test/java/util/ResourceBundle/Control/BadStaticInitRB.java.i
+data/src/share/classes/sun/tools/jstat/Identifier.java.i
+data/src/share/classes/sun/io/ByteToCharCp948.java.i
+data/make/mkdemo/jvmti/waiters/Makefile.i
data/make/tools/CharsetMapping/IBM930.c2b.i
-data/test/javax/crypto/spec/DESKeySpec/CheckParity.java.i
-data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer_Stub.java.i
+data/src/share/classes/sun/tools/jconsole/resources/connected16.png.i
+data/test/java/net/InetAddress/HashSpread.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sr_RS.properties.i
data/src/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java.i
+data/make/common/shared/Compiler.gmk.i
data/test/javax/xml/crypto/dsig/data/certs/nemain.crt.i
data/src/solaris/classes/sun/awt/X11/XDnDConstants.java.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_sv.properties.i
data/src/share/native/sun/awt/medialib/mlib_ImageCheck.h.i
-data/src/share/classes/sun/reflect/ByteVectorImpl.java.i
-data/test/sun/security/krb5/auto/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
-data/test/sun/security/krb5/RFC396xTest.java.i
-data/src/share/classes/sun/java2d/SunCompositeContext.java.i
-data/test/java/beans/XMLDecoder/spec/TestNew.java.i
+data/make/sun/font/t2k/mapfile-vers.i
+data/src/share/native/com/sun/media/sound/Ports.h.i
+data/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java.i
+data/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java.i
+data/make/java/nio/genCoder.sh.i
data/src/share/native/sun/font/layout/SingleSubstitutionSubtables.h.i
-data/test/java/util/PluggableLocale/providersrc/java.text.spi.DecimalFormatSymbolsProvider.i
+data/test/sun/net/www/MarkResetTest.java.i
data/test/java/net/InetAddress/CachedUnknownHostName.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/IntCalls.java.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java.i
+data/src/share/classes/java/util/MissingResourceException.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/BooleanArrays.java.i
data/src/share/classes/java/awt/dnd/DragSourceListener.java.i
-data/test/java/security/Signature/NONEwithRSA.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandard.java.i
+data/src/share/classes/com/sun/crypto/provider/CipherTextStealing.java.i
+data/src/share/classes/java/awt/print/PrinterException.java.i
data/src/solaris/classes/sun/awt/X11/ToplevelStateListener.java.i
data/src/share/classes/java/lang/ClassFormatError.java.i
-data/test/java/io/PipedReader/Ready.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/config.i
-data/make/tools/javazic/Makefile.i
-data/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.i
+data/src/share/classes/com/sun/tools/jdi/LocationImpl.java.i
+data/src/share/classes/java/nio/charset/CoderMalfunctionError.java.i
+data/src/share/classes/sun/text/resources/CollationData_fr.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java.i
data/src/share/native/com/sun/media/sound/PortMixer.c.i
data/src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java.i
-data/test/sun/net/www/protocol/jar/jarbug/src/jar1/GetResource.java.i
-data/src/share/classes/java/applet/package.html.i
-data/src/share/classes/com/sun/net/httpserver/package-info.java.i
+data/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_hu.properties.i
+data/src/share/classes/javax/imageio/stream/package.html.i
data/src/share/native/sun/awt/libpng/pngstruct.h.i
data/src/share/classes/sun/util/resources/CalendarData_mt_MT.properties.i
data/test/demo/jvmti/Context.java.i
data/src/share/classes/javax/swing/text/AbstractWriter.java.i
-data/src/share/native/sun/management/MemoryPoolImpl.c.i
-data/src/share/native/sun/java2d/loops/ByteIndexed.h.i
-data/src/share/classes/javax/print/attribute/standard/NumberOfDocuments.java.i
+data/src/share/native/sun/awt/image/gif/gifdecoder.c.i
+data/src/share/classes/com/sun/servicetag/SolarisServiceTag.java.i
+data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter.i
data/src/share/classes/java/awt/peer/CanvasPeer.java.i
data/src/share/classes/sun/rmi/rmic/Main.java.i
-data/test/sun/security/pkcs11/KeyStore/Basic.policy.i
+data/test/javax/management/generified/ListTypeCheckTest.java.i
data/test/java/rmi/reliability/benchmark/bench/XmlReporter.java.i
data/test/java/rmi/server/RemoteObject/toStub/ToStub.java.i
-data/src/share/native/sun/font/layout/ContextualGlyphInsertion.h.i
-data/src/windows/classes/sun/java2d/ScreenUpdateManager.java.i
+data/src/share/native/sun/java2d/opengl/OGLMaskBlit.h.i
+data/src/linux/doc/man/ja/jps.1.i
+data/test/java/security/Permission/ToString.java.i
data/src/share/demo/jfc/TableExample/TableExample3.java.i
data/test/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.html.i
-data/test/java/io/Reader/NullLock.java.i
-data/test/java/beans/Introspector/memory/Test4508780.java.i
+data/src/windows/resource/icons/awt.ico.i
data/test/java/rmi/transport/dgcDeadLock/Test.java.i
data/src/share/classes/com/sun/jdi/PrimitiveType.java.i
-data/src/share/classes/sun/nio/cs/ext/SJIS_0213.java.i
+data/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java.i
data/test/java/awt/MultipleGradientPaint/MultiGradientTest.java.i
data/test/sun/tools/jstat/snap1.awk.i
-data/src/share/classes/sun/security/krb5/internal/AuthContext.java.i
+data/src/share/classes/java/io/InputStreamReader.java.i
data/test/sun/net/www/protocol/http/ResponseCacheStream.java.i
data/test/java/lang/instrument/ilib/Inject.java.i
+data/test/java/net/Socket/FDClose.java.i
data/src/share/classes/javax/management/event/EventClientNotFoundException.java.i
data/make/tools/CharsetMapping/IBM918.nr.i
+data/test/java/util/zip/input.jar.i
data/src/share/native/sun/java2d/loops/AnyInt.h.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties.i
-data/test/sun/tools/native2ascii/test3.i
-data/src/windows/classes/sun/security/mscapi/Key.java.i
+data/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java.i
+data/test/java/net/Authenticator/B4769350.java.i
+data/src/share/classes/java/net/CookieManager.java.i
data/src/share/native/sun/java2d/ShaderList.h.i
-data/test/com/sun/jdi/DeoptimizeWalk.sh.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java.i
+data/src/share/classes/javax/swing/DebugGraphicsInfo.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicTransferable.java.i
-data/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh.i
+data/test/sun/net/www/ftptest/FtpServer.java.i
data/src/share/classes/sun/nio/ch/exceptions.i
data/src/share/classes/javax/crypto/ShortBufferException.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_ME.properties.i
-data/test/sun/security/ssl/sanity/interop/JSSEServer.java.i
-data/src/share/classes/sun/security/util/DerInputStream.java.i
+data/test/javax/swing/text/html/TableView/7030332/sample2.png.i
+data/test/javax/swing/border/Test6978482.java.i
data/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/PainterImpl.template.i
-data/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java.i
-data/src/windows/native/sun/windows/awt_TrayIcon.cpp.i
+data/src/share/classes/sun/reflect/ClassDefiner.java.i
+data/test/java/awt/Mixing/Validating.java.i
+data/src/solaris/native/sun/awt/colordata.h.i
+data/test/java/security/cert/CertificateFactory/SlowStream.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java.i
data/src/share/classes/javax/net/SocketFactory.java.i
data/src/share/classes/javax/swing/text/DefaultCaret.java.i
-data/src/share/back/export/sys.h.i
+data/make/sun/rmi/rmic/FILES.gmk.i
data/test/javax/xml/crypto/dsig/data/certs/morigu.crt.i
data/src/share/classes/sun/management/HotspotCompilation.java.i
-data/make/com/sun/tracing/dtrace/Makefile.i
+data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java.i
data/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/ServerImpl.java.i
data/src/solaris/native/sun/java2d/loops/vis_FuncArray.c.i
-data/src/share/classes/javax/management/openmbean/MXBeanMappingFactoryClass.java.i
-data/test/java/beans/Performance/TestPropertyChangeSupport.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain0.txt.i
+data/src/solaris/native/sun/java2d/loops/vis_AlphaMaskBlit.c.i
data/src/share/classes/sun/tools/tree/InlineMethodExpression.java.i
-data/test/tools/pack200/Pack200Props.java.i
-data/src/share/classes/sun/misc/ExtensionInstallationException.java.i
+data/src/share/classes/javax/management/BetweenQueryExp.java.i
+data/test/javax/swing/JColorChooser/Test4759934.java.i
data/src/share/demo/jfc/Font2DTest/resources/TextResources_de.properties.i
-data/make/tools/CharsetMapping/IBM737.map.i
data/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java.i
data/test/sun/security/krb5/confplusprop2.conf.i
data/test/com/sun/jdi/sde/InstallSDE.java.i
data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java.i
-data/src/linux/doc/man/jarsigner.1.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java.i
-data/src/share/classes/sun/tools/tree/ConstantExpression.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/inffast.h.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java.i
+data/test/javax/swing/JTextArea/7049024/bug7049024.java.i
+data/src/share/classes/sun/io/ByteToCharISO2022.java.i
+data/src/share/classes/javax/swing/text/html/BRView.java.i
data/test/java/util/zip/ZipFile/ShortRead.java.i
-data/test/com/sun/tools/attach/RedefineAgent.java.i
+data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java.i
data/src/share/classes/javax/management/remote/JMXAddressable.java.i
data/src/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java.i
data/src/share/classes/java/util/logging/FileHandler.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java.i
-data/test/sun/security/provider/SeedGenerator/Priority_Inversion.java.i
-data/test/java/util/concurrent/ScheduledThreadPoolExecutor/DecorateTask.java.i
-data/test/com/sun/jdi/TemplateTest.java.i
-data/test/javax/management/query/QueryNotifFilterTest.java.i
-data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties.i
-data/test/javax/swing/plaf/basic/Test6984643.java.i
+data/src/share/classes/com/sun/media/sound/SunFileReader.java.i
+data/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono32.gif.i
+data/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java.i
+data/test/com/sun/jdi/CountFilterTest.java.i
+data/src/share/classes/com/sun/jdi/TypeComponent.java.i
+data/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java.i
data/src/windows/classes/sun/java2d/d3d/D3DBackBufferSurfaceData.java.i
-data/test/com/sun/jdi/MixedSuspendTest.sh.i
+data/src/share/classes/java/rmi/ServerError.java.i
data/src/share/native/sun/awt/image/jpeg/jconfig.h.i
data/src/share/classes/com/sun/jdi/event/WatchpointEvent.java.i
data/test/com/sun/crypto/provider/Cipher/RSA/oaep-vect.txt.i
data/test/java/beans/XMLEncoder/Test4625418.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java.i
-data/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll.i
+data/src/share/classes/sun/io/CharToByteMacThai.java.i
+data/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java.i
data/src/share/sample/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg.i
-data/src/solaris/classes/sun/awt/X11/MWMConstants.java.i
data/make/java/net/FILES_c.gmk.i
-data/src/share/classes/java/lang/reflect/Modifier.java.i
-data/test/javax/crypto/Mac/ByteBuffers.java.i
-data/test/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_kyoto.properties.i
+data/src/share/classes/sun/tools/tree/BitOrExpression.java.i
+data/src/share/classes/sun/text/resources/FormatData_fi.java.i
+data/test/com/sun/net/httpserver/SelCacheTest.java.i
data/src/share/classes/javax/management/loading/ClassLoaderRepository.java.i
data/test/org/openjdk/jigsaw/cli/jmod-signed.sh.i
data/test/com/sun/jdi/FilterMatch.java.i
+data/src/share/classes/javax/net/ssl/SSLContext.java.i
data/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java.i
data/test/sun/security/pkcs11/Secmod/nsstrust.cfg.i
data/test/javax/security/auth/login/LoginContext/ConfigConstructor.policy.i
data/src/share/native/sun/security/ec/ecp_mont.c.i
-data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java.i
+data/src/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.java.i
data/src/share/classes/javax/sound/midi/ControllerEventListener.java.i
-data/src/share/classes/javax/accessibility/AccessibleExtendedComponent.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java.i
+data/src/share/classes/sun/nio/cs/ext/MacRomania.java.i
+data/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java.i
data/src/share/native/java/lang/fdlibm/src/w_cosh.c.i
data/src/share/classes/sun/management/resources/agent.properties.i
-data/src/share/classes/java/sql/PreparedStatement.java.i
-data/src/share/classes/java/awt/font/LineMetrics.java.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnClass.java.i
+data/test/com/sun/net/httpserver/bugs/B6401598.java.i
+data/src/share/classes/javax/security/auth/x500/package.html.i
data/src/solaris/classes/sun/awt/motif/MCanvasPeer.java.i
-data/test/javax/management/mxbean/RandomMXBeanTest.java.i
+data/src/share/classes/java/lang/management/MemoryManagerMXBean.java.i
data/src/share/classes/sun/net/idn/UCharacterDirection.java.i
data/test/sun/net/www/protocol/jar/jarbug/src/test/JarTest.java.i
data/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java.i
-data/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java.i
-data/test/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java.i
-data/test/sun/security/krb5/ParseConfig.java.i
-data/test/java/io/File/MaxPathLength.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/ding.sf2.i
-data/src/share/classes/com/sun/rowset/RowSetFactoryImpl.java.i
+data/src/share/classes/java/security/cert/CollectionCertStoreParameters.java.i
+data/src/share/classes/sun/text/resources/FormatData_ru_RU.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/LayerContainer.java.i
+data/src/windows/resource/version.rc.i
+data/src/share/classes/sun/tools/tree/IfStatement.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.d
+data/src/share/classes/java/awt/color/ICC_ColorSpace.java.i
data/test/java/beans/XMLEncoder/Test6176120.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java.i
data/src/share/native/sun/awt/image/jpeg/jdpostct.c.i
data/src/share/demo/jvmti/hprof/hprof_check.c.i
data/test/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_sv.properties.i
-data/test/java/security/KeyRep/RC5.pre.1.5.key.i
-data/test/java/rmi/Naming/UnderscoreHost_Stub.java.i
+data/src/share/classes/sun/font/FontManagerFactory.java.i
+data/src/share/classes/java/awt/geom/PathIterator.java.i
+data/test/java/net/URLClassLoader/B6896088.java.i
data/test/java/lang/Boolean/MakeBooleanComparable.java.i
-data/test/java/lang/reflect/Proxy/returnTypes/GetCloneable.java.i
+data/src/solaris/native/sun/awt/awt_Scrollbar.c.i
data/src/share/native/sun/font/layout/HebrewShaping.h.i
-data/src/share/classes/sun/security/pkcs11/Token.java.i
+data/src/share/classes/sun/print/PSPathGraphics.java.i
data/src/share/classes/sun/misc/Signal.java.i
-data/src/share/classes/com/sun/media/sound/SF2Soundbank.java.i
+data/src/share/classes/sun/nio/cs/ext/MS949.java.i
data/src/share/classes/java/lang/annotation/Documented.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java.i
data/src/share/classes/sun/dyn/util/VerifyType.java.i
data/src/share/classes/sun/tools/tree/FieldExpression.java.i
data/test/javax/swing/JFileChooser/4150029/bug4150029.html.i
-data/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java.i
-data/make/netbeans/jdwpgen/nbproject/sqe.properties.i
+data/src/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java.i
data/test/sun/security/jgss/GssNPE.java.i
data/src/share/classes/java/io/PipedReader.java.i
-data/src/share/classes/java/rmi/server/RemoteCall.java.i
-data/test/java/util/Map/Get.java.i
+data/test/java/util/concurrent/BlockingQueue/Interrupt.java.i
+data/src/share/classes/java/security/cert/CertSelector.java.i
data/src/share/classes/javax/swing/event/MenuDragMouseListener.java.i
data/src/share/native/sun/awt/libpng/pngconf.h.i
-data/src/solaris/javavm/export/jni_md.h.i
-data/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java.i
+data/src/share/classes/sun/tools/tree/LessExpression.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java.i
+data/src/share/classes/com/sun/tools/jdi/VMState.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java.i
-data/src/share/native/sun/java2d/loops/ThreeByteBgr.c.i
+data/src/share/native/sun/security/ec/impl/ec2_aff.c.i
data/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java.i
data/test/java/util/zip/ZipFile/ReleaseInflater.java.i
data/src/share/classes/sun/security/ssl/ServerHandshaker.java.i
data/make/tools/CharsetMapping/IBM1112.map.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/CloseTest.java.i
-data/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java.i
-data/test/sun/security/pkcs11/Provider/ConfigQuotedString.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java.i
+data/test/sun/security/provider/PolicyParser/UnresolvedProperty.policy.i
+data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh.i
data/test/java/beans/PropertyEditor/TestDoubleTypeNull.java.i
-data/src/solaris/classes/sun/awt/motif/X11GB18030_1.java.i
-data/test/java/util/TreeMap/NullAtEnd.java.i
+data/src/share/classes/sun/text/resources/unorm.icu.i
+data/test/sun/security/krb5/auto/BadKdc4.java.i
data/test/java/security/Security/signedfirst/StaticSignedProvFirst.java.i
data/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java.i
-data/test/sun/security/util/BitArray/NamedBitList.java.i
-data/test/javax/management/remote/mandatory/loading/SingleClassLoader.java.i
+data/src/share/classes/sun/rmi/server/ActivatableRef.java.i
+data/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java.i
data/src/share/classes/com/sun/tools/attach/AttachPermission.java.i
data/test/javax/script/Test7.js.i
-data/src/windows/hpi/src/path_md.c.i
-data/src/windows/classes/sun/java2d/d3d/D3DContext.java.i
+data/test/sun/nio/cs/TestISO2022CNDecoder.java.i
+data/src/share/classes/com/sun/media/sound/DLSInstrument.java.i
data/src/share/classes/javax/swing/JLabel.java.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.i
-data/src/solaris/native/sun/java2d/j2d_md.h.i
+data/src/share/classes/sun/nio/ch/AllocatedNativeObject.java.i
data/test/javax/xml/crypto/dsig/KeySelectors.java.i
+data/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java.i
data/src/share/demo/nbproject/management/FullThreadDump/nbproject/project.xml.i
-data/test/java/lang/reflect/Constructor/TestParameterAnnotations.java.i
-data/test/com/sun/jdi/CatchPatternTest.sh.i
-data/test/javax/management/remote/mandatory/version/ImplVersionCommand.java.i
-data/test/com/sun/jdi/ShellScaffold.sh.i
+data/src/share/classes/java/rmi/registry/LocateRegistry.java.i
+data/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.i
+data/src/share/native/sun/font/layout/KernTable.h.i
+data/src/share/native/java/lang/fdlibm/src/w_gamma.c.i
+data/src/share/classes/sun/security/provider/DSAPrivateKey.java.i
data/test/sun/security/util/Oid/S11N.sh.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java.i
+data/src/share/classes/com/sun/imageio/stream/StreamCloser.java.i
data/test/java/io/Serializable/backRefCNFException/Read.java.i
data/src/share/classes/sun/text/resources/FormatData_de_CH.java.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java.i
-data/test/java/util/Hashtable/SimpleSerialization.java.i
-data/test/java/beans/PropertyEditor/TestEnumSubclassValue.java.i
+data/src/share/classes/sun/net/httpserver/LeftOverInputStream.java.i
+data/src/share/classes/java/util/prefs/NodeChangeEvent.java.i
data/src/share/demo/nbproject/jfc/SampleTree/build.properties.i
data/test/java/nio/charset/coders/FullRead.java.i
-data/src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java.i
-data/make/tools/swing-beans/beaninfo/images/JMenuColor16.gif.i
+data/src/share/classes/java/beans/Expression.java.i
+data/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher.i
data/test/java/util/ResourceBundle/RBTestFmwk.java.i
+data/test/com/sun/jdi/EnumTest.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpSecurityParameters.java.i
-data/src/share/classes/java/io/NotSerializableException.java.i
+data/test/java/rmi/server/RMIClassLoader/spi/Property.java.i
data/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java.i
data/src/share/classes/java/rmi/activation/ActivationSystem.java.i
data/src/share/classes/java/lang/invoke/MethodHandleImpl.java.i
-data/src/share/demo/nio/zipfs/src/META-INF/services/java.nio.file.spi.FileSystemProvider.i
-data/test/java/io/charStreams/StringConvert.java.i
-data/test/javax/print/PrintSubInputStream/Example.java.i
+data/test/sun/security/pkcs11/ec/p12passwords.txt.i
+data/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java.i
data/src/share/native/sun/font/layout/LEScripts.h.i
data/src/share/classes/sun/security/util/AuthResources_ko.java.i
-data/src/share/native/java/lang/fdlibm/src/e_acosh.c.i
+data/make/tools/reorder/tests/LoadToolkit.java.i
data/src/solaris/native/sun/awt/MouseInfo.c.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/BootAnalyzer.java.i
+data/src/share/classes/sun/net/TelnetProtocolException.java.i
data/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.policy.i
-data/src/share/classes/java/awt/doc-files/modal-example1.gif.i
data/test/java/awt/Graphics/DrawImageBG/SystemBgColorTest.java.i
data/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain3.txt.i
-data/test/com/sun/jdi/ControlFlow.java.i
-data/src/share/classes/sun/nio/cs/ext/MSISO2022JP.java.i
-data/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java.i
-data/src/share/classes/sun/util/resources/TimeZoneNames_ko.java.i
-data/test/sun/nio/cs/TestCompoundTest.java.i
+data/src/share/classes/java/security/SecureRandomSpi.java.i
+data/src/share/classes/sun/security/jgss/LoginConfigImpl.java.i
+data/make/PatchList.solaris.i
+data/src/share/classes/javax/swing/undo/UndoableEditSupport.java.i
+data/src/share/classes/javax/smartcardio/CommandAPDU.java.i
data/src/share/classes/sun/io/CharToByteCp861.java.i
-data/test/java/lang/String/Supplementary.java.i
-data/src/share/native/sun/awt/libpng/pngwio.c.i
-data/src/share/classes/javax/management/monitor/StringMonitor.java.i
+data/make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java.i
+data/src/windows/native/com/sun/management/OperatingSystem_md.c.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpInt.java.i
data/test/java/util/prefs/PrefsSpi.java.i
-data/test/java/net/Authenticator/B6870935.java.i
-data/src/share/classes/java/awt/im/spi/InputMethodContext.java.i
-data/test/com/sun/crypto/provider/Cipher/RSA/TestRSA.java.i
-data/test/java/net/CookieHandler/B6791927.java.i
+data/src/share/classes/java/io/ObjectOutput.java.i
+data/src/share/classes/java/lang/RuntimeException.java.i
+data/src/share/classes/java/lang/ClassLoader.java.i
+data/test/java/io/InputStreamReader/GrowAfterEOF.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/CustomObjTrees.java.i
data/src/solaris/classes/sun/awt/motif/X11JIS0212.java.i
data/make/java/sun_nio/Makefile.i
data/test/java/io/Serializable/6966692/Test6966692.sh.i
data/test/java/beans/Performance/TestIntrospector.java.i
data/test/com/sun/jdi/CatchAllTest.sh.i
-data/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java.i
+data/src/share/classes/java/security/Provider.java.i
+data/src/share/classes/sun/tools/jconsole/Version-template.java.i
data/src/share/classes/java/rmi/AccessException.java.i
-data/src/share/back/util.c.i
+data/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java.i
data/src/share/classes/javax/security/auth/login/CredentialException.java.i
-data/src/share/native/sun/java2d/loops/UshortGray.c.i
+data/src/share/native/sun/font/layout/CanonShaping.cpp.i
data/src/share/classes/sun/io/CharToByteCp856.java.i
-data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.html.i
+data/src/share/classes/sun/nio/cs/ext/ISO_8859_3.java.i
data/src/share/demo/jfc/CodePointIM/CodePointIM.java.i
+data/src/share/classes/sun/io/ByteToCharCp285.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent0111.java.i
-data/src/share/classes/sun/rmi/log/ReliableLog.java.i
-data/src/share/classes/java/sql/package.html.i
-data/test/java/rmi/activation/Activatable/nestedActivate/security.policy.i
-data/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java.i
+data/make/modules/BuildPackages.gmk.i
+data/src/share/classes/sun/util/resources/LocaleNames.properties.i
+data/test/sun/nio/cs/EuroConverter.java.i
+data/src/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java.i
data/src/share/classes/java/security/KeyFactorySpi.java.i
data/test/sun/text/resources/Format/Bug4807540.java.i
data/src/solaris/doc/sun/man/man1/ja/javadoc.1.d
-data/test/javax/swing/JFileChooser/6342301/bug6342301.java.i
+data/test/java/util/PluggableLocale/CollatorProviderTest.sh.i
data/src/share/classes/com/sun/servicetag/Installer.java.i
-data/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java.i
+data/src/share/sample/nio/server/Content.java.i
data/test/sun/security/util/Oid/OidFormat.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java.i
-data/test/sun/nio/cs/CheckICNE.java.i
+data/src/windows/classes/sun/awt/windows/WScrollPanePeer.java.i
data/src/share/classes/sun/security/jgss/HttpCaller.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/Package.java.i
data/src/solaris/doc/sun/man/man1/ja/javadoc.1.i
data/src/share/classes/javax/security/auth/login/Configuration.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c.i
+data/src/share/classes/java/awt/geom/AffineTransform.java.i
data/src/share/native/sun/security/ec/impl/mpi-priv.h.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java.i
-data/src/share/sample/vm/clr-jvm/README.txt.i
+data/src/share/native/sun/awt/debug/debug_mem.h.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java.i
data/src/windows/native/sun/windows/awt_Robot.cpp.i
data/test/java/net/Socket/NullHost.java.i
data/test/javax/management/context/RemoteContextTest.java.i
data/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp.i
data/src/share/classes/javax/swing/text/html/Map.java.i
-data/make/tools/src/build/tools/automulti/TestALFGenerator.java.i
-data/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java.i
+data/src/share/classes/java/awt/Frame.java.i
+data/src/share/classes/java/awt/KeyEventDispatcher.java.i
data/src/windows/classes/sun/tools/attach/WindowsAttachProvider.java.i
data/src/share/classes/java/util/concurrent/TimeoutException.java.i
-data/src/share/classes/java/util/LinkedHashSet.java.i
-data/test/java/nio/Buffer/CopyDirectIntMemory.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties.i
+data/src/share/classes/javax/swing/text/html/ResourceLoader.java.i
+data/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java.i
+data/test/java/net/CookieHandler/B6644726.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java.i
data/make/common/shared/Compiler-msvc.gmk.i
-data/test/sun/tools/jps/jps-Vvml_2.sh.i
-data/src/share/classes/sun/tools/asm/Assembler.java.i
+data/src/solaris/doc/sun/man/man1/ja/jsadebugd.1.i
+data/test/java/rmi/activation/Activatable/downloadParameterClass/manual.security.policy.i
data/src/share/classes/java/awt/image/DataBuffer.java.i
data/src/share/classes/javax/swing/text/html/parser/ContentModelState.java.i
data/test/sun/nio/cs/CheckCaseInsensitiveEncAliases.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.java.i
+data/src/share/classes/sun/util/resources/TimeZoneNames.java.i
+data/test/javax/swing/JEditorPane/4492274/test.html.i
data/src/windows/native/sun/windows/awt_Dimension.cpp.i
-data/test/java/net/Socket/asyncClose/DatagramSocket_receive.java.i
+data/src/share/native/java/lang/fdlibm/src/w_fmod.c.i
+data/src/share/classes/javax/management/BadAttributeValueExpException.java.i
data/src/share/classes/javax/management/BooleanValueExp.java.i
-data/test/java/util/logging/LoggingDeadlock2.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM949C.java.i
data/src/share/native/sun/java2d/opengl/OGLRenderer.h.i
data/src/share/classes/sun/io/ByteToCharISO8859_1.java.i
-data/src/share/classes/sun/java2d/pipe/OutlineTextRenderer.java.i
+data/src/share/classes/java/util/Calendar.java.i
data/test/java/io/Serializable/cloneArray/CloneArray.java.i
-data/src/share/sample/nio/file/Xdd.java.i
data/src/share/classes/java/lang/module/ModuleInfoAnnotation.java.i
-data/src/share/classes/sun/tools/serialver/serialver.properties.i
+data/src/share/classes/sun/text/normalizer/ICUBinary.java.i
data/test/java/util/Collection/IteratorAtEnd.java.i
data/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java.i
-data/src/windows/native/sun/windows/awt_Scrollbar.cpp.i
data/test/sun/rmi/rmic/newrmic/equivalence/MyObject.java.i
data/test/javax/management/loading/LibraryLoader/jar_src/UseNativeLib.java.i
+data/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h.i
data/src/solaris/classes/sun/awt/X11/XNETProtocol.java.i
-data/src/share/classes/sun/io/CharToByteCp948.java.i
-data/src/share/native/sun/security/ec/impl/mpi.c.i
-data/test/com/sun/jdi/InnerTarg.java.i
+data/src/share/native/java/io/FileInputStream.c.i
+data/test/java/io/InputStream/Skip.java.i
+data/test/com/sun/jdi/UnpreparedByName.java.i
data/src/share/classes/com/sun/tools/example/trace/EventThread.java.i
data/src/share/classes/java/util/DualPivotQuicksort.java.i
data/src/share/classes/java/security/spec/RSAPublicKeySpec.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorType.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java.i
-data/test/javax/swing/text/html/TableView/7030332/bug7030332.java.i
data/src/share/classes/sun/security/pkcs11/P11DHKeyFactory.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java.i
-data/test/java/lang/Runtime/exec/WinCommand.java.i
+data/test/java/awt/im/4959409/bug4959409.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java.i
data/src/solaris/bin/ia64/jvm.cfg.i
-data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java.i
+data/src/share/classes/sun/util/resources/CalendarData_ja.properties.i
data/test/java/nio/channels/SocketChannel/ExceptionTranslation.java.i
data/test/java/io/Serializable/oldTests/BinaryTree.java.i
-data/test/java/io/Serializable/unnamedPackageSwitch/A.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c.i
+data/test/com/sun/servicetag/servicetag2.properties.i
+data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-start.jpg.i
+data/src/share/classes/javax/swing/DesktopManager.java.i
data/src/share/classes/sun/security/util/Resources_es.java.i
-data/src/share/classes/sun/security/provider/DSAParameters.java.i
-data/test/java/lang/Character/CheckProp.java.i
+data/src/share/classes/com/sun/tools/hat/internal/util/Comparer.java.i
+data/src/share/classes/java/nio/file/FileSystem.java.i
data/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java.i
-data/test/java/lang/ref/SoftReference/Bash.java.i
-data/test/java/util/Locale/data/deflocale.sh.i
+data/test/sun/tools/jps/jps-m_Output2.awk.i
+data/test/com/sun/jdi/UnpreparedClasses.java.i
+data/test/java/io/Serializable/lookupAnyInvocation/LookupAnyInvocation.java.i
data/test/java/rmi/activation/Activatable/unregisterInactive/group.security.policy.i
data/make/sun/awt/README.i
data/test/java/net/HttpURLConnection/HttpResponseCode.java.i
-data/test/sun/security/ssl/README.i
+data/test/javax/management/Introspector/MBeanDescriptionTest.java.i
data/src/solaris/native/sun/awt/multiVis.h.i
-data/src/share/classes/sun/tools/tree/AssignAddExpression.java.i
-data/src/share/native/sun/awt/medialib/mlib_status.h.i
-data/src/share/classes/sun/audio/AudioStream.java.i
+data/test/java/io/PrintWriter/OversynchronizedTest.java.i
+data/src/solaris/native/sun/nio/fs/genUnixConstants.c.i
+data/src/share/classes/javax/swing/Spring.java.i
data/src/windows/classes/sun/nio/ch/PendingIoCache.java.i
-data/src/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java.i
+data/src/share/classes/javax/swing/tree/TreeNode.java.i
data/src/windows/native/sun/windows/GDIHashtable.cpp.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java.i
-data/src/solaris/back/proc_md.h.i
+data/test/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java.i
+data/src/share/classes/sun/rmi/server/ActivationGroupInit.java.i
data/test/java/net/ServerSocket/ThreadStop.java.i
-data/make/tools/CharsetMapping/IBM037.nr.i
+data/src/share/classes/com/sun/tools/jdi/IntegerValueImpl.java.i
data/src/share/classes/sun/print/AttributeUpdater.java.i
data/test/java/beans/XMLEncoder/java_util_ArrayList.java.i
data/src/share/classes/javax/net/ssl/HttpsURLConnection.java.i
-data/test/java/security/KeyRep/SerialDSAPubKey.policy.i
-data/test/java/security/KeyRep/RSA.pre.1.5.key.i
-data/test/com/sun/jdi/RefTypes.java.i
+data/make/tools/CharsetMapping/IBM942.c2b.i
+data/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java.i
+data/src/share/classes/com/sun/tools/jdi/CharTypeImpl.java.i
data/test/java/util/zip/ZipFile/input.jar.i
-data/src/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java.i
+data/src/share/classes/javax/management/StandardEmitterMBean.java.i
data/make/javax/rmi/Makefile.i
-data/src/solaris/doc/sun/man/man1/extcheck.1.i
-data/src/share/classes/com/sun/media/sound/DLSRegion.java.i
-data/test/java/nio/channels/ServerSocketChannel/Basic.java.i
-data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java.i
+data/src/share/classes/javax/management/event/RMIPushEventForwarder.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java.i
+data/src/share/classes/javax/xml/crypto/OctetStreamData.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/ResolutionInfo.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java.i
data/src/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java.i
-data/src/share/classes/java/sql/Statement.java.i
-data/test/sun/nio/cs/OLD/IBM949_OLD.java.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts.mf.i
+data/src/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java.i
data/src/share/classes/sun/reflect/Reflection.java.i
data/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java.i
data/src/windows/native/sun/windows/awt_Dialog.cpp.i
-data/test/java/util/ArrayList/IteratorMicroBenchmark.java.i
-data/src/share/classes/javax/swing/plaf/DimensionUIResource.java.i
-data/src/share/classes/sun/text/normalizer/UCharacter.java.i
+data/src/share/classes/javax/swing/SingleSelectionModel.java.i
+data/test/javax/crypto/Cipher/Turkish.java.i
+data/src/share/classes/java/applet/package.html.i
data/test/java/security/AccessControlContext/CheckCtor.java.i
data/src/share/demo/applets/MoleculeViewer/models/cyclohexane.xyz.i
data/src/share/native/java/io/ObjectOutputStream.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_NN.c.i
+data/src/share/classes/sun/print/RasterPrinterJob.java.i
data/src/share/classes/javax/swing/text/Utilities.java.i
-data/src/share/classes/sun/java2d/pisces/Stroker.java.i
-data/src/share/classes/javax/swing/border/BevelBorder.java.i
-data/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.java.i
-data/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java.i
-data/src/share/classes/sun/text/resources/FormatData_en_PH.java.i
+data/src/share/classes/org/openjdk/jigsaw/Hi.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java.i
+data/src/share/classes/java/nio/channels/SeekableByteChannel.java.i
+data/src/share/classes/sun/security/action/LoadLibraryAction.java.i
data/test/javax/swing/JFileChooser/6698013/bug6698013.html.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_34.c.i
data/test/sun/util/resources/TimeZone/IntlTest.java.i
data/test/javax/management/context/ContextTest.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java.i
-data/src/share/sample/jmx/jmx-scandir/build.xml.i
-data/test/sun/security/provider/certpath/ReverseBuilder/prjM2mgrM.i
-data/test/sun/security/pkcs11/Secmod/Crypto.java.i
-data/test/java/nio/channels/FileChannel/Transfer.java.i
-data/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java.i
+data/src/solaris/native/sun/awt/initIDs.c.i
+data/test/java/net/URLConnection/DisconnectAfterEOF.java.i
+data/test/javax/crypto/Mac/ByteBuffers.java.i
+data/test/java/awt/Paint/PgramUserBoundsTest.java.i
data/src/share/demo/jfc/Metalworks/resources/HelpFiles/metal.html.i
data/test/java/security/cert/X509Certificate/ExtKeyUsage.java.i
data/src/share/classes/com/sun/pept/ept/ContactInfo.java.i
-data/test/java/net/URLDecoder/B6463990.java.i
+data/src/share/demo/jfc/Notepad/resources/new.gif.i
data/test/java/lang/Math/Atan2Tests.java.i
-data/test/javax/management/Introspector/ParameterNameTest.java.i
-data/src/share/native/sun/java2d/loops/FillParallelogram.c.i
+data/src/share/classes/java/rmi/dgc/Lease.java.i
+data/src/share/classes/java/util/ListIterator.java.i
data/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c.i
-data/src/share/classes/java/util/logging/Level.java.i
-data/test/java/net/InetSocketAddress/B6469803.java.i
+data/test/java/io/Serializable/serialver/classpath/Test.java.i
+data/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java.i
data/test/java/util/Formatter/BasicBooleanObject.java.i
data/src/share/back/inStream.c.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java.i
-data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly_Stub.java.i
+data/src/share/classes/javax/imageio/stream/ImageOutputStream.java.i
+data/test/javax/swing/JLabel/7004134/bug7004134.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpPdu.java.i
data/test/java/util/ResourceBundle/Bug4168625Resource3_en.java.i
data/src/share/native/sun/font/layout/StateTableProcessor.h.i
-data/test/java/lang/ThreadLocal/TestThreadId.java.i
-data/src/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java.i
data/test/javax/swing/JScrollBar/6542335/bug6542335.java.i
-data/test/sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java.i
+data/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java.i
data/src/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav.i
data/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java.i
-data/test/com/sun/jdi/sde/MangleTest.java.i
-data/test/sun/tools/jstat/printCompilationOutput1.awk.i
-data/test/sun/security/ssl/sanity/pluggability/CheckSSLContextExport.java.i
-data/src/share/classes/javax/naming/LinkLoopException.java.i
+data/make/com/sun/tools/attach/FILES_java.gmk.i
+data/src/share/classes/java/text/AttributedCharacterIterator.java.i
+data/src/share/classes/com/sun/jdi/event/package.html.i
+data/test/java/util/AbstractList/HasNextAfterException.java.i
data/test/java/util/Deque/ChorusLine.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_CL.java.i
-data/src/share/classes/sun/text/resources/FormatData_th_TH_TH.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_lt.properties.i
+data/src/share/classes/sun/security/x509/GeneralSubtrees.java.i
+data/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java.i
data/src/solaris/sample/dtrace/hotspot_jni/CriticalSection_slow.d.i
data/test/sun/tools/jps/jps-l_1.sh.i
-data/src/share/native/sun/awt/medialib/mlib_ImageClipping.h.i
+data/src/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java.i
data/test/javax/print/applet/YesNo.java.i
data/src/share/classes/sun/security/jgss/krb5/Krb5CredElement.java.i
-data/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java.i
+data/src/share/classes/javax/sound/midi/MidiDeviceTransmitter.java.i
data/src/share/native/sun/font/layout/KhmerLayoutEngine.h.i
data/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java.i
-data/src/solaris/doc/sun/man/man1/ja/jstatd.1.i
-data/src/share/classes/javax/sql/StatementEvent.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.access.in.i
+data/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java.i
+data/test/sun/security/pkcs11/tls/TestKeyMaterial.java.i
+data/test/java/lang/management/ThreadMXBean/Utils.java.i
+data/src/share/classes/org/relaxng/datatype/Datatype.java.i
data/test/sun/net/www/protocol/file/GetContentLength.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp.i
-data/test/sun/nio/cs/OLD/IBM970_OLD.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java.i
+data/src/share/demo/jfc/FileChooserDemo/FileChooserDemo.java.i
data/test/java/io/Serializable/modifyStaticFields/ModifyStaticFields.java.i
-data/src/solaris/classes/sun/awt/motif/X11KSC5601.java.i
+data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.chk.i
data/src/share/classes/java/security/cert/CertificateEncodingException.java.i
data/test/java/nio/file/attribute/AclFileAttributeView/Basic.java.i
-data/test/java/net/Authenticator/B4678055.java.i
+data/src/share/classes/java/security/acl/Group.java.i
data/test/java/util/PluggableLocale/providersrc/FooNumberFormat.java.i
data/src/share/native/com/sun/tools/jdi/SharedMemoryConnection.c.i
data/test/java/lang/instrument/MakeJAR.sh.i
-data/src/share/classes/java/awt/print/Paper.java.i
-data/make/sun/org/mozilla/Makefile.i
-data/test/sun/security/x509/X500Name/NullX500Name.java.i
-data/test/com/sun/security/sasl/Cram.java.i
-data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java.i
+data/test/org/openjdk/jigsaw/library.sh.i
+data/make/modules/tools/src/com/sun/classanalyzer/ClassAnalyzer.java.i
+data/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java.i
+data/src/share/classes/javax/security/auth/login/AccountException.java.i
+data/src/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java.i
data/src/share/classes/sun/jvmstat/monitor/IntegerMonitor.java.i
data/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/password.properties.i
-data/test/sun/security/ssl/sanity/interop/CipherTest.java.i
-data/src/share/bin/defines.h.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/PKIXExtendedTM.java.i
+data/src/share/classes/sun/tools/tree/CheckContext.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpPduBulkType.java.i
data/src/share/classes/java/awt/doc-files/RadialGradientPaint-1.png.i
-data/test/sun/tools/jstat/usage.out.i
+data/test/java/util/Vector/SerializationDeadlock.java.i
data/test/javax/crypto/Cipher/ByteBuffersNull.java.i
-data/make/tools/src/build/tools/jdwpgen/ClassObjectTypeNode.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java.i
data/src/share/classes/java/lang/CharSequence.java.i
-data/src/share/classes/javax/swing/text/ZoneView.java.i
-data/test/java/lang/ClassLoader/deadlock/SupAlice.java.i
-data/test/javax/management/mxbean/LeakTest.java.i
-data/src/share/demo/management/FullThreadDump/Deadlock.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java.i
+data/test/java/beans/PropertyEditor/TestFloatClassValue.java.i
+data/src/share/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml.i
+data/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java.i
data/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java.i
data/src/share/native/sun/font/AccelGlyphCache.h.i
data/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java.i
-data/src/share/classes/java/rmi/registry/RegistryHandler.java.i
+data/src/share/classes/java/awt/doc-files/modal-example1.gif.i
data/test/sun/tools/jstat/fileURITest1.awk.i
-data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/ProtectedCtor.java.i
-data/src/share/classes/java/awt/event/InvocationEvent.java.i
+data/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java.i
+data/src/share/classes/java/lang/Exception.java.i
data/src/share/classes/sun/security/x509/X509AttributeName.java.i
-data/make/tools/swing-beans/beaninfo/images/JListMono16.gif.i
-data/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c.i
-data/test/java/lang/Class/forName/classes/Z.class.i
-data/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/p11-ibutton.txt.i
+data/src/share/classes/java/awt/image/TileObserver.java.i
+data/src/share/classes/sun/util/logging/resources/logging_ja.properties.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/RenderTests.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_Ports.c.i
data/src/share/demo/jvmti/waiters/Thread.cpp.i
data/test/java/nio/Buffer/BasicByte.java.i
-data/test/java/util/logging/ClassLoaderLeakTest.java.i
-data/test/java/security/cert/CertPathValidator/targetConstraints/ValidateTargetConstraints.java.i
+data/test/sun/security/krb5/auto/CleanState.java.i
+data/src/share/sample/scripting/scriptpad/src/scripts/linewrap.js.i
data/test/java/lang/String/NonCharacterMapping.java.i
data/src/solaris/doc/sun/man/man1/jmap.1.i
-data/make/common/shared/Defs-solaris.gmk.i
+data/src/share/classes/java/io/package.html.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U16Func.c.i
-data/test/javax/management/mxbean/GenericTypeTest.java.i
+data/src/share/classes/java/io/InterruptedIOException.java.i
data/src/solaris/native/sun/awt/awt_util.h.i
data/src/share/classes/sun/io/ByteToCharCp922.java.i
-data/test/java/security/KeyPairGenerator/GenerateKeypair.java.i
+data/src/share/classes/sun/management/MethodInfo.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java.i
data/src/share/classes/sun/io/CharToByteMS936.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/ProxyArrayCalls.java.i
+data/src/share/demo/jfc/Metalworks/resources/HelpFiles/toc.html.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java.i
data/src/share/demo/applets/NervousText/NervousText.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_de_AT.properties.i
data/src/share/classes/com/sun/media/sound/UlawCodec.java.i
-data/test/tools/launcher/VerifyExceptions.java.i
+data/src/share/classes/sun/security/jgss/krb5/Krb5Token.java.i
+data/src/share/classes/sun/awt/ModalityListener.java.i
data/src/share/classes/sun/text/resources/FormatData_sr_ME.java.i
-data/test/sun/tools/jps/jps-m_Output2.awk.i
+data/src/share/classes/javax/swing/plaf/InsetsUIResource.java.i
+data/test/javax/management/openmbean/MBeanFeatureInfoSerialStore.java.i
data/src/share/classes/sun/awt/im/InputMethodAdapter.java.i
+data/src/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties.i
data/src/share/classes/sun/tools/javac/SourceClass.java.i
data/test/java/lang/management/ThreadMXBean/ThreadDump.java.i
-data/test/sun/nio/cs/Test6254467.java.i
+data/test/java/util/Locale/data/deflocale.rhel5.i
data/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java.i
data/src/share/classes/java/io/FileOutputStream.java.i
data/src/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java.i
data/src/share/classes/javax/net/ServerSocketFactory.java.i
-data/test/java/rmi/reliability/juicer/Orange.java.i
-data/test/java/security/KeyRep/SerialOld.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/A.1.i
-data/src/share/classes/sun/io/ByteToCharCp860.java.i
+data/src/share/demo/jvmti/hprof/hprof_frame.c.i
+data/src/share/classes/javax/swing/text/rtf/charsets/cpg437.txt.i
+data/src/share/classes/sun/util/resources/LocaleNames_no.properties.i
+data/src/share/classes/com/sun/media/sound/SoftProcess.java.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/rmid.security.policy.i
-data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor32.gif.i
-data/src/share/demo/applets/SpreadSheet/SpreadSheet.java.i
+data/src/share/classes/javax/security/auth/SubjectDomainCombiner.java.i
+data/src/share/classes/javax/swing/table/AbstractTableModel.java.i
data/test/java/io/charStreams/BufferSizes.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so.i
data/test/java/io/Externalizable/compatibility/old.ser.i
-data/src/solaris/native/sun/java2d/loops/vis_UshortGray_FromRgb.c.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.policy.i
+data/src/share/classes/com/sun/security/sasl/ExternalClient.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl_Stub.java.i
data/src/share/classes/com/sun/jmx/defaults/ServiceName.java.i
data/src/share/classes/javax/swing/text/StyleContext.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmslut.c.i
+data/src/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java.i
data/test/java/lang/ThreadLocal/InitialValue.java.i
data/src/share/classes/java/awt/peer/ScrollPanePeer.java.i
-data/src/windows/native/sun/windows/awt_KeyEvent.cpp.i
-data/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java.i
-data/test/java/math/BigDecimal/CompareToTests.java.i
+data/src/share/classes/com/sun/beans/decoder/FieldElementHandler.java.i
+data/make/tools/swing-beans/beaninfo/images/JProgressBarMono16.gif.i
+data/src/share/classes/javax/swing/text/NumberFormatter.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/ResultSet.java.i
data/test/javax/sql/rowset/serial/SerialClob/SetCharacterStream.java.i
-data/src/share/lib/images/cursors/motif_MoveDrop32x32.gif.i
+data/make/tools/src/build/tools/jdwpgen/ReferenceIDTypeNode.java.i
data/src/share/classes/sun/io/ByteToCharMacRomania.java.i
-data/test/java/nio/Buffer/SwapMicroBenchmark.java.i
+data/test/java/lang/ThreadGroup/SetMaxPriority.java.i
+data/src/share/native/sun/security/ec/oid.c.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.d
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/cert8.db.i
-data/src/share/classes/sun/rmi/server/resources/rmid_ja.properties.i
+data/src/share/classes/javax/security/auth/PrivateCredentialPermission.java.i
data/src/windows/native/sun/java2d/windows/GDIRenderer.cpp.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java.i
-data/test/java/util/BitSet/PreviousBits.java.i
-data/test/java/security/SecureRandom/Serialize.java.i
+data/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java.i
+data/src/solaris/native/sun/java2d/j2d_md.h.i
data/src/share/classes/java/awt/AWTEventMulticaster.java.i
data/test/java/util/Hashtable/SerializationDeadlock.java.i
-data/src/share/native/sun/font/layout/ShapingTypeData.cpp.i
+data/test/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/XColors.java.i
-data/test/java/beans/PropertyChangeSupport/1.5.0_10.ser.i
-data/test/sun/nio/cs/LeftOverSurrogate.java.i
+data/test/java/security/cert/PKIXParameters/InvalidParameters.java.i
+data/test/com/sun/net/httpserver/Test7a.java.i
data/test/java/util/PluggableLocale/GenericTest.sh.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c.i
-data/test/javax/management/openmbean/EqualsTest.java.i
-data/test/sun/net/InetAddress/nameservice/SimpleNameService.java.i
-data/test/java/lang/reflect/Method/invoke/ErrorInInvoke.java.i
-data/test/javax/security/auth/Subject/doAs/policy.i
-data/src/solaris/hpi/include/largefile_linux.h.i
+data/src/share/classes/sun/tools/java/BinaryMember.java.i
+data/test/javax/management/openmbean/EqualsTest.java.i
+data/test/sun/net/InetAddress/nameservice/SimpleNameService.java.i
+data/test/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_es.properties.i
+data/src/share/classes/sun/security/tools/JarSignerResources.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java.i
data/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SetClientMode.java.i
data/test/java/util/concurrent/Exchanger/LoopHelpers.java.i
data/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java.i
-data/test/sun/tools/jrunscript/jrunscript-argsTest.sh.i
-data/test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java.i
-data/test/sun/tools/jstatd/jstatdDefaults.sh.i
+data/src/share/classes/sun/security/rsa/SunRsaSign.java.i
+data/src/share/classes/java/awt/dnd/DragSourceAdapter.java.i
+data/src/solaris/doc/sun/man/man1/ja/native2ascii.1.i
data/test/javax/swing/JLayer/6875716/bug6875716.java.i
data/test/sun/nio/cs/Decode.java.i
-data/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h.i
+data/src/share/classes/sun/net/httpserver/HttpConnection.java.i
data/src/share/classes/sun/nio/ch/SelChImpl.java.i
data/test/java/util/Collections/EmptyCollectionSerialization.java.i
data/src/share/classes/sun/text/resources/FormatData_en_GB.java.i
-data/src/share/classes/sun/security/rsa/RSAPadding.java.i
+data/src/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java.i
data/src/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java.i
data/test/java/beans/XMLEncoder/javax_swing_JTree.java.i
-data/test/java/util/EnumSet/EnumSetBash.java.i
-data/test/java/util/concurrent/ConcurrentLinkedQueue/LoopHelpers.java.i
+data/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java.i
+data/test/com/sun/jdi/MonitorEventTest.java.i
data/make/netbeans/jmx/README.i
data/test/javax/swing/JPopupMenu/6987844/bug6987844.java.i
-data/make/tools/swing-beans/beaninfo/images/JListColor16.gif.i
+data/src/share/classes/javax/security/auth/callback/NameCallback.java.i
data/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh.i
data/src/share/classes/javax/print/attribute/standard/PageRanges.java.i
-data/test/java/util/Collections/CheckedIdentityMap.java.i
-data/src/windows/native/sun/windows/awt_Cursor.h.i
+data/src/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java.i
+data/test/javax/management/MBeanInfo/SerializationTest.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/trusted.jks.i
data/src/share/classes/sun/text/resources/FormatData_uk_UA.java.i
-data/test/sun/security/provider/PolicyFile/Comparator.java.i
-data/test/javax/swing/border/Test4243289.java.i
-data/src/share/native/java/lang/fdlibm/src/s_logb.c.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java.i
+data/make/sun/awt/Depend.sed.i
+data/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java.i
data/test/sun/tools/jstat/gcOutput1.awk.i
-data/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java.i
data/test/sun/nio/cs/TestCp834_SBCS.java.i
data/test/java/beans/PropertyEditor/TestFloatTypeValue.java.i
-data/src/share/classes/java/util/Enumeration.java.i
-data/test/java/rmi/testlibrary/RMID.java.i
+data/src/share/classes/javax/management/AttributeChangeNotificationFilter.java.i
+data/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java.i
data/src/share/classes/com/sun/jdi/connect/VMStartException.java.i
data/src/share/classes/sun/tools/tree/NegativeExpression.java.i
data/src/share/classes/sun/io/CharToByteCp918.java.i
+data/test/java/io/charStreams/ABCOutputStream.java.i
data/src/share/classes/java/text/DecimalFormatSymbols.java.i
data/src/share/classes/java/lang/AbstractStringBuilder.java.i
data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav.i
@@ -20641,196 +20664,209 @@ data/make/tools/CharsetMapping/IBM838.map.i
data/test/javax/management/remote/mandatory/version/ImplVersionReader.java.i
data/src/share/classes/com/sun/crypto/provider/DHParameters.java.i
data/src/share/classes/javax/management/MBeanServerDelegateMBean.java.i
-data/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java.i
data/test/sun/security/tools/keytool/standard.sh.i
-data/src/share/classes/javax/naming/NamingException.java.i
-data/src/share/classes/sun/nio/fs/AbstractWatchService.java.i
-data/test/java/lang/Compare.java.i
+data/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.i
+data/src/share/sample/scripting/scriptpad/nbproject/file-targets.xml.i
+data/src/share/classes/sun/reflect/generics/scope/ClassScope.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c.i
-data/src/share/classes/sun/tools/tree/ShortExpression.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFAttributes.java.i
data/test/java/util/StringTokenizer/FormFeed.java.i
data/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp.i
+data/src/share/classes/com/sun/jdi/VoidType.java.i
data/make/java/java/reorder-i586.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_UY.properties.i
-data/src/share/modules/jdk/module-info.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so.i
+data/src/share/classes/java/util/ServiceLoader.java.i
data/test/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java.i
-data/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableStreamCipher.java.i
+data/src/share/classes/sun/jkernel/StandaloneByteArrayAccess.java.i
data/src/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java.i
-data/test/javax/swing/JTable/6777378/bug6777378.java.i
+data/src/share/demo/jvmti/index.html.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostClient.java.i
data/src/share/classes/com/sun/jmx/namespace/RoutingMBeanServerConnection.java.i
data/test/sun/security/provider/PolicyFile/SelfExpansion.policy.i
-data/make/java/java/reorder-sparcv9.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_PH.properties.i
-data/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java.i
+data/src/share/classes/sun/nio/cs/ext/SJIS_0213.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMSecurityDefs.java.i
+data/src/share/classes/com/sun/tools/attach/AgentInitializationException.java.i
data/src/share/classes/com/sun/security/jgss/jgss-overview.html.i
data/test/sun/nio/cs/FindASCIIReplBugs.java.i
-data/test/sun/security/provider/certpath/ReverseBuilder/prjM2divE.i
+data/src/share/classes/sun/security/provider/certpath/X509CertPath.java.i
data/src/share/classes/javax/swing/text/IconView.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java.i
+data/src/share/classes/javax/swing/event/MenuEvent.java.i
data/test/javax/management/query/InstanceOfExpTest.java.i
-data/src/solaris/classes/sun/awt/X11CustomCursor.java.i
-data/src/share/classes/javax/net/ssl/SSLContext.java.i
+data/test/com/sun/jdi/CompatibleConnectors.java.i
+data/src/share/classes/sun/net/www/URLConnection.java.i
data/test/java/lang/management/ThreadMXBean/ThreadLists.java.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c.i
-data/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java.i
-data/test/java/util/ResourceBundle/RestrictedBundleTest.html.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java.i
-data/test/java/security/SecureClassLoader/DefineClassByteBuffer.java.i
+data/src/share/classes/sun/management/jmxremote/SingleEntryRegistry.java.i
+data/src/share/classes/java/awt/Rectangle.java.i
+data/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java.i
+data/test/java/util/ResourceBundle/Bug6204853_Utf8.properties.i
data/test/javax/security/auth/login/LoginContext/ConfigConstructor.java.i
-data/src/solaris/classes/sun/awt/motif/X11GB2312.java.i
-data/src/share/classes/javax/print/package.html.i
+data/test/java/io/BufferedReader/ReadLineSync.java.i
+data/src/solaris/lib/sdp/sdp.conf.template.i
data/src/share/classes/sun/nio/cs/ext/GBK.java.i
data/src/solaris/npt/utf_md.h.i
data/test/java/lang/instrument/ilib/Info.java.i
data/make/common/BuildNativePackages.gmk.i
data/test/java/beans/XMLEncoder/java_awt_BasicStroke.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java.i
-data/test/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java.i
+data/test/java/lang/ClassLoader/resource.jar.i
data/test/sun/tools/jstat/options1.out.i
data/src/windows/classes/sun/java2d/d3d/D3DPaints.java.i
data/test/java/nio/file/Path/SBC.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java.i
+data/src/share/classes/com/sun/tools/extcheck/ExtCheck.java.i
data/test/java/util/jar/JarFile/test.jar.i
-data/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor16.gif.i
+data/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpPduFactory.java.i
data/src/share/classes/sun/nio/ch/Cancellable.java.i
-data/test/java/io/BufferedReader/Ready.java.i
-data/test/com/sun/jdi/EnumTest.java.i
+data/src/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java.i
+data/src/solaris/hpi/include/largefile.h.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java.i
data/src/share/modules/jdk.boot/module-info.java.i
data/src/share/classes/sun/util/PreHashedMap.java.i
-data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorProvider.i
-data/src/share/classes/sun/net/www/content/audio/x_aiff.java.i
+data/src/windows/instrument/FileSystemSupport_md.c.i
+data/src/share/classes/sun/util/resources/CalendarData_pl.properties.i
data/src/share/classes/sun/font/FontStrikeDisposer.java.i
-data/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64.i
+data/test/java/nio/channels/SocketChannel/Stream.java.i
+data/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java.i
data/test/java/awt/im/JTextFieldTest.html.i
data/test/java/awt/Frame/FrameSize/TestFrameSize.java.i
data/src/share/classes/java/net/FileNameMap.java.i
-data/make/mkdemo/management/README.txt.i
+data/src/share/classes/java/lang/reflect/ParameterizedType.java.i
data/test/sun/security/rsa/InvalidBitString.java.i
data/src/share/classes/sun/security/x509/ReasonFlags.java.i
-data/src/share/sample/README.i
-data/src/share/classes/javax/swing/event/RowSorterListener.java.i
-data/src/share/classes/java/awt/doc-files/RadialGradientPaint-4.png.i
-data/test/sun/rmi/rmic/defaultStubVersion/run.sh.i
-data/src/share/classes/java/awt/Composite.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java.i
+data/src/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java.i
+data/test/sun/security/pkcs11/rsa/TestCACerts.java.i
+data/src/share/sample/vm/clr-jvm/README.txt.i
+data/src/share/classes/javax/swing/text/Keymap.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java.i
data/src/share/classes/java/lang/StackOverflowError.java.i
-data/test/java/rmi/testlibrary/README.jcov.i
+data/test/java/io/Serializable/unnamedPackageSwitch/A.java.i
data/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java.i
data/test/java/util/Locale/Bug4184873_he.i
-data/src/share/classes/com/oracle/net/Sdp.java.i
-data/make/sun/jpeg/mapfile-vers.i
+data/src/share/classes/sun/io/CharToByteBig5_HKSCS.java.i
+data/make/tools/CharsetMapping/IBM737.map.i
+data/src/share/classes/java/nio/channels/AsynchronousFileChannel.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/DoubleArrayCalls.java.i
-data/src/share/classes/sun/io/ByteToCharUTF8.java.i
-data/test/java/util/concurrent/ConcurrentQueues/GCRetention.java.i
-data/src/windows/classes/sun/awt/windows/WDesktopProperties.java.i
-data/src/share/classes/javax/print/attribute/PrintServiceAttribute.java.i
+data/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java.i
+data/make/com/sun/jndi/Makefile.i
+data/src/solaris/classes/sun/awt/X11/MWMConstants.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/Nonce.java.i
+data/make/sun/org/Makefile.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java.i
-data/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c.i
+data/test/sun/security/tools/keytool/CloseFile.java.i
+data/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java.i
data/src/share/classes/sun/text/resources/FormatData_sr_Latn_BA.java.i
-data/src/share/classes/java/io/ByteArrayOutputStream.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy.i
-data/src/share/demo/applets/GraphicsTest/AppletFrame.java.i
+data/test/java/rmi/activation/Activatable/restartService/security.policy.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c.i
+data/make/mksample/Makefile.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java.i
+data/src/solaris/native/sun/awt/awt_motif.h.i
+data/make/netbeans/jarzip/build.xml.i
data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader.i
data/src/share/classes/sun/java2d/pipe/AATileGenerator.java.i
data/src/share/classes/javax/swing/event/ListSelectionEvent.java.i
data/test/com/sun/security/sasl/digest/log.properties.i
-data/src/share/classes/sun/nio/fs/DynamicFileAttributeView.java.i
+data/src/share/demo/jvmti/minst/sample.makefile.txt.i
data/src/solaris/classes/sun/awt/motif/MTextFieldPeer.java.i
+data/make/netbeans/jmx/build.properties.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties.i
-data/test/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java.i
-data/src/share/classes/sun/reflect/misc/MethodUtil.java.i
-data/test/com/sun/jdi/FetchLocals.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java.i
+data/src/share/classes/java/awt/print/PrinterIOException.java.i
data/src/share/classes/javax/sql/rowset/CachedRowSet.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java.i
+data/test/java/util/zip/StreamIOAfterClose.java.i
data/test/java/lang/Math/PowTests.java.i
data/test/java/net/ServerSocket/TestAfterClose.java.i
data/src/linux/doc/man/ja/schemagen.1.i
-data/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java.i
+data/test/java/security/UnresolvedPermission/AccessorMethods.signer1.i
data/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java.i
data/src/share/classes/sun/java2d/loops/DrawGlyphListAA.java.i
-data/test/java/nio/charset/StandardCharsets/Standard.java.i
-data/src/windows/native/java/net/Inet6AddressImpl.c.i
+data/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java.i
+data/src/share/classes/javax/swing/doc-files/BoxLayout-1.gif.i
data/test/java/lang/StringCoding/Enormous.java.i
data/test/java/net/Socket/InheritHandle.java.i
-data/src/share/native/java/io/FileInputStream.c.i
+data/src/share/classes/sun/io/CharToByteCp948.java.i
data/test/sun/nio/cs/OLD/IBM948_OLD.java.i
data/test/java/text/Bidi/Bug7042148.java.i
data/src/solaris/native/sun/jdga/jdga.h.i
data/make/tools/Makefile.i
data/src/share/classes/java/util/AbstractList.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java.i
-data/test/java/nio/charset/Charset/Default.java.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.h.i
+data/src/share/classes/com/sun/media/sound/JSSecurityManager.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Encoder.java.i
data/src/share/native/sun/java2d/pipe/Region.c.i
-data/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java.i
-data/src/share/back/ThreadGroupReferenceImpl.h.i
-data/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy.i
-data/src/share/classes/javax/sound/midi/spi/package.html.i
-data/test/sun/java2d/cmm/ColorConvertOp/LRGB555.png.i
-data/test/com/sun/tools/attach/ProviderTests.sh.i
-data/test/java/util/zip/ZipInputStream/Constructor.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_pl.properties.i
+data/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskBlit.c.i
+data/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java.i
+data/src/share/classes/javax/print/attribute/Size2DSyntax.java.i
+data/make/common/Release.gmk.i
+data/src/share/classes/java/lang/reflect/Modifier.java.i
+data/src/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java.i
+data/src/share/native/common/check_version.c.i
+data/test/java/util/ResourceBundle/Bug6299235Test.java.i
+data/src/share/classes/javax/sql/StatementEvent.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerGlowEffect.java.i
-data/test/sun/security/provider/PolicyParser/EncodeURL.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java.i
-data/test/javax/script/Test7.java.i
+data/src/share/classes/com/sun/media/sound/WaveFileReader.java.i
+data/src/share/classes/java/awt/datatransfer/FlavorMap.java.i
+data/src/share/classes/javax/print/attribute/standard/OrientationRequested.java.i
+data/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties.i
-data/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/p11-ibutton.txt.i
+data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/ProtectedCtor.java.i
+data/make/tools/swing-beans/beaninfo/images/JListMono16.gif.i
data/test/java/beans/XMLEncoder/Test4822050.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/AbstractGradient.java.i
-data/src/share/classes/com/sun/crypto/provider/JarVerifier.java.i
+data/test/java/beans/PropertyChangeSupport/1.5.0_10.ser.i
data/src/share/classes/javax/naming/directory/SearchControls.java.i
data/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java.i
-data/src/share/classes/sun/security/util/Password.java.i
+data/src/windows/classes/sun/awt/windows/WDefaultFontCharset.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/Load5.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/ResultSet.java.i
-data/src/share/classes/sun/util/resources/CalendarData_cs.properties.i
-data/src/share/classes/javax/swing/SwingUtilities.java.i
-data/make/tools/swing-beans/beaninfo/images/JScrollPaneColor32.gif.i
-data/test/tools/pack200/dyn.jar.i
+data/make/modules/modularize.i
+data/src/share/classes/javax/print/attribute/PrintServiceAttribute.java.i
+data/test/java/util/BitSet/PreviousBits.java.i
+data/src/share/classes/com/sun/media/sound/AiffFileWriter.java.i
+data/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java.i
data/src/solaris/native/common/gdefs_md.h.i
-data/test/com/sun/jdi/ArrayRangeTest.java.i
-data/test/sun/security/pkcs11/sslecc/CipherTest.java.i
+data/src/windows/lib/tzmappings.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java.i
data/src/share/classes/java/awt/DefaultKeyboardFocusManager.java.i
data/src/windows/native/sun/windows/awt_GDIObject.cpp.i
data/test/java/nio/channels/FileChannel/MapOverEnd.java.i
data/src/share/classes/javax/naming/ldap/SortControl.java.i
-data/test/java/lang/String/SBConstructor.java.i
-data/make/java/math/Makefile.i
-data/test/java/io/charStreams/ABCOutputStream.java.i
-data/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java.i
-data/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy.i
+data/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java.i
+data/test/java/util/zip/FlaterCriticalArray.java.i
+data/make/javax/Makefile.i
+data/src/share/demo/jvmti/agent_util/README.txt.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java.i
data/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java.i
data/src/share/classes/java/util/LinkedHashMap.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathTableMeta.java.i
data/test/java/security/BasicPermission/Homogeneity.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/Attribute.java.i
-data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh.i
+data/make/tools/reorder/tools/util-i586.il.i
data/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java.i
data/test/java/beans/PropertyChangeSupport/TestSynchronization.java.i
-data/src/share/classes/java/util/spi/LocaleNameProvider.java.i
+data/src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c.i
+data/src/share/classes/sun/security/x509/AVA.java.i
data/src/share/classes/com/sun/script/javascript/JavaAdapter.java.i
-data/src/share/classes/sun/tools/jstat/Scale.java.i
+data/src/share/classes/sun/misc/RegexpTarget.java.i
data/src/share/classes/com/sun/tools/attach/package.html.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpSecurityException.java.i
-data/test/java/util/zip/input.jar.i
+data/src/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java.i
+data/src/share/classes/sun/io/ByteToCharCp737.java.i
+data/src/share/classes/java/io/BufferedOutputStream.java.i
data/src/share/classes/sun/nio/fs/AbstractPath.java.i
data/src/share/classes/sun/nio/cs/IBM437.java.i
-data/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java.i
-data/src/share/classes/com/sun/jmx/namespace/NamespaceInterceptor.java.i
-data/test/sun/security/mscapi/KeyStoreCompatibilityMode.java.i
-data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java.i
-data/src/share/classes/java/util/EnumSet.java.i
+data/test/java/net/Inet6Address/B4923906.java.i
+data/make/tools/swing-beans/beaninfo/BeanInfoUtils.java.i
+data/test/sun/security/ssl/sanity/interop/CipherTest.java.i
+data/test/java/text/Format/DateFormat/ISO8601ZoneTest.java.i
+data/src/share/classes/java/security/cert/CertPathValidator.java.i
+data/test/javax/swing/JColorChooser/Test4461329.java.i
data/test/java/io/LineNumberInputStream/MarkReset.java.i
-data/test/java/io/LineNumberReader/Read.java.i
-data/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM1148.java.i
data/test/sun/security/tools/keytool/i18n.java.i
data/src/share/classes/java/beans/beancontext/BeanContextProxy.java.i
data/src/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java.i
-data/src/share/classes/javax/management/DynamicMBean.java.i
+data/test/javax/swing/plaf/basic/Test6984643.java.i
diff --git a/jdk/.hg/store/undo b/jdk/.hg/store/undo
index c62ecc3..8d0dec9 100644
Binary files a/jdk/.hg/store/undo and b/jdk/.hg/store/undo differ
diff --git a/jdk/.hg/undo.desc b/jdk/.hg/undo.desc
index ba0306f..5fafb69 100644
--- a/jdk/.hg/undo.desc
+++ b/jdk/.hg/undo.desc
@@ -1,3 +1,3 @@
-4867
+4868
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/jdk
diff --git a/jdk/.hg/undo.dirstate b/jdk/.hg/undo.dirstate
index 801a8a7..e6cccfe 100644
Binary files a/jdk/.hg/undo.dirstate and b/jdk/.hg/undo.dirstate differ
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 0bc01fd..0bc94a0 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -137,3 +137,9 @@ fc569517f3cf242f90ce3503b743eb5553938946 jdk8-b04
bdb870cc269ef8b221d17a217be89092400b59d2 jdk8-b06
19f0a3db863cc491affc78b48c4a81a6679b2433 jdk8-b07
1c023bcd0c5a01ac07bc7eea728aafbb0d8991e9 jdk8-b08
+f1ec21b8142168ff40f3278d2f6b5fe4bd5f3b26 jdk8-b09
+4788745572ef2bde34924ef34e7e4d55ba07e979 jdk8-b10
+7ab0d613cd1a271a9763ffb894dc1f0a5b95a7e4 jdk8-b11
+09fd2067f715e4505c44b01c301258a4e8f8964e jdk8-b12
+4cb2e8679b27432854690cb688ea06d3b2d8e008 jdk8-b13
+99632935785e2038b2fc836da9f2ede69dea294b jdk8-b14
diff --git a/jdk/make/com/sun/org/apache/xml/Makefile b/jdk/make/com/sun/org/apache/xml/Makefile
index 8439df9..90df6b7 100644
--- a/jdk/make/com/sun/org/apache/xml/Makefile
+++ b/jdk/make/com/sun/org/apache/xml/Makefile
@@ -31,6 +31,8 @@ BUILDDIR = ../../../../..
MODULE = security-xmldsig
PACKAGE = com.sun.org.apache.xml
PRODUCT = xml
+JAVAC_MAX_WARNINGS = true
+JAVAC_WARNINGS_FATAL = true
include $(BUILDDIR)/common/Defs.gmk
#
diff --git a/jdk/make/com/sun/security/auth/module/Makefile b/jdk/make/com/sun/security/auth/module/Makefile
index 83eb9f7..f2cb5f1 100644
--- a/jdk/make/com/sun/security/auth/module/Makefile
+++ b/jdk/make/com/sun/security/auth/module/Makefile
@@ -79,7 +79,3 @@ endif # linux
#
include $(BUILDDIR)/common/Library.gmk
-#
-# JVMDI implementation lives in the VM.
-#
-OTHER_LDLIBS = $(JVMLIB)
diff --git a/jdk/make/common/BuildNativePackages.gmk b/jdk/make/common/BuildNativePackages.gmk
index ec63beb..5e6cf76 100644
--- a/jdk/make/common/BuildNativePackages.gmk
+++ b/jdk/make/common/BuildNativePackages.gmk
@@ -56,10 +56,7 @@ jmod-pkgs: $(JMOD_PKGS)
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
for m in `$(NAWK) '{print $$1}' $(MODULES_LIST)` ; do \
$(CD) $(ABS_MODULEPATH_DIR)/$$m && \
- (if [ -d resources ] ; then \
- RES="-r resources" ; \
- fi ; \
- if [ -d bin ] ; then \
+ (if [ -d bin ] ; then \
NATCMD="-natcmd bin" ; \
fi ; \
if [ -d lib ] ; then \
@@ -69,7 +66,7 @@ jmod-pkgs: $(JMOD_PKGS)
CONFIG="-config etc" ; \
fi ; \
$(HOST_JPKG_CMD) -v -m classes \
- $$RES $$NATCMD $$NATLIB $$CONFIG $(SIGNER_ARGS) \
+ $$NATCMD $$NATLIB $$CONFIG $(SIGNER_ARGS) \
-d $(JMOD_PKGS) jmod $$m $(SIGNER_PW)) || exit 1 ; \
done
@$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..."
@@ -89,13 +86,12 @@ deb-pkgs: $(DEB_PKGS)
fi ; \
done ; \
(ISZ=$$(expr $$(du -s $(MODULEPATH_DIR)/$$m | cut -f1)); \
- RES="$$(if [ -f $(MODULE_CLASSLIST_DIR)/$$m.resources ] ; then $(ECHO) "-r $(MODULEPATH_DIR)/$$m/resources" ; fi)"; \
$(HOST_JPKG_CMD) -v -m $(MODULEPATH_DIR)/$$m/classes \
- -i $(JIGSAW_IMAGE)/$$m $$RES \
+ -i $(JIGSAW_IMAGE)/$$m \
--java-home /usr/local/jigsaw \
-L /usr/local/jigsaw/lib/modules \
-n 'Jigsaw Team' -e 'jigsaw-dev at openjdk.java.net' \
- -s "Jigsaw JDK 7 $$m module" --installed-size $$ISZ \
+ -s "Jigsaw JDK 8 $$m module" --installed-size $$ISZ \
-d $(DEB_PKGS) deb $$m) ; \
done
@$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..."
diff --git a/jdk/make/common/Defs-linux.gmk b/jdk/make/common/Defs-linux.gmk
index 939d329..a90fd3e 100644
--- a/jdk/make/common/Defs-linux.gmk
+++ b/jdk/make/common/Defs-linux.gmk
@@ -373,6 +373,7 @@ endif
override LIBPOSIX4 =
override LIBSOCKET =
override LIBNSL =
+override LIBSCF =
override LIBTHREAD =
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = true
diff --git a/jdk/make/common/Defs-solaris.gmk b/jdk/make/common/Defs-solaris.gmk
index 20e8984..3044342 100644
--- a/jdk/make/common/Defs-solaris.gmk
+++ b/jdk/make/common/Defs-solaris.gmk
@@ -711,6 +711,9 @@ LIBSOCKET = -lsocket
# Network Services library
LIBNSL = -lnsl
+# service configuration facility library
+LIBSCF = -lscf
+
# GLOBAL_KPIC: If set means all libraries are PIC, position independent code
# EXCEPT for select compiles
# If a .o file is compiled non-PIC then it should be forced
diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk
index 84da73c..c63de54 100644
--- a/jdk/make/common/Defs.gmk
+++ b/jdk/make/common/Defs.gmk
@@ -220,14 +220,30 @@ JDK_LOCALES = ja zh_CN
JRE_NONEXIST_LOCALES = en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
#
-# All libraries except libjava and libjvm itself link against libjvm and
-# libjava, the latter for its exported common utilities. libjava only links
-# against libjvm. Programs' makefiles take their own responsibility for
+# For now, most libraries except libjava and libjvm itself link against libjvm
+# and libjava, the latter for its exported common utilities. libjava only
+# links against libjvm. Programs' makefiles take their own responsibility for
# adding other libs.
#
+# The makefiles for these packages do not link against libjvm and libjava.
+# This list will eventually go away and each Programs' makefiles
+# will have to explicitly declare that they want to link to libjava/libjvm
+#
+NO_JAVALIB_PKGS = \
+ sun.security.mscapi \
+ sun.security.krb5 \
+ sun.security.pkcs11 \
+ sun.security.jgss \
+ sun.security.jgss.wrapper \
+ sun.security.ec \
+ sun.security.smartcardio \
+ com.sun.security.auth.module
+
ifdef PACKAGE
# put JAVALIB first, but do not lose any platform specific values....
- LDLIBS_COMMON = $(JAVALIB)
+ ifeq (,$(findstring $(PACKAGE),$(NO_JAVALIB_PKGS)))
+ LDLIBS_COMMON = $(JAVALIB)
+ endif
endif # PACKAGE
#
diff --git a/jdk/make/common/Demo.gmk b/jdk/make/common/Demo.gmk
index 600910f..e95959a 100644
--- a/jdk/make/common/Demo.gmk
+++ b/jdk/make/common/Demo.gmk
@@ -160,6 +160,8 @@ ifneq ($(strip $(DEMO_ALL_NATIVE_SOURCES)),)
# bit between them.
LINK.demo = $(LINK.c)
LDLIBS.demo = $(EXTRA_LIBS) $(LFLAGS_$(COMPILER_VERSION))
+ DEMO_VERSION_INFO = $(OBJDIR)/$(LIBRARY).res
+ LDLIBS.demo += $(DEMO_VERSION_INFO)
else
ifneq ($(DEMO_NEEDS_CPP),)
LINK.demo = $(LINK.cpp)
@@ -290,6 +292,13 @@ ifndef DEMO_SKIP_SRCZIP
$(install-file)
endif
+ifeq ($(PLATFORM),windows)
+# JDK name required here
+RC_FLAGS += /D "JDK_FNAME=$(LIBRARY).dll" \
+ /D "JDK_INTERNAL_NAME=$(LIBRARY)" \
+ /D "JDK_FTYPE=0x2L"
+endif
+
# Native library building
ifdef DEMO_LIBRARY
@@ -310,6 +319,9 @@ $(OBJDIR)/%.$(OBJECT_SUFFIX): $(DEMO_BUILD_SRCDIR)/%.cpp
# Actual creation of the native shared library (C++ and C are different)
$(DEMO_LIBRARY): $(DEMO_FULL_OBJECTS)
@$(prep-target)
+ ifeq ($(PLATFORM),windows)
+ $(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(DEMO_VERSION_INFO) $(VERSIONINFO_RESOURCE)
+ endif
$(LINK.demo) $(SHARED_LIBRARY_FLAG) $(CC_PROGRAM_OUTPUT_FLAG)$@ \
$(DEMO_FULL_OBJECTS) $(LDLIBS.demo)
@$(call binary_file_verification,$@)
diff --git a/jdk/make/common/Library.gmk b/jdk/make/common/Library.gmk
index 4196eea..6aafbde 100644
--- a/jdk/make/common/Library.gmk
+++ b/jdk/make/common/Library.gmk
@@ -166,7 +166,7 @@ $(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf
$(LINK) -dll -out:$(OBJDIR)/$(@F) \
-map:$(OBJDIR)/$(LIBRARY).map \
$(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
- $(OTHER_LCF) $(JAVALIB) $(LDLIBS)
+ $(OTHER_LCF) $(LDLIBS)
$(CP) $(OBJDIR)/$(@F) $@
@$(call binary_file_verification,$@)
$(install-module-file)
diff --git a/jdk/make/java/java/FILES_java.gmk b/jdk/make/java/java/FILES_java.gmk
index 47ae079..eaf071d 100644
--- a/jdk/make/java/java/FILES_java.gmk
+++ b/jdk/make/java/java/FILES_java.gmk
@@ -539,7 +539,8 @@ JAVA_JAVA_jigsaw = \
org/openjdk/jigsaw/LoaderPool.java \
org/openjdk/jigsaw/LocatableCatalog.java \
org/openjdk/jigsaw/Manifest.java \
- org/openjdk/jigsaw/ModuleFileFormat.java \
+ org/openjdk/jigsaw/ModuleFile.java \
+ org/openjdk/jigsaw/ModuleFileWriter.java \
org/openjdk/jigsaw/PathContext.java \
org/openjdk/jigsaw/PathLinker.java \
org/openjdk/jigsaw/SignedModule.java \
diff --git a/jdk/make/java/java/Makefile b/jdk/make/java/java/Makefile
index 9d2d62f..10fc688 100644
--- a/jdk/make/java/java/Makefile
+++ b/jdk/make/java/java/Makefile
@@ -210,7 +210,7 @@ OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlib
-libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib \
shell32.lib delayimp.lib /DELAYLOAD:shell32.dll
else
-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) -ldl \
+OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBSCF) -ldl \
-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
endif
diff --git a/jdk/make/java/java/mapfile-vers b/jdk/make/java/java/mapfile-vers
index 4cb01bd..8a3fca1 100644
--- a/jdk/make/java/java/mapfile-vers
+++ b/jdk/make/java/java/mapfile-vers
@@ -90,7 +90,6 @@ SUNWprivate_1.1 {
Java_java_io_FileSystem_getFileSystem;
Java_java_io_ObjectInputStream_bytesToDoubles;
Java_java_io_ObjectInputStream_bytesToFloats;
- Java_java_io_ObjectInputStream_latestUserDefinedLoader;
Java_java_io_ObjectOutputStream_doublesToBytes;
Java_java_io_ObjectOutputStream_floatsToBytes;
Java_java_io_ObjectStreamClass_hasStaticInitializer;
@@ -276,6 +275,7 @@ SUNWprivate_1.1 {
Java_sun_misc_Version_getJvmVersionInfo;
Java_sun_misc_Version_getJvmSpecialVersion;
Java_sun_misc_VM_getThreadStateValues;
+ Java_sun_misc_VM_latestUserDefinedLoader;
Java_sun_misc_VM_initialize;
Java_sun_misc_VMSupport_initAgentProperties;
diff --git a/jdk/make/java/nio/FILES_java.gmk b/jdk/make/java/nio/FILES_java.gmk
index 41397ca..b394b89 100644
--- a/jdk/make/java/nio/FILES_java.gmk
+++ b/jdk/make/java/nio/FILES_java.gmk
@@ -232,6 +232,7 @@ FILES_src = \
sun/nio/cs/UTF_16BE.java \
sun/nio/cs/UTF_16LE.java \
sun/nio/cs/UTF_8.java \
+ sun/nio/cs/CESU_8.java \
sun/nio/cs/Unicode.java \
sun/nio/cs/UnicodeDecoder.java \
sun/nio/cs/UnicodeEncoder.java \
diff --git a/jdk/make/java/security/Makefile b/jdk/make/java/security/Makefile
index dbd4639..8be9e97 100644
--- a/jdk/make/java/security/Makefile
+++ b/jdk/make/java/security/Makefile
@@ -27,8 +27,8 @@ BUILDDIR = ../..
MODULE = base
PACKAGE = java.security
PRODUCT = sun
-JAVAC_MAX_WARNINGS = false
-JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation
+JAVAC_MAX_WARNINGS = true
+JAVAC_LINT_OPTIONS = -Xlint:all
JAVAC_WARNINGS_FATAL = true
include $(BUILDDIR)/common/Defs.gmk
diff --git a/jdk/make/javax/Makefile b/jdk/make/javax/Makefile
index 251628c..ebeec3c 100644
--- a/jdk/make/javax/Makefile
+++ b/jdk/make/javax/Makefile
@@ -30,7 +30,7 @@
BUILDDIR = ..
include $(BUILDDIR)/common/Defs.gmk
-SUBDIRS = others
+SUBDIRS = others security
SUBDIRS_management = management
diff --git a/jdk/make/javax/others/Makefile b/jdk/make/javax/others/Makefile
index 1283dce..7740163 100644
--- a/jdk/make/javax/others/Makefile
+++ b/jdk/make/javax/others/Makefile
@@ -38,10 +38,6 @@ AUTO_FILES_JAVA_DIRS = \
com/sun/naming/internal \
javax/net \
javax/script \
- javax/security/auth \
- javax/security/cert \
- javax/security/sasl \
- javax/smartcardio \
javax/tools \
javax/xml
diff --git a/jdk/make/javax/security/Makefile b/jdk/make/javax/security/Makefile
new file mode 100644
index 0000000..88d7abb
--- /dev/null
+++ b/jdk/make/javax/security/Makefile
@@ -0,0 +1,49 @@
+#
+# Copyright (c) 2011, 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. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+#
+# Makefile for building javax (security classes)
+#
+
+BUILDDIR = ../..
+JAVAC_MAX_WARNINGS = true
+JAVAC_WARNINGS_FATAL = true
+
+include $(BUILDDIR)/common/Defs.gmk
+
+#
+# Files to compile
+#
+AUTO_FILES_JAVA_DIRS = \
+ javax/security/auth \
+ javax/security/cert \
+ javax/security/sasl \
+ javax/smartcardio
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Classes.gmk
+
diff --git a/jdk/make/modules/Makefile b/jdk/make/modules/Makefile
index 6f3f5d3..4cd4809 100644
--- a/jdk/make/modules/Makefile
+++ b/jdk/make/modules/Makefile
@@ -31,7 +31,7 @@ CLASSANALYZER_JAR_FILE = $(BUILDTOOLJARDIR)/classanalyzer.jar
MODULES_CONFIG = modules.config
MODULES_GROUP = modules.group
MODULES_PROPERTIES = modules.properties
-DEP_CONFIG = jdk7.depconfig
+DEP_CONFIG = jdk.depconfig
OPTIONAL_DEP_CONFIG = optional.depconfig
#
@@ -63,7 +63,7 @@ OPTIONAL_DEP_CONFIG = optional.depconfig
# modules.config : defines the low-level modules and specifies
# what classes and resource files each module includes.
# modules.group : defines the module groups and its members.
-# jdk7.depconfig : lists the dynamic dependencies including
+# jdk.depconfig : lists the dynamic dependencies including
# use of reflection Class.forName and JNI FindClass and
# service provider.
# optional.depconfig : lists the optional dependencies
@@ -227,16 +227,7 @@ define install-module
$(RM) -r $(JIGSAW_MODULE_LIB)/$$m ; \
$(ECHO) "Installing module $$m" ; \
$(CD) $(MODULEPATH_DIR) && \
- if [ -f $(MODULE_CLASSLIST_DIR)/$$m.resources ] ; then \
- $(ECHO) "$(HOST_JMOD_CMD) install $$m/classes -r $$m/resources $$m \
- -L $(JIGSAW_MODULE_LIB)" ; \
- $(HOST_JMOD_CMD) install $$m/classes -r $$m/resources $$m \
- -L $(JIGSAW_MODULE_LIB) || exit 1 ; \
- else \
- $(ECHO) "$(HOST_JMOD_CMD) install $$m/classes $$m -L $(JIGSAW_MODULE_LIB)" ; \
- $(HOST_JMOD_CMD) install $$m/classes $$m \
- -L $(JIGSAW_MODULE_LIB) || exit 1 ; \
- fi
+ $(HOST_JMOD_CMD) install $$m/classes $$m -L $(JIGSAW_MODULE_LIB) || exit 1 ;
endef
#
diff --git a/jdk/make/modules/jdk.depconfig b/jdk/make/modules/jdk.depconfig
new file mode 100644
index 0000000..f0c3dfd
--- /dev/null
+++ b/jdk/make/modules/jdk.depconfig
@@ -0,0 +1,513 @@
+#
+# Copyright (c) 2009, 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.
+#
+
+# private java.lang.Object createInetSocketAddress(java.lang.String, int)
+ at ClassForName
+ com.sun.jndi.ldap.Connection -> java.net.InetSocketAddress
+ com.sun.jndi.ldap.Connection -> java.net.SocketAddress
+
+# com.sun.jndi.ldap.VersionHelper
+ at ClassForName(optional)
+ com.sun.jndi.ldap.VersionHelper -> com.sun.jndi.ldap.VersionHelper*
+
+# private static void initMethodHandles()
+ at ClassForName
+ com.sun.jndi.toolkit.corba.CorbaUtils -> javax.rmi.CORBA.Stub
+ com.sun.jndi.toolkit.corba.CorbaUtils -> javax.rmi.PortableRemoteObject
+
+# com.sun.naming.internal.ResourceManager$AppletParameter
+ at ClassForName(optional)
+ com.sun.naming.internal.ResourceManager$AppletParameter -> java.applet.Applet
+
+# private static boolean loadProviderAsService()
+ at Provider
+ com.sun.net.httpserver.spi.HttpServerProvider -> META-INF/services/com.sun.net.httpserver.spi.HttpServerProvider
+
+# com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXSLT
+ at ClassForName
+ com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXSLT -> javax.xml.XMLConstants
+
+# public static java.beans.PersistenceDelegate getPersistenceDelegate(java.lang.Class)
+ at ClassForName
+ java.beans.MetaData -> java.beans.*_PersistenceDelegate
+
+# ## desktop -> jdbc (does this need to be optional dependency so that
+# desktop module can find java.sql.Timestamp class when jdbc module exist)??
+#
+# private static java.lang.reflect.Method getNanosMethod()
+# @ClassForName(optional)
+# java.beans.java_sql_Timestamp_PersistenceDelegate -> java.sql.Timestamp
+
+# java.beans.java_util_Collections$CheckedCollection_PersistenceDelegate
+ at ClassForName
+ java.beans.java_util_Collections$CheckedCollection_PersistenceDelegate -> java.util.Collections$CheckedCollection
+
+# java.beans.java_util_Collections$CheckedMap_PersistenceDelegate
+ at ClassForName
+ java.beans.java_util_Collections$CheckedMap_PersistenceDelegate -> java.util.Collections$CheckedMap
+
+# private static java.lang.Object getType(java.lang.Object)
+ at ClassForName
+ java.beans.java_util_EnumMap_PersistenceDelegate -> java.util.EnumMap
+
+# private java.lang.Integer getAxis(java.lang.Object)
+ at ClassForName
+ java.beans.javax_swing_Box_PersistenceDelegate -> javax.swing.BoxLayout
+
+# java.lang.Double
+ at Inline
+ java.lang.Double -> sun.misc.FloatConsts
+ java.lang.Double -> sun.misc.DoubleConsts
+
+# java.lang.Float
+ at Inline
+ java.lang.Float -> sun.misc.FloatConsts
+ java.lang.Float -> sun.misc.DoubleConsts
+
+# java.net.DefaultDatagramSocketImplFactory
+ at ClassForName(optional)
+ java.net.DefaultDatagramSocketImplFactory -> java.net.*DatagramSocketImpl
+
+# private static sun.net.spi.nameservice.NameService createNSProvider(java.lang.String)
+ at Provider
+ java.net.InetAddress -> META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
+
+# static java.net.InetAddressImpl create()
+ at ClassForName
+ java.net.InetAddressImplFactory -> java.net.*Inet[46]AddressImpl
+
+# private static void init()
+ at NativeFindClass
+ java.net.PlainDatagramSocketImpl -> java.io.FileDescriptor
+
+# java.net.ProxySelector
+ at ClassForName
+ java.net.ProxySelector -> sun.net.spi.DefaultProxySelector
+
+# static java.net.URLStreamHandler getURLStreamHandler(java.lang.String)
+ at ClassForName(optional)
+ java.net.URL -> sun.net.www.protocol.*.Handler
+
+# private java.net.ContentHandler lookupContentHandlerClassFor(java.lang.String)
+ at ClassForName
+ java.net.URLConnection -> sun.net.www.content.*
+
+# private static java.nio.channels.spi.AsynchronousChannelProvider loadProviderAsService()
+ at Provider
+ java.nio.channels.spi.AsynchronousChannelProvider$ProviderHolder -> META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider
+
+# private static boolean loadProviderFromProperty()
+ at ClassForName
+ java.nio.channels.spi.SelectorProvider -> sun.nio.ch.DefaultSelectorProvider
+
+# private static boolean loadProviderAsService()
+ at Provider
+ java.nio.channels.spi.SelectorProvider -> META-INF/services/java.nio.channels.spi.SelectorProvider
+
+# private static java.util.Iterator providers()
+ at Provider
+ java.nio.charset.Charset -> META-INF/services/java.nio.charset.spi.CharsetProvider
+
+# private static void probeExtendedProvider()
+ at ClassForName(optional)
+ java.nio.charset.Charset -> sun.nio.cs.ext.ExtendedCharsets
+
+# public static java.nio.file.FileSystem newFileSystem(java.net.URI, java.util.Map<java.lang.String, ?>, java.lang.ClassLoader)
+ at Provider
+ java.nio.file.FileSystems -> META-INF/services/java.nio.file.FileSystemProvider
+
+# private static java.util.List<java.nio.file.spi.FileTypeDetector> loadInstalledDetectors()
+ at Provider
+ java.nio.file.Files$DefaultFileTypeDetectorHolder -> META-INF/services/java.nio.file.spi.FileTypeDetector
+
+# public static java.util.List<java.nio.file.spi.FileSystemProvider> installedProviders()
+ at Provider
+ java.nio.file.spi.FileSystemProvider -> META-INF/services/java.nio.file.FileSystemProvider
+
+# private static java.rmi.server.RMIClassLoaderSpi initializeProvider()
+ at Provider
+ java.rmi.server.RMIClassLoader -> META-INF/services/java.rmi.server.RMIClassLoaderSpi
+
+ at ClassForName(optional)
+ java.util.Properties -> sun.util.xml.XMLUtils
+
+# private static void initializeSystemScope()
+ at ClassForName(optional)
+ java.security.IdentityScope -> sun.security.provider.IdentityDatabase
+
+# static java.security.Policy getPolicyNoCheck()
+ at ClassForName
+ java.security.Policy -> sun.security.provider.PolicyFile
+
+# private static java.lang.Class getSpiClass(java.lang.String)
+ at ClassForName
+ java.security.Security -> java.security.*Spi
+
+# private static void invalidateSMCache(java.lang.String)
+ at ClassForName
+ java.security.Security -> java.lang.SecurityManager
+
+# private static void loadInitialDrivers()
+ at Provider
+ java.sql.DriverManager -> META-INF/services/java.sql.Driver
+
+# private static java.text.BreakIterator createBreakInstance(java.util.Locale, int, java.lang.String, java.lang.String)
+ at Provider
+ java.text.BreakIterator -> META-INF/services/java.util.spi.BreakIteratorProvider
+
+# public static java.text.Collator getInstance(java.util.Locale)
+ at Provider
+ java.text.Collator -> META-INF/services/java.util.spi.CollatorProvider
+
+# private static java.text.DateFormat get(int, int, int, java.util.Locale)
+ at Provider
+ java.text.DateFormat -> META-INF/services/java.util.spi.DateNameProvider
+
+# public static java.util.Locale[] getAvailableLocales()
+ at Provider
+ java.text.DateFormatSymbols -> META-INF/services/java.util.spi.DateFormatSymbolsProvider
+
+# public static java.util.Locale[] getAvailableLocales()
+ at Provider
+ java.text.DecimalFormatSymbols -> META-INF/services/java.util.spi.DecimalFormatSymbolsProvider
+
+# public static java.util.Locale[] getAvailableLocales()
+ at Provider
+ java.text.NumberFormat -> META-INF/services/java.util.spi.NumberFormatProvider
+
+# public java.lang.String getDisplayName(java.util.Locale)
+ at Provider
+ java.util.Currency -> META-INF/services/java.util.spi.CurrencyNameProvider
+
+# java.util.Formatter
+ at Inline
+ java.util.Formatter -> sun.misc.DoubleConsts
+
+# java.util.Locale
+ at Inline
+ java.util.Locale -> java.util.LocaleISOData
+
+# private java.lang.String getDisplayString(java.lang.String, java.util.Locale, int)
+ at Provider
+ java.util.Locale -> META-INF/services/java.util.spi.LocaleNameProvider
+
+# private static java.util.prefs.PreferencesFactory factory1()
+ at ClassForName
+ java.util.prefs.Preferences -> java.util.prefs.WindowsPreferencesFactory
+ java.util.prefs.Preferences -> java.util.prefs.FileSystemPreferencesFactory
+
+# private static java.util.prefs.PreferencesFactory factory1()
+ at Provider
+ java.util.prefs.Preferences -> META-INF/services/java.util.prefs.PreferencesFactory
+
+# public void registerApplicationClasspathSpis()
+ at Provider
+ javax.imageio.spi.IIORegistry -> META-INF/services/javax.imageio.spi.IIOServiceProvider
+
+# private void registerInstalledProviders()
+ at Provider
+ javax.imageio.spi.IIORegistry -> META-INF/services/javax.imageio.spi.ImageReaderSpi
+ javax.imageio.spi.IIORegistry -> META-INF/services/javax.imageio.spi.ImageWriterSpi
+ javax.imageio.spi.IIORegistry -> META-INF/services/javax.imageio.spi.ImageReaderWriterSpi
+ javax.imageio.spi.IIORegistry -> META-INF/services/javax.imageio.spi.ImageTranscoderSpi
+ javax.imageio.spi.IIORegistry -> META-INF/services/javax.imageio.spi.ImageInputStreamSpi
+ javax.imageio.spi.IIORegistry -> META-INF/services/javax.imageio.spi.ImageOutputStreamSpi
+
+# public javax.naming.ldap.ExtendedResponse createExtendedResponse(java.lang.String, byte[], int, int)
+ at Provider
+ javax.naming.ldap.StartTlsRequest -> META-INF/services/javax.naming.ldap.StartTlsResponse
+
+# private static java.util.ArrayList getAllLookupServices()
+ at Provider
+ javax.print.PrintServiceLookup -> META-INF/services/javax.print.PrintServiceLookup
+
+# private static java.util.ArrayList getAllFactories()
+ at Provider
+ javax.print.StreamPrintServiceFactory -> META-INF/services/javax.print.StreamPrintServiceFactory
+
+# private void initEngines(java.lang.ClassLoader)
+ at Provider
+ javax.script.ScriptEngineManager -> META-INF/services/javax.script.ScriptEngineFactory
+
+# private void initializeInputMethodLocatorList()
+ at Provider
+ sun.awt.im.ExecutableInputMethodManager -> META-INF/services/java.awt.im.spi.InputMethodDescriptor
+
+# private static java.lang.Class getConverterClass(int, java.lang.String)
+ at ClassForName(optional)
+ sun.io.Converters -> sun.io.*
+
+# public static sun.java2d.cmm.PCMM getModule()
+ at Provider
+ sun.java2d.cmm.CMSManager -> META-INF/services/sun.java2d.cmm.PCMM
+
+# public static sun.java2d.pipe.RenderingEngine getInstance()
+ at Provider
+ sun.java2d.pipe.RenderingEngine -> META-INF/services/sun.java2d.pipe.RenderingEngine
+
+# public static sun.java2d.pipe.RenderingEngine getInstance()
+ at ClassForName(optional)
+ sun.java2d.pipe.RenderingEngine -> sun.dc.DuctusRenderingEngine
+
+# sun.misc.FloatingDecimal
+ at Inline
+ sun.misc.FloatingDecimal -> sun.misc.FloatConsts
+ sun.misc.FloatingDecimal -> sun.misc.DoubleConsts
+
+# sun.misc.FormattedFloatingDecimal
+ at Inline
+ sun.misc.FormattedFloatingDecimal -> sun.misc.FloatConsts
+ sun.misc.FormattedFloatingDecimal -> sun.misc.DoubleConsts
+
+# sun.misc.FpUtils
+ at Inline
+ sun.misc.FpUtils -> sun.misc.FloatConsts
+ sun.misc.FpUtils -> sun.misc.DoubleConsts
+
+# public java.net.URLStreamHandler createURLStreamHandler(java.lang.String)
+ at ClassForName(optional)
+ sun.misc.Launcher$Factory -> sun.net.www.protocol.*.Handler
+
+# private static sun.net.NetHooks$Provider loadProvider(java.lang.String)
+ at ClassForName(optional)
+ sun.net.NetHooks -> sun.net.spi.SdpProvider
+
+# sun.net.idn.StringPrep
+ at Inline
+ sun.net.idn.StringPrep -> sun.net.idn.UCharacterDirection
+
+# private static boolean init()
+ at NativeFindClass
+ sun.net.spi.DefaultProxySelector -> java.net.Proxy
+ sun.net.spi.DefaultProxySelector -> java.net.Proxy$Type
+ sun.net.spi.DefaultProxySelector -> java.net.InetSocketAddress
+
+# private static java.nio.channels.Channel createChannel()
+ at ClassForName
+ sun.nio.ch.InheritedChannel -> java.io.FileDescriptor
+
+# private static void initDBBConstructor()
+ at ClassForName
+ sun.nio.ch.Util -> java.nio.DirectByteBuffer
+
+# private static void initDBBRConstructor()
+ at ClassForName
+ sun.nio.ch.Util -> java.nio.DirectByteBufferR
+
+# private java.nio.charset.Charset lookup(java.lang.String)
+ at ClassForName(optional)
+ sun.nio.cs.FastCharsetProvider -> sun.nio.cs.*
+
+# sun.nio.cs.ext.ExtendedCharsets
+ at ClassForName(optional)
+ sun.nio.cs.ext.ExtendedCharsets -> sun.nio.cs.ext.*
+
+# sun.nio.cs.ext.ExtendedCharsets
+ at ClassForName(optional)
+ sun.nio.cs.ext.ExtendedCharsets -> sun.nio.cs.ext.*
+
+
+# public static java.nio.file.spi.FileSystemProvider create()
+ at ClassForName
+ sun.nio.fs.DefaultFileSystemProvider -> sun.nio.fs.SolarisFileSystemProvider
+ sun.nio.fs.DefaultFileSystemProvider -> sun.nio.fs.LinuxFileSystemProvider
+
+# sun.rmi.server.MarshalInputStream
+ at ClassForName
+ sun.rmi.server.MarshalInputStream -> sun.rmi.server.Activation$ActivationSystemImpl_Stub
+ sun.rmi.server.MarshalInputStream -> sun.rmi.registry.RegistryImpl_Stub
+
+# private java.security.Provider doLoadProvider()
+ at ClassForName(optional)
+ sun.security.jca.ProviderConfig -> sun.security.pkcs11.SunPKCS11
+ sun.security.jca.ProviderConfig -> sun.security.provider.Sun
+ sun.security.jca.ProviderConfig -> sun.security.rsa.SunRsaSign
+ sun.security.jca.ProviderConfig -> sun.security.ec.SunEC
+ sun.security.jca.ProviderConfig -> com.sun.net.ssl.internal.ssl.Provider
+ sun.security.jca.ProviderConfig -> com.sun.crypto.provider.SunJCE
+ sun.security.jca.ProviderConfig -> sun.security.jgss.SunProvider
+ sun.security.jca.ProviderConfig -> com.sun.security.sasl.Provider
+ sun.security.jca.ProviderConfig -> org.jcp.xml.dsig.internal.dom.XMLDSigRI
+ sun.security.jca.ProviderConfig -> sun.security.smartcardio.SunPCSC
+ sun.security.jca.ProviderConfig -> sun.security.mscapi.SunMSCAPI
+
+# public static java.security.Provider getSunProvider()
+ at ClassForName
+ sun.security.jca.Providers -> sun.security.provider.Sun
+ sun.security.jca.Providers -> sun.security.provider.VerificationProvider
+
+# private static sun.security.jgss.spi.MechanismFactory getMechFactoryImpl(java.security.Provider, java.lang.String, org.ietf.jgss.Oid, sun.security.jgss.GSSCaller)
+ at ClassForName
+ sun.security.jgss.ProviderList -> sun.security.jgss.spi.MechanismFactory
+
+# sun.security.jgss.wrapper.SunNativeProvider
+ at NativeFindClass
+ sun.security.jgss.wrapper.SunNativeProvider -> org.ietf.jgss.Oid
+ sun.security.jgss.wrapper.SunNativeProvider -> org.ietf.jgss.GSSException
+ sun.security.jgss.wrapper.SunNativeProvider -> sun.security.jgss.wrapper.GSSNameElement
+ sun.security.jgss.wrapper.SunNativeProvider -> sun.security.jgss.wrapper.GSSCredElement
+ sun.security.jgss.wrapper.SunNativeProvider -> sun.security.jgss.wrapper.NativeGSSContext
+ sun.security.jgss.wrapper.SunNativeProvider -> sun.security.jgss.wrapper.SunNativeProvider
+ sun.security.jgss.wrapper.SunNativeProvider -> org.ietf.jgss.MessageProp
+ sun.security.jgss.wrapper.SunNativeProvider -> org.ietf.jgss.ChannelBinding
+ sun.security.jgss.wrapper.SunNativeProvider -> java.net.InetAddress
+ sun.security.jgss.wrapper.SunNativeProvider -> sun.security.jgss.wrapper.GSSLibStub
+
+# static void ensureLoaded()
+ at NativeFindClass
+ sun.security.krb5.Credentials -> sun.security.krb5.internal.Krb5
+ sun.security.krb5.Credentials -> sun.security.krb5.internal.Ticket
+ sun.security.krb5.Credentials -> sun.security.krb5.PrincipalName
+ sun.security.krb5.Credentials -> sun.security.util.DerValue
+ sun.security.krb5.Credentials -> sun.security.krb5.EncryptionKey
+ sun.security.krb5.Credentials -> sun.security.krb5.internal.TicketFlags
+ sun.security.krb5.Credentials -> sun.security.krb5.internal.KerberosTime
+
+# public static java.lang.String getDefaultCacheName()
+ at ClassForName(optional)
+ sun.security.krb5.internal.ccache.FileCredentialsCache -> com.sun.security.auth.module.UnixSystem
+
+# sun.security.pkcs.PKCS9Attribute
+ at ClassForName
+ sun.security.pkcs.PKCS9Attribute -> sun.security.util.ObjectIdentifier
+ sun.security.pkcs.PKCS9Attribute -> java.util.Date
+ sun.security.pkcs.PKCS9Attribute -> sun.security.pkcs.SignerInfo
+ sun.security.pkcs.PKCS9Attribute -> sun.security.x509.CertificateExtensions
+
+# protected T engineGetKeySpec(java.security.Key, java.lang.Class<T>)
+ at ClassForName
+ sun.security.provider.DSAKeyFactory -> java.security.spec.DSAPublicKeySpec
+ sun.security.provider.DSAKeyFactory -> java.security.spec.X509EncodedKeySpec
+ sun.security.provider.DSAKeyFactory -> java.security.spec.DSAPrivateKeySpec
+ sun.security.provider.DSAKeyFactory -> java.security.spec.PKCS8EncodedKeySpec
+
+# protected T engineGetParameterSpec(java.lang.Class<T>)
+ at ClassForName
+ sun.security.provider.DSAParameters -> java.security.spec.DSAParameterSpec
+
+# sun.security.provider.VerificationProvider
+ at ClassForName(optional)
+ sun.security.provider.VerificationProvider -> sun.security.provider.Sun
+ sun.security.provider.VerificationProvider -> sun.security.rsa.SunRsaSign
+
+# sun.security.provider.certpath.URICertStore$LDAP
+ at ClassForName(optional)
+ sun.security.provider.certpath.URICertStore$LDAP -> sun.security.provider.certpath.ldap.LDAPCertStoreHelper
+
+# sun.security.smartcardio.PCSC
+ at NativeFindClass
+ sun.security.smartcardio.PCSC -> sun.security.smartcardio.PCSCException
+
+# sun.security.ssl.HandshakeMessage
+ at ClassForName
+ sun.security.ssl.HandshakeMessage -> java.security.MessageDigest$Delegate
+
+# ## This is a test to implement JsseJce.isKerberosAvailable() method.
+# but causes a circular dependence jsse -> kerberos -> jsse
+#
+# sun.security.ssl.JsseJce
+# @ClassForName(optional)
+# sun.security.ssl.JsseJce -> sun.security.krb5.PrincipalName
+
+# sun.security.x509.OIDMap$OIDInfo
+ at ClassForName
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.SubjectKeyIdentifierExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.KeyUsageExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.PrivateKeyUsageExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.SubjectAlternativeNameExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.IssuerAlternativeNameExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.BasicConstraintsExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.CRLNumberExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.CRLReasonCodeExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.NameConstraintsExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.PolicyMappingsExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.AuthorityKeyIdentifierExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.PolicyConstraintsExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.NetscapeCertTypeExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.CertificatePoliciesExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.ExtendedKeyUsageExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.InhibitAnyPolicyExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.CRLDistributionPointsExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.CertificateIssuerExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.SubjectInfoAccessExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.AuthorityInfoAccessExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.IssuingDistributionPointExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.DeltaCRLIndicatorExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.FreshestCRLExtension
+ sun.security.x509.OIDMap$OIDInfo -> sun.security.x509.OCSPNoCheckExtension
+
+# sun.util.LocaleServiceProviderPool$AllAvailableLocales
+ at Provider
+ sun.util.LocaleServiceProviderPool$AllAvailableLocales -> META-INF/services/java.text.spi.BreakIteratorProvider
+ sun.util.LocaleServiceProviderPool$AllAvailableLocales -> META-INF/services/java.text.spi.CollatorProvider
+ sun.util.LocaleServiceProviderPool$AllAvailableLocales -> META-INF/services/java.text.spi.DateFormatProvider
+ sun.util.LocaleServiceProviderPool$AllAvailableLocales -> META-INF/services/java.text.spi.DateFormatSymbolsProvider
+ sun.util.LocaleServiceProviderPool$AllAvailableLocales -> META-INF/services/java.text.spi.DecimalFormatSymbolsProvider
+ sun.util.LocaleServiceProviderPool$AllAvailableLocales -> META-INF/services/java.text.spi.NumberFormatProvider
+ sun.util.LocaleServiceProviderPool$AllAvailableLocales -> META-INF/services/java.util.spi.CurrencyNameProvider
+ sun.util.LocaleServiceProviderPool$AllAvailableLocales -> META-INF/services/java.util.spi.LocaleNameProvider
+ sun.util.LocaleServiceProviderPool$AllAvailableLocales -> META-INF/services/java.util.spi.TimeZoneNameProvider
+
+# private static final java.lang.String[] retrieveDisplayNames(sun.util.resources.OpenListResourceBundle, java.lang.String, java.util.Locale)
+ at Provider
+ sun.util.TimeZoneNameUtility -> META-INF/services/java.util.spi.TimeZoneNamePProvider
+
+# public static sun.util.calendar.CalendarSystem forName(java.lang.String)
+ at ClassForName
+ sun.util.calendar.CalendarSystem -> sun.util.calendar.Gregorian
+ sun.util.calendar.CalendarSystem -> sun.util.calendar.LocalGregorianCalendar
+ sun.util.calendar.CalendarSystem -> sun.util.calendar.JulianCalendar
+
+# sun.util.logging.LoggingSupport
+ at ClassForName(optional)
+ sun.util.logging.LoggingSupport -> java.util.logging.LoggingProxyImpl
+
+ at ClassForName(optional)
+ sun.tools.jinfo.JInfo -> sun.jvm.hotspot.tools.JInfo
+
+ at ClassForName(optional)
+ sun.tools.jmap.JMap -> sun.jvm.hotspot.tools.PMap
+ sun.tools.jmap.JMap -> sun.jvm.hotspot.tools.HeapSummary
+ sun.tools.jmap.JMap -> sun.jvm.hotspot.tools.HeapDumper
+ sun.tools.jmap.JMap -> sun.jvm.hotspot.tools.ObjectHistogram
+ sun.tools.jmap.JMap -> sun.jvm.hotspot.tools.PermStat
+ sun.tools.jmap.JMap -> sun.jvm.hotspot.tools.FinalizerInfo
+ sun.tools.jmap.JMap -> sun.jvm.hotspot.tools.HeapDumper
+ sun.tools.jmap.JMap -> sun.jvm.hotspot.tools.HeapSummary
+
+ at ClassForName(optional)
+ sun.tools.jstack.JStack -> sun.jvm.hotspot.tools.JStack
+
+ at ClassForName(optional)
+ sun.rmi.rmic.Main -> sun.rmi.rmic.iiop.StubGenerator
+ sun.rmi.rmic.Main -> sun.rmi.rmic.iiop.IDLGenerator
+ sun.rmi.rmic.Main -> sun.rmi.rmic.iiop.PrintGenerator
+ sun.rmi.rmic.Main -> sun.rmi.rmic.iiop.BatchEnvironment
+
+ at ClassForName(optional)
+ javax.management.remote.rmi.RMIConnector -> org.omg.stub.javax.management.remote.rmi._RMIConnection_Stub
+ javax.management.remote.rmi.RMIConnector -> com.sun.jmx.remote.protocol.iiop.ProxyStub
+ javax.management.remote.rmi.RMIConnector -> com.sun.jmx.remote.protocol.iiop.ProxyInputStream
+ javax.management.remote.rmi.RMIConnector -> com.sun.jmx.remote.protocol.iiop.PInputStream
+ com.sun.jmx.remote.internal.IIOPHelper -> com.sun.jmx.remote.protocol.iiop.IIOPProxyImpl
+
diff --git a/jdk/make/modules/modules.config b/jdk/make/modules/modules.config
index 324bade..a2cb813 100644
--- a/jdk/make/modules/modules.config
+++ b/jdk/make/modules/modules.config
@@ -57,7 +57,6 @@ module private-legacy {
sun.misc.UCEncoder,
sun.misc.UUDecoder,
sun.misc.UUEncoder,
- com.sun.net.ssl.SSLContext,
sun.net.NetworkServer,
sun.net.URLCanonicalizer,
sun.reflect.misc.ConstructorUtil,
@@ -67,6 +66,8 @@ module private-legacy {
sunw.io.Serializable,
sunw.util.EventListener,
sunw.util.EventObject;
+ // ## keep SSLContext in the base to get one fewer split package
+ // include com.sun.net.ssl.SSLContext;
}
// Deprecated classes that aren't referenced/used go here.
@@ -107,6 +108,7 @@ module base {
include java.nio.**, com.sun.nio.file.*;
include com.oracle.nio.**;
+ include com.oracle.net.*;
include sun.nio.fs.*, sun.nio.ch.*, sun.nio.ByteBuffered;
exclude sun.nio.ch.Sctp*;
exclude META-INF/services/java.nio.file.spi.FileSystemProvider;
@@ -146,12 +148,7 @@ module base {
exclude sun.security.ec.ECD*,
sun.security.ec.ECKeyPairGenerator,
sun.security.ec.SunEC*,
- sun.security.pkcs.PKCS10*,
- sun.security.pkcs.EncodingException,
- sun.security.util.BigInt,
- sun.security.util.HostnameChecker,
- sun.security.x509.CertAndKeyGen,
- sun.security.util.PathList;
+ sun.security.util.HostnameChecker;
// Kerberos not needed
exclude javax.security.auth.kerberos.**,
@@ -486,7 +483,8 @@ module security-jsse {
sun.net.www.protocol.https.**,
sun.security.internal.interfaces.Tls*,
sun.security.internal.spec.Tls*,
- sun.security.util.HostnameChecker;
+ sun.security.util.HostnameChecker,
+ sun.security.provider.certpath.ssl.**;
}
module security-sunpkcs11 {
@@ -565,20 +563,6 @@ module security-auth {
include com.sun.security.auth.**;
}
-// See 6953295 - these classes are only used by keytool
-module security-misc {
- include sun.security.pkcs.PKCS10*,
- sun.security.pkcs.EncodingException;
-
- // this class is a candidate to be removed.
- include sun.security.util.BigInt;
-
- // Used by keytool and jarsigner tools
- // Include it here due to split package for now
- // They should be moved to some other package to be included keytool
- include sun.security.util.PathList, sun.security.x509.CertAndKeyGen;
-}
-
// ## deprecated but public APIs
module security-acl {
include java.security.acl.*, sun.security.acl.*;
@@ -673,14 +657,6 @@ module zipfs {
include META-INF/services/java.nio.file.spi.FileSystemProvider;
}
-// networking extension
-module net-ext {
- include sctp;
-
- // SDP API
- include com.oracle.net.*;
-}
-
/**************************************************************************/
module beans {
@@ -1018,7 +994,8 @@ module tools.jarsigner {
}
module tools.keytool {
- include sun.security.tools.*;
+ include sun.security.pkcs10.*,
+ sun.security.tools.*;
// KeyTool class is in jdk.jarsigner module
// Alternatives: add sun.keytool and sun.jarsigner
diff --git a/jdk/make/modules/modules.group b/jdk/make/modules/modules.group
index f785de8..ee4b6f9 100644
--- a/jdk/make/modules/modules.group
+++ b/jdk/make/modules/modules.group
@@ -102,7 +102,6 @@ module sun.desktop {
requires local jdk.boot; // ensure loaded by bootstrap class loader
include beans;
- include prefs;
include client;
// jndi and corba have a dependency on Applet but
@@ -128,9 +127,29 @@ module jdk.desktop {
requires optional jdk.jaxp;
}
+// ## java.util.prefs should be moved to the base module
+// ## once we eliminate the Preferences implementation for Unix
+// ## to XML (currently stored as a XML file).
+module jdk.prefs {
+ requires local jdk.boot; // ensure loaded by bootstrap class loader
+ include prefs;
+}
+
module sun.management {
requires local jdk.boot; // ensure loaded by bootstrap class loader
include management;
+ requires optional sun.management.iiop;
+}
+
+// JMX RMI-IIOP connector
+module sun.management.iiop {
+ requires local jdk.boot; // ensure loaded by bootstrap class loader
+
+ include management-iiop;
+}
+
+module sun.snmp {
+ requires local jdk.boot; // ensure loaded by bootstrap class loader
include management-snmp;
}
@@ -139,12 +158,6 @@ module sun.corba {
include corba;
- // include COS naming service provider for JNDI
- // that pulls in jndi module
- include jndi-cosnaming;
- // include JMX RMI-IIOP connector that pulls in the management module
- include management-iiop;
-
// include corba-specific tools
include tools.orbd;
include tools.servertool;
@@ -173,7 +186,7 @@ module sun.compat {
include jdbc-odbc;
}
-// Deprecated APIs
+// Deprecated APIs used by snmp
module sun.security.acl {
requires local jdk.boot; // ensure loaded by bootstrap class loader
include security-acl;
@@ -201,7 +214,7 @@ module jdk.sunpkcs11 {
include security-sunpkcs11;
}
-module jdk.sunjce {
+module jdk.crypto {
include security-sunjce;
}
@@ -259,6 +272,11 @@ module sun.jndi {
include sun.auth.jndi;
}
+module sun.cosnaming {
+ // include COS naming service provider for JNDI
+ // that pulls in jndi module
+ include jndi-cosnaming;
+}
module sun.rmi {
requires local jdk.boot; // ensure loaded by bootstrap class loader
@@ -271,7 +289,7 @@ module sun.rmi {
class sun.launcher.LauncherHelper; // module entry point to invoke the tool
}
-module sun.jaas {
+module sun.auth {
requires local jdk.boot; // ensure loaded by bootstrap class loader
include security-auth;
include sun.callback.text;
@@ -281,13 +299,9 @@ module sun.jaas {
include security-sasl-ntlm;
}
-module sun.jsse {
+module sun.tls {
requires local jdk.boot; // ensure loaded by bootstrap class loader
include security-jsse;
-
- // ## split sun.security.pkcs and sun.security.util package between jdk.boot
- // ## they are used by keytool only. See 6953295
- include security-misc;
}
module jdk.deploy {
@@ -341,13 +355,19 @@ module sun.resources {
}
// Oracle's platform extension (supported APIs)
-module jdk.ext {
+module jdk.sctp {
requires local jdk.boot; // loaded by bootstrap class loader
- include httpserver;
- include net-ext;
+ include sctp;
+}
+
+module jdk.zipfs {
include zipfs;
}
+module jdk.httpserver {
+ include httpserver;
+}
+
// ## langtools maintains the list of modules and names
// ## keep jdk.javah and jdk.javap for now
module jdk.javah {
@@ -368,10 +388,12 @@ module jdk.tools.base {
requires jdk.javah;
requires jdk.javap;
+ include tools.jar;
+ include tools.jarsigner;
include tools.jpkg;
include tools.jrepo;
include tools.jsign;
- include tools.jar;
+ include tools.keytool;
include tools.pack200;
class sun.launcher.LauncherHelper; // module entry point to invoke the tool
@@ -386,9 +408,6 @@ module jdk.tools.jre {
// JRE tools
include tools.policytool;
- // ## 6890876 adds dependency to LDAP (jndi.provider)
- // include tools.keytool;
-
class sun.launcher.LauncherHelper; // module entry point to invoke the tool
}
@@ -408,8 +427,6 @@ module jdk.tools {
include tools.appletviewer;
include tools.extcheck;
- include tools.jarsigner;
- include tools.keytool; // ## see 6890876
include tools.jconsole;
include tools.jdb;
include tools.jdb.gui;
diff --git a/jdk/make/modules/optional.depconfig b/jdk/make/modules/optional.depconfig
index 652ce11..ee978c3 100644
--- a/jdk/make/modules/optional.depconfig
+++ b/jdk/make/modules/optional.depconfig
@@ -138,12 +138,6 @@
java.io.FileInputStream -> java.nio.channels.FileChannel
java.io.FileInputStream -> sun.nio.ch.FileChannelImpl
-# public void loadFromXML(java.io.InputStream)
-# public void storeToXML(java.io.OutputStream, java.lang.String, java.lang.String)
- at Optional
- java.util.Properties -> java.util.XMLUtils
-
-# public static java.nio.channels.Channel inheritedChannel()
@Optional
java.lang.System -> java.nio.channels.Channel
java.lang.System -> java.nio.channels.spi.SelectorProvider
diff --git a/jdk/make/org/ietf/jgss/Makefile b/jdk/make/org/ietf/jgss/Makefile
index 9887e71..26f0219 100644
--- a/jdk/make/org/ietf/jgss/Makefile
+++ b/jdk/make/org/ietf/jgss/Makefile
@@ -26,6 +26,8 @@
BUILDDIR = ../../..
PACKAGE = org.ietf.jgss
PRODUCT = sun
+JAVAC_MAX_WARNINGS = true
+JAVAC_WARNINGS_FATAL = true
include $(BUILDDIR)/common/Defs.gmk
#
diff --git a/jdk/make/sun/javazic/tzdata/VERSION b/jdk/make/sun/javazic/tzdata/VERSION
index 9ccfe4c..fbc87a0 100644
--- a/jdk/make/sun/javazic/tzdata/VERSION
+++ b/jdk/make/sun/javazic/tzdata/VERSION
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2011j
+tzdata2011l
diff --git a/jdk/make/sun/javazic/tzdata/asia b/jdk/make/sun/javazic/tzdata/asia
index 36c5237..446940c 100644
--- a/jdk/make/sun/javazic/tzdata/asia
+++ b/jdk/make/sun/javazic/tzdata/asia
@@ -2216,7 +2216,47 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
# http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
# </a>
+# From Steffen Thorsen (2011-08-26):
+# Gaza and the West Bank did go back to standard time in the beginning of
+# August, and will now enter daylight saving time again on 2011-08-30
+# 00:00 (so two periods of DST in 2011). The pause was because of
+# Ramadan.
+#
+# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=416217">
+# http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
+# </a>
+# Additional info:
+# <a href="http://www.timeanddate.com/news/time/palestine-dst-2011.html">
+# http://www.timeanddate.com/news/time/palestine-dst-2011.html
+# </a>
+
+# From Alexander Krivenyshev (2011-08-27):
+# According to the article in The Jerusalem Post:
+# "...Earlier this month, the Palestinian government in the West Bank decided to
+# move to standard time for 30 days, during Ramadan. The Palestinians in the
+# Gaza Strip accepted the change and also moved their clocks one hour back.
+# The Hamas government said on Saturday that it won't observe summertime after
+# the Muslim feast of Id al-Fitr, which begins on Tuesday..."
+# ...
+# <a href="http://www.jpost.com/MiddleEast/Article.aspx?id=235650">
+# http://www.jpost.com/MiddleEast/Article.aspx?id=235650
+# </a>
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html">
+# http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
+# </a>
# The rules for Egypt are stolen from the `africa' file.
+
+# From Steffen Thorsen (2011-09-30):
+# West Bank did end Daylight Saving Time this morning/midnight (2011-09-30
+# 00:00).
+# So West Bank and Gaza now have the same time again.
+#
+# Many sources, including:
+# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=424808">
+# http://www.maannews.net/eng/ViewDetails.aspx?ID=424808
+# </a>
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
@@ -2232,19 +2272,37 @@ Rule Palestine 2005 only - Oct 4 2:00 0 -
Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S
Rule Palestine 2006 only - Sep 22 0:00 0 -
Rule Palestine 2007 only - Sep Thu>=8 2:00 0 -
-Rule Palestine 2008 only - Aug lastFri 2:00 0 -
+Rule Palestine 2008 only - Aug lastFri 0:00 0 -
Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S
-Rule Palestine 2010 max - Mar lastSat 0:01 1:00 S
-Rule Palestine 2009 max - Sep Fri>=1 2:00 0 -
+Rule Palestine 2009 only - Sep Fri>=1 2:00 0 -
+Rule Palestine 2010 only - Mar lastSat 0:01 1:00 S
Rule Palestine 2010 only - Aug 11 0:00 0 -
+# From Arthur David Olson (2011-09-20):
+# 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
2:00 Zion EET 1948 May 15
2:00 EgyptAsia EE%sT 1967 Jun 5
2:00 Zion I%sT 1996
2:00 Jordan EE%sT 1999
- 2:00 Palestine EE%sT
+ 2:00 Palestine EE%sT 2011 Apr 2 12:01
+ 2:00 1:00 EEST 2011 Aug 1
+ 2:00 - EET
+
+Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
+ 2:00 Zion EET 1948 May 15
+ 2:00 EgyptAsia EE%sT 1967 Jun 5
+ 2:00 Zion I%sT 1996
+ 2:00 Jordan EE%sT 1999
+ 2:00 Palestine EE%sT 2008 Aug
+ 2:00 1:00 EEST 2008 Sep
+ 2:00 Palestine EE%sT 2011 Apr 1 12:01
+ 2:00 1:00 EEST 2011 Aug 1
+ 2:00 - EET 2011 Aug 30
+ 2:00 1:00 EEST 2011 Sep 30 3:00
+ 2:00 - EET
# Paracel Is
# no information
diff --git a/jdk/make/sun/javazic/tzdata/australasia b/jdk/make/sun/javazic/tzdata/australasia
index 0330fcd..722908b 100644
--- a/jdk/make/sun/javazic/tzdata/australasia
+++ b/jdk/make/sun/javazic/tzdata/australasia
@@ -318,6 +318,18 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
# http://www.worldtimezone.com/dst_news/dst_news_fiji04.html
# </a>
+# From Steffen Thorsen (2011-10-03):
+# Now the dates have been confirmed, and at least our start date
+# assumption was correct (end date was one week wrong).
+#
+# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155">
+# www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155
+# </a>
+# which says
+# Members of the public are reminded to change their time to one hour in
+# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to
+# 2am on February 26 next year.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
@@ -325,6 +337,8 @@ Rule Fiji 2009 only - Nov 29 2:00 1:00 S
Rule Fiji 2010 only - Mar lastSun 3:00 0 -
Rule Fiji 2010 only - Oct 24 2:00 1:00 S
Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
+Rule Fiji 2011 only - Oct 23 2:00 1:00 S
+Rule Fiji 2012 only - Feb 26 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva
12:00 Fiji FJ%sT # Fiji Time
diff --git a/jdk/make/sun/javazic/tzdata/europe b/jdk/make/sun/javazic/tzdata/europe
index 5c6abc1..b5394fb 100644
--- a/jdk/make/sun/javazic/tzdata/europe
+++ b/jdk/make/sun/javazic/tzdata/europe
@@ -583,9 +583,9 @@ Rule Russia 1985 1991 - Mar lastSun 2:00s 1:00 S
#
Rule Russia 1992 only - Mar lastSat 23:00 1:00 S
Rule Russia 1992 only - Sep lastSat 23:00 0 -
-Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S
+Rule Russia 1993 2010 - Mar lastSun 2:00s 1:00 S
Rule Russia 1993 1995 - Sep lastSun 2:00s 0 -
-Rule Russia 1996 max - Oct lastSun 2:00s 0 -
+Rule Russia 1996 2010 - Oct lastSun 2:00s 0 -
# From Alexander Krivenyshev (2011-06-14):
# According to Kremlin press service, Russian President Dmitry Medvedev
@@ -605,7 +605,6 @@ Rule Russia 1996 max - Oct lastSun 2:00s 0 -
# From Arthur David Olson (2011-06-15):
# Take "abolishing daylight saving time" to mean that time is now considered
# to be standard.
-# At least for now, keep the "old" Russia rules for the benefit of Belarus.
# These are for backward compatibility with older versions.
@@ -711,6 +710,23 @@ Zone Europe/Vienna 1:05:20 - LMT 1893 Apr
1:00 EU CE%sT
# Belarus
+# From Yauhen Kharuzhy (2011-09-16):
+# By latest Belarus government act Europe/Minsk timezone was changed to
+# GMT+3 without DST (was GMT+2 with DST).
+#
+# Sources (Russian language):
+# 1.
+# <a href="http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html">
+# http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
+# </a>
+# 2.
+# <a href="http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/">
+# http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
+# </a>
+# 3.
+# <a href="http://news.tut.by/society/250578.html">
+# http://news.tut.by/society/250578.html
+# </a>
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Minsk 1:50:16 - LMT 1880
1:50 - MMT 1924 May 2 # Minsk Mean Time
@@ -722,7 +738,8 @@ Zone Europe/Minsk 1:50:16 - LMT 1880
2:00 1:00 EEST 1991 Sep 29 2:00s
2:00 - EET 1992 Mar 29 0:00s
2:00 1:00 EEST 1992 Sep 27 0:00s
- 2:00 Russia EE%sT
+ 2:00 Russia EE%sT 2011 Mar 27 2:00s
+ 3:00 - FET # Further-eastern European Time
# Belgium
#
@@ -2056,7 +2073,7 @@ Zone Europe/Kaliningrad 1:22:00 - LMT 1893 Apr
2:00 Poland CE%sT 1946
3:00 Russia MSK/MSD 1991 Mar 31 2:00s
2:00 Russia EE%sT 2011 Mar 27 2:00s
- 3:00 - KALT
+ 3:00 - FET # Further-eastern European Time
#
# From Oscar van Vlijmen (2001-08-25): [This region consists of]
# Respublika Adygeya, Arkhangel'skaya oblast',
@@ -2211,7 +2228,7 @@ Zone Asia/Irkutsk 6:57:20 - LMT 1880
# [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
# From Oscar van Vlijmen (2009-11-29):
-# ...some regions of RUssia were merged with others since 2005...
+# ...some regions of [Russia] were merged with others since 2005...
# Some names were changed, no big deal, except for one instance: a new name.
# YAK/YAKST: UTC+9 Zabajkal'skij kraj.
@@ -2635,6 +2652,28 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
# of March at 3am the time is changing to 4am and each last Sunday of
# October the time at 4am is changing to 3am"
+# From Alexander Krivenyshev (2011-09-20):
+# On September 20, 2011 the deputies of the Verkhovna Rada agreed to
+# abolish the transfer clock to winter time.
+#
+# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
+# approval from 266 deputies.
+#
+# Ukraine abolishes transter back to the winter time (in Russian)
+# <a href="http://news.mail.ru/politics/6861560/">
+# http://news.mail.ru/politics/6861560/
+# </a>
+#
+# The Ukrainians will no longer change the clock (in Russian)
+# <a href="http://www.segodnya.ua/news/14290482.html">
+# http://www.segodnya.ua/news/14290482.html
+# </a>
+#
+# Deputies cancelled the winter time (in Russian)
+# <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
+# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
+# </a>
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Most of Ukraine since 1970 has been like Kiev.
# "Kyiv" is the transliteration of the Ukrainian name, but
@@ -2648,7 +2687,8 @@ Zone Europe/Kiev 2:02:04 - LMT 1880
3:00 - MSK 1990 Jul 1 2:00
2:00 - EET 1992
2:00 E-Eur EE%sT 1995
- 2:00 EU EE%sT
+ 2:00 EU EE%sT 2011 Mar lastSun 1:00u
+ 3:00 - FET # Further-eastern European Time
# Ruthenia used CET 1990/1991.
# "Uzhhorod" is the transliteration of the Ukrainian name, but
# "Uzhgorod" is more common in English.
@@ -2662,7 +2702,8 @@ Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
1:00 - CET 1991 Mar 31 3:00
2:00 - EET 1992
2:00 E-Eur EE%sT 1995
- 2:00 EU EE%sT
+ 2:00 EU EE%sT 2011 Mar lastSun 1:00u
+ 3:00 - FET # Further-eastern European Time
# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
# "Zaporizhia" is the transliteration of the Ukrainian name, but
# "Zaporozh'ye" is more common in English. Use the common English
@@ -2675,7 +2716,8 @@ Zone Europe/Zaporozhye 2:20:40 - LMT 1880
1:00 C-Eur CE%sT 1943 Oct 25
3:00 Russia MSK/MSD 1991 Mar 31 2:00
2:00 E-Eur EE%sT 1995
- 2:00 EU EE%sT
+ 2:00 EU EE%sT 2011 Mar lastSun 1:00u
+ 3:00 - FET # Further-eastern European Time
# Central Crimea used Moscow time 1994/1997.
Zone Europe/Simferopol 2:16:24 - LMT 1880
2:16 - SMT 1924 May 2 # Simferopol Mean T
@@ -2700,7 +2742,8 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
# Assume it happened in March by not changing the clocks.
3:00 Russia MSK/MSD 1997
3:00 - MSK 1997 Mar lastSun 1:00u
- 2:00 EU EE%sT
+ 2:00 EU EE%sT 2011 Mar lastSun 1:00u
+ 3:00 - FET # Further-eastern European Time
###############################################################################
diff --git a/jdk/make/sun/javazic/tzdata/northamerica b/jdk/make/sun/javazic/tzdata/northamerica
index d31b7f0..fbefc6d 100644
--- a/jdk/make/sun/javazic/tzdata/northamerica
+++ b/jdk/make/sun/javazic/tzdata/northamerica
@@ -505,7 +505,7 @@ Zone America/Juneau 15:02:19 - LMT 1867 Oct 18
-8:00 US P%sT 1983 Oct 30 2:00
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Sitka -14:58:47 - LMT 1867 Oct 18
+Zone America/Sitka 14:58:47 - LMT 1867 Oct 18
-9:01:13 - LMT 1900 Aug 20 12:00
-8:00 - PST 1942
-8:00 US P%sT 1946
@@ -1190,31 +1190,21 @@ Rule StJohns 1960 1986 - Oct lastSun 2:00 0 S
# INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
# at 00:01 local time. For now, assume it started in 1987.
-# From Michael Pelley (2011-08-05):
-# The Government of Newfoundland and Labrador has pending changes to
-# modify the hour for daylight savings time to come into effect in
-# November 2011. This modification would change the time from 12:01AM to
-# 2:00AM on the dates of the switches of Daylight Savings Time to/from
-# Standard Time.
-#
-# As a matter of reference, in Canada provinces have the authority of
-# setting time zone information. The legislation has passed our
-# legislative body (The House of Assembly) and is awaiting the
-# proclamation to come into effect. You may find this information at:
-# <a href="http://www.assembly.nl.ca/legislation/sr/lists/Proclamation.htm">
-# http://www.assembly.nl.ca/legislation/sr/lists/Proclamation.htm
-# </a>
-# and
-# search within that web page for Standard Time (Amendment) Act. The Act
-# may be found at:
-# <a href="http://www.assembly.nl.ca/business/bills/Bill1106.htm">
-# http://www.assembly.nl.ca/business/bills/Bill1106.htm
+# From Michael Pelley (2011-09-12):
+# We received today, Monday, September 12, 2011, notification that the
+# changes to the Newfoundland Standard Time Act have been proclaimed.
+# The change in the Act stipulates that the change from Daylight Savings
+# Time to Standard Time and from Standard Time to Daylight Savings Time
+# now occurs at 2:00AM.
+# ...
+# <a href="http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm">
+# http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm
# </a>
# ...
-# MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery
-# Office of the Chief Information Officer Executive Council Government of
-# Newfoundland & Labrador P.O. Box 8700, 40 Higgins Line, St. John's NL
-# A1B 4J6
+# MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery
+# Office of the Chief Information Officer
+# Executive Council
+# Government of Newfoundland & Labrador
Rule StJohns 1987 only - Apr Sun>=1 0:01 1:00 D
Rule StJohns 1987 2006 - Oct lastSun 0:01 0 S
diff --git a/jdk/make/sun/javazic/tzdata/southamerica b/jdk/make/sun/javazic/tzdata/southamerica
index 215d95d..0f15500 100644
--- a/jdk/make/sun/javazic/tzdata/southamerica
+++ b/jdk/make/sun/javazic/tzdata/southamerica
@@ -819,6 +819,26 @@ Zone America/La_Paz -4:32:36 - LMT 1890
# <a href="http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html">
# http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
# </a>
+#
+# From Alexander Krivenyshev (2011-10-04):
+# State Bahia will return to Daylight savings time this year after 8 years off.
+# The announcement was made by Governor Jaques Wagner in an interview to a
+# television station in Salvador.
+
+# In Portuguese:
+# <a href="http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html">
+# http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html
+# </a> and
+# <a href="http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html">
+# http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
+# </a>
+
+# From Guilherme Bernardes Rodrigues (2011-10-07):
+# There is news in the media, however there is still no decree about it.
+# I just send a e-mail to Zulmira Brandão at
+# <a href="http://pcdsh01.on.br/">http://pcdsh01.on.br/</a> the
+# oficial agency about time in Brazil, and she confirmed that the old rule is
+# still in force.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
@@ -1057,6 +1077,9 @@ Zone America/Maceio -2:22:52 - LMT 1914
Zone America/Bahia -2:34:04 - LMT 1914
-3:00 Brazil BR%sT 2003 Sep 24
-3:00 - BRT
+# as noted above, not yet in operation.
+# -3:00 - BRT 2011 Oct 16
+# -3:00 Brazil BR%sT
#
# Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
# Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
diff --git a/jdk/make/sun/javazic/tzdata/zone.tab b/jdk/make/sun/javazic/tzdata/zone.tab
index 81ce7f5..89d3c8e 100644
--- a/jdk/make/sun/javazic/tzdata/zone.tab
+++ b/jdk/make/sun/javazic/tzdata/zone.tab
@@ -341,7 +341,8 @@ PL +5215+02100 Europe/Warsaw
PM +4703-05620 America/Miquelon
PN -2504-13005 Pacific/Pitcairn
PR +182806-0660622 America/Puerto_Rico
-PS +3130+03428 Asia/Gaza
+PS +3130+03428 Asia/Gaza Gaza Strip
+PS +313200+0350542 Asia/Hebron West Bank
PT +3843-00908 Europe/Lisbon mainland
PT +3238-01654 Atlantic/Madeira Madeira Islands
PT +3744-02540 Atlantic/Azores Azores
diff --git a/jdk/make/sun/net/Makefile b/jdk/make/sun/net/Makefile
index 3e56798..b36fa66 100644
--- a/jdk/make/sun/net/Makefile
+++ b/jdk/make/sun/net/Makefile
@@ -28,6 +28,7 @@ PACKAGE = sun.net
PRODUCT = sun
SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
+SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
include $(BUILDDIR)/common/Defs.gmk
SUBDIRS = others spi
diff --git a/jdk/make/sun/rmi/rmi/Makefile b/jdk/make/sun/rmi/rmi/Makefile
index cd66bf3..4c277bd 100644
--- a/jdk/make/sun/rmi/rmi/Makefile
+++ b/jdk/make/sun/rmi/rmi/Makefile
@@ -31,16 +31,9 @@ BUILDDIR = ../../..
MODULE = rmi
PACKAGE = sun.rmi
PRODUCT = sun
-LIBRARY = rmi
include $(BUILDDIR)/common/Defs.gmk
#
-# Add use of a mapfile
-#
-FILES_m = mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-#
# Java files to compile.
#
AUTO_FILES_JAVA_DIRS = \
@@ -53,31 +46,9 @@ AUTO_FILES_JAVA_DIRS = \
com/sun/rmi
#
-# Native files to compile.
-#
-FILES_c = \
- sun/rmi/server/MarshalInputStream.c
-
-#
-# Add ambient vpath to pick up files not part of sun.rmi package
-#
-vpath %.c $(SHARE_SRC)/native/sun/rmi/server
-
-#
-# Exported files that require generated .h
-#
-FILES_export = \
- sun/rmi/server/MarshalInputStream.java
-
-#
-# Link to JVM for JVM_LatestUserDefinedLoader
-#
-OTHER_LDLIBS = $(JVMLIB)
-
-#
# Rules
#
-include $(BUILDDIR)/common/Library.gmk
+include $(BUILDDIR)/common/Rules.gmk
#
# Full package names of implementations requiring stubs
diff --git a/jdk/make/sun/security/ec/Makefile b/jdk/make/sun/security/ec/Makefile
index 8946393..b0f7e21 100644
--- a/jdk/make/sun/security/ec/Makefile
+++ b/jdk/make/sun/security/ec/Makefile
@@ -193,10 +193,8 @@ ifeq ($(NATIVE_ECC_AVAILABLE), true)
#
# Libraries to link
#
- ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS += $(JVMLIB)
- else
- OTHER_LDLIBS = -ldl $(JVMLIB) $(LIBCXX)
+ ifneq ($(PLATFORM), windows)
+ OTHER_LDLIBS = $(LIBCXX)
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
diff --git a/jdk/make/sun/security/jgss/wrapper/Makefile b/jdk/make/sun/security/jgss/wrapper/Makefile
index dded1d7..48d5a32 100644
--- a/jdk/make/sun/security/jgss/wrapper/Makefile
+++ b/jdk/make/sun/security/jgss/wrapper/Makefile
@@ -73,5 +73,6 @@ include $(BUILDDIR)/common/Library.gmk
# Libraries to link
#
ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS = -ldl $(JVMLIB)
+ OTHER_LDLIBS = -ldl
endif
+
diff --git a/jdk/make/sun/security/krb5/Makefile b/jdk/make/sun/security/krb5/Makefile
index 12f25d1..bd16d71 100644
--- a/jdk/make/sun/security/krb5/Makefile
+++ b/jdk/make/sun/security/krb5/Makefile
@@ -70,15 +70,6 @@ else
include $(BUILDDIR)/common/Classes.gmk
endif # PLATFORM
-#
-# Libraries to link
-#
-ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS = $(JVMLIB)
-else
- OTHER_LDLIBS = -ldl $(JVMLIB)
-endif
-
build:
ifeq ($(PLATFORM),windows)
$(call make-launcher, kinit, sun.security.krb5.internal.tools.Kinit, , , $(KERBEROS_TOOLS_MODULE))
diff --git a/jdk/make/sun/security/mscapi/Makefile b/jdk/make/sun/security/mscapi/Makefile
index ecc2442..ba7e530 100644
--- a/jdk/make/sun/security/mscapi/Makefile
+++ b/jdk/make/sun/security/mscapi/Makefile
@@ -164,7 +164,7 @@ include $(BUILDDIR)/common/Library.gmk
# Libraries to link
#
ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS += $(JVMLIB) Crypt32.Lib
+ OTHER_LDLIBS += Crypt32.Lib
endif
#
diff --git a/jdk/make/sun/security/other/Makefile b/jdk/make/sun/security/other/Makefile
index ab74d58..cc869ae 100644
--- a/jdk/make/sun/security/other/Makefile
+++ b/jdk/make/sun/security/other/Makefile
@@ -26,7 +26,7 @@
BUILDDIR = ../../..
PACKAGE = sun.security.other
PRODUCT = sun
-JAVAC_MAX_WARNINGS=false
+JAVAC_MAX_WARNINGS=true
JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation
JAVAC_WARNINGS_FATAL=true
include $(BUILDDIR)/common/Defs.gmk
@@ -38,6 +38,7 @@ AUTO_FILES_JAVA_DIRS = \
sun/security/acl \
sun/security/jca \
sun/security/pkcs \
+ sun/security/pkcs10 \
sun/security/pkcs12 \
sun/security/provider \
sun/security/rsa \
diff --git a/jdk/make/sun/security/pkcs11/Makefile b/jdk/make/sun/security/pkcs11/Makefile
index 851118e..691ac8e 100644
--- a/jdk/make/sun/security/pkcs11/Makefile
+++ b/jdk/make/sun/security/pkcs11/Makefile
@@ -161,10 +161,8 @@ include $(BUILDDIR)/common/Library.gmk
#
# Libraries to link
#
-ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS = $(JVMLIB)
-else
- OTHER_LDLIBS = -ldl $(JVMLIB)
+ifneq ($(PLATFORM), windows)
+ OTHER_LDLIBS = -ldl
endif
# Other config files
diff --git a/jdk/make/sun/security/smartcardio/Makefile b/jdk/make/sun/security/smartcardio/Makefile
index 137678c..426fb99 100644
--- a/jdk/make/sun/security/smartcardio/Makefile
+++ b/jdk/make/sun/security/smartcardio/Makefile
@@ -74,8 +74,8 @@ include $(BUILDDIR)/common/Library.gmk
# Libraries to link
#
ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS = $(JVMLIB) winscard.lib
+ OTHER_LDLIBS = winscard.lib
else
- OTHER_LDLIBS = -ldl $(JVMLIB)
+ OTHER_LDLIBS = -ldl
OTHER_CFLAGS = -D__sun_jdk
endif
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Modularizer.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Modularizer.java
index 7813b46..7573b5d 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Modularizer.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Modularizer.java
@@ -68,8 +68,7 @@ public class Modularizer {
long classBytes = 0;
long resourceBytes = 0;
final Module module;
- final File classDir; // destination for classes
- final File resDir; // destination for resources
+ final File classDir; // destination for classes and resources
final File mdir;
/**
@@ -81,11 +80,7 @@ public class Modularizer {
ModuleContent(Module m, File dir) throws IOException {
this.module = m;
this.mdir = dir;
- // ## classes & resource files should be put in the
- // ## same directory when jpkg tool is modified to
- // ## support that
this.classDir = new File(dir, "classes");
- this.resDir = new File(dir, "resources");
}
/**
@@ -109,11 +104,6 @@ public class Modularizer {
// override all files
update = false;
}
- if (!resDir.exists()) {
- Files.mkdirs(resDir);
- // override all files
- update = false;
- }
final boolean copyAll = update == false;
Module.Visitor<Void, File> visitor = new Module.Visitor<Void, File>() {
@@ -137,7 +127,7 @@ public class Modularizer {
@Override
public Void visitResource(ResourceFile r, File dir) {
String pathname = r.getPathname();
- Filter filter = copyAll ? null : new Filter(resDir, pathname);
+ Filter filter = copyAll ? null : new Filter(classDir, pathname);
try {
long bytes = writeResource(r, filter);
if (bytes > 0) {
@@ -201,7 +191,7 @@ public class Modularizer {
*/
long writeResource(ResourceFile res, Filter filter) throws IOException {
String pathname = res.getPathname();
- Copier visitor = new Copier(resDir, filter);
+ Copier visitor = new Copier(classDir, filter);
if (lastVisitedClassPath != null) {
ClassPathEntry cp = lastVisitedClassPath.accept(visitor, pathname);
if (cp != null) {
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java b/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java
index ee9ff2d..464e3d1 100644
--- a/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java
@@ -32,6 +32,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.InputStream;
import java.net.Socket;
+import javax.net.ssl.SSLSocket;
import javax.naming.CommunicationException;
import javax.naming.ServiceUnavailableException;
@@ -361,6 +362,19 @@ public final class Connection implements Runnable {
}
}
+ // For LDAP connect timeouts on LDAP over SSL connections must treat
+ // the SSL handshake following socket connection as part of the timeout.
+ // So explicitly set a socket read timeout, trigger the SSL handshake,
+ // then reset the timeout.
+ if (connectTimeout > 0 && socket instanceof SSLSocket) {
+ SSLSocket sslSocket = (SSLSocket) socket;
+ int socketTimeout = sslSocket.getSoTimeout();
+
+ sslSocket.setSoTimeout(connectTimeout); // reuse full timeout value
+ sslSocket.startHandshake();
+ sslSocket.setSoTimeout(socketTimeout);
+ }
+
return socket;
}
diff --git a/jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java b/jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java
index c17fcf7..c604353 100644
--- a/jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java
+++ b/jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -179,6 +179,12 @@ class HttpsURLConnection extends HttpURLConnection
throw new IllegalArgumentException(
"no SSLSocketFactory specified");
}
+
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkSetFactory();
+ }
+
sslSocketFactory = sf;
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
index 5b1acfd..308d517 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
@@ -115,9 +115,9 @@ public final class Init {
// provider mechanism instead if implementing their own
// transform or canonicalization algorithms.
// InputStream is = Class.forName("com.sun.org.apache.xml.internal.security.Init").getResourceAsStream("resource/config.xml");
- InputStream is = (InputStream) AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
+ InputStream is = AccessController.doPrivileged(
+ new PrivilegedAction<InputStream>() {
+ public InputStream run() {
// String cfile = System.getProperty
// ("com.sun.org.apache.xml.internal.security.resource.config");
return getClass().getResourceAsStream
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java
index 7a23913..030795b 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java
@@ -45,9 +45,9 @@ public class JCEMapper {
- private static Map uriToJCEName;
+ private static Map<String, String> uriToJCEName;
- private static Map algorithmsMap;
+ private static Map<String, Algorithm> algorithmsMap;
private static String providerName = null;
/**
@@ -63,8 +63,8 @@ public class JCEMapper {
static void loadAlgorithms( Element algorithmsEl) {
Element[] algorithms = XMLUtils.selectNodes(algorithmsEl.getFirstChild(),Init.CONF_NS,"Algorithm");
- uriToJCEName = new HashMap( algorithms.length * 2);
- algorithmsMap = new HashMap( algorithms.length * 2);
+ uriToJCEName = new HashMap<String, String>( algorithms.length * 2);
+ algorithmsMap = new HashMap<String, Algorithm>( algorithms.length * 2);
for (int i = 0 ;i < algorithms.length ;i ++) {
Element el = algorithms[i];
String id = el.getAttribute("URI");
@@ -76,7 +76,7 @@ public class JCEMapper {
}
static Algorithm getAlgorithmMapping(String algoURI) {
- return ((Algorithm)algorithmsMap.get(algoURI));
+ return algorithmsMap.get(algoURI);
}
/**
@@ -90,7 +90,7 @@ public class JCEMapper {
if (log.isLoggable(java.util.logging.Level.FINE))
log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
- String jceName = (String) uriToJCEName.get(AlgorithmURI);
+ String jceName = uriToJCEName.get(AlgorithmURI);
return jceName;
}
@@ -106,7 +106,7 @@ public class JCEMapper {
if (log.isLoggable(java.util.logging.Level.FINE))
log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
- return ((Algorithm) algorithmsMap.get(AlgorithmURI)).algorithmClass;
+ return (algorithmsMap.get(AlgorithmURI)).algorithmClass;
}
/**
@@ -116,7 +116,7 @@ public class JCEMapper {
* @return The length of the key used in the alogrithm
*/
public static int getKeyLengthFromURI(String AlgorithmURI) {
- return Integer.parseInt(((Algorithm) algorithmsMap.get(AlgorithmURI)).keyLength);
+ return Integer.parseInt((algorithmsMap.get(AlgorithmURI)).keyLength);
}
/**
@@ -128,7 +128,7 @@ public class JCEMapper {
*/
public static String getJCEKeyAlgorithmFromURI(String AlgorithmURI) {
- return ((Algorithm) algorithmsMap.get(AlgorithmURI)).requiredKey;
+ return (algorithmsMap.get(AlgorithmURI)).requiredKey;
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java
index fa62ef3..63a808b 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java
@@ -71,9 +71,10 @@ public class MessageDigestAlgorithm extends Algorithm {
this.algorithm = messageDigest;
}
- static ThreadLocal instances=new ThreadLocal() {
- protected Object initialValue() {
- return new HashMap();
+ static ThreadLocal<Map<String, MessageDigest>> instances=new
+ ThreadLocal<Map<String, MessageDigest>>() {
+ protected Map<String, MessageDigest> initialValue() {
+ return new HashMap<String, MessageDigest>();
};
};
@@ -92,7 +93,7 @@ public class MessageDigestAlgorithm extends Algorithm {
}
private static MessageDigest getDigestInstance(String algorithmURI) throws XMLSignatureException {
- MessageDigest result=(MessageDigest) ((Map)instances.get()).get(algorithmURI);
+ MessageDigest result= instances.get().get(algorithmURI);
if (result!=null)
return result;
String algorithmID = JCEMapper.translateURItoJCEID(algorithmURI);
@@ -121,7 +122,7 @@ private static MessageDigest getDigestInstance(String algorithmURI) throws XMLSi
throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
}
- ((Map)instances.get()).put(algorithmURI, md);
+ instances.get().put(algorithmURI, md);
return md;
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java
index 567df3c..24fd47e 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java
@@ -51,28 +51,28 @@ public class SignatureAlgorithm extends Algorithm {
static boolean _alreadyInitialized = false;
/** All available algorithm classes are registered here */
- static HashMap _algorithmHash = null;
+ static Map<String, Class<? extends SignatureAlgorithmSpi>> _algorithmHash = null;
- static ThreadLocal instancesSigning=new ThreadLocal() {
- protected Object initialValue() {
- return new HashMap();
+ static ThreadLocal<Map<String, SignatureAlgorithmSpi>> instancesSigning=new ThreadLocal<Map<String, SignatureAlgorithmSpi>>() {
+ protected Map<String, SignatureAlgorithmSpi> initialValue() {
+ return new HashMap<String, SignatureAlgorithmSpi>();
};
};
- static ThreadLocal instancesVerify=new ThreadLocal() {
- protected Object initialValue() {
- return new HashMap();
+ static ThreadLocal<Map<String, SignatureAlgorithmSpi>> instancesVerify=new ThreadLocal<Map<String, SignatureAlgorithmSpi>>() {
+ protected Map<String, SignatureAlgorithmSpi> initialValue() {
+ return new HashMap<String, SignatureAlgorithmSpi>();
};
};
- static ThreadLocal keysSigning=new ThreadLocal() {
- protected Object initialValue() {
- return new HashMap();
+ static ThreadLocal<Map<String, Key>> keysSigning=new ThreadLocal<Map<String, Key>>() {
+ protected Map<String, Key> initialValue() {
+ return new HashMap<String, Key>();
};
};
- static ThreadLocal keysVerify=new ThreadLocal() {
- protected Object initialValue() {
- return new HashMap();
+ static ThreadLocal<Map<String, Key>> keysVerify=new ThreadLocal<Map<String, Key>>() {
+ protected Map<String, Key> initialValue() {
+ return new HashMap<String, Key>();
};
};
// boolean isForSigning=false;
@@ -105,34 +105,34 @@ public class SignatureAlgorithm extends Algorithm {
.engineGetContextFromElement(this._constructionElement);
}
private static SignatureAlgorithmSpi getInstanceForSigning(String algorithmURI) throws XMLSignatureException {
- SignatureAlgorithmSpi result=(SignatureAlgorithmSpi) ((Map)instancesSigning.get()).get(algorithmURI);
+ SignatureAlgorithmSpi result= instancesSigning.get().get(algorithmURI);
if (result!=null) {
result.reset();
return result;
}
result=buildSigner(algorithmURI, result);
- ((Map)instancesSigning.get()).put(algorithmURI,result);
+ instancesSigning.get().put(algorithmURI,result);
return result;
}
private static SignatureAlgorithmSpi getInstanceForVerify(String algorithmURI) throws XMLSignatureException {
- SignatureAlgorithmSpi result=(SignatureAlgorithmSpi) ((Map)instancesVerify.get()).get(algorithmURI);
+ SignatureAlgorithmSpi result= instancesVerify.get().get(algorithmURI);
if (result!=null) {
result.reset();
return result;
}
result=buildSigner(algorithmURI, result);
- ((Map)instancesVerify.get()).put(algorithmURI,result);
+ instancesVerify.get().put(algorithmURI,result);
return result;
}
private static SignatureAlgorithmSpi buildSigner(String algorithmURI, SignatureAlgorithmSpi result) throws XMLSignatureException {
try {
- Class implementingClass =
+ Class<? extends SignatureAlgorithmSpi> implementingClass =
SignatureAlgorithm.getImplementingClass(algorithmURI);
if (log.isLoggable(java.util.logging.Level.FINE))
log.log(java.util.logging.Level.FINE, "Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
- result=(SignatureAlgorithmSpi) implementingClass.newInstance();
+ result= implementingClass.newInstance();
return result;
} catch (IllegalAccessException ex) {
Object exArgs[] = { algorithmURI, ex.getMessage() };
@@ -270,7 +270,7 @@ public class SignatureAlgorithm extends Algorithm {
*/
public void initSign(Key signingKey) throws XMLSignatureException {
initializeAlgorithm(true);
- Map map=(Map)keysSigning.get();
+ Map<String, Key> map=keysSigning.get();
if (map.get(this.algorithmURI)==signingKey) {
return;
}
@@ -329,7 +329,7 @@ public class SignatureAlgorithm extends Algorithm {
*/
public void initVerify(Key verificationKey) throws XMLSignatureException {
initializeAlgorithm(false);
- Map map=(Map)keysVerify.get();
+ Map<String, Key> map=keysVerify.get();
if (map.get(this.algorithmURI)==verificationKey) {
return;
}
@@ -375,7 +375,7 @@ public class SignatureAlgorithm extends Algorithm {
log.log(java.util.logging.Level.FINE, "Init() called");
if (!SignatureAlgorithm._alreadyInitialized) {
- SignatureAlgorithm._algorithmHash = new HashMap(10);
+ SignatureAlgorithm._algorithmHash = new HashMap<String, Class<? extends SignatureAlgorithmSpi>>(10);
SignatureAlgorithm._alreadyInitialized = true;
}
}
@@ -388,6 +388,7 @@ public class SignatureAlgorithm extends Algorithm {
* @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
* @throws XMLSignatureException
*/
+ @SuppressWarnings("unchecked")
public static void register(String algorithmURI, String implementingClass)
throws AlgorithmAlreadyRegisteredException,XMLSignatureException {
@@ -396,7 +397,7 @@ public class SignatureAlgorithm extends Algorithm {
log.log(java.util.logging.Level.FINE, "Try to register " + algorithmURI + " " + implementingClass);
// are we already registered?
- Class registeredClassClass =
+ Class<? extends SignatureAlgorithmSpi> registeredClassClass =
SignatureAlgorithm.getImplementingClass(algorithmURI);
if (registeredClassClass!=null) {
String registeredClass = registeredClassClass.getName();
@@ -409,7 +410,7 @@ public class SignatureAlgorithm extends Algorithm {
}
}
try {
- SignatureAlgorithm._algorithmHash.put(algorithmURI, Class.forName(implementingClass));
+ SignatureAlgorithm._algorithmHash.put(algorithmURI, (Class <? extends SignatureAlgorithmSpi>)Class.forName(implementingClass));
} catch (ClassNotFoundException ex) {
Object exArgs[] = { algorithmURI, ex.getMessage() };
@@ -431,13 +432,13 @@ public class SignatureAlgorithm extends Algorithm {
* @param URI
* @return the class that implements the URI
*/
- private static Class getImplementingClass(String URI) {
+ private static Class<? extends SignatureAlgorithmSpi> getImplementingClass(String URI) {
if (SignatureAlgorithm._algorithmHash == null) {
return null;
}
- return (Class) SignatureAlgorithm._algorithmHash.get(URI);
+ return SignatureAlgorithm._algorithmHash.get(URI);
}
/**
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java
index a418123..b435a98 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java
@@ -28,6 +28,7 @@ import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
import com.sun.org.apache.xml.internal.security.exceptions.AlgorithmAlreadyRegisteredException;
import org.w3c.dom.Document;
@@ -83,7 +84,7 @@ public class Canonicalizer {
ALGO_ID_C14N11_OMIT_COMMENTS + "#WithComments";
static boolean _alreadyInitialized = false;
- static Map _canonicalizerHash = null;
+ static Map<String,Class<? extends CanonicalizerSpi>> _canonicalizerHash = null;
protected CanonicalizerSpi canonicalizerSpi = null;
@@ -94,7 +95,7 @@ public class Canonicalizer {
public static void init() {
if (!Canonicalizer._alreadyInitialized) {
- Canonicalizer._canonicalizerHash = new HashMap(10);
+ Canonicalizer._canonicalizerHash = new HashMap<String, Class<? extends CanonicalizerSpi>>(10);
Canonicalizer._alreadyInitialized = true;
}
}
@@ -109,10 +110,11 @@ public class Canonicalizer {
throws InvalidCanonicalizerException {
try {
- Class implementingClass = getImplementingClass(algorithmURI);
+ Class<? extends CanonicalizerSpi> implementingClass =
+ getImplementingClass(algorithmURI);
this.canonicalizerSpi =
- (CanonicalizerSpi) implementingClass.newInstance();
+ implementingClass.newInstance();
this.canonicalizerSpi.reset=true;
} catch (Exception e) {
Object exArgs[] = { algorithmURI };
@@ -144,11 +146,12 @@ public class Canonicalizer {
* @param implementingClass
* @throws AlgorithmAlreadyRegisteredException
*/
+ @SuppressWarnings("unchecked")
public static void register(String algorithmURI, String implementingClass)
throws AlgorithmAlreadyRegisteredException {
// check whether URI is already registered
- Class registeredClass = getImplementingClass(algorithmURI);
+ Class<? extends CanonicalizerSpi> registeredClass = getImplementingClass(algorithmURI);
if (registeredClass != null) {
Object exArgs[] = { algorithmURI, registeredClass };
@@ -158,7 +161,7 @@ public class Canonicalizer {
}
try {
- _canonicalizerHash.put(algorithmURI, Class.forName(implementingClass));
+ _canonicalizerHash.put(algorithmURI, (Class<? extends CanonicalizerSpi>) Class.forName(implementingClass));
} catch (ClassNotFoundException e) {
throw new RuntimeException("c14n class not found");
}
@@ -304,7 +307,7 @@ public class Canonicalizer {
* @return the result of the c14n.
* @throws CanonicalizationException
*/
- public byte[] canonicalizeXPathNodeSet(Set xpathNodeSet)
+ public byte[] canonicalizeXPathNodeSet(Set<Node> xpathNodeSet)
throws CanonicalizationException {
return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet);
}
@@ -317,7 +320,7 @@ public class Canonicalizer {
* @return the result of the c14n.
* @throws CanonicalizationException
*/
- public byte[] canonicalizeXPathNodeSet(Set xpathNodeSet,
+ public byte[] canonicalizeXPathNodeSet(Set<Node> xpathNodeSet,
String inclusiveNamespaces) throws CanonicalizationException {
return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet,
inclusiveNamespaces);
@@ -347,8 +350,8 @@ public class Canonicalizer {
* @param URI
* @return the name of the class that implements the given URI
*/
- private static Class getImplementingClass(String URI) {
- return (Class) _canonicalizerHash.get(URI);
+ private static Class<? extends CanonicalizerSpi> getImplementingClass(String URI) {
+ return _canonicalizerHash.get(URI);
}
/**
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java
index e55b67c..48294fe 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java
@@ -28,6 +28,7 @@ import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Document;
@@ -151,7 +152,7 @@ public abstract class CanonicalizerSpi {
* @return the c14n bytes
* @throws CanonicalizationException
*/
- public abstract byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet)
+ public abstract byte[] engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet)
throws CanonicalizationException;
/**
@@ -162,7 +163,7 @@ public abstract class CanonicalizerSpi {
* @return the c14n bytes
* @throws CanonicalizationException
*/
- public abstract byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet, String inclusiveNamespaces)
+ public abstract byte[] engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet, String inclusiveNamespaces)
throws CanonicalizationException;
/**
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java
index 802abda..8675b67 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java
@@ -41,7 +41,7 @@ import java.util.Comparator;
*
* @author Christian Geuer-Pollmann
*/
-public class AttrCompare implements Comparator, Serializable {
+public class AttrCompare implements Comparator<Attr>, Serializable {
private final static long serialVersionUID = -7113259629930576230L;
private final static int ATTR0_BEFORE_ATTR1 = -1;
@@ -62,16 +62,14 @@ public class AttrCompare implements Comparator, Serializable {
* key (an empty namespace URI is lexicographically least).
* </UL>
*
- * @param obj0 casted Attr
- * @param obj1 casted Attr
+ * @param attr0
+ * @param attr1
* @return returns a negative integer, zero, or a positive integer as
* obj0 is less than, equal to, or greater than obj1
*
*/
- public int compare(Object obj0, Object obj1) {
+ public int compare(Attr attr0, Attr attr1) {
- Attr attr0 = (Attr) obj0;
- Attr attr1 = (Attr) obj1;
String namespaceURI0 = attr0.getNamespaceURI();
String namespaceURI1 = attr1.getNamespaceURI();
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java
index 4790fd8..e0a4696 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java
@@ -25,6 +25,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -33,6 +34,7 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -59,7 +61,7 @@ import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
*/
public abstract class Canonicalizer11 extends CanonicalizerBase {
boolean firstCall = true;
- final SortedSet result = new TreeSet(COMPARE);
+ final SortedSet<Attr> result = new TreeSet<Attr>(COMPARE);
static final String XMLNS_URI = Constants.NamespaceSpecNS;
static final String XML_LANG_URI = Constants.XML_LANG_SPACE_SpecNS;
@@ -72,9 +74,9 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
static class XmlsStackElement {
int level;
boolean rendered = false;
- List nodes = new ArrayList();
+ List<Attr> nodes = new ArrayList<Attr>();
};
- List levels = new ArrayList();
+ List<XmlsStackElement> levels = new ArrayList<XmlsStackElement>();
void push(int level) {
currentLevel = level;
if (currentLevel == -1)
@@ -86,7 +88,7 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
lastlevel = 0;
return;
}
- lastlevel=((XmlsStackElement)levels.get(levels.size()-1)).level;
+ lastlevel=(levels.get(levels.size()-1)).level;
}
}
void addXmlnsAttr(Attr n) {
@@ -98,7 +100,7 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
}
cur.nodes.add(n);
}
- void getXmlnsAttr(Collection col) {
+ void getXmlnsAttr(Collection<Attr> col) {
if (cur == null) {
cur = new XmlsStackElement();
cur.level = currentLevel;
@@ -111,7 +113,7 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
if (size == -1) {
parentRendered = true;
} else {
- e = (XmlsStackElement) levels.get(size);
+ e = levels.get(size);
if (e.rendered && e.level+1 == currentLevel)
parentRendered = true;
}
@@ -121,17 +123,17 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
return;
}
- Map loa = new HashMap();
- List baseAttrs = new ArrayList();
+ Map<String, Attr> loa = new HashMap<String, Attr>();
+ List<Attr> baseAttrs = new ArrayList<Attr>();
boolean successiveOmitted = true;
for (;size>=0;size--) {
- e = (XmlsStackElement) levels.get(size);
+ e = levels.get(size);
if (e.rendered) {
successiveOmitted = false;
}
- Iterator it = e.nodes.iterator();
+ Iterator<Attr> it = e.nodes.iterator();
while (it.hasNext() && successiveOmitted) {
- Attr n = (Attr) it.next();
+ Attr n = it.next();
if (n.getLocalName().equals("base")) {
if (!e.rendered) {
baseAttrs.add(n);
@@ -141,11 +143,11 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
}
}
if (!baseAttrs.isEmpty()) {
- Iterator it = cur.nodes.iterator();
+ Iterator<Attr> it = cur.nodes.iterator();
String base = null;
Attr baseAttr = null;
while (it.hasNext()) {
- Attr n = (Attr) it.next();
+ Attr n = it.next();
if (n.getLocalName().equals("base")) {
base = n.getValue();
baseAttr = n;
@@ -154,7 +156,7 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
}
it = baseAttrs.iterator();
while (it.hasNext()) {
- Attr n = (Attr) it.next();
+ Attr n = it.next();
if (base == null) {
base = n.getValue();
baseAttr = n;
@@ -202,13 +204,13 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
* @return the Attr[]s to be outputted
* @throws CanonicalizationException
*/
- Iterator handleAttributesSubtree(Element E, NameSpaceSymbTable ns)
+ Iterator<Attr> handleAttributesSubtree(Element E, NameSpaceSymbTable ns)
throws CanonicalizationException {
if (!E.hasAttributes() && !firstCall) {
return null;
}
// result will contain the attrs which have to be outputted
- final SortedSet result = this.result;
+ final SortedSet<Attr> result = this.result;
result.clear();
NamedNodeMap attrs = E.getAttributes();
int attrsLength = attrs.getLength();
@@ -236,7 +238,7 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
if (n != null) {
// Render the ns definition
- result.add(n);
+ result.add((Attr)n);
if (C14nHelper.namespaceIsRelative(N)) {
Object exArgs[] = {E.getTagName(), NName, N.getNodeValue()};
throw new CanonicalizationException(
@@ -251,13 +253,15 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
// to the output.
ns.getUnrenderedNodes(result);
// output the attributes in the xml namespace.
- xmlattrStack.getXmlnsAttr(result);
+ xmlattrStack.getXmlnsAttr(getSortedSetAsCollection(result));
firstCall = false;
}
return result.iterator();
}
+
+
/**
* Returns the Attr[]s to be outputted for the given element.
* <br>
@@ -271,7 +275,7 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
* @return the Attr[]s to be outputted
* @throws CanonicalizationException
*/
- Iterator handleAttributes(Element E, NameSpaceSymbTable ns)
+ Iterator<Attr> handleAttributes(Element E, NameSpaceSymbTable ns)
throws CanonicalizationException {
// result will contain the attrs which have to be output
xmlattrStack.push(ns.getLevel());
@@ -283,11 +287,11 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
attrsLength = attrs.getLength();
}
- SortedSet result = this.result;
+ SortedSet<Attr> result = this.result;
result.clear();
for (int i = 0; i < attrsLength; i++) {
- Attr N = (Attr) attrs.item(i);
+ Attr N = (Attr)attrs.item(i);
String NUri = N.getNamespaceURI();
if (XMLNS_URI != NUri) {
@@ -332,7 +336,7 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
// (NName, NValue, N, isRealVisible);
Node n = ns.addMappingAndRender(NName, NValue, N);
if (n != null) {
- result.add(n);
+ result.add((Attr)n);
if (C14nHelper.namespaceIsRelative(N)) {
Object exArgs[] =
{ E.getTagName(), NName, N.getNodeValue() };
@@ -362,7 +366,7 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
}
// output the xmlns def if needed.
if (n != null) {
- result.add(n);
+ result.add((Attr)n);
}
// Float all xml:* attributes of the unselected parent elements to
// this one. addXmlAttributes(E,result);
@@ -381,7 +385,7 @@ public abstract class Canonicalizer11 extends CanonicalizerBase {
* @return none it always fails
* @throws CanonicalizationException always
*/
- public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet,
+ public byte[] engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet,
String inclusiveNamespaces) throws CanonicalizationException {
throw new CanonicalizationException(
"c14n.Canonicalizer.UnsupportedOperation");
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java
index 541c2d6..b0b2e0b 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java
@@ -57,7 +57,7 @@ import org.xml.sax.SAXException;
*/
public abstract class Canonicalizer20010315 extends CanonicalizerBase {
boolean firstCall=true;
- final SortedSet result= new TreeSet(COMPARE);
+ final SortedSet<Attr> result= new TreeSet<Attr>(COMPARE);
static final String XMLNS_URI=Constants.NamespaceSpecNS;
static final String XML_LANG_URI=Constants.XML_LANG_SPACE_SpecNS;
static class XmlAttrStack {
@@ -67,9 +67,9 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
static class XmlsStackElement {
int level;
boolean rendered=false;
- List nodes=new ArrayList();
+ List<Attr> nodes=new ArrayList<Attr>();
};
- List levels=new ArrayList();
+ List<XmlsStackElement> levels=new ArrayList<XmlsStackElement>();
void push(int level) {
currentLevel=level;
if (currentLevel==-1)
@@ -81,7 +81,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
lastlevel=0;
return;
}
- lastlevel=((XmlsStackElement)levels.get(levels.size()-1)).level;
+ lastlevel=(levels.get(levels.size()-1)).level;
}
}
void addXmlnsAttr(Attr n) {
@@ -93,7 +93,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
}
cur.nodes.add(n);
}
- void getXmlnsAttr(Collection col) {
+ void getXmlnsAttr(Collection<Attr> col) {
int size=levels.size()-1;
if (cur==null) {
cur=new XmlsStackElement();
@@ -106,7 +106,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
if (size==-1) {
parentRendered=true;
} else {
- e=(XmlsStackElement)levels.get(size);
+ e=levels.get(size);
if (e.rendered && e.level+1==currentLevel)
parentRendered=true;
@@ -117,12 +117,12 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
return;
}
- Map loa = new HashMap();
+ Map<String,Attr> loa = new HashMap<String,Attr>();
for (;size>=0;size--) {
- e=(XmlsStackElement)levels.get(size);
- Iterator it=e.nodes.iterator();
+ e=levels.get(size);
+ Iterator<Attr> it=e.nodes.iterator();
while (it.hasNext()) {
- Attr n=(Attr)it.next();
+ Attr n=it.next();
if (!loa.containsKey(n.getName()))
loa.put(n.getName(),n);
}
@@ -161,13 +161,13 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
* @return the Attr[]s to be outputted
* @throws CanonicalizationException
*/
- Iterator handleAttributesSubtree(Element E, NameSpaceSymbTable ns )
+ Iterator<Attr> handleAttributesSubtree(Element E, NameSpaceSymbTable ns )
throws CanonicalizationException {
if (!E.hasAttributes() && !firstCall) {
return null;
}
// result will contain the attrs which have to be outputted
- final SortedSet result = this.result;
+ final SortedSet<Attr> result = this.result;
result.clear();
NamedNodeMap attrs = E.getAttributes();
int attrsLength = attrs.getLength();
@@ -194,7 +194,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
if (n!=null) {
//Render the ns definition
- result.add(n);
+ result.add((Attr)n);
if (C14nHelper.namespaceIsRelative(N)) {
Object exArgs[] = { E.getTagName(), NName, N.getNodeValue() };
throw new CanonicalizationException(
@@ -206,7 +206,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
if (firstCall) {
//It is the first node of the subtree
//Obtain all the namespaces defined in the parents, and added to the output.
- ns.getUnrenderedNodes(result);
+ ns.getUnrenderedNodes(getSortedSetAsCollection(result));
//output the attributes in the xml namespace.
xmlattrStack.getXmlnsAttr(result);
firstCall=false;
@@ -227,7 +227,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
* @return the Attr[]s to be outputted
* @throws CanonicalizationException
*/
- Iterator handleAttributes(Element E, NameSpaceSymbTable ns ) throws CanonicalizationException {
+ Iterator<Attr> handleAttributes(Element E, NameSpaceSymbTable ns ) throws CanonicalizationException {
// result will contain the attrs which have to be outputted
xmlattrStack.push(ns.getLevel());
boolean isRealVisible=isVisibleDO(E,ns.getLevel())==1;
@@ -239,7 +239,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
}
- SortedSet result = this.result;
+ SortedSet<Attr> result = this.result;
result.clear();
for (int i = 0; i < attrsLength; i++) {
@@ -277,7 +277,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
//Node n=ns.addMappingAndRenderXNodeSet(NName,NValue,N,isRealVisible);
Node n=ns.addMappingAndRender(NName,NValue,N);
if (n!=null) {
- result.add(n);
+ result.add((Attr)n);
if (C14nHelper.namespaceIsRelative(N)) {
Object exArgs[] = { E.getTagName(), NName, N.getNodeValue() };
throw new CanonicalizationException(
@@ -306,12 +306,12 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
}
//output the xmlns def if needed.
if (n!=null) {
- result.add(n);
+ result.add((Attr)n);
}
//Float all xml:* attributes of the unselected parent elements to this one.
//addXmlAttributes(E,result);
xmlattrStack.getXmlnsAttr(result);
- ns.getUnrenderedNodes(result);
+ ns.getUnrenderedNodes(getSortedSetAsCollection(result));
}
@@ -325,7 +325,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
* @return none it always fails
* @throws CanonicalizationException always
*/
- public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet, String inclusiveNamespaces)
+ public byte[] engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet, String inclusiveNamespaces)
throws CanonicalizationException {
/** $todo$ well, should we throw UnsupportedOperationException ? */
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java
index 679c7b5..9dec09b 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java
@@ -61,9 +61,9 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
* This Set contains the names (Strings like "xmlns" or "xmlns:foo") of
* the inclusive namespaces.
*/
- TreeSet _inclusiveNSSet = new TreeSet();
+ TreeSet<String> _inclusiveNSSet = new TreeSet<String>();
static final String XMLNS_URI=Constants.NamespaceSpecNS;
- final SortedSet result = new TreeSet(COMPARE);
+ final SortedSet<Attr> result = new TreeSet<Attr>(COMPARE);
/**
* Constructor Canonicalizer20010315Excl
*
@@ -106,8 +106,7 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
*/
public byte[] engineCanonicalizeSubTree(Node rootNode,
String inclusiveNamespaces,Node excl) throws CanonicalizationException {
- this._inclusiveNSSet = (TreeSet)InclusiveNamespaces
- .prefixStr2Set(inclusiveNamespaces);
+ this._inclusiveNSSet = getInclusiveNameSpace(inclusiveNamespaces);
return super.engineCanonicalizeSubTree(rootNode,excl);
}
/**
@@ -117,10 +116,10 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
* @return the rootNode c14n.
* @throws CanonicalizationException
*/
+ @SuppressWarnings("unchecked")
public byte[] engineCanonicalize(XMLSignatureInput rootNode,
String inclusiveNamespaces) throws CanonicalizationException {
- this._inclusiveNSSet = (TreeSet)InclusiveNamespaces
- .prefixStr2Set(inclusiveNamespaces);
+ this._inclusiveNSSet = getInclusiveNameSpace(inclusiveNamespaces);
return super.engineCanonicalize(rootNode);
}
@@ -130,12 +129,12 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
* @param E
* @throws CanonicalizationException
*/
- Iterator handleAttributesSubtree(Element E,NameSpaceSymbTable ns)
+ Iterator<Attr> handleAttributesSubtree(Element E,NameSpaceSymbTable ns)
throws CanonicalizationException {
// System.out.println("During the traversal, I encountered " +
// XMLUtils.getXPath(E));
// result will contain the attrs which have to be outputted
- SortedSet result = this.result;
+ SortedSet<Attr> result = this.result;
result.clear();
NamedNodeMap attrs=null;
@@ -145,7 +144,7 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
attrsLength = attrs.getLength();
}
//The prefix visibly utilized(in the attribute or in the name) in the element
- SortedSet visiblyUtilized =(SortedSet) _inclusiveNSSet.clone();
+ SortedSet<String> visiblyUtilized = getNSSetClone();
for (int i = 0; i < attrsLength; i++) {
Attr N = (Attr) attrs.item(i);
@@ -187,9 +186,9 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
visiblyUtilized.add(prefix);
//This can be optimezed by I don't have time
- Iterator it=visiblyUtilized.iterator();
+ Iterator<String> it=visiblyUtilized.iterator();
while (it.hasNext()) {
- String s=(String)it.next();
+ String s=it.next();
Attr key=ns.getMapping(s);
if (key==null) {
continue;
@@ -207,25 +206,35 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
* @param inclusiveNamespaces
* @throws CanonicalizationException
*/
- public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet,
+ public byte[] engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet,
String inclusiveNamespaces) throws CanonicalizationException {
-
- this._inclusiveNSSet = (TreeSet)InclusiveNamespaces
- .prefixStr2Set(inclusiveNamespaces);
+ this._inclusiveNSSet = getInclusiveNameSpace(inclusiveNamespaces);
return super.engineCanonicalizeXPathNodeSet(xpathNodeSet);
}
+ @SuppressWarnings("unchecked")
+ private TreeSet<String> getInclusiveNameSpace(String inclusiveNameSpaces) {
+ return (TreeSet<String>)InclusiveNamespaces.prefixStr2Set(inclusiveNameSpaces);
+ }
+
+
+ @SuppressWarnings("unchecked")
+ private SortedSet<String> getNSSetClone() {
+ return (SortedSet<String>) this._inclusiveNSSet.clone();
+ }
+
+
/**
* @inheritDoc
* @param E
* @throws CanonicalizationException
*/
- final Iterator handleAttributes(Element E, NameSpaceSymbTable ns)
+ final Iterator<Attr> handleAttributes(Element E, NameSpaceSymbTable ns)
throws CanonicalizationException {
// result will contain the attrs which have to be outputted
- SortedSet result = this.result;
+ SortedSet<Attr> result = this.result;
result.clear();
NamedNodeMap attrs = null;
int attrsLength = 0;
@@ -234,11 +243,11 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
attrsLength = attrs.getLength();
}
//The prefix visibly utilized(in the attribute or in the name) in the element
- Set visiblyUtilized =null;
+ Set<String> visiblyUtilized =null;
//It's the output selected.
boolean isOutputElement=isVisibleDO(E,ns.getLevel())==1;
if (isOutputElement) {
- visiblyUtilized = (Set) this._inclusiveNSSet.clone();
+ visiblyUtilized = getNSSetClone();
}
for (int i = 0; i < attrsLength; i++) {
@@ -272,7 +281,7 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
if (!isOutputElement && isVisible(N) && _inclusiveNSSet.contains(NName) && !ns.removeMappingIfRender(NName)) {
Node n=ns.addMappingAndRender(NName,NNodeValue,N);
if (n!=null) {
- result.add(n);
+ result.add((Attr)n);
if (C14nHelper.namespaceIsRelative(N)) {
Object exArgs[] = { E.getTagName(), NName, N.getNodeValue() };
throw new CanonicalizationException(
@@ -315,9 +324,9 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
}
//This can be optimezed by I don't have time
//visiblyUtilized.addAll(this._inclusiveNSSet);
- Iterator it=visiblyUtilized.iterator();
+ Iterator<String> it=visiblyUtilized.iterator();
while (it.hasNext()) {
- String s=(String)it.next();
+ String s=it.next();
Attr key=ns.getMapping(s);
if (key==null) {
continue;
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java
index 05f22d8..77024c2 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java
@@ -33,9 +33,12 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
+import java.util.SortedSet;
+import java.util.Collection;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizerSpi;
@@ -94,10 +97,10 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
}
}
- List nodeFilter;
+ List<NodeFilter> nodeFilter;
boolean _includeComments;
- Set _xpathNodeSet = null;
+ Set<Node> _xpathNodeSet = null;
/**
* The node to be skiped/excluded from the DOM tree
* in subtree canonicalizations.
@@ -130,7 +133,7 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
* @param xpathNodeSet
* @throws CanonicalizationException
*/
- public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet)
+ public byte[] engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet)
throws CanonicalizationException {
this._xpathNodeSet = xpathNodeSet;
return engineCanonicalizeXPathNodeSetInternal(XMLUtils.getOwnerDocument(this._xpathNodeSet));
@@ -251,7 +254,7 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
final OutputStream writer=this._writer;
final Node excludeNode=this._excludeNode;
final boolean includeComments=this._includeComments;
- Map cache=new HashMap();
+ Map<String, byte[]> cache=new HashMap<String, byte[]>();
do {
switch (currentNode.getNodeType()) {
@@ -298,11 +301,11 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
String name=currentElement.getTagName();
UtfHelpper.writeByte(name,writer,cache);
- Iterator attrs = this.handleAttributesSubtree(currentElement,ns);
+ Iterator<Attr> attrs = this.handleAttributesSubtree(currentElement,ns);
if (attrs!=null) {
//we output all Attrs which are available
while (attrs.hasNext()) {
- Attr attr = (Attr) attrs.next();
+ Attr attr = attrs.next();
outputAttrToWriter(attr.getNodeName(),attr.getNodeValue(), writer,cache);
}
}
@@ -394,7 +397,7 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
Node parentNode=null;
OutputStream writer=this._writer;
int documentLevel=NODE_BEFORE_DOCUMENT_ELEMENT;
- Map cache=new HashMap();
+ Map<String, byte[]> cache=new HashMap<String,byte[]>();
do {
switch (currentNode.getNodeType()) {
@@ -464,11 +467,11 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
ns.push();
}
- Iterator attrs = handleAttributes(currentElement,ns);
+ Iterator<Attr> attrs = handleAttributes(currentElement,ns);
if (attrs!=null) {
//we output all Attrs which are available
while (attrs.hasNext()) {
- Attr attr = (Attr) attrs.next();
+ Attr attr = attrs.next();
outputAttrToWriter(attr.getNodeName(),attr.getNodeValue(), writer,cache);
}
}
@@ -522,9 +525,9 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
}
int isVisibleDO(Node currentNode,int level) {
if (nodeFilter!=null) {
- Iterator it=nodeFilter.iterator();
+ Iterator<NodeFilter> it=nodeFilter.iterator();
while (it.hasNext()) {
- int i=((NodeFilter)it.next()).isNodeIncludeDO(currentNode,level);
+ int i=(it.next()).isNodeIncludeDO(currentNode,level);
if (i!=1)
return i;
}
@@ -535,9 +538,9 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
}
int isVisibleInt(Node currentNode) {
if (nodeFilter!=null) {
- Iterator it=nodeFilter.iterator();
+ Iterator<NodeFilter> it=nodeFilter.iterator();
while (it.hasNext()) {
- int i=((NodeFilter)it.next()).isNodeInclude(currentNode);
+ int i=(it.next()).isNodeInclude(currentNode);
if (i!=1)
return i;
}
@@ -549,9 +552,9 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
boolean isVisible(Node currentNode) {
if (nodeFilter!=null) {
- Iterator it=nodeFilter.iterator();
+ Iterator<NodeFilter> it=nodeFilter.iterator();
while (it.hasNext()) {
- if (((NodeFilter)it.next()).isNodeInclude(currentNode)!=1)
+ if ((it.next()).isNodeInclude(currentNode)!=1)
return false;
}
}
@@ -589,7 +592,7 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
* @param ns
*/
final void getParentNameSpaces(Element el,NameSpaceSymbTable ns) {
- List parents=new ArrayList(10);
+ List<Element> parents=new ArrayList<Element>(10);
Node n1=el.getParentNode();
if (!(n1 instanceof Element)) {
return;
@@ -605,9 +608,9 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
parent=(Element)n;
}
//Visit them in reverse order.
- ListIterator it=parents.listIterator(parents.size());
+ ListIterator<Element> it=parents.listIterator(parents.size());
while (it.hasPrevious()) {
- Element ele=(Element)it.previous();
+ Element ele=it.previous();
handleParent(ele, ns);
}
Attr nsprefix;
@@ -624,7 +627,7 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
* @return the attributes nodes to output.
* @throws CanonicalizationException
*/
- abstract Iterator handleAttributes(Element E, NameSpaceSymbTable ns )
+ abstract Iterator<Attr> handleAttributes(Element E, NameSpaceSymbTable ns )
throws CanonicalizationException;
/**
@@ -635,7 +638,7 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
* @return the attributes nodes to output.
* @throws CanonicalizationException
*/
- abstract Iterator handleAttributesSubtree(Element E, NameSpaceSymbTable ns)
+ abstract Iterator<Attr> handleAttributesSubtree(Element E, NameSpaceSymbTable ns)
throws CanonicalizationException;
abstract void circumventBugIfNeeded(XMLSignatureInput input) throws CanonicalizationException, ParserConfigurationException, IOException, SAXException;
@@ -660,7 +663,7 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
* @throws IOException
*/
static final void outputAttrToWriter(final String name, final String value, final OutputStream writer,
- final Map cache) throws IOException {
+ final Map<String, byte[]> cache) throws IOException {
writer.write(' ');
UtfHelpper.writeByte(name,writer,cache);
writer.write(equalsStr);
@@ -841,4 +844,10 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
}
}
+ @SuppressWarnings("unchecked")
+ protected Collection<Attr> getSortedSetAsCollection(SortedSet<Attr> result) {
+ return (Collection<Attr>)(Collection)result;
+ }
+
+
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java
index 538d369..114bf7e 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java
@@ -44,7 +44,7 @@ public class NameSpaceSymbTable {
/**The level of nameSpaces (for Inclusive visibility).*/
int nameSpaces=0;
/**The stacks for removing the definitions when doing pop.*/
- List level;
+ List<SymbMap> level;
boolean cloned=true;
static final String XMLNS="xmlns";
final static SymbMap initialMap=new SymbMap();
@@ -57,7 +57,7 @@ public class NameSpaceSymbTable {
* Default constractor
**/
public NameSpaceSymbTable() {
- level = new ArrayList(10);
+ level = new ArrayList<SymbMap>(10);
//Insert the default binding for xmlns.
symb=(SymbMap) initialMap.clone();
}
@@ -67,11 +67,11 @@ public class NameSpaceSymbTable {
* For Inclusive rendering
* @param result the list where to fill the unrendered xmlns definitions.
**/
- public void getUnrenderedNodes(Collection result) {
+ public void getUnrenderedNodes(Collection<Attr> result) {
//List result=new ArrayList();
- Iterator it=symb.entrySet().iterator();
+ Iterator<NameSpaceSymbEntry> it=symb.entrySet().iterator();
while (it.hasNext()) {
- NameSpaceSymbEntry n=(NameSpaceSymbEntry)(it.next());
+ NameSpaceSymbEntry n= it.next();
//put them rendered?
if ((!n.rendered) && (n.n!=null)) {
n=(NameSpaceSymbEntry) n.clone();
@@ -339,8 +339,8 @@ class SymbMap implements Cloneable {
}
}
- List entrySet() {
- List a=new ArrayList();
+ List<NameSpaceSymbEntry> entrySet() {
+ List<NameSpaceSymbEntry> a=new ArrayList<NameSpaceSymbEntry>();
for (int i=0;i<entries.length;i++) {
if ((entries[i]!=null) && !("".equals(entries[i].uri))) {
a.add(entries[i]);
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java
index cfcc06d..b62dd3b 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java
@@ -6,8 +6,8 @@ import java.util.Map;
public class UtfHelpper {
- final static void writeByte(final String str,final OutputStream out,Map cache) throws IOException {
- byte []result=(byte[]) cache.get(str);
+ final static void writeByte(final String str,final OutputStream out,Map<String,byte[]> cache) throws IOException {
+ byte []result= cache.get(str);
if (result==null) {
result=getStringInUtf8(str);
cache.put(str,result);
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java
index 81a49b4..803fca8 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java
@@ -95,7 +95,7 @@ public interface AgreementMethod {
* Returns aditional information regarding the <code>AgreementMethod</code>.
* @return
*/
- Iterator getAgreementMethodInformation();
+ Iterator<Element> getAgreementMethodInformation();
/**
* Adds additional <code>AgreementMethod</code> information.
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java
index 7700f45..2664db9 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java
@@ -89,7 +89,7 @@ public interface EncryptionMethod {
* @return an <code>Iterator</code> over all the additional infomation
* about the <code>EncryptionMethod</code>.
*/
- Iterator getEncryptionMethodInformation();
+ Iterator<Element> getEncryptionMethodInformation();
/**
* Adds encryption method information.
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java
index 307a134..da1eb65 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java
@@ -67,7 +67,7 @@ public interface EncryptionProperties {
*
* @return an <code>Iterator</code> over all the encryption properties.
*/
- Iterator getEncryptionProperties();
+ Iterator<EncryptionProperty> getEncryptionProperties();
/**
* Adds an <code>EncryptionProperty</code>.
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java
index 9f61495..4cd6c46 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java
@@ -101,7 +101,7 @@ public interface EncryptionProperty {
* @return an <code>Iterator</code> over all the addiitonal encryption
* information contained in this class.
*/
- Iterator getEncryptionInformation();
+ Iterator<Element> getEncryptionInformation();
/**
* Adds encryption information.
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java
index 0039a41..4523a89 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java
@@ -74,7 +74,7 @@ public interface Reference {
*
* @return child elements.
*/
- Iterator getElementRetrievalInformation();
+ Iterator<Element> getElementRetrievalInformation();
/**
* Adds retrieval information.
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java
index 7fd5b85..2cf0ec5 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java
@@ -87,7 +87,7 @@ public interface ReferenceList {
*
* @return Iterator.
*/
- public Iterator getReferences();
+ public Iterator<Reference> getReferences();
/**
* <code>DataReference</code> factory method. Returns a
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java
index 683acdb..8479835 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java
@@ -2772,7 +2772,7 @@ public class XMLCipher {
// </complexType>
private class AgreementMethodImpl implements AgreementMethod {
private byte[] kaNonce = null;
- private List agreementMethodInformation = null;
+ private List<Element> agreementMethodInformation = null;
private KeyInfo originatorKeyInfo = null;
private KeyInfo recipientKeyInfo = null;
private String algorithmURI = null;
@@ -2781,7 +2781,7 @@ public class XMLCipher {
* @param algorithm
*/
public AgreementMethodImpl(String algorithm) {
- agreementMethodInformation = new LinkedList();
+ agreementMethodInformation = new LinkedList<Element>();
URI tmpAlgorithm = null;
try {
tmpAlgorithm = new URI(algorithm);
@@ -2802,7 +2802,7 @@ public class XMLCipher {
}
/** @inheritDoc */
- public Iterator getAgreementMethodInformation() {
+ public Iterator<Element> getAgreementMethodInformation() {
return (agreementMethodInformation.iterator());
}
@@ -2879,9 +2879,9 @@ public class XMLCipher {
_contextDocument.createTextNode(new String(kaNonce)));
}
if (!agreementMethodInformation.isEmpty()) {
- Iterator itr = agreementMethodInformation.iterator();
+ Iterator<Element> itr = agreementMethodInformation.iterator();
while (itr.hasNext()) {
- result.appendChild((Element) itr.next());
+ result.appendChild(itr.next());
}
}
if (null != originatorKeyInfo) {
@@ -3486,7 +3486,7 @@ public class XMLCipher {
private String algorithm = null;
private int keySize = Integer.MIN_VALUE;
private byte[] oaepParams = null;
- private List encryptionMethodInformation = null;
+ private List<Element> encryptionMethodInformation = null;
/**
*
* @param algorithm
@@ -3499,7 +3499,7 @@ public class XMLCipher {
// complain
}
this.algorithm = tmpAlgorithm.toString();
- encryptionMethodInformation = new LinkedList();
+ encryptionMethodInformation = new LinkedList<Element>();
}
/** @inheritDoc */
public String getAlgorithm() {
@@ -3522,7 +3522,7 @@ public class XMLCipher {
oaepParams = params;
}
/** @inheritDoc */
- public Iterator getEncryptionMethodInformation() {
+ public Iterator<Element> getEncryptionMethodInformation() {
return (encryptionMethodInformation.iterator());
}
/** @inheritDoc */
@@ -3565,8 +3565,8 @@ public class XMLCipher {
new String(oaepParams))));
}
if (!encryptionMethodInformation.isEmpty()) {
- Iterator itr = encryptionMethodInformation.iterator();
- result.appendChild((Element) itr.next());
+ Iterator<Element> itr = encryptionMethodInformation.iterator();
+ result.appendChild(itr.next());
}
return (result);
@@ -3582,13 +3582,13 @@ public class XMLCipher {
// </complexType>
private class EncryptionPropertiesImpl implements EncryptionProperties {
private String id = null;
- private List encryptionProperties = null;
+ private List<EncryptionProperty> encryptionProperties = null;
/**
*
*
*/
public EncryptionPropertiesImpl() {
- encryptionProperties = new LinkedList();
+ encryptionProperties = new LinkedList<EncryptionProperty>();
}
/** @inheritDoc */
public String getId() {
@@ -3599,7 +3599,7 @@ public class XMLCipher {
this.id = id;
}
/** @inheritDoc */
- public Iterator getEncryptionProperties() {
+ public Iterator<EncryptionProperty> getEncryptionProperties() {
return (encryptionProperties.iterator());
}
/** @inheritDoc */
@@ -3625,7 +3625,7 @@ public class XMLCipher {
if (null != id) {
result.setAttributeNS(null, EncryptionConstants._ATT_ID, id);
}
- Iterator itr = getEncryptionProperties();
+ Iterator<EncryptionProperty> itr = getEncryptionProperties();
while (itr.hasNext()) {
result.appendChild(((EncryptionPropertyImpl)
itr.next()).toElement());
@@ -3647,15 +3647,15 @@ public class XMLCipher {
private class EncryptionPropertyImpl implements EncryptionProperty {
private String target = null;
private String id = null;
- private HashMap attributeMap = new HashMap();
- private List encryptionInformation = null;
+ private HashMap<String,String> attributeMap = new HashMap<String,String>();
+ private List<Element> encryptionInformation = null;
/**
*
*
*/
public EncryptionPropertyImpl() {
- encryptionInformation = new LinkedList();
+ encryptionInformation = new LinkedList<Element>();
}
/** @inheritDoc */
public String getTarget() {
@@ -3692,14 +3692,14 @@ public class XMLCipher {
}
/** @inheritDoc */
public String getAttribute(String attribute) {
- return (String) attributeMap.get(attribute);
+ return attributeMap.get(attribute);
}
/** @inheritDoc */
public void setAttribute(String attribute, String value) {
attributeMap.put(attribute, value);
}
/** @inheritDoc */
- public Iterator getEncryptionInformation() {
+ public Iterator<Element> getEncryptionInformation() {
return (encryptionInformation.iterator());
}
/** @inheritDoc */
@@ -3821,8 +3821,8 @@ public class XMLCipher {
// </complexType>
//</element>
private class ReferenceListImpl implements ReferenceList {
- private Class sentry;
- private List references;
+ private Class<?> sentry;
+ private List<Reference> references;
/**
*
* @param type
@@ -3835,7 +3835,7 @@ public class XMLCipher {
} else {
throw new IllegalArgumentException();
}
- references = new LinkedList();
+ references = new LinkedList<Reference>();
}
/** @inheritDoc */
public void add(Reference reference) {
@@ -3860,7 +3860,7 @@ public class XMLCipher {
return (references.isEmpty());
}
/** @inheritDoc */
- public Iterator getReferences() {
+ public Iterator<Reference> getReferences() {
return (references.iterator());
}
@@ -3869,9 +3869,9 @@ public class XMLCipher {
_contextDocument,
EncryptionConstants.EncryptionSpecNS,
EncryptionConstants._TAG_REFERENCELIST);
- Iterator eachReference = references.iterator();
+ Iterator<Reference> eachReference = references.iterator();
while (eachReference.hasNext()) {
- Reference reference = (Reference) eachReference.next();
+ Reference reference = eachReference.next();
result.appendChild(
((ReferenceImpl) reference).toElement());
}
@@ -3894,18 +3894,18 @@ public class XMLCipher {
*/
private abstract class ReferenceImpl implements Reference {
private String uri;
- private List referenceInformation;
+ private List<Element> referenceInformation;
ReferenceImpl(String _uri) {
this.uri = _uri;
- referenceInformation = new LinkedList();
+ referenceInformation = new LinkedList<Element>();
}
/** @inheritDoc */
public String getURI() {
return (uri);
}
/** @inheritDoc */
- public Iterator getElementRetrievalInformation() {
+ public Iterator<Element> getElementRetrievalInformation() {
return (referenceInformation.iterator());
}
/** @inheritDoc */
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java
index cf588b8..0a39b1a 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java
@@ -97,12 +97,12 @@ public class KeyInfo extends SignatureElementProxy {
/** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(KeyInfo.class.getName());
- List x509Datas=null;
- List encryptedKeys=null;
+ List<X509Data> x509Datas=null;
+ List<EncryptedKey> encryptedKeys=null;
- static final List nullList;
+ static final List<StorageResolver> nullList;
static {
- List list = new ArrayList();
+ List<StorageResolver> list = new ArrayList<StorageResolver>(1);
list.add(null);
nullList = Collections.unmodifiableList(list);
}
@@ -297,7 +297,7 @@ public class KeyInfo extends SignatureElementProxy {
*/
public void add(X509Data x509data) {
if (x509Datas==null)
- x509Datas=new ArrayList();
+ x509Datas=new ArrayList<X509Data>();
x509Datas.add(x509data);
this._constructionElement.appendChild(x509data.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
@@ -313,7 +313,7 @@ public class KeyInfo extends SignatureElementProxy {
public void add(EncryptedKey encryptedKey)
throws XMLEncryptionException {
if (encryptedKeys==null)
- encryptedKeys=new ArrayList();
+ encryptedKeys=new ArrayList<EncryptedKey>();
encryptedKeys.add(encryptedKey);
XMLCipher cipher = XMLCipher.getInstance();
this._constructionElement.appendChild(cipher.martial(encryptedKey));
@@ -541,7 +541,7 @@ public class KeyInfo extends SignatureElementProxy {
*/
public X509Data itemX509Data(int i) throws XMLSecurityException {
if (x509Datas!=null) {
- return (X509Data) x509Datas.get(i);
+ return x509Datas.get(i);
}
Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
Constants._TAG_X509DATA,i);
@@ -562,7 +562,7 @@ public class KeyInfo extends SignatureElementProxy {
public EncryptedKey itemEncryptedKey(int i) throws XMLSecurityException {
if (encryptedKeys!=null) {
- return (EncryptedKey) encryptedKeys.get(i);
+ return encryptedKeys.get(i);
}
Element e =
XMLUtils.selectXencNode(this._constructionElement.getFirstChild(),
@@ -728,16 +728,16 @@ public class KeyInfo extends SignatureElementProxy {
PublicKey getPublicKeyFromStaticResolvers() throws KeyResolverException {
int length=KeyResolver.length();
int storageLength=this._storageResolvers.size();
- Iterator it= KeyResolver.iterator();
+ Iterator<KeyResolverSpi> it= KeyResolver.iterator();
for (int i = 0; i < length; i++) {
- KeyResolverSpi keyResolver = (KeyResolverSpi) it.next();
+ KeyResolverSpi keyResolver = it.next();
Node currentChild=this._constructionElement.getFirstChild();
String uri= this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (int k = 0; k < storageLength; k++) {
StorageResolver storage =
- (StorageResolver) this._storageResolvers.get(k);
+ this._storageResolvers.get(k);
PublicKey pk =
keyResolver.engineLookupAndResolvePublicKey((Element) currentChild,
@@ -776,7 +776,7 @@ public class KeyInfo extends SignatureElementProxy {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (int k = 0; k < storageLength; k++) {
StorageResolver storage =
- (StorageResolver) this._storageResolvers.get(k);
+ this._storageResolvers.get(k);
PublicKey pk = keyResolver
.engineLookupAndResolvePublicKey((Element) currentChild, uri, storage);
@@ -845,9 +845,9 @@ public class KeyInfo extends SignatureElementProxy {
String uri=this.getBaseURI();
int length= KeyResolver.length();
int storageLength=this._storageResolvers.size();
- Iterator it = KeyResolver.iterator();
+ Iterator<KeyResolverSpi> it = KeyResolver.iterator();
for (int i = 0; i <length; i++) {
- KeyResolverSpi keyResolver = (KeyResolverSpi) it.next();
+ KeyResolverSpi keyResolver = it.next();
X509Certificate cert= applyCurrentResolver(uri, storageLength, keyResolver);
if (cert!=null) {
KeyResolver.hit(it);
@@ -863,7 +863,7 @@ public class KeyInfo extends SignatureElementProxy {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (int k = 0; k < storageLength; k++) {
StorageResolver storage =
- (StorageResolver) this._storageResolvers.get(k);
+ this._storageResolvers.get(k);
X509Certificate cert = keyResolver
.engineLookupResolveX509Certificate((Element) currentChild, uri,
@@ -944,9 +944,9 @@ public class KeyInfo extends SignatureElementProxy {
SecretKey getSecretKeyFromStaticResolvers() throws KeyResolverException {
final int length=KeyResolver.length();
int storageLength=this._storageResolvers.size();
- Iterator it = KeyResolver.iterator();
+ Iterator<KeyResolverSpi> it = KeyResolver.iterator();
for (int i = 0; i < length; i++) {
- KeyResolverSpi keyResolver = (KeyResolverSpi) it.next();
+ KeyResolverSpi keyResolver = it.next();
Node currentChild=this._constructionElement.getFirstChild();
String uri=this.getBaseURI();
@@ -954,7 +954,7 @@ public class KeyInfo extends SignatureElementProxy {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (int k = 0; k < storageLength; k++) {
StorageResolver storage =
- (StorageResolver) this._storageResolvers.get(k);
+ this._storageResolvers.get(k);
SecretKey sk =
keyResolver.engineLookupAndResolveSecretKey((Element) currentChild,
@@ -992,7 +992,7 @@ public class KeyInfo extends SignatureElementProxy {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (int k = 0; k < storageLength; k++) {
StorageResolver storage =
- (StorageResolver) this._storageResolvers.get(k);
+ this._storageResolvers.get(k);
SecretKey sk = keyResolver
.engineLookupAndResolveSecretKey((Element) currentChild, uri, storage);
@@ -1012,7 +1012,7 @@ public class KeyInfo extends SignatureElementProxy {
/**
* Stores the individual (per-KeyInfo) {@link KeyResolver}s
*/
- List _internalKeyResolvers = null;
+ List<KeyResolverSpi> _internalKeyResolvers = null;
/**
* This method is used to add a custom {@link KeyResolverSpi} to a KeyInfo
@@ -1022,7 +1022,7 @@ public class KeyInfo extends SignatureElementProxy {
*/
public void registerInternalKeyResolver(KeyResolverSpi realKeyResolver) {
if (_internalKeyResolvers==null) {
- _internalKeyResolvers=new ArrayList();
+ _internalKeyResolvers=new ArrayList<KeyResolverSpi>();
}
this._internalKeyResolvers.add(realKeyResolver);
}
@@ -1044,11 +1044,11 @@ public class KeyInfo extends SignatureElementProxy {
* @return the KeyResolverSpi for the index.
*/
KeyResolverSpi itemInternalKeyResolver(int i) {
- return (KeyResolverSpi) this._internalKeyResolvers.get(i);
+ return this._internalKeyResolvers.get(i);
}
/** Field _storageResolvers */
- List _storageResolvers = nullList;
+ List<StorageResolver> _storageResolvers = nullList;
/**
* Method addStorageResolver
@@ -1057,7 +1057,7 @@ public class KeyInfo extends SignatureElementProxy {
*/
public void addStorageResolver(StorageResolver storageResolver) {
if (_storageResolvers == nullList ){
- _storageResolvers=new ArrayList();
+ _storageResolvers=new ArrayList<StorageResolver>();
}
this._storageResolvers.add(storageResolver);
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java
index 1da9dbb..a10cb41 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java
@@ -52,7 +52,7 @@ public class KeyResolver {
static boolean _alreadyInitialized = false;
/** Field _resolverVector */
- static List _resolverVector = null;
+ static List<KeyResolver> _resolverVector = null;
/** Field _resolverSpi */
protected KeyResolverSpi _resolverSpi = null;
@@ -85,12 +85,12 @@ public class KeyResolver {
return KeyResolver._resolverVector.size();
}
- public static void hit(Iterator hintI) {
+ public static void hit(Iterator<KeyResolverSpi> hintI) {
ResolverIterator hint = (ResolverIterator) hintI;
int i = hint.i;
if (i!=1 && hint.res ==_resolverVector) {
- List resolverVector=(List)((ArrayList)_resolverVector).clone();
- Object ob=resolverVector.remove(i-1);
+ List<KeyResolver> resolverVector=getResolverVectorClone();
+ KeyResolver ob=resolverVector.remove(i-1);
resolverVector.add(0,ob);
_resolverVector=resolverVector;
} else {
@@ -113,12 +113,9 @@ public class KeyResolver {
throws KeyResolverException {
// use the old vector to not be hit by updates
- List resolverVector = KeyResolver._resolverVector;
- for (int i = 0; i < resolverVector.size(); i++) {
- KeyResolver resolver=
- (KeyResolver) resolverVector.get(i);
-
- if (resolver==null) {
+ List<KeyResolver> resolverVector = KeyResolver._resolverVector;
+ for (KeyResolver resolver : resolverVector) {
+ if (resolver==null) {
Object exArgs[] = {
(((element != null)
&& (element.getNodeType() == Node.ELEMENT_NODE))
@@ -157,10 +154,8 @@ public class KeyResolver {
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
- List resolverVector = KeyResolver._resolverVector;
- for (int i = 0; i < resolverVector.size(); i++) {
- KeyResolver resolver=
- (KeyResolver) resolverVector.get(i);
+ List<KeyResolver> resolverVector = KeyResolver._resolverVector;
+ for (KeyResolver resolver : resolverVector) {
if (resolver==null) {
Object exArgs[] = {
@@ -176,11 +171,11 @@ public class KeyResolver {
PublicKey cert=resolver.resolvePublicKey(element, BaseURI, storage);
if (cert!=null) {
- if (i!=0 && resolverVector==_resolverVector) {
+ if (resolverVector.indexOf(resolver)!=0 && resolverVector==_resolverVector) {
//update resolver.
- resolverVector=(List)((ArrayList)_resolverVector).clone();
- Object ob=resolverVector.remove(i);
- resolverVector.add(0,ob);
+ resolverVector=getResolverVectorClone();
+ resolverVector.remove(resolver);
+ resolverVector.add(0,resolver);
_resolverVector=resolverVector;
}
return cert;
@@ -195,13 +190,19 @@ public class KeyResolver {
throw new KeyResolverException("utils.resolver.noClass", exArgs);
}
+
+ @SuppressWarnings("unchecked")
+ private static List<KeyResolver> getResolverVectorClone() {
+ return (List<KeyResolver>)((ArrayList<KeyResolver>)_resolverVector).clone();
+ }
+
/**
* The init() function is called by com.sun.org.apache.xml.internal.security.Init.init()
*/
public static void init() {
if (!KeyResolver._alreadyInitialized) {
- KeyResolver._resolverVector = new ArrayList(10);
+ KeyResolver._resolverVector = new ArrayList<KeyResolver>(10);
_alreadyInitialized = true;
}
}
@@ -230,8 +231,8 @@ public class KeyResolver {
*
* @param className
*/
- public static void registerAtStart(String className) {
- KeyResolver._resolverVector.add(0, className);
+ public static void registerAtStart(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+ register(className);
}
/**
@@ -322,11 +323,11 @@ public class KeyResolver {
return this._resolverSpi.getClass().getName();
}
- static class ResolverIterator implements Iterator {
- List res;
- Iterator it;
+ static class ResolverIterator implements Iterator<KeyResolverSpi> {
+ List<KeyResolver> res;
+ Iterator<KeyResolver> it;
int i;
- public ResolverIterator(List list) {
+ public ResolverIterator(List<KeyResolver> list) {
res = list;
it = res.iterator();
}
@@ -335,9 +336,9 @@ public class KeyResolver {
return it.hasNext();
}
- public Object next() {
+ public KeyResolverSpi next() {
i++;
- KeyResolver resolver = (KeyResolver) it.next();
+ KeyResolver resolver = it.next();
if (resolver==null) {
throw new RuntimeException("utils.resolver.noClass");
}
@@ -351,7 +352,7 @@ public class KeyResolver {
}
};
- public static Iterator iterator() {
+ public static Iterator<KeyResolverSpi> iterator() {
return new ResolverIterator(_resolverVector);
}
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java
index dc2865b..3e5c82c 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
/**
* This class is abstract class for a child KeyInfo Elemnet.
*
- * If you want the your KeyResolver, at firstly you must extand this class, and register
+ * If you want your KeyResolver, at first you must extend this class, and register
* as following in config.xml
* <PRE>
* <KeyResolver URI="http://www.w3.org/2000/09/xmldsig#KeyValue"
@@ -177,7 +177,7 @@ public abstract class KeyResolverSpi {
}
/** Field _properties */
- protected java.util.Map _properties = null;
+ protected java.util.Map<String,String> _properties = null;
protected boolean globalResolver=false;
@@ -189,7 +189,7 @@ public abstract class KeyResolverSpi {
*/
public void engineSetProperty(String key, String value) {
if (_properties==null)
- _properties=new HashMap();
+ _properties=new HashMap<String,String>();
this._properties.put(key, value);
}
@@ -203,7 +203,7 @@ public abstract class KeyResolverSpi {
if (_properties==null)
return null;
- return (String) this._properties.get(key);
+ return this._properties.get(key);
}
/**
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
index 3dff218..8067442 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
@@ -278,18 +278,18 @@ public class RetrievalMethodResolver extends KeyResolverSpi {
return null;
}
- static Element getDocumentElement(Set set) {
- Iterator it=set.iterator();
+ static Element getDocumentElement(Set<Node> set) {
+ Iterator<Node> it=set.iterator();
Element e=null;
while (it.hasNext()) {
- Node currentNode=(Node)it.next();
+ Node currentNode=it.next();
if (currentNode instanceof Element) {
e=(Element)currentNode;
break;
}
}
- List parents=new ArrayList(10);
+ List<Element> parents=new ArrayList<Element>(10);
//Obtain all the parents of the elemnt
do {
@@ -301,10 +301,10 @@ public class RetrievalMethodResolver extends KeyResolverSpi {
e=(Element)n;
} while (e!=null);
//Visit them in reverse order.
- ListIterator it2=parents.listIterator(parents.size()-1);
+ ListIterator<Element> it2=parents.listIterator(parents.size()-1);
Element ele=null;
while (it2.hasPrevious()) {
- ele=(Element)it2.previous();
+ ele=it2.previous();
if (set.contains(ele)) {
return ele;
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java
index f1a8dd3..7b11e84 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java
@@ -42,10 +42,10 @@ public class StorageResolver {
java.util.logging.Logger.getLogger(StorageResolver.class.getName());
/** Field _storageResolvers */
- List _storageResolvers = null;
+ List<Object> _storageResolvers = null;
/** Field _iterator */
- Iterator _iterator = null;
+ Iterator<Object> _iterator = null;
/**
* Constructor StorageResolver
@@ -69,7 +69,7 @@ public class StorageResolver {
*/
public void add(StorageResolverSpi resolver) {
if (_storageResolvers==null)
- _storageResolvers=new ArrayList();
+ _storageResolvers=new ArrayList<Object>();
this._storageResolvers.add(resolver);
this._iterator = null;
@@ -121,11 +121,11 @@ public class StorageResolver {
* @return the iterator for the resolvers.
*
*/
- public Iterator getIterator() {
+ public Iterator<Object> getIterator() {
if (this._iterator == null) {
if (_storageResolvers==null)
- _storageResolvers=new ArrayList();
+ _storageResolvers=new ArrayList<Object>();
this._iterator = new StorageResolverIterator(this._storageResolvers.iterator());
}
@@ -141,7 +141,7 @@ public class StorageResolver {
if (this._iterator == null) {
if (_storageResolvers==null)
- _storageResolvers=new ArrayList();
+ _storageResolvers=new ArrayList<Object>();
this._iterator = new StorageResolverIterator(this._storageResolvers.iterator());
}
@@ -163,17 +163,17 @@ public class StorageResolver {
* @author $Author: mullan $
* @version $Revision: 1.5 $
*/
- static class StorageResolverIterator implements Iterator {
+ static class StorageResolverIterator implements Iterator<Object> {
/** Field _resolvers */
- Iterator _resolvers = null;
+ Iterator<Object> _resolvers = null;
/**
* Constructor FilesystemIterator
*
* @param resolvers
*/
- public StorageResolverIterator(Iterator resolvers) {
+ public StorageResolverIterator(Iterator<Object> resolvers) {
this._resolvers = resolvers;
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java
index 25f3e28..0721125 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java
@@ -36,5 +36,5 @@ public abstract class StorageResolverSpi {
*
* @return the iterator for the storage
*/
- public abstract Iterator getIterator();
+ public abstract Iterator<?> getIterator();
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
index 06fb569..3b38e4a 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
@@ -54,10 +54,10 @@ public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
String _merlinsCertificatesDir = null;
/** Field _certs */
- private List _certs = new ArrayList();
+ private List<X509Certificate> _certs = new ArrayList<X509Certificate>();
/** Field _iterator */
- Iterator _iterator = null;
+ Iterator<X509Certificate> _iterator = null;
/**
*
@@ -83,7 +83,7 @@ public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
private void readCertsFromHarddrive() throws StorageResolverException {
File certDir = new File(this._merlinsCertificatesDir);
- ArrayList al = new ArrayList();
+ ArrayList<String> al = new ArrayList<String>();
String[] names = certDir.list();
for (int i = 0; i < names.length; i++) {
@@ -108,7 +108,7 @@ public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
for (int i = 0; i < al.size(); i++) {
String filename = certDir.getAbsolutePath() + File.separator
- + (String) al.get(i);
+ + al.get(i);
File file = new File(filename);
boolean added = false;
String dn = null;
@@ -146,7 +146,7 @@ public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
}
/** @inheritDoc */
- public Iterator getIterator() {
+ public Iterator<X509Certificate> getIterator() {
return this._iterator;
}
@@ -156,10 +156,10 @@ public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
* @author $Author: mullan $
* @version $Revision: 1.5 $
*/
- private static class FilesystemIterator implements Iterator {
+ private static class FilesystemIterator implements Iterator<X509Certificate> {
/** Field _certs */
- List _certs = null;
+ List<X509Certificate> _certs = null;
/** Field _i */
int _i;
@@ -169,7 +169,7 @@ public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
*
* @param certs
*/
- public FilesystemIterator(List certs) {
+ public FilesystemIterator(List<X509Certificate> certs) {
this._certs = certs;
this._i = 0;
}
@@ -180,7 +180,7 @@ public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
}
/** @inheritDoc */
- public Object next() {
+ public X509Certificate next() {
return this._certs.get(this._i++);
}
@@ -206,8 +206,8 @@ public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
new CertsInFilesystemDirectoryResolver(
"data/ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/certs");
- for (Iterator i = krs.getIterator(); i.hasNext(); ) {
- X509Certificate cert = (X509Certificate) i.next();
+ for (Iterator<X509Certificate> i = krs.getIterator(); i.hasNext(); ) {
+ X509Certificate cert = i.next();
byte[] ski =
com.sun.org.apache.xml.internal.security.keys.content.x509.XMLX509SKI
.getSKIBytesFromCert(cert);
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java
index 1863243..2a56621 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java
@@ -42,7 +42,7 @@ public class KeyStoreResolver extends StorageResolverSpi {
KeyStore _keyStore = null;
/** Field _iterator */
- Iterator _iterator = null;
+ Iterator<X509Certificate> _iterator = null;
/**
* Constructor KeyStoreResolver
@@ -56,7 +56,7 @@ public class KeyStoreResolver extends StorageResolverSpi {
}
/** @inheritDoc */
- public Iterator getIterator() {
+ public Iterator<X509Certificate> getIterator() {
return this._iterator;
}
@@ -66,13 +66,13 @@ public class KeyStoreResolver extends StorageResolverSpi {
* @author $Author: mullan $
* @version $Revision: 1.5 $
*/
- static class KeyStoreIterator implements Iterator {
+ static class KeyStoreIterator implements Iterator<X509Certificate> {
/** Field _keyStore */
KeyStore _keyStore = null;
/** Field _aliases */
- Enumeration _aliases = null;
+ Enumeration<String> _aliases = null;
/**
* Constructor KeyStoreIterator
@@ -97,12 +97,13 @@ public class KeyStoreResolver extends StorageResolverSpi {
}
/** @inheritDoc */
- public Object next() {
+ @SuppressWarnings("unchecked")
+ public X509Certificate next() {
- String alias = (String) this._aliases.nextElement();
+ String alias = this._aliases.nextElement();
try {
- return this._keyStore.getCertificate(alias);
+ return (X509Certificate)this._keyStore.getCertificate(alias);
} catch (KeyStoreException ex) {
return null;
}
@@ -135,8 +136,8 @@ public class KeyStoreResolver extends StorageResolverSpi {
KeyStoreResolver krs = new KeyStoreResolver(ks);
- for (Iterator i = krs.getIterator(); i.hasNext(); ) {
- X509Certificate cert = (X509Certificate) i.next();
+ for (Iterator<X509Certificate> i = krs.getIterator(); i.hasNext(); ) {
+ X509Certificate cert = i.next();
byte[] ski =
com.sun.org.apache.xml.internal.security.keys.content.x509.XMLX509SKI
.getSKIBytesFromCert(cert);
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java
index 7e61b2a..3048bb1 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java
@@ -38,7 +38,7 @@ public class SingleCertificateResolver extends StorageResolverSpi {
X509Certificate _certificate = null;
/** Field _iterator */
- Iterator _iterator = null;
+ Iterator<X509Certificate> _iterator = null;
/**
*
@@ -51,7 +51,7 @@ public class SingleCertificateResolver extends StorageResolverSpi {
}
/** @inheritDoc */
- public Iterator getIterator() {
+ public Iterator<X509Certificate> getIterator() {
return this._iterator;
}
@@ -61,7 +61,7 @@ public class SingleCertificateResolver extends StorageResolverSpi {
* @author $Author: mullan $
* @version $Revision: 1.5 $
*/
- static class InternalIterator implements Iterator {
+ static class InternalIterator implements Iterator<X509Certificate> {
/** Field _alreadyReturned */
boolean _alreadyReturned = false;
@@ -84,7 +84,7 @@ public class SingleCertificateResolver extends StorageResolverSpi {
}
/** @inheritDoc */
- public Object next() {
+ public X509Certificate next() {
this._alreadyReturned = true;
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java
index 97ea751..440a012 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java
@@ -28,6 +28,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
@@ -62,17 +63,17 @@ public class Manifest extends SignatureElementProxy {
java.util.logging.Logger.getLogger(Manifest.class.getName());
/** Field _references */
- List _references;
+ List<Reference> _references;
Element[] _referencesEl;
/** Field verificationResults[] */
private boolean verificationResults[] = null;
/** Field _resolverProperties */
- HashMap _resolverProperties = null;
+ Map<String,String> _resolverProperties = null;
/** Field _perManifestResolvers */
- List _perManifestResolvers = null;
+ List<ResourceResolver> _perManifestResolvers = null;
/**
* Consturts {@link Manifest}
@@ -85,7 +86,7 @@ public class Manifest extends SignatureElementProxy {
XMLUtils.addReturnToElement(this._constructionElement);
- this._references = new ArrayList();
+ this._references = new ArrayList<Reference>();
}
/**
@@ -117,7 +118,7 @@ public class Manifest extends SignatureElementProxy {
}
// create Vector
- this._references = new ArrayList(le);
+ this._references = new ArrayList<Reference>(le);
for (int i = 0; i < le; i++) {
this._references.add(null);
@@ -175,7 +176,7 @@ public class Manifest extends SignatureElementProxy {
for (int i = 0; i < this.getLength(); i++) {
// update the cached Reference object, the Element content is automatically updated
- Reference currentRef = (Reference) this._references.get(i);
+ Reference currentRef = this._references.get(i);
currentRef.generateDigestValue();
}
@@ -208,7 +209,7 @@ public class Manifest extends SignatureElementProxy {
this._references.set(i, ref);
}
- return (Reference) this._references.get(i);
+ return this._references.get(i);
}
@@ -323,12 +324,12 @@ public class Manifest extends SignatureElementProxy {
try {
XMLSignatureInput signedManifestNodes =
currentRef.dereferenceURIandPerformTransforms(null);
- Set nl = signedManifestNodes.getNodeSet();
+ Set<Node> nl = signedManifestNodes.getNodeSet();
Manifest referencedManifest = null;
- Iterator nlIterator = nl.iterator();
+ Iterator<Node> nlIterator = nl.iterator();
findManifest: while (nlIterator.hasNext()) {
- Node n = (Node) nlIterator.next();
+ Node n = nlIterator.next();
if ((n.getNodeType() == Node.ELEMENT_NODE) && ((Element) n)
.getNamespaceURI()
@@ -449,7 +450,7 @@ public class Manifest extends SignatureElementProxy {
return;
}
if (_perManifestResolvers==null)
- _perManifestResolvers = new ArrayList();
+ _perManifestResolvers = new ArrayList<ResourceResolver>();
this._perManifestResolvers.add(resolver);
}
@@ -465,7 +466,7 @@ public class Manifest extends SignatureElementProxy {
return;
}
if (_perManifestResolvers==null)
- _perManifestResolvers = new ArrayList();
+ _perManifestResolvers = new ArrayList<ResourceResolver>();
this._perManifestResolvers.add(new ResourceResolver(resolverSpi));
}
@@ -479,7 +480,7 @@ public class Manifest extends SignatureElementProxy {
*/
public void setResolverProperty(String key, String value) {
if (_resolverProperties==null) {
- _resolverProperties=new HashMap(10);
+ _resolverProperties=new HashMap<String, String>(10);
}
this._resolverProperties.put(key, value);
}
@@ -491,7 +492,7 @@ public class Manifest extends SignatureElementProxy {
* @return the value
*/
public String getResolverProperty(String key) {
- return (String) this._resolverProperties.get(key);
+ return this._resolverProperties.get(key);
}
/**
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java
index ed2c568..8e29839 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java
@@ -436,6 +436,7 @@ private Element digestValueElement;
*
* @deprecated use getContentsBeforeTransformation
*/
+ @Deprecated
public XMLSignatureInput getTransformsInput() throws ReferenceNotInitializedException
{
XMLSignatureInput input=getContentsBeforeTransformation();
@@ -557,7 +558,7 @@ private Element digestValueElement;
try {
XMLSignatureInput nodes = this.getNodesetBeforeFirstCanonicalization();
- Set inclusiveNamespaces = new HashSet();
+ Set<String> inclusiveNamespaces = new HashSet<String>();
{
Transforms transforms = this.getTransforms();
@@ -710,7 +711,7 @@ private Element digestValueElement;
XMLSignatureInput output=this.dereferenceURIandPerformTransforms(os);
// if signing and c14n11 property == true explicitly add
// C14N11 transform if needed
- if (this.useC14N11 && !validating &&
+ if (Reference.useC14N11 && !validating &&
!output.isOutputStreamSet() && !output.isOctetStream()) {
if (transforms == null) {
transforms = new Transforms(this._doc);
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java
index e02e889..2ba9e25 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java
@@ -74,7 +74,7 @@ public class XMLSignatureInput implements Cloneable {
/**
* The original NodeSet for this XMLSignatureInput
*/
- Set _inputNodeSet = null;
+ Set<Node> _inputNodeSet = null;
/**
* The original Element
*/
@@ -107,7 +107,7 @@ public class XMLSignatureInput implements Cloneable {
/**
* Node Filter list.
*/
- List nodeFilters=new ArrayList();
+ List<NodeFilter> nodeFilters=new ArrayList<NodeFilter>();
boolean needsToBeExpanded=false;
OutputStream outputStream=null;
@@ -164,6 +164,7 @@ public class XMLSignatureInput implements Cloneable {
* @deprecated
* @param inputStr the input String which including XML document or node
*/
+ @Deprecated
public XMLSignatureInput(String inputStr) {
this(inputStr.getBytes());
}
@@ -179,6 +180,7 @@ public class XMLSignatureInput implements Cloneable {
* @param encoding the encoding of <code>inputStr</code>
* @throws UnsupportedEncodingException
*/
+ @Deprecated
public XMLSignatureInput(String inputStr, String encoding)
throws UnsupportedEncodingException {
this(inputStr.getBytes(encoding));
@@ -201,7 +203,7 @@ public class XMLSignatureInput implements Cloneable {
* @param inputNodeSet
* @param usedXPathAPI
*/
- public XMLSignatureInput(Set inputNodeSet) {
+ public XMLSignatureInput(Set<Node> inputNodeSet) {
this._inputNodeSet = inputNodeSet;
}
@@ -215,7 +217,7 @@ public class XMLSignatureInput implements Cloneable {
* @throws ParserConfigurationException
* @throws CanonicalizationException
*/
- public Set getNodeSet() throws CanonicalizationException,
+ public Set<Node> getNodeSet() throws CanonicalizationException,
ParserConfigurationException, IOException, SAXException {
return getNodeSet(false);
}
@@ -231,7 +233,7 @@ public class XMLSignatureInput implements Cloneable {
* @throws ParserConfigurationException
* @throws CanonicalizationException
*/
- public Set getNodeSet(boolean circumvent)
+ public Set<Node> getNodeSet(boolean circumvent)
throws ParserConfigurationException, IOException, SAXException,
CanonicalizationException {
if (this._inputNodeSet!=null) {
@@ -242,13 +244,13 @@ public class XMLSignatureInput implements Cloneable {
if (circumvent) {
XMLUtils.circumventBug2650(XMLUtils.getOwnerDocument(_subNode));
}
- this._inputNodeSet = new HashSet();
+ this._inputNodeSet = new HashSet<Node>();
XMLUtils.getSet(_subNode,this._inputNodeSet, excludeNode, this.excludeComments);
return this._inputNodeSet;
} else if (this.isOctetStream()) {
convertToNodes();
- HashSet result=new HashSet();
+ HashSet<Node> result=new HashSet<Node>();
XMLUtils.getSet(_subNode, result,null,false);
//this._inputNodeSet=result;
return result;
@@ -447,7 +449,7 @@ public class XMLSignatureInput implements Cloneable {
* @throws XMLSignatureException
* @return The HTML representation for this XMLSignature
*/
- public String getHTMLRepresentation(Set inclusiveNamespaces)
+ public String getHTMLRepresentation(Set<String> inclusiveNamespaces)
throws XMLSignatureException {
XMLSignatureInputDebugger db = new XMLSignatureInputDebugger( this,
@@ -584,7 +586,7 @@ public class XMLSignatureInput implements Cloneable {
/**
* @return the node filters
*/
- public List getNodeFilters() {
+ public List<NodeFilter> getNodeFilters() {
// TODO Auto-generated method stub
return nodeFilters;
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java
index 8fe1ca3..3186ef4 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java
@@ -47,9 +47,9 @@ public class XMLSignatureInputDebugger {
/** Field _xmlSignatureInput */
- private Set _xpathNodeSet;
+ private Set<Node> _xpathNodeSet;
- private Set _inclusiveNamespaces;
+ private Set<String> _inclusiveNamespaces;
/** Field _doc */
private Document _doc = null;
@@ -159,7 +159,7 @@ public class XMLSignatureInputDebugger {
* @param inclusiveNamespace
*/
public XMLSignatureInputDebugger(
- XMLSignatureInput xmlSignatureInput, Set inclusiveNamespace) {
+ XMLSignatureInput xmlSignatureInput, Set<String> inclusiveNamespace) {
this(xmlSignatureInput);
@@ -182,7 +182,7 @@ public class XMLSignatureInputDebugger {
{
// get only a single node as anchor to fetch the owner document
- Node n = (Node) this._xpathNodeSet.iterator().next();
+ Node n = this._xpathNodeSet.iterator().next();
this._doc = XMLUtils.getOwnerDocument(n);
}
@@ -341,10 +341,10 @@ public class XMLSignatureInputDebugger {
// we output all Attrs which are available
NamedNodeMap attrs = currentElement.getAttributes();
int attrsLength = attrs.getLength();
- Object attrs2[] = new Object[attrsLength];
+ Attr attrs2[] = new Attr[attrsLength];
for (int i = 0; i < attrsLength; i++) {
- attrs2[i] = attrs.item(i);
+ attrs2[i] = (Attr)attrs.item(i);
}
Arrays.sort(attrs2, ATTR_COMPARE);
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java
index 7471313..7e1a519 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.HashMap;
+import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
@@ -65,9 +66,9 @@ public final class Transform extends SignatureElementProxy {
private static boolean alreadyInitialized = false;
/** All available Transform classes are registered here */
- private static HashMap transformClassHash = null;
+ private static Map<String, Class<?>> transformClassHash = null;
- private static HashMap transformSpiHash = new HashMap();
+ private static Map<String, TransformSpi> transformSpiHash = new HashMap<String, TransformSpi>();
private TransformSpi transformSpi = null;
@@ -209,7 +210,7 @@ public final class Transform extends SignatureElementProxy {
*/
public static void init() {
if (!alreadyInitialized) {
- transformClassHash = new HashMap(10);
+ transformClassHash = new HashMap<String,Class<?>>(10);
// make sure builtin algorithms are all registered first
com.sun.org.apache.xml.internal.security.Init.init();
alreadyInitialized = true;
@@ -231,7 +232,7 @@ public final class Transform extends SignatureElementProxy {
throws AlgorithmAlreadyRegisteredException {
// are we already registered?
- Class registeredClass = getImplementingClass(algorithmURI);
+ Class<? extends TransformSpi> registeredClass = getImplementingClass(algorithmURI);
if ((registeredClass != null) ) {
Object exArgs[] = { algorithmURI, registeredClass };
throw new AlgorithmAlreadyRegisteredException(
@@ -331,20 +332,21 @@ public final class Transform extends SignatureElementProxy {
* @param URI
* @return The name of the class implementing the URI.
*/
- private static Class getImplementingClass(String URI) {
- return (Class) transformClassHash.get(URI);
+ @SuppressWarnings("unchecked")
+ private static Class<? extends TransformSpi> getImplementingClass(String URI) {
+ return (Class<? extends TransformSpi>)transformClassHash.get(URI);
}
private static TransformSpi getTransformSpi(String URI)
throws InvalidTransformException {
try {
- Object value = transformSpiHash.get(URI);
+ TransformSpi value = transformSpiHash.get(URI);
if (value != null) {
- return (TransformSpi) value;
+ return value;
}
- Class cl = (Class) transformClassHash.get(URI);
+ Class<? extends TransformSpi> cl = getImplementingClass(URI);
if (cl != null) {
- TransformSpi tr = (TransformSpi) cl.newInstance();
+ TransformSpi tr = cl.newInstance();
transformSpiHash.put(URI, tr);
return tr;
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java
index 11cc8df..35aa9ff 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java
@@ -41,6 +41,7 @@ public abstract class TransformSpi {
* For API compatibility not thread safe.
* @deprecated
*/
+ @Deprecated
protected Transform _transformObject = null;
/**
* Set the transform object.
@@ -48,6 +49,7 @@ public abstract class TransformSpi {
* @param transform the Transform
* @deprecated
*/
+ @Deprecated
protected void setTransform(Transform transform) {
this._transformObject = transform;
}
@@ -120,6 +122,7 @@ public abstract class TransformSpi {
* @throws SAXException
* @throws TransformationException
*/
+ @Deprecated
protected XMLSignatureInput enginePerformTransform(
XMLSignatureInput input)
throws IOException,
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java
index 8f9766e..15c1b57 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java
@@ -154,6 +154,7 @@ public class FuncHere extends Function {
* @param vars
* @param globalsSize
*/
+ @SuppressWarnings("rawtypes")
public void fixupVariables(java.util.Vector vars, int globalsSize) {
// do nothing
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java
index 4f0f1bb..d58453c 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java
@@ -96,9 +96,9 @@ public class TransformXPath2Filter extends TransformSpi {
throws TransformationException {
CachedXPathAPIHolder.setDoc(_transformObject.getElement().getOwnerDocument());
try {
- List unionNodes=new ArrayList();
- List substractNodes=new ArrayList();
- List intersectNodes=new ArrayList();
+ List<NodeList> unionNodes=new ArrayList<NodeList>();
+ List<NodeList> substractNodes=new ArrayList<NodeList>();
+ List<NodeList> intersectNodes=new ArrayList<NodeList>();
CachedXPathFuncHereAPI xPathFuncHereAPI =
new CachedXPathFuncHereAPI(CachedXPathAPIHolder.getCachedXPathAPI());
@@ -170,18 +170,15 @@ public class TransformXPath2Filter extends TransformSpi {
throw new TransformationException("empty", ex);
}
}
- static Set convertNodeListToSet(List l){
- Set result=new HashSet();
- for (int j=0;j<l.size();j++) {
- NodeList rootNodes=(NodeList) l.get(j);
- int length = rootNodes.getLength();
+ static Set<Node> convertNodeListToSet(List<NodeList> l){
+ Set<Node> result=new HashSet<Node>();
+ for (NodeList rootNodes : l) {
+ int length = rootNodes.getLength();
for (int i = 0; i < length; i++) {
Node rootNode = rootNodes.item(i);
result.add(rootNode);
-
}
-
}
return result;
}
@@ -191,8 +188,8 @@ class XPath2NodeFilter implements NodeFilter {
boolean hasUnionNodes;
boolean hasSubstractNodes;
boolean hasIntersectNodes;
- XPath2NodeFilter(Set unionNodes, Set substractNodes,
- Set intersectNodes) {
+ XPath2NodeFilter(Set<Node> unionNodes, Set<Node> substractNodes,
+ Set<Node> intersectNodes) {
this.unionNodes=unionNodes;
hasUnionNodes=!unionNodes.isEmpty();
this.substractNodes=substractNodes;
@@ -200,9 +197,9 @@ class XPath2NodeFilter implements NodeFilter {
this.intersectNodes=intersectNodes;
hasIntersectNodes=!intersectNodes.isEmpty();
}
- Set unionNodes;
- Set substractNodes;
- Set intersectNodes;
+ Set<Node> unionNodes;
+ Set<Node> substractNodes;
+ Set<Node> intersectNodes;
/**
@@ -282,16 +279,15 @@ class XPath2NodeFilter implements NodeFilter {
*
* @return if rooted bye the rootnodes
*/
- static boolean rooted(Node currentNode, Set nodeList ) {
+ static boolean rooted(Node currentNode, Set<Node> nodeList ) {
if (nodeList.contains(currentNode)) {
return true;
}
- Iterator it=nodeList.iterator();
- while (it.hasNext()) {
- Node rootNode = (Node) it.next();
- if (XMLUtils.isDescendantOrSelf(rootNode,currentNode)) {
- return true;
- }
+
+ for(Node rootNode : nodeList) {
+ if (XMLUtils.isDescendantOrSelf(rootNode,currentNode)) {
+ return true;
+ }
}
return false;
}
@@ -303,7 +299,7 @@ class XPath2NodeFilter implements NodeFilter {
*
* @return if rooted bye the rootnodes
*/
- static boolean inList(Node currentNode, Set nodeList ) {
+ static boolean inList(Node currentNode, Set<Node> nodeList ) {
return nodeList.contains(currentNode);
}
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java
index 13da913..8ff4b9f 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java
@@ -62,14 +62,6 @@ public class TransformXSLT extends TransformSpi {
static final String defaultXSLTSpecNSprefix = "xslt";
static final String XSLTSTYLESHEET = "stylesheet";
- // check for secure processing feature
- private static Class xClass = null;
- static {
- try {
- xClass = Class.forName("javax.xml.XMLConstants");
- } catch (Exception e) {}
- }
-
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(
TransformXSLT.class.getName());
@@ -101,10 +93,6 @@ public class TransformXSLT extends TransformSpi {
protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream baos, Transform _transformObject)
throws IOException,
TransformationException {
- if (xClass == null) {
- Object exArgs[] = { "SECURE_PROCESSING_FEATURE not supported" };
- throw new TransformationException("generic.EmptyMessage", exArgs);
- }
try {
Element transformElement = _transformObject.getElement();
@@ -119,11 +107,9 @@ public class TransformXSLT extends TransformSpi {
}
TransformerFactory tFactory = TransformerFactory.newInstance();
- Class c = tFactory.getClass();
- Method m = c.getMethod("setFeature", new Class[] {String.class, boolean.class});
- // Process XSLT stylesheets in a secure manner
- m.invoke(tFactory, new Object[] {"http://javax.xml.XMLConstants/feature/secure-processing", Boolean.TRUE});
+ // Process XSLT stylesheets in a secure manner
+ tFactory.setFeature("http://javax.xml.XMLConstants/feature/secure-processing", Boolean.TRUE);
/*
* This transform requires an octet stream as input. If the actual
* input is an XPath node-set, then the signature application should
@@ -193,18 +179,6 @@ public class TransformXSLT extends TransformSpi {
Object exArgs[] = { ex.getMessage() };
throw new TransformationException("generic.EmptyMessage", exArgs, ex);
- } catch (NoSuchMethodException ex) {
- Object exArgs[] = { ex.getMessage() };
-
- throw new TransformationException("generic.EmptyMessage", exArgs, ex);
- } catch (IllegalAccessException ex) {
- Object exArgs[] = { ex.getMessage() };
-
- throw new TransformationException("generic.EmptyMessage", exArgs, ex);
- } catch (java.lang.reflect.InvocationTargetException ex) {
- Object exArgs[] = { ex.getMessage() };
-
- throw new TransformationException("generic.EmptyMessage", exArgs, ex);
}
}
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
index c953869..f615881 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
@@ -74,19 +74,16 @@ public class InclusiveNamespaces extends ElementProxy
* @param doc
* @param prefixes
*/
- public InclusiveNamespaces(Document doc, Set prefixes) {
+ public InclusiveNamespaces(Document doc, Set<String> prefixes) {
super(doc);
StringBuffer sb = new StringBuffer();
- SortedSet prefixList = new TreeSet(prefixes);
+ SortedSet<String> prefixList = new TreeSet<String>(prefixes);
- Iterator it = prefixList.iterator();
-
- while (it.hasNext()) {
- String prefix = (String) it.next();
+ for (String prefix : prefixList) {
if (prefix.equals("xmlns")) {
sb.append("#default ");
} else {
@@ -138,9 +135,9 @@ public class InclusiveNamespaces extends ElementProxy
* @param inclusiveNamespaces
* @return A set to string
*/
- public static SortedSet prefixStr2Set(String inclusiveNamespaces) {
+ public static SortedSet<String> prefixStr2Set(String inclusiveNamespaces) {
- SortedSet prefixes = new TreeSet();
+ SortedSet<String> prefixes = new TreeSet<String>();
if ((inclusiveNamespaces == null)
|| (inclusiveNamespaces.length() == 0)) {
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java
index fa32270..0a7503a 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java
@@ -28,8 +28,8 @@ import org.w3c.dom.Document;
*/
public class CachedXPathAPIHolder {
- static ThreadLocal local=new ThreadLocal();
- static ThreadLocal localDoc=new ThreadLocal();
+ static ThreadLocal<CachedXPathAPI> local=new ThreadLocal<CachedXPathAPI>();
+ static ThreadLocal<Document> localDoc=new ThreadLocal<Document>();
/**
* Sets the doc for the xpath transformation. Resets the cache if needed
@@ -37,7 +37,7 @@ public class CachedXPathAPIHolder {
*/
public static void setDoc(Document doc) {
if (localDoc.get()!=doc) {
- CachedXPathAPI cx=(CachedXPathAPI)local.get();
+ CachedXPathAPI cx=local.get();
if (cx==null) {
cx=new CachedXPathAPI();
local.set(cx);
@@ -54,7 +54,7 @@ public class CachedXPathAPIHolder {
* @return the cachexpathapi for this thread
*/
public static CachedXPathAPI getCachedXPathAPI() {
- CachedXPathAPI cx=(CachedXPathAPI)local.get();
+ CachedXPathAPI cx=local.get();
if (cx==null) {
cx=new CachedXPathAPI();
local.set(cx);
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathFuncHereAPI.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathFuncHereAPI.java
index cd19e5f..fe1ae84 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathFuncHereAPI.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathFuncHereAPI.java
@@ -173,6 +173,7 @@ public class CachedXPathFuncHereAPI {
* @throws TransformerException
* @deprecated
*/
+ @Deprecated
public NodeIterator selectNodeIterator(
Node contextNode, Node xpathnode, Node namespaceNode)
throws TransformerException {
@@ -195,6 +196,7 @@ public class CachedXPathFuncHereAPI {
* @throws TransformerException
* @deprecated
*/
+ @Deprecated
public NodeList selectNodeList(Node contextNode, Node xpathnode)
throws TransformerException {
return selectNodeList(contextNode, xpathnode, getStrFromNode(xpathnode), contextNode);
@@ -239,6 +241,7 @@ public class CachedXPathFuncHereAPI {
* @throws TransformerException
* @deprecated
*/
+ @Deprecated
public XObject eval(Node contextNode, Node xpathnode)
throws TransformerException {
return eval(contextNode, xpathnode, getStrFromNode(xpathnode),contextNode);
@@ -375,12 +378,12 @@ public class CachedXPathFuncHereAPI {
private XPath createXPath(String str, PrefixResolver prefixResolver) throws TransformerException {
XPath xpath = null;
- Class[] classes = new Class[]{String.class, SourceLocator.class, PrefixResolver.class, int.class,
+ Class<?>[] classes = new Class<?>[]{String.class, SourceLocator.class, PrefixResolver.class, int.class,
ErrorListener.class, FunctionTable.class};
Object[] objects = new Object[]{str, null, prefixResolver, new Integer(XPath.SELECT), null, _funcTable};
try {
- Constructor constructor = XPath.class.getConstructor(classes);
- xpath = (XPath) constructor.newInstance(objects);
+ Constructor<XPath> constructor = XPath.class.getConstructor(classes);
+ xpath = constructor.newInstance(objects);
} catch (Throwable t) {
}
if (xpath == null) {
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java
index 4a344b9..f44c76c 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java
@@ -24,6 +24,7 @@ package com.sun.org.apache.xml.internal.security.utils;
import java.math.BigInteger;
import java.util.HashMap;
+import java.util.Map;
import com.sun.org.apache.xml.internal.security.exceptions.Base64DecodingException;
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
@@ -370,6 +371,7 @@ public abstract class ElementProxy {
* @return the bytes
* @throws XMLSecurityException
*/
+ @Deprecated
public byte[] getBytesFromChildElement(String localname, String namespace)
throws XMLSecurityException {
@@ -392,14 +394,12 @@ public abstract class ElementProxy {
*/
public String getTextFromChildElement(String localname, String namespace) {
- Text t =
- (Text) XMLUtils.selectNode(
- this._constructionElement.getFirstChild(),
- namespace,
- localname,
- 0).getFirstChild();
+ return XMLUtils.selectNode(
+ this._constructionElement.getFirstChild(),
+ namespace,
+ localname,
+ 0).getFirstChild().getNodeValue();
- return t.getData();
}
/**
@@ -493,8 +493,8 @@ public abstract class ElementProxy {
}
/** Field _prefixMappings */
- static HashMap _prefixMappings = new HashMap();
- static HashMap _prefixMappingsBindings = new HashMap();
+ static Map<String, String> _prefixMappings = new HashMap<String,String>();
+ static Map<String, String> _prefixMappingsBindings = new HashMap<String,String>();
/**
* Method setDefaultPrefix
@@ -533,10 +533,10 @@ public abstract class ElementProxy {
* @return the default prefix bind to this element.
*/
public static String getDefaultPrefix(String namespace) {
- return (String) ElementProxy._prefixMappings.get(namespace);
+ return ElementProxy._prefixMappings.get(namespace);
}
public static String getDefaultPrefixBindings(String namespace) {
- return (String) ElementProxy._prefixMappingsBindings.get(namespace);
+ return ElementProxy._prefixMappingsBindings.get(namespace);
}
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java
index 360f099..cd40b79 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java
@@ -21,6 +21,7 @@
package com.sun.org.apache.xml.internal.security.utils;
import java.util.ArrayList;
+import java.util.List;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -34,7 +35,7 @@ import org.w3c.dom.NodeList;
public class HelperNodeList implements NodeList {
/** Field nodes */
- ArrayList nodes = new ArrayList(20);
+ List<Node> nodes = new ArrayList<Node>(20);
boolean _allNodesMustHaveSameParent = false;
/**
@@ -62,7 +63,7 @@ public class HelperNodeList implements NodeList {
// log.log(java.util.logging.Level.FINE, "item(" + index + ") of " + this.getLength() + " nodes");
- return (Node) nodes.get(index);
+ return nodes.get(index);
}
/**
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java
index da5c496..2fba845 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java
@@ -23,6 +23,7 @@ package com.sun.org.apache.xml.internal.security.utils;
import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.WeakHashMap;
+import java.util.Map;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -52,7 +53,8 @@ public class IdResolver {
private static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(IdResolver.class.getName());
- private static WeakHashMap docMap = new WeakHashMap();
+ private static Map<Document, Map<String, WeakReference<Element>>> docMap =
+ new WeakHashMap<Document, Map<String, WeakReference<Element>>>();
/**
* Constructor IdResolver
@@ -70,15 +72,15 @@ public class IdResolver {
*/
public static void registerElementById(Element element, String idValue) {
Document doc = element.getOwnerDocument();
- WeakHashMap elementMap;
+ Map<String, WeakReference<Element>> elementMap;
synchronized (docMap) {
- elementMap = (WeakHashMap) docMap.get(doc);
+ elementMap = docMap.get(doc);
if (elementMap == null) {
- elementMap = new WeakHashMap();
+ elementMap = new WeakHashMap<String, WeakReference<Element>>();
docMap.put(doc, elementMap);
}
}
- elementMap.put(idValue, new WeakReference(element));
+ elementMap.put(idValue, new WeakReference<Element>(element));
}
/**
@@ -156,20 +158,20 @@ public class IdResolver {
private static Element getElementByIdType(Document doc, String id) {
if (log.isLoggable(java.util.logging.Level.FINE))
log.log(java.util.logging.Level.FINE, "getElementByIdType() Search for ID " + id);
- WeakHashMap elementMap;
+ Map<String, WeakReference<Element>> elementMap;
synchronized (docMap) {
- elementMap = (WeakHashMap) docMap.get(doc);
+ elementMap = docMap.get(doc);
}
if (elementMap != null) {
- WeakReference weakReference = (WeakReference) elementMap.get(id);
+ WeakReference<Element> weakReference = elementMap.get(id);
if (weakReference != null) {
- return (Element) weakReference.get();
+ return weakReference.get();
}
}
return null;
}
- private static java.util.List names;
+ private static java.util.List<String> names;
private static int namesLength;
static {
String namespaces[]={
@@ -248,6 +250,8 @@ public class IdResolver {
int index=s==null ? elementIndex : names.indexOf(n.getNamespaceURI());
index=(index<0) ? namesLength : index;
String name=n.getLocalName();
+ if (name == null)
+ name = n.getName();
if (name.length()>2)
continue;
String value=n.getNodeValue();
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java
index 3347b04..e9a7935 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java
@@ -33,8 +33,8 @@ public class UnsyncBufferedOutputStream extends OutputStream {
final byte[] buf;
static final int size=8*1024;
- private static ThreadLocal bufCahce = new ThreadLocal() {
- protected synchronized Object initialValue() {
+ private static ThreadLocal<byte[]> bufCahce = new ThreadLocal<byte[]>() {
+ protected synchronized byte[] initialValue() {
return new byte[size];
}
};
@@ -44,7 +44,7 @@ public class UnsyncBufferedOutputStream extends OutputStream {
* @param out the outputstream to buffer
*/
public UnsyncBufferedOutputStream(OutputStream out) {
- buf=(byte[])bufCahce.get();
+ buf=bufCahce.get();
this.out=out;
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java
index bfba75d..2a2f7dd 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java
@@ -29,8 +29,8 @@ import java.io.OutputStream;
*/
public class UnsyncByteArrayOutputStream extends OutputStream {
private static final int INITIAL_SIZE = 8192;
- private static ThreadLocal bufCache = new ThreadLocal() {
- protected synchronized Object initialValue() {
+ private static ThreadLocal<byte[]> bufCache = new ThreadLocal<byte[]>() {
+ protected synchronized byte[] initialValue() {
return new byte[INITIAL_SIZE];
}
};
@@ -40,7 +40,7 @@ public class UnsyncByteArrayOutputStream extends OutputStream {
private int pos = 0;
public UnsyncByteArrayOutputStream() {
- buf = (byte[])bufCache.get();
+ buf = bufCache.get();
}
public void write(byte[] arg0) {
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java
index 92ca11a..5df2b6e 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java
@@ -82,13 +82,15 @@ public class XMLUtils {
* @param exclude
* @param com wheather comments or not
*/
- public static void getSet(Node rootNode,Set result,Node exclude ,boolean com) {
+ public static void getSet(Node rootNode,Set<Node> result,Node exclude ,boolean com) {
if ((exclude!=null) && isDescendantOrSelf(exclude,rootNode)){
return;
}
getSetRec(rootNode,result,exclude,com);
}
- static final void getSetRec(final Node rootNode,final Set result,
+
+ @SuppressWarnings("fallthrough")
+ static final void getSetRec(final Node rootNode,final Set<Node> result,
final Node exclude ,final boolean com) {
//Set result = new HashSet();
if (rootNode==exclude) {
@@ -104,7 +106,7 @@ public class XMLUtils {
result.add(nl.item(i));
}
}
- //no return keep working
+ //no return keep working - ignore fallthrough warning
case Node.DOCUMENT_NODE:
for (Node r=rootNode.getFirstChild();r!=null;r=r.getNextSibling()){
if (r.getNodeType()==Node.TEXT_NODE) {
@@ -230,7 +232,7 @@ public class XMLUtils {
static String dsPrefix=null;
- static Map namePrefixes=new HashMap();
+ static Map<String, String> namePrefixes=new HashMap<String, String>();
/**
* Creates an Element in the XML Signature specification namespace.
*
@@ -248,7 +250,7 @@ public class XMLUtils {
if ((dsPrefix == null) || (dsPrefix.length() == 0)) {
return doc.createElementNS(Constants.SignatureSpecNS, elementName);
}
- String namePrefix=(String) namePrefixes.get(elementName);
+ String namePrefix= namePrefixes.get(elementName);
if (namePrefix==null) {
StringBuffer tag=new StringBuffer(dsPrefix);
tag.append(':');
@@ -318,11 +320,9 @@ public class XMLUtils {
* @param xpathNodeSet
* @return the owner document
*/
- public static Document getOwnerDocument(Set xpathNodeSet) {
+ public static Document getOwnerDocument(Set<Node> xpathNodeSet) {
NullPointerException npe = null;
- Iterator iterator = xpathNodeSet.iterator();
- while(iterator.hasNext()) {
- Node node = (Node) iterator.next();
+ for (Node node : xpathNodeSet) {
int nodeType =node.getNodeType();
if (nodeType == Node.DOCUMENT_NODE) {
return (Document) node;
@@ -397,14 +397,14 @@ public class XMLUtils {
* @param xpathNodeSet
* @return the set with the nodelist
*/
- public static Set convertNodelistToSet(NodeList xpathNodeSet) {
+ public static Set<Node> convertNodelistToSet(NodeList xpathNodeSet) {
if (xpathNodeSet == null) {
- return new HashSet();
+ return new HashSet<Node>();
}
int length = xpathNodeSet.getLength();
- Set set = new HashSet(length);
+ Set<Node> set = new HashSet<Node>(length);
for (int i = 0; i < length; i++) {
set.add(xpathNodeSet.item(i));
@@ -446,6 +446,7 @@ public class XMLUtils {
* @param node
* @see <A HREF="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=2650">Namespace axis resolution is not XPath compliant </A>
*/
+ @SuppressWarnings("fallthrough")
private static void circumventBug2650internal(Node node) {
Node parent=null;
Node sibling=null;
@@ -642,12 +643,12 @@ public class XMLUtils {
* @param inputSet
* @return nodes with the constrain
*/
- public static Set excludeNodeFromSet(Node signatureElement, Set inputSet) {
- Set resultSet = new HashSet();
- Iterator iterator = inputSet.iterator();
+ public static Set<Node> excludeNodeFromSet(Node signatureElement, Set<Node> inputSet) {
+ Set<Node> resultSet = new HashSet<Node>();
+ Iterator<Node> iterator = inputSet.iterator();
while (iterator.hasNext()) {
- Node inputNode = (Node) iterator.next();
+ Node inputNode = iterator.next();
if (!XMLUtils
.isDescendantOrSelf(signatureElement, inputNode)) {
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java
index 8a96076..5d5719b 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java
@@ -56,7 +56,7 @@ public class ResourceResolver {
static boolean _alreadyInitialized = false;
/** these are the system-wide resolvers */
- static List _resolverVector = null;
+ static List<ResourceResolver> _resolverVector = null;
static boolean allThreadSafeInList=true;
@@ -102,7 +102,7 @@ public class ResourceResolver {
int length=ResourceResolver._resolverVector.size();
for (int i = 0; i < length; i++) {
ResourceResolver resolver =
- (ResourceResolver) ResourceResolver._resolverVector.get(i);
+ ResourceResolver._resolverVector.get(i);
ResourceResolver resolverTmp=null;
try {
resolverTmp = allThreadSafeInList || resolver._resolverSpi.engineIsThreadSafe() ? resolver :
@@ -120,7 +120,7 @@ public class ResourceResolver {
if (i!=0) {
//update resolver.
//System.out.println("Swaping");
- List resolverVector=(List)((ArrayList)_resolverVector).clone();
+ List<ResourceResolver> resolverVector=getResolverVectorClone();
resolverVector.remove(i);
resolverVector.add(0,resolver);
_resolverVector=resolverVector;
@@ -139,6 +139,17 @@ public class ResourceResolver {
throw new ResourceResolverException("utils.resolver.noClass", exArgs,
uri, BaseURI);
}
+
+ /**
+ * Method getResolverVectorClone
+ *
+ * @return clone of _resolverVector
+ */
+ @SuppressWarnings("unchecked")
+ private static List<ResourceResolver> getResolverVectorClone() {
+ return (List<ResourceResolver>)((ArrayList<ResourceResolver>)_resolverVector).clone();
+ }
+
/**
* Method getInstance
*
@@ -150,7 +161,7 @@ public class ResourceResolver {
* @throws ResourceResolverException
*/
public static final ResourceResolver getInstance(
- Attr uri, String BaseURI, List individualResolvers)
+ Attr uri, String BaseURI, List<ResourceResolver> individualResolvers)
throws ResourceResolverException {
if (log.isLoggable(java.util.logging.Level.FINE)) {
@@ -163,7 +174,7 @@ public class ResourceResolver {
if ((individualResolvers != null) && ((size=individualResolvers.size()) > 0)) {
for (int i = 0; i < size; i++) {
ResourceResolver resolver =
- (ResourceResolver) individualResolvers.get(i);
+ individualResolvers.get(i);
if (resolver != null) {
String currentClass = resolver._resolverSpi.getClass().getName();
@@ -186,7 +197,7 @@ public class ResourceResolver {
public static void init() {
if (!ResourceResolver._alreadyInitialized) {
- ResourceResolver._resolverVector = new ArrayList(10);
+ ResourceResolver._resolverVector = new ArrayList<ResourceResolver>(10);
_alreadyInitialized = true;
}
}
@@ -288,7 +299,7 @@ public class ResourceResolver {
*
* @param properties
*/
- public void addProperties(Map properties) {
+ public void addProperties(Map<String,String> properties) {
this._resolverSpi.engineAddProperies(properties);
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java
index bed9420..1ff89b7 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java
@@ -41,7 +41,7 @@ public abstract class ResourceResolverSpi {
ResourceResolverSpi.class.getName());
/** Field _properties */
- protected java.util.Map _properties = null;
+ protected java.util.Map<String,String> _properties = null;
/**
* This is the workhorse method used to resolve resources.
@@ -63,7 +63,7 @@ public abstract class ResourceResolverSpi {
*/
public void engineSetProperty(String key, String value) {
if (_properties==null) {
- _properties=new HashMap();
+ _properties=new HashMap<String,String>();
}
this._properties.put(key, value);
}
@@ -78,17 +78,17 @@ public abstract class ResourceResolverSpi {
if (_properties==null) {
return null;
}
- return (String) this._properties.get(key);
+ return this._properties.get(key);
}
/**
*
* @param properties
*/
- public void engineAddProperies(Map properties) {
+ public void engineAddProperies(Map<String,String> properties) {
if (properties!=null) {
if (_properties==null) {
- _properties=new HashMap();
+ _properties=new HashMap<String,String>();
}
this._properties.putAll(properties);
}
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java
index 7b23e7a..706cccc 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java
@@ -289,7 +289,7 @@ public class ResolverDirectHTTP extends ResourceResolverSpi {
* @inheritDoc
*/
public String[] engineGetPropertyKeys() {
- return (String[]) ResolverDirectHTTP.properties.clone();
+ return ResolverDirectHTTP.properties.clone();
}
private URI getNewURI(String uri, String BaseURI)
diff --git a/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java b/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
index 5c2580c..b6ffb01 100644
--- a/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
+++ b/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
@@ -725,7 +725,7 @@ public class Krb5LoginModule implements LoginModule {
cred = builder.action().getCreds();
}
if (storeKey) {
- encKeys = builder.getKeys();
+ encKeys = builder.getKeys(isInitiator);
// When encKeys is empty, the login actually fails.
// For compatibility, exception is thrown in commit().
}
diff --git a/jdk/src/share/classes/java/awt/AWTKeyStroke.java b/jdk/src/share/classes/java/awt/AWTKeyStroke.java
index fc31153..13f6edd 100644
--- a/jdk/src/share/classes/java/awt/AWTKeyStroke.java
+++ b/jdk/src/share/classes/java/awt/AWTKeyStroke.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -25,6 +25,7 @@
package java.awt;
import java.awt.event.KeyEvent;
+import sun.awt.AppContext;
import java.awt.event.InputEvent;
import java.util.Collections;
import java.util.HashMap;
@@ -66,9 +67,6 @@ import java.lang.reflect.Field;
public class AWTKeyStroke implements Serializable {
static final long serialVersionUID = -6430539691155161871L;
- private static Map cache;
- private static AWTKeyStroke cacheKey;
- private static Constructor ctor = getCtor(AWTKeyStroke.class);
private static Map modifierKeywords;
/**
* Associates VK_XXX (as a String) with code (as Integer). This is
@@ -77,6 +75,25 @@ public class AWTKeyStroke implements Serializable {
*/
private static VKCollection vks;
+ //A key for the collection of AWTKeyStrokes within AppContext.
+ private static Object APP_CONTEXT_CACHE_KEY = new Object();
+ //A key withing the cache
+ private static AWTKeyStroke APP_CONTEXT_KEYSTROKE_KEY = new AWTKeyStroke();
+
+ /*
+ * Reads keystroke class from AppContext and if null, puts there the
+ * AWTKeyStroke class.
+ * Must be called under locked AWTKeyStro
+ */
+ private static Class getAWTKeyStrokeClass() {
+ Class clazz = (Class)AppContext.getAppContext().get(AWTKeyStroke.class);
+ if (clazz == null) {
+ clazz = AWTKeyStroke.class;
+ AppContext.getAppContext().put(AWTKeyStroke.class, AWTKeyStroke.class);
+ }
+ return clazz;
+ }
+
private char keyChar = KeyEvent.CHAR_UNDEFINED;
private int keyCode = KeyEvent.VK_UNDEFINED;
private int modifiers;
@@ -164,9 +181,12 @@ public class AWTKeyStroke implements Serializable {
if (subclass == null) {
throw new IllegalArgumentException("subclass cannot be null");
}
- if (AWTKeyStroke.ctor.getDeclaringClass().equals(subclass)) {
- // Already registered
- return;
+ synchronized (AWTKeyStroke.class) {
+ Class keyStrokeClass = (Class)AppContext.getAppContext().get(AWTKeyStroke.class);
+ if (keyStrokeClass != null && keyStrokeClass.equals(subclass)){
+ // Already registered
+ return;
+ }
}
if (!AWTKeyStroke.class.isAssignableFrom(subclass)) {
throw new ClassCastException("subclass is not derived from AWTKeyStroke");
@@ -197,9 +217,9 @@ public class AWTKeyStroke implements Serializable {
}
synchronized (AWTKeyStroke.class) {
- AWTKeyStroke.ctor = ctor;
- cache = null;
- cacheKey = null;
+ AppContext.getAppContext().put(AWTKeyStroke.class, subclass);
+ AppContext.getAppContext().remove(APP_CONTEXT_CACHE_KEY);
+ AppContext.getAppContext().remove(APP_CONTEXT_KEYSTROKE_KEY);
}
}
@@ -229,13 +249,19 @@ public class AWTKeyStroke implements Serializable {
private static synchronized AWTKeyStroke getCachedStroke
(char keyChar, int keyCode, int modifiers, boolean onKeyRelease)
{
+ Map cache = (Map)AppContext.getAppContext().get(APP_CONTEXT_CACHE_KEY);
+ AWTKeyStroke cacheKey = (AWTKeyStroke)AppContext.getAppContext().get(APP_CONTEXT_KEYSTROKE_KEY);
+
if (cache == null) {
cache = new HashMap();
+ AppContext.getAppContext().put(APP_CONTEXT_CACHE_KEY, cache);
}
if (cacheKey == null) {
try {
- cacheKey = (AWTKeyStroke)ctor.newInstance((Object[]) null);
+ Class clazz = getAWTKeyStrokeClass();
+ cacheKey = (AWTKeyStroke)getCtor(clazz).newInstance((Object[]) null);
+ AppContext.getAppContext().put(APP_CONTEXT_KEYSTROKE_KEY, cacheKey);
} catch (InstantiationException e) {
assert(false);
} catch (IllegalAccessException e) {
@@ -253,9 +279,8 @@ public class AWTKeyStroke implements Serializable {
if (stroke == null) {
stroke = cacheKey;
cache.put(stroke, stroke);
- cacheKey = null;
+ AppContext.getAppContext().remove(APP_CONTEXT_KEYSTROKE_KEY);
}
-
return stroke;
}
diff --git a/jdk/src/share/classes/java/io/InputStream.java b/jdk/src/share/classes/java/io/InputStream.java
index 23c166e..63d31d5 100644
--- a/jdk/src/share/classes/java/io/InputStream.java
+++ b/jdk/src/share/classes/java/io/InputStream.java
@@ -44,10 +44,9 @@ package java.io;
*/
public abstract class InputStream implements Closeable {
- // SKIP_BUFFER_SIZE is used to determine the size of skipBuffer
- private static final int SKIP_BUFFER_SIZE = 2048;
- // skipBuffer is initialized in skip(long), if needed.
- private static byte[] skipBuffer;
+ // MAX_SKIP_BUFFER_SIZE is used to determine the maximum buffer size to
+ // use when skipping.
+ private static final int MAX_SKIP_BUFFER_SIZE = 2048;
/**
* Reads the next byte of data from the input stream. The value byte is
@@ -212,18 +211,15 @@ public abstract class InputStream implements Closeable {
long remaining = n;
int nr;
- if (skipBuffer == null)
- skipBuffer = new byte[SKIP_BUFFER_SIZE];
-
- byte[] localSkipBuffer = skipBuffer;
if (n <= 0) {
return 0;
}
+ int size = (int)Math.min(MAX_SKIP_BUFFER_SIZE, remaining);
+ byte[] skipBuffer = new byte[size];
while (remaining > 0) {
- nr = read(localSkipBuffer, 0,
- (int) Math.min(SKIP_BUFFER_SIZE, remaining));
+ nr = read(skipBuffer, 0, (int)Math.min(size, remaining));
if (nr < 0) {
break;
}
diff --git a/jdk/src/share/classes/java/io/ObjectInputStream.java b/jdk/src/share/classes/java/io/ObjectInputStream.java
index 26a764f..04705e6 100644
--- a/jdk/src/share/classes/java/io/ObjectInputStream.java
+++ b/jdk/src/share/classes/java/io/ObjectInputStream.java
@@ -2025,8 +2025,9 @@ public class ObjectInputStream
* This method should not be removed or its signature changed without
* corresponding modifications to the above class.
*/
- // REMIND: change name to something more accurate?
- private static native ClassLoader latestUserDefinedLoader();
+ private static ClassLoader latestUserDefinedLoader() {
+ return sun.misc.VM.latestUserDefinedLoader();
+ }
/**
* Default GetField implementation.
diff --git a/jdk/src/share/classes/java/lang/invoke/CallSite.java b/jdk/src/share/classes/java/lang/invoke/CallSite.java
index 465cd77..9bc2033 100644
--- a/jdk/src/share/classes/java/lang/invoke/CallSite.java
+++ b/jdk/src/share/classes/java/lang/invoke/CallSite.java
@@ -266,7 +266,7 @@ public class CallSite {
/*package-private*/
void setTargetNormal(MethodHandle newTarget) {
- target = newTarget;
+ MethodHandleNatives.setCallSiteTargetNormal(this, newTarget);
}
/*package-private*/
MethodHandle getTargetVolatile() {
@@ -274,7 +274,7 @@ public class CallSite {
}
/*package-private*/
void setTargetVolatile(MethodHandle newTarget) {
- unsafe.putObjectVolatile(this, TARGET_OFFSET, newTarget);
+ MethodHandleNatives.setCallSiteTargetVolatile(this, newTarget);
}
// this implements the upcall from the JVM, MethodHandleNatives.makeDynamicCallSite:
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
index 6bf8079..c0beb39 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -934,12 +934,4 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
return THROW_EXCEPTION;
}
static <T extends Throwable> Empty throwException(T t) throws T { throw t; }
-
- // Linkage support:
- static void registerBootstrap(Class<?> callerClass, MethodHandle bootstrapMethod) {
- MethodHandleNatives.registerBootstrap(callerClass, bootstrapMethod);
- }
- static MethodHandle getBootstrap(Class<?> callerClass) {
- return MethodHandleNatives.getBootstrap(callerClass);
- }
}
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
index e01d9b1..9670cfe 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
@@ -61,15 +61,6 @@ class MethodHandleNatives {
/** Initialize a method type, once per form. */
static native void init(MethodType self);
- /** Tell the JVM about a class's bootstrap method. */
- static native void registerBootstrap(Class<?> caller, MethodHandle bootstrapMethod);
-
- /** Ask the JVM about a class's bootstrap method. */
- static native MethodHandle getBootstrap(Class<?> caller);
-
- /** Tell the JVM that we need to change the target of an invokedynamic. */
- static native void setCallSiteTarget(CallSite site, MethodHandle target);
-
/** Fetch the vmtarget field.
* It will be sanitized as necessary to avoid exposing non-Java references.
* This routine is for debugging and reflection.
@@ -122,6 +113,12 @@ class MethodHandleNatives {
static final boolean COUNT_GWT;
+ /// CallSite support
+
+ /** Tell the JVM that we need to change the target of a CallSite. */
+ static native void setCallSiteTargetNormal(CallSite site, MethodHandle target);
+ static native void setCallSiteTargetVolatile(CallSite site, MethodHandle target);
+
private static native void registerNatives();
static {
registerNatives();
diff --git a/jdk/src/share/classes/java/lang/ref/Reference.java b/jdk/src/share/classes/java/lang/ref/Reference.java
index f483edf..6d3d9c3 100644
--- a/jdk/src/share/classes/java/lang/ref/Reference.java
+++ b/jdk/src/share/classes/java/lang/ref/Reference.java
@@ -27,7 +27,6 @@ package java.lang.ref;
import sun.misc.Cleaner;
-
/**
* Abstract base class for reference objects. This class defines the
* operations common to all reference objects. Because reference objects are
@@ -69,7 +68,7 @@ public abstract class Reference<T> {
* null.
*
* Pending: queue = ReferenceQueue with which instance is registered;
- * next = Following instance in queue, or this if at end of list.
+ * next = this
*
* Enqueued: queue = ReferenceQueue.ENQUEUED; next = Following instance
* in queue, or this if at end of list.
@@ -81,17 +80,28 @@ public abstract class Reference<T> {
* the next field is null then the instance is active; if it is non-null,
* then the collector should treat the instance normally.
*
- * To ensure that concurrent collector can discover active Reference
+ * To ensure that a concurrent collector can discover active Reference
* objects without interfering with application threads that may apply
* the enqueue() method to those objects, collectors should link
- * discovered objects through the discovered field.
+ * discovered objects through the discovered field. The discovered
+ * field is also used for linking Reference objects in the pending list.
*/
private T referent; /* Treated specially by GC */
ReferenceQueue<? super T> queue;
+ /* When active: NULL
+ * pending: this
+ * Enqueued: next reference in queue (or this if last)
+ * Inactive: this
+ */
Reference next;
+
+ /* When active: next element in a discovered reference list maintained by GC (or this if last)
+ * pending: next element in the pending list (or null if last)
+ * otherwise: NULL
+ */
transient private Reference<T> discovered; /* used by VM */
@@ -106,7 +116,8 @@ public abstract class Reference<T> {
/* List of References waiting to be enqueued. The collector adds
* References to this list, while the Reference-handler thread removes
- * them. This list is protected by the above lock object.
+ * them. This list is protected by the above lock object. The
+ * list uses the discovered field to link its elements.
*/
private static Reference pending = null;
@@ -120,14 +131,12 @@ public abstract class Reference<T> {
public void run() {
for (;;) {
-
Reference r;
synchronized (lock) {
if (pending != null) {
r = pending;
- Reference rn = r.next;
- pending = (rn == r) ? null : rn;
- r.next = r;
+ pending = r.discovered;
+ r.discovered = null;
} else {
try {
lock.wait();
@@ -201,10 +210,8 @@ public abstract class Reference<T> {
* been enqueued
*/
public boolean isEnqueued() {
- /* In terms of the internal states, this predicate actually tests
- whether the instance is either Pending or Enqueued */
synchronized (this) {
- return (this.queue != ReferenceQueue.NULL) && (this.next != null);
+ return (this.next != null && this.queue == ReferenceQueue.ENQUEUED);
}
}
diff --git a/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java b/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
index 0d03a40..f1a4995 100644
--- a/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
+++ b/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
@@ -44,7 +44,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
int timeout = 0;
boolean connected = false;
private int trafficClass = 0;
- private InetAddress connectedAddress = null;
+ protected InetAddress connectedAddress = null;
private int connectedPort = -1;
/* cached socket options */
diff --git a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
index 4265315..c510c61 100644
--- a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
+++ b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
@@ -71,7 +71,7 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
/* whether this Socket is a stream (TCP) socket or not (UDP)
*/
- private boolean stream;
+ protected boolean stream;
/**
* Load net library into runtime.
@@ -86,10 +86,11 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
* is a stream socket (true) or an unconnected UDP socket (false).
*/
protected synchronized void create(boolean stream) throws IOException {
- fd = new FileDescriptor();
this.stream = stream;
if (!stream) {
ResourceManager.beforeUdpCreate();
+ // only create the fd after we know we will be able to create the socket
+ fd = new FileDescriptor();
try {
socketCreate(false);
} catch (IOException ioe) {
@@ -98,6 +99,7 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
throw ioe;
}
} else {
+ fd = new FileDescriptor();
socketCreate(true);
}
if (socket != null)
diff --git a/jdk/src/share/classes/java/net/DatagramSocket.java b/jdk/src/share/classes/java/net/DatagramSocket.java
index 5d73de6..9c9dec1 100644
--- a/jdk/src/share/classes/java/net/DatagramSocket.java
+++ b/jdk/src/share/classes/java/net/DatagramSocket.java
@@ -287,7 +287,7 @@ class DatagramSocket implements java.io.Closeable {
AccessController.doPrivileged(
new PrivilegedExceptionAction<Void>() {
public Void run() throws NoSuchMethodException {
- Class[] cl = new Class[1];
+ Class<?>[] cl = new Class<?>[1];
cl[0] = DatagramPacket.class;
impl.getClass().getDeclaredMethod("peekData", cl);
return null;
diff --git a/jdk/src/share/classes/java/net/InMemoryCookieStore.java b/jdk/src/share/classes/java/net/InMemoryCookieStore.java
index 6676d97..e885cdd 100644
--- a/jdk/src/share/classes/java/net/InMemoryCookieStore.java
+++ b/jdk/src/share/classes/java/net/InMemoryCookieStore.java
@@ -91,8 +91,10 @@ class InMemoryCookieStore implements CookieStore {
if (cookie.getDomain() != null) {
addIndex(domainIndex, cookie.getDomain(), cookie);
}
- // add it to uri index, too
- addIndex(uriIndex, getEffectiveURI(uri), cookie);
+ if (uri != null) {
+ // add it to uri index, too
+ addIndex(uriIndex, getEffectiveURI(uri), cookie);
+ }
}
} finally {
lock.unlock();
diff --git a/jdk/src/share/classes/java/net/InetAddress.java b/jdk/src/share/classes/java/net/InetAddress.java
index a64011f..8758cab 100644
--- a/jdk/src/share/classes/java/net/InetAddress.java
+++ b/jdk/src/share/classes/java/net/InetAddress.java
@@ -876,10 +876,12 @@ class InetAddress implements java.io.Serializable {
nameService = java.security.AccessController.doPrivileged(
new java.security.PrivilegedExceptionAction<NameService>() {
public NameService run() {
- Iterator itr = Service.providers(NameServiceDescriptor.class);
+ // sun.misc.Service.providers returns a raw Iterator
+ @SuppressWarnings("unchecked")
+ Iterator<NameServiceDescriptor> itr =
+ Service.providers(NameServiceDescriptor.class);
while (itr.hasNext()) {
- NameServiceDescriptor nsd
- = (NameServiceDescriptor)itr.next();
+ NameServiceDescriptor nsd = itr.next();
if (providerName.
equalsIgnoreCase(nsd.getType()+","
+nsd.getProviderName())) {
diff --git a/jdk/src/share/classes/java/net/ServerSocket.java b/jdk/src/share/classes/java/net/ServerSocket.java
index 86bc174..b4ab7b6 100644
--- a/jdk/src/share/classes/java/net/ServerSocket.java
+++ b/jdk/src/share/classes/java/net/ServerSocket.java
@@ -267,10 +267,9 @@ class ServerSocket implements java.io.Closeable {
AccessController.doPrivileged(
new PrivilegedExceptionAction<Void>() {
public Void run() throws NoSuchMethodException {
- Class[] cl = new Class[2];
- cl[0] = SocketAddress.class;
- cl[1] = Integer.TYPE;
- impl.getClass().getDeclaredMethod("connect", cl);
+ impl.getClass().getDeclaredMethod("connect",
+ SocketAddress.class,
+ int.class);
return null;
}
});
diff --git a/jdk/src/share/classes/java/nio/charset/Charset.java b/jdk/src/share/classes/java/nio/charset/Charset.java
index 53b0d2b..2d3f020 100644
--- a/jdk/src/share/classes/java/nio/charset/Charset.java
+++ b/jdk/src/share/classes/java/nio/charset/Charset.java
@@ -435,7 +435,7 @@ public abstract class Charset
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
try {
- Class epc
+ Class<?> epc
= Class.forName("sun.nio.cs.ext.ExtendedCharsets");
extendedProvider = (CharsetProvider)epc.newInstance();
} catch (ClassNotFoundException x) {
diff --git a/jdk/src/share/classes/java/nio/file/Files.java b/jdk/src/share/classes/java/nio/file/Files.java
index 2777829..2683b7e 100644
--- a/jdk/src/share/classes/java/nio/file/Files.java
+++ b/jdk/src/share/classes/java/nio/file/Files.java
@@ -363,6 +363,17 @@ public final class Files {
// -- Directories --
+ private static class AcceptAllFilter
+ implements DirectoryStream.Filter<Path>
+ {
+ private AcceptAllFilter() { }
+
+ @Override
+ public boolean accept(Path entry) { return true; }
+
+ static final AcceptAllFilter FILTER = new AcceptAllFilter();
+ }
+
/**
* Opens a directory, returning a {@link DirectoryStream} to iterate over
* all entries in the directory. The elements returned by the directory
@@ -397,12 +408,7 @@ public final class Files {
public static DirectoryStream<Path> newDirectoryStream(Path dir)
throws IOException
{
- return provider(dir).newDirectoryStream(dir, new DirectoryStream.Filter<Path>() {
- @Override
- public boolean accept(Path entry) {
- return true;
- }
- });
+ return provider(dir).newDirectoryStream(dir, AcceptAllFilter.FILTER);
}
/**
diff --git a/jdk/src/share/classes/java/security/Security.java b/jdk/src/share/classes/java/security/Security.java
index b9dd144..f8890e6 100644
--- a/jdk/src/share/classes/java/security/Security.java
+++ b/jdk/src/share/classes/java/security/Security.java
@@ -814,7 +814,7 @@ public final class Security {
public Void run() {
try {
/* Get the class via the bootstrap class loader. */
- Class cl = Class.forName(
+ Class<?> cl = Class.forName(
"java.lang.SecurityManager", false, null);
Field f = null;
boolean accessible = false;
diff --git a/jdk/src/share/classes/java/security/Signature.java b/jdk/src/share/classes/java/security/Signature.java
index b92a16b..72d2b08 100644
--- a/jdk/src/share/classes/java/security/Signature.java
+++ b/jdk/src/share/classes/java/security/Signature.java
@@ -899,6 +899,7 @@ public abstract class Signature extends SignatureSpi {
* and its original parent (Object).
*/
+ @SuppressWarnings("deprecation")
private static class Delegate extends Signature {
// The provider implementation (delegate)
@@ -1203,6 +1204,7 @@ public abstract class Signature extends SignatureSpi {
}
// adapter for RSA/ECB/PKCS1Padding ciphers
+ @SuppressWarnings("deprecation")
private static class CipherAdapter extends SignatureSpi {
private final Cipher cipher;
diff --git a/jdk/src/share/classes/java/text/BreakIterator.java b/jdk/src/share/classes/java/text/BreakIterator.java
index e00e09a..6010784 100644
--- a/jdk/src/share/classes/java/text/BreakIterator.java
+++ b/jdk/src/share/classes/java/text/BreakIterator.java
@@ -443,7 +443,7 @@ public abstract class BreakIterator implements Cloneable
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#word">word breaks</a>
+ * for <a href="BreakIterator.html#word">word breaks</a>
* for the {@linkplain Locale#getDefault() default locale}.
* @return A break iterator for word breaks
*/
@@ -454,7 +454,7 @@ public abstract class BreakIterator implements Cloneable
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#word">word breaks</a>
+ * for <a href="BreakIterator.html#word">word breaks</a>
* for the given locale.
* @param locale the desired locale
* @return A break iterator for word breaks
@@ -470,7 +470,7 @@ public abstract class BreakIterator implements Cloneable
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#line">line breaks</a>
+ * for <a href="BreakIterator.html#line">line breaks</a>
* for the {@linkplain Locale#getDefault() default locale}.
* @return A break iterator for line breaks
*/
@@ -481,7 +481,7 @@ public abstract class BreakIterator implements Cloneable
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#line">line breaks</a>
+ * for <a href="BreakIterator.html#line">line breaks</a>
* for the given locale.
* @param locale the desired locale
* @return A break iterator for line breaks
@@ -497,7 +497,7 @@ public abstract class BreakIterator implements Cloneable
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#character">character breaks</a>
+ * for <a href="BreakIterator.html#character">character breaks</a>
* for the {@linkplain Locale#getDefault() default locale}.
* @return A break iterator for character breaks
*/
@@ -508,7 +508,7 @@ public abstract class BreakIterator implements Cloneable
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#character">character breaks</a>
+ * for <a href="BreakIterator.html#character">character breaks</a>
* for the given locale.
* @param locale the desired locale
* @return A break iterator for character breaks
@@ -524,7 +524,7 @@ public abstract class BreakIterator implements Cloneable
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#sentence">sentence breaks</a>
+ * for <a href="BreakIterator.html#sentence">sentence breaks</a>
* for the {@linkplain Locale#getDefault() default locale}.
* @return A break iterator for sentence breaks
*/
@@ -535,7 +535,7 @@ public abstract class BreakIterator implements Cloneable
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#sentence">sentence breaks</a>
+ * for <a href="BreakIterator.html#sentence">sentence breaks</a>
* for the given locale.
* @param locale the desired locale
* @return A break iterator for sentence breaks
diff --git a/jdk/src/share/classes/java/util/Collections.java b/jdk/src/share/classes/java/util/Collections.java
index d15a429..04e642e 100644
--- a/jdk/src/share/classes/java/util/Collections.java
+++ b/jdk/src/share/classes/java/util/Collections.java
@@ -2352,6 +2352,64 @@ public class Collections {
}
/**
+ * Returns a dynamically typesafe view of the specified queue.
+ * Any attempt to insert an element of the wrong type will result in
+ * an immediate {@link ClassCastException}. Assuming a queue contains
+ * no incorrectly typed elements prior to the time a dynamically typesafe
+ * view is generated, and that all subsequent access to the queue
+ * takes place through the view, it is <i>guaranteed</i> that the
+ * queue cannot contain an incorrectly typed element.
+ *
+ * <p>A discussion of the use of dynamically typesafe views may be
+ * found in the documentation for the {@link #checkedCollection
+ * checkedCollection} method.
+ *
+ * <p>The returned queue will be serializable if the specified queue
+ * is serializable.
+ *
+ * <p>Since {@code null} is considered to be a value of any reference
+ * type, the returned queue permits insertion of {@code null} elements
+ * whenever the backing queue does.
+ *
+ * @param queue the queue for which a dynamically typesafe view is to be
+ * returned
+ * @param type the type of element that {@code queue} is permitted to hold
+ * @return a dynamically typesafe view of the specified queue
+ * @since 1.8
+ */
+ public static <E> Queue<E> checkedQueue(Queue<E> queue, Class<E> type) {
+ return new CheckedQueue<>(queue, type);
+ }
+
+ /**
+ * @serial include
+ */
+ static class CheckedQueue<E>
+ extends CheckedCollection<E>
+ implements Queue<E>, Serializable
+ {
+ private static final long serialVersionUID = 1433151992604707767L;
+ final Queue<E> queue;
+
+ CheckedQueue(Queue<E> queue, Class<E> elementType) {
+ super(queue, elementType);
+ this.queue = queue;
+ }
+
+ public E element() {return queue.element();}
+ public boolean equals(Object o) {return o == this || c.equals(o);}
+ public int hashCode() {return c.hashCode();}
+ public E peek() {return queue.peek();}
+ public E poll() {return queue.poll();}
+ public E remove() {return queue.remove();}
+
+ public boolean offer(E e) {
+ typeCheck(e);
+ return add(e);
+ }
+ }
+
+ /**
* Returns a dynamically typesafe view of the specified set.
* Any attempt to insert an element of the wrong type will result in
* an immediate {@link ClassCastException}. Assuming a set contains
@@ -3144,6 +3202,102 @@ public class Collections {
}
/**
+ * Returns the empty sorted set (immutable). This set is serializable.
+ *
+ * <p>This example illustrates the type-safe way to obtain an empty sorted
+ * set:
+ * <pre>
+ * SortedSet<String> s = Collections.emptySortedSet();
+ * </pre>
+ * Implementation note: Implementations of this method need not
+ * create a separate <tt>SortedSet</tt> object for each call.
+ *
+ * @since 1.8
+ */
+ @SuppressWarnings("unchecked")
+ public static final <E> SortedSet<E> emptySortedSet() {
+ return (SortedSet<E>) new EmptySortedSet<>();
+ }
+
+ /**
+ * @serial include
+ */
+ private static class EmptySortedSet<E>
+ extends AbstractSet<E>
+ implements SortedSet<E>, Serializable
+ {
+ private static final long serialVersionUID = 6316515401502265487L;
+ public Iterator<E> iterator() { return emptyIterator(); }
+ public int size() {return 0;}
+ public boolean isEmpty() {return true;}
+ public boolean contains(Object obj) {return false;}
+ public boolean containsAll(Collection<?> c) { return c.isEmpty(); }
+ public Object[] toArray() { return new Object[0]; }
+
+ public <E> E[] toArray(E[] a) {
+ if (a.length > 0)
+ a[0] = null;
+ return a;
+ }
+
+ // Preserves singleton property
+ private Object readResolve() {
+ return new EmptySortedSet<>();
+ }
+
+ public Comparator comparator() {
+ return null;
+ }
+
+ public SortedSet<E> subSet(Object fromElement, Object toElement) {
+ Objects.requireNonNull(fromElement);
+ Objects.requireNonNull(toElement);
+
+ if (!(fromElement instanceof Comparable) ||
+ !(toElement instanceof Comparable))
+ {
+ throw new ClassCastException();
+ }
+
+ if ((((Comparable)fromElement).compareTo(toElement) >= 0) ||
+ (((Comparable)toElement).compareTo(fromElement) < 0))
+ {
+ throw new IllegalArgumentException();
+ }
+
+ return emptySortedSet();
+ }
+
+ public SortedSet<E> headSet(Object toElement) {
+ Objects.requireNonNull(toElement);
+
+ if (!(toElement instanceof Comparable)) {
+ throw new ClassCastException();
+ }
+
+ return emptySortedSet();
+ }
+
+ public SortedSet<E> tailSet(Object fromElement) {
+ Objects.requireNonNull(fromElement);
+
+ if (!(fromElement instanceof Comparable)) {
+ throw new ClassCastException();
+ }
+
+ return emptySortedSet();
+ }
+
+ public E first() {
+ throw new NoSuchElementException();
+ }
+
+ public E last() {
+ throw new NoSuchElementException();
+ }
+ }
+
+ /**
* The empty list (immutable). This list is serializable.
*
* @see #emptyList()
diff --git a/jdk/src/share/classes/java/util/CurrencyData.properties b/jdk/src/share/classes/java/util/CurrencyData.properties
index 5cfc139..b943993 100644
--- a/jdk/src/share/classes/java/util/CurrencyData.properties
+++ b/jdk/src/share/classes/java/util/CurrencyData.properties
@@ -71,7 +71,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
#
# The table is based on the following web sites:
# http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/db_en.html
-# http://www.bsi-global.com/iso4217currency
+# http://www.currency-iso.org/iso_index/iso_tables.htm
# http://www.cia.gov/cia/publications/factbook/indexgeo.html
# AFGHANISTAN
@@ -105,7 +105,7 @@ AU=AUD
# AUSTRIA
AT=EUR
# AZERBAIJAN
-AZ=AZM;2005-12-31-20-00-00;AZN
+AZ=AZN
# BAHAMAS
BS=BSD
# BAHRAIN
@@ -378,7 +378,7 @@ MS=XCD
# MOROCCO
MA=MAD
# MOZAMBIQUE
-MZ=MZM;2006-06-30-22-00-00;MZN
+MZ=MZN
# MYANMAR
MM=MMK
# NAMIBIA
@@ -440,7 +440,7 @@ QA=QAR
# REUNION
RE=EUR
# ROMANIA
-RO=ROL;2005-06-30-21-00-00;RON
+RO=RON
# RUSSIAN FEDERATION
RU=RUB
# RWANDA
@@ -532,7 +532,7 @@ TT=TTD
# TUNISIA
TN=TND
# TURKEY
-TR=TRL;2004-12-31-22-00-00;TRY
+TR=TRY
# TURKMENISTAN
TM=TMT
# TURKS AND CAICOS ISLANDS
@@ -558,7 +558,7 @@ UZ=UZS
# VANUATU
VU=VUV
# VENEZUELA
-VE=VEB;2008-01-01-04-00-00;VEF
+VE=VEF
# VIET NAM
VN=VND
# VIRGIN ISLANDS, BRITISH
diff --git a/jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java b/jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java
index fbd8fca..5027b9a 100644
--- a/jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java
+++ b/jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, 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
@@ -347,6 +347,9 @@ class HttpsURLConnection extends HttpURLConnection
* @param sf the SSL socket factory
* @throws IllegalArgumentException if the <code>SSLSocketFactory</code>
* parameter is null.
+ * @throws SecurityException if a security manager exists and its
+ * <code>checkSetFactory</code> method does not allow
+ * a socket factory to be specified.
* @see #getSSLSocketFactory()
*/
public void setSSLSocketFactory(SSLSocketFactory sf) {
@@ -355,6 +358,10 @@ class HttpsURLConnection extends HttpURLConnection
"no SSLSocketFactory specified");
}
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkSetFactory();
+ }
sslSocketFactory = sf;
}
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLEngine.java b/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
index 2eea551..411626c 100644
--- a/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
+++ b/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
@@ -538,7 +538,7 @@ public abstract class SSLEngine {
* If this <code>SSLEngine</code> has not yet started its initial
* handshake, this method will automatically start the handshake.
* <P>
- * This method will attempt to produce one SSL/TLS packet, and will
+ * This method will attempt to produce SSL/TLS records, and will
* consume as much source data as possible, but will never consume
* more than the sum of the bytes remaining in each buffer. Each
* <code>ByteBuffer</code>'s position is updated to reflect the
diff --git a/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java b/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java
index 87afbed..3f5e708 100644
--- a/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java
+++ b/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java
@@ -117,7 +117,7 @@ public final class PrivateCredentialPermission extends Permission {
* The set contains elements of type,
* <code>PrivateCredentialPermission.CredOwner</code>.
*/
- private Set principals; // ignored - kept around for compatibility
+ private Set<Principal> principals; // ignored - kept around for compatibility
private transient CredOwner[] credOwners;
/**
diff --git a/jdk/src/share/classes/javax/security/auth/Subject.java b/jdk/src/share/classes/javax/security/auth/Subject.java
index 56e864c..5a9ecea 100644
--- a/jdk/src/share/classes/javax/security/auth/Subject.java
+++ b/jdk/src/share/classes/javax/security/auth/Subject.java
@@ -1291,6 +1291,7 @@ public final class Subject implements java.io.Serializable {
oos.writeFields();
}
+ @SuppressWarnings("unchecked")
private void readObject(ObjectInputStream ois)
throws IOException, ClassNotFoundException
{
@@ -1329,6 +1330,7 @@ public final class Subject implements java.io.Serializable {
}
}
+ @SuppressWarnings("unchecked") /*To suppress warning from line 1374*/
private void populateSet() {
final Iterator<?> iterator;
switch(which) {
diff --git a/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java b/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java
index 676137f..9da411c 100644
--- a/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java
+++ b/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java
@@ -56,6 +56,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
sun.security.util.Debug.getInstance("combiner",
"\t[SubjectDomainCombiner]");
+ @SuppressWarnings("deprecation")
// Note: check only at classloading time, not dynamically during combine()
private static final boolean useJavaxPolicy =
javax.security.auth.Policy.isCustomPolicySet(debug);
@@ -300,6 +301,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
if (!allowCaching) {
java.security.AccessController.doPrivileged
(new PrivilegedAction<Void>() {
+ @SuppressWarnings("deprecation")
public Void run() {
// Call refresh only caching is disallowed
javax.security.auth.Policy.getPolicy().refresh();
@@ -308,6 +310,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
});
}
+
int cLen = (currentDomains == null ? 0 : currentDomains.length);
int aLen = (assignedDomains == null ? 0 : assignedDomains.length);
@@ -348,13 +351,13 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
// get the original perms
Permissions perms = new Permissions();
PermissionCollection coll = pd.getPermissions();
- java.util.Enumeration e;
+ java.util.Enumeration<Permission> e;
if (coll != null) {
synchronized (coll) {
e = coll.elements();
while (e.hasMoreElements()) {
Permission newPerm =
- (Permission)e.nextElement();
+ e.nextElement();
perms.add(newPerm);
}
}
@@ -367,6 +370,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
PermissionCollection newPerms =
java.security.AccessController.doPrivileged
(new PrivilegedAction<PermissionCollection>() {
+ @SuppressWarnings("deprecation")
public PermissionCollection run() {
return
javax.security.auth.Policy.getPolicy().getPermissions
@@ -379,7 +383,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner {
synchronized (newPerms) {
e = newPerms.elements();
while (e.hasMoreElements()) {
- Permission newPerm = (Permission)e.nextElement();
+ Permission newPerm = e.nextElement();
if (!perms.implies(newPerm)) {
perms.add(newPerm);
if (debug != null)
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java b/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
index 3ab9beb..3304ac8 100644
--- a/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
+++ b/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
@@ -375,6 +375,7 @@ final class KrbDelegationPermissionCollection extends PermissionCollection
/*
* Reads in a Vector of DelegationPermissions and saves them in the perms field.
*/
+ @SuppressWarnings("unchecked")
private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException {
// Don't call defaultReadObject()
diff --git a/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java b/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java
index 566c719..c79d0e1 100644
--- a/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java
+++ b/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java
@@ -583,6 +583,7 @@ final class KrbServicePermissionCollection extends PermissionCollection
/*
* Reads in a Vector of ServicePermissions and saves them in the perms field.
*/
+ @SuppressWarnings("unchecked")
private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException {
// Don't call defaultReadObject()
diff --git a/jdk/src/share/classes/javax/security/auth/login/LoginContext.java b/jdk/src/share/classes/javax/security/auth/login/LoginContext.java
index 6fb484a..f76c6ed 100644
--- a/jdk/src/share/classes/javax/security/auth/login/LoginContext.java
+++ b/jdk/src/share/classes/javax/security/auth/login/LoginContext.java
@@ -214,14 +214,14 @@ public class LoginContext {
private boolean subjectProvided = false;
private boolean loginSucceeded = false;
private CallbackHandler callbackHandler;
- private Map state = new HashMap();
+ private Map<String,?> state = new HashMap<String,Object>();
private Configuration config;
private boolean configProvided = false;
private AccessControlContext creatorAcc = null;
private ModuleInfo[] moduleStack;
private ClassLoader contextClassLoader = null;
- private static final Class[] PARAMS = { };
+ private static final Class<?>[] PARAMS = { };
// state saved in the event a user-specified asynchronous exception
// was specified and thrown
@@ -306,7 +306,7 @@ public class LoginContext {
(DEFAULT_HANDLER);
if (defaultHandler == null || defaultHandler.length() == 0)
return null;
- Class c = Class.forName(defaultHandler,
+ Class<?> c = Class.forName(defaultHandler,
true,
finalLoader);
return (CallbackHandler)c.newInstance();
@@ -743,12 +743,12 @@ public class LoginContext {
} else {
// instantiate the LoginModule
- Class c = Class.forName
+ Class<?> c = Class.forName
(moduleStack[i].entry.getLoginModuleName(),
true,
contextClassLoader);
- Constructor constructor = c.getConstructor(PARAMS);
+ Constructor<?> constructor = c.getConstructor(PARAMS);
Object[] args = { };
// allow any object to be a LoginModule
diff --git a/jdk/src/share/classes/javax/security/auth/x500/X500Principal.java b/jdk/src/share/classes/javax/security/auth/x500/X500Principal.java
index 5636856..64a54f1 100644
--- a/jdk/src/share/classes/javax/security/auth/x500/X500Principal.java
+++ b/jdk/src/share/classes/javax/security/auth/x500/X500Principal.java
@@ -118,7 +118,7 @@ public final class X500Principal implements Principal, java.io.Serializable {
* is improperly specified
*/
public X500Principal(String name) {
- this(name, (Map<String, String>) Collections.EMPTY_MAP);
+ this(name, Collections.<String, String>emptyMap());
}
/**
diff --git a/jdk/src/share/classes/javax/security/cert/CertificateEncodingException.java b/jdk/src/share/classes/javax/security/cert/CertificateEncodingException.java
index 9eb5315..866d104 100644
--- a/jdk/src/share/classes/javax/security/cert/CertificateEncodingException.java
+++ b/jdk/src/share/classes/javax/security/cert/CertificateEncodingException.java
@@ -41,6 +41,7 @@ package javax.security.cert;
*/
public class CertificateEncodingException extends CertificateException {
+ private static final long serialVersionUID = -8187642723048403470L;
/**
* Constructs a CertificateEncodingException with no detail message. A
* detail message is a String that describes this particular
diff --git a/jdk/src/share/classes/javax/security/cert/CertificateException.java b/jdk/src/share/classes/javax/security/cert/CertificateException.java
index 44cebf7..95d0d3f 100644
--- a/jdk/src/share/classes/javax/security/cert/CertificateException.java
+++ b/jdk/src/share/classes/javax/security/cert/CertificateException.java
@@ -41,6 +41,7 @@ package javax.security.cert;
*/
public class CertificateException extends Exception {
+ private static final long serialVersionUID = -5757213374030785290L;
/**
* Constructs a certificate exception with no detail message. A detail
* message is a String that describes this particular exception.
diff --git a/jdk/src/share/classes/javax/security/cert/CertificateExpiredException.java b/jdk/src/share/classes/javax/security/cert/CertificateExpiredException.java
index 405344e..889e786 100644
--- a/jdk/src/share/classes/javax/security/cert/CertificateExpiredException.java
+++ b/jdk/src/share/classes/javax/security/cert/CertificateExpiredException.java
@@ -43,6 +43,7 @@ package javax.security.cert;
*/
public class CertificateExpiredException extends CertificateException {
+ private static final long serialVersionUID = 5091601212177261883L;
/**
* Constructs a CertificateExpiredException with no detail message. A
* detail message is a String that describes this particular
diff --git a/jdk/src/share/classes/javax/security/cert/CertificateNotYetValidException.java b/jdk/src/share/classes/javax/security/cert/CertificateNotYetValidException.java
index 2e6b4c3..20ed156 100644
--- a/jdk/src/share/classes/javax/security/cert/CertificateNotYetValidException.java
+++ b/jdk/src/share/classes/javax/security/cert/CertificateNotYetValidException.java
@@ -43,6 +43,7 @@ package javax.security.cert;
*/
public class CertificateNotYetValidException extends CertificateException {
+ private static final long serialVersionUID = -8976172474266822818L;
/**
* Constructs a CertificateNotYetValidException with no detail message. A
* detail message is a String that describes this particular
diff --git a/jdk/src/share/classes/javax/security/cert/CertificateParsingException.java b/jdk/src/share/classes/javax/security/cert/CertificateParsingException.java
index d935e12..c60ffe4 100644
--- a/jdk/src/share/classes/javax/security/cert/CertificateParsingException.java
+++ b/jdk/src/share/classes/javax/security/cert/CertificateParsingException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, 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
@@ -42,6 +42,8 @@ package javax.security.cert;
*/
public class CertificateParsingException extends CertificateException {
+ private static final long serialVersionUID = -8449352422951136229L;
+
/**
* Constructs a CertificateParsingException with no detail message. A
* detail message is a String that describes this particular
diff --git a/jdk/src/share/classes/javax/security/cert/X509Certificate.java b/jdk/src/share/classes/javax/security/cert/X509Certificate.java
index 7f16f02..39b24ec 100644
--- a/jdk/src/share/classes/javax/security/cert/X509Certificate.java
+++ b/jdk/src/share/classes/javax/security/cert/X509Certificate.java
@@ -219,11 +219,11 @@ public abstract class X509Certificate extends Certificate {
className = "com.sun.security.cert.internal.x509.X509V1CertImpl";
}
try {
- Class[] params = null;
+ Class<?>[] params = null;
if (value instanceof InputStream) {
- params = new Class[] { InputStream.class };
+ params = new Class<?>[] { InputStream.class };
} else if (value instanceof byte[]) {
- params = new Class[] { value.getClass() };
+ params = new Class<?>[] { value.getClass() };
} else
throw new CertificateException("Unsupported argument type");
Class<?> certClass = Class.forName(className);
diff --git a/jdk/src/share/classes/javax/security/sasl/Sasl.java b/jdk/src/share/classes/javax/security/sasl/Sasl.java
index 4188c41..ca9eb2a 100644
--- a/jdk/src/share/classes/javax/security/sasl/Sasl.java
+++ b/jdk/src/share/classes/javax/security/sasl/Sasl.java
@@ -395,7 +395,7 @@ public class Sasl {
* will be thrown.
*/
ClassLoader cl = p.getClass().getClassLoader();
- Class implClass;
+ Class<?> implClass;
implClass = Class.forName(className, true, cl);
return implClass.newInstance();
} catch (ClassNotFoundException e) {
@@ -576,7 +576,7 @@ public class Sasl {
classes.clear();
// Check the keys for each provider.
- for (Enumeration e = providers[i].keys(); e.hasMoreElements(); ) {
+ for (Enumeration<Object> e = providers[i].keys(); e.hasMoreElements(); ) {
String currentKey = (String)e.nextElement();
if (currentKey.startsWith(serviceName)) {
// We should skip the currentKey if it contains a
diff --git a/jdk/src/share/classes/javax/smartcardio/TerminalFactory.java b/jdk/src/share/classes/javax/smartcardio/TerminalFactory.java
index d1d5983..38a80bc 100644
--- a/jdk/src/share/classes/javax/smartcardio/TerminalFactory.java
+++ b/jdk/src/share/classes/javax/smartcardio/TerminalFactory.java
@@ -113,7 +113,7 @@ public final class TerminalFactory {
type = "PC/SC";
Provider sun = Security.getProvider("SunPCSC");
if (sun == null) {
- Class clazz = Class.forName("sun.security.smartcardio.SunPCSC");
+ Class<?> clazz = Class.forName("sun.security.smartcardio.SunPCSC");
sun = (Provider)clazz.newInstance();
}
factory = TerminalFactory.getInstance(type, null, sun);
@@ -131,6 +131,8 @@ public final class TerminalFactory {
}
private static final class NoneProvider extends Provider {
+
+ private static final long serialVersionUID = 2745808869881593918L;
final static Provider INSTANCE = new NoneProvider();
private NoneProvider() {
super("None", 1.0d, "none");
diff --git a/jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java b/jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java
index 29c8fb4..66c9baa 100644
--- a/jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java
+++ b/jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java
@@ -24,20 +24,17 @@
*/
package javax.swing;
-import java.applet.Applet;
import java.awt.*;
import java.awt.event.*;
import java.awt.image.*;
import java.lang.reflect.*;
import java.lang.ref.WeakReference;
-import java.security.AccessController;
import java.util.*;
import com.sun.java.swing.SwingUtilities3;
import sun.awt.SubRegionShowable;
import sun.java2d.SunGraphics2D;
-import sun.security.action.GetPropertyAction;
import sun.java2d.pipe.hw.ExtendedBufferCapabilities;
import sun.awt.SunToolkit;
import sun.util.logging.PlatformLogger;
@@ -120,10 +117,6 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
*/
private JComponent rootJ;
/**
- * Parent Applet/Window for the current paint/copyArea
- */
- private Container root;
- /**
* Location of component being painted relative to root.
*/
private int xOffset;
@@ -278,7 +271,9 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
public boolean paint(JComponent paintingComponent,
JComponent bufferComponent, Graphics g,
int x, int y, int w, int h) {
- if (prepare(paintingComponent, true, x, y, w, h)) {
+ Container root = fetchRoot(paintingComponent);
+
+ if (prepare(paintingComponent, root, true, x, y, w, h)) {
if ((g instanceof SunGraphics2D) &&
((SunGraphics2D)g).getDestination() == root) {
// BufferStrategy may have already constrained the Graphics. To
@@ -319,7 +314,9 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
//
// If the buffer isn't in sync there is no point in doing a copyArea,
// it has garbage.
- if (prepare(c, false, 0, 0, 0, 0) && bufferInfo.isInSync()) {
+ Container root = fetchRoot(c);
+
+ if (prepare(c, root, false, 0, 0, 0, 0) && bufferInfo.isInSync()) {
if (clip) {
Rectangle cBounds = c.getVisibleRect();
int relX = xOffset + x;
@@ -500,14 +497,14 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
*
* @return true if should use buffering per window in painting.
*/
- private boolean prepare(JComponent c, boolean isPaint, int x, int y,
+ private boolean prepare(JComponent c, Container root, boolean isPaint, int x, int y,
int w, int h) {
if (bsg != null) {
bsg.dispose();
bsg = null;
}
bufferStrategy = null;
- if (fetchRoot(c)) {
+ if (root != null) {
boolean contentsLost = false;
BufferInfo bufferInfo = getBufferInfo(root);
if (bufferInfo == null) {
@@ -567,10 +564,10 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
return false;
}
- private boolean fetchRoot(JComponent c) {
+ private Container fetchRoot(JComponent c) {
boolean encounteredHW = false;
rootJ = c;
- root = c;
+ Container root = c;
xOffset = yOffset = 0;
while (root != null &&
(!(root instanceof Window) &&
@@ -597,7 +594,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
// heavyweights. If we didn't do this when we
// went to show the descendants of the nested hw
// you would see nothing, so, we bail out here.
- return false;
+ return null;
}
}
}
@@ -613,11 +610,11 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
// bit tricky with Swing. This gives a good approximation
// of the various ways to turn on double buffering for
// components.
- return true;
+ return root;
}
}
// Don't do true double buffering.
- return false;
+ return null;
}
/**
diff --git a/jdk/src/share/classes/javax/swing/JTable.java b/jdk/src/share/classes/javax/swing/JTable.java
index 386b2a4..6314cb0 100644
--- a/jdk/src/share/classes/javax/swing/JTable.java
+++ b/jdk/src/share/classes/javax/swing/JTable.java
@@ -1828,6 +1828,8 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* table. While the {@code autoCreateRowSorter} property remains
* {@code true}, every time the model is changed, a new {@code
* TableRowSorter} is created and set as the table's row sorter.
+ * The default value for the {@code autoCreateRowSorter}
+ * property is {@code false}.
*
* @param autoCreateRowSorter whether or not a {@code RowSorter}
* should be automatically created
diff --git a/jdk/src/share/classes/javax/swing/JTree.java b/jdk/src/share/classes/javax/swing/JTree.java
index 13a4056..c5ca4b6 100644
--- a/jdk/src/share/classes/javax/swing/JTree.java
+++ b/jdk/src/share/classes/javax/swing/JTree.java
@@ -1838,7 +1838,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
* nodes, or <code>null</code> if nothing is currently selected
*/
public TreePath[] getSelectionPaths() {
- return getSelectionModel().getSelectionPaths();
+ TreePath[] selectionPaths = getSelectionModel().getSelectionPaths();
+
+ return (selectionPaths != null && selectionPaths.length > 0) ? selectionPaths : null;
}
/**
diff --git a/jdk/src/share/classes/javax/swing/text/DefaultCaret.java b/jdk/src/share/classes/javax/swing/text/DefaultCaret.java
index ecbfdf0..464fff6 100644
--- a/jdk/src/share/classes/javax/swing/text/DefaultCaret.java
+++ b/jdk/src/share/classes/javax/swing/text/DefaultCaret.java
@@ -1326,7 +1326,7 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou
if ( ! SwingUtilities2.canCurrentEventAccessSystemClipboard() ) {
return;
}
- if (this.dot != this.mark && component != null) {
+ if (this.dot != this.mark && component != null && component.hasFocus()) {
Clipboard clip = getSystemSelection();
if (clip != null) {
String selectedText;
diff --git a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java
index 5fc8c0f..a1f99e9 100644
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java
+++ b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java
@@ -1181,7 +1181,12 @@ public class HTMLDocument extends DefaultStyledDocument {
public void insertAfterStart(Element elem, String htmlText) throws
BadLocationException, IOException {
verifyParser();
- if (elem != null && elem.isLeaf()) {
+
+ if (elem == null || htmlText == null) {
+ return;
+ }
+
+ if (elem.isLeaf()) {
throw new IllegalArgumentException
("Can not insert HTML after start of a leaf");
}
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/Manifest.java b/jdk/src/share/classes/org/openjdk/jigsaw/Manifest.java
index cc09c43..8ed040c 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/Manifest.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/Manifest.java
@@ -55,8 +55,9 @@ public final class Manifest {
return module;
}
+ // list of directories, each of which contains
+ // classes and resources
private List<File> classes = new ArrayList<File>();
- private List<File> resources = new ArrayList<File>();
/* ## Eventually
private List<File> libs = new ArrayList<File>();
@@ -93,34 +94,15 @@ public final class Manifest {
}
/**
- * <p> The module-classes directories to be scanned for the requested
+ * <p> The module-classes-resources directories to be scanned for the requested
* modules. </p>
+ * <p> The resource files will be copied, without change, into
+ * the installed module. </p>
*/
public List<File> classes() {
return classes;
}
-
- /**
- * <p> Add a resource directory to this manifest. </p>
- *
- * <p> The content of this directory will be copied, without change, into
- * the installed module. </p>
- */
- public Manifest addResources(File f) {
- if (!f.isDirectory())
- throw new IllegalArgumentException(f + ": Not a directory");
- resources.add(f);
- return this;
- }
-
- /**
- * <p> The resource directories whose contents will be installed </p>
- */
- public List<File> resources() {
- return resources;
- }
-
public static Manifest create(String mn) {
return new Manifest(mn);
}
@@ -128,9 +110,4 @@ public final class Manifest {
public static Manifest create(String mn, File classes) {
return new Manifest(mn).addClasses(classes);
}
-
- public static Manifest create(String mn, File classes, File resources) {
- return new Manifest(mn).addClasses(classes).addResources(resources);
- }
-
}
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFile.java b/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFile.java
new file mode 100644
index 0000000..a60312f
--- /dev/null
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFile.java
@@ -0,0 +1,959 @@
+/*
+ * Copyright (c) 2010, 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package org.openjdk.jigsaw;
+
+import java.io.*;
+import java.security.*;
+import java.util.*;
+import java.util.jar.*;
+import java.util.zip.*;
+
+import static org.openjdk.jigsaw.FileConstants.ModuleFile.*;
+
+public final class ModuleFile {
+ /**
+ * Return the subdir of a section in an extracted module file.
+ */
+ public static String getSubdirOfSection(SectionType type) {
+ switch (type) {
+ case MODULE_INFO:
+ case SIGNATURE:
+ return ".";
+ case CLASSES:
+ case RESOURCES:
+ return "classes";
+ case NATIVE_LIBS:
+ return "lib";
+ case NATIVE_CMDS:
+ return "bin";
+ case CONFIG:
+ return "etc";
+ default:
+ throw new AssertionError(type);
+ }
+ }
+
+ public final static class Reader implements Closeable {
+
+ private DataInputStream stream;
+ private File destination;
+ private HashType hashtype;
+
+ private static class CountingInputStream extends FilterInputStream {
+ int count;
+ public CountingInputStream(InputStream stream, int count) {
+ super(stream);
+ this.count = count;
+ }
+
+ public int available() throws IOException {
+ return count;
+ }
+
+ public boolean markSupported() {
+ return false;
+ }
+
+ public int read() throws IOException {
+ if (count == 0)
+ return -1;
+ int read = super.read();
+ if (-1 != read)
+ count--;
+ return read;
+ }
+
+ public int read(byte[] b, int off, int len) throws IOException {
+ if (count == 0)
+ return -1;
+ len = Math.min(len, count);
+ int read = super.read(b, off, len);
+ if (-1 != read)
+ count-=read;
+ return read;
+ }
+
+ public void reset() throws IOException {
+ throw new IOException("Can't reset this stream");
+ }
+
+ public long skip(long n) throws IOException {
+ if (count == 0)
+ return -1;
+ n = Math.min(n, count);
+ long skipped = super.skip(n);
+ if (n > 0)
+ count-=skipped;
+ return skipped;
+ }
+ }
+
+ public Reader(DataInputStream stream) {
+ hashtype = HashType.SHA256;
+ // Ensure that mark/reset is supported
+ if (stream.markSupported()) {
+ this.stream = stream;
+ } else {
+ this.stream =
+ new DataInputStream(new BufferedInputStream(stream));
+ }
+ }
+
+ private void checkHashMatch(byte[] expected, byte[] computed)
+ throws IOException
+ {
+ if (!MessageDigest.isEqual(expected, computed))
+ throw new IOException("Expected hash "
+ + hashHexString(expected)
+ + " instead of "
+ + hashHexString(computed));
+ }
+
+ private ModuleFileHeader fileHeader = null;
+ private MessageDigest fileDigest = null;
+ private MessageDigest sectionDigest = null;
+ private DataInputStream fileIn = null;
+ private byte[] moduleInfoBytes = null;
+ private Integer moduleSignatureType = null;
+ private byte[] moduleSignatureBytes = null;
+ private final int MAX_SECTION_HEADER_LENGTH = 128;
+ private List<byte[]> calculatedHashes = new ArrayList<>();
+ private boolean extract = true;
+
+ /*
+ * Reads the MODULE_INFO section and the Signature section, if present,
+ * but does not write any files.
+ */
+ public byte[] readStart() throws IOException {
+
+ try {
+ fileDigest = getHashInstance(hashtype);
+ sectionDigest = getHashInstance(hashtype);
+ DigestInputStream dis =
+ new DigestInputStream(stream, fileDigest);
+ fileHeader = ModuleFileHeader.read(dis);
+ // calculate module header hash
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ fileHeader.write(new DataOutputStream(baos));
+ sectionDigest.update(baos.toByteArray());
+ calculatedHashes.add(sectionDigest.digest());
+
+ fileIn = new DataInputStream(dis);
+ if (readSection(fileIn) != SectionType.MODULE_INFO)
+ throw new IOException("First module-file section"
+ + " is not MODULE_INFO");
+ assert moduleInfoBytes != null;
+
+ // Read the Signature Section, if present
+ readSignatureSection(fileIn, dis);
+
+ return moduleInfoBytes.clone();
+ } catch (IOException x) {
+ close();
+ throw x;
+ }
+ }
+
+ public void readRest() throws IOException {
+ extract = false;
+ readRest(null);
+ }
+
+ public void readRest(File dst) throws IOException {
+
+ destination = dst;
+ try {
+ if (extract)
+ Files.store(moduleInfoBytes, computeRealPath("info"));
+ // Module-Info and Signature, if present, have been consumed
+
+ // Read rest of file until all sections have been read
+ stream.mark(1);
+ while (-1 != stream.read()) {
+ stream.reset();
+ readSection(fileIn);
+ stream.mark(1);
+ }
+
+ close();
+ byte[] fileHeaderHash = fileHeader.getHashNoClone();
+ checkHashMatch(fileHeaderHash, fileDigest.digest());
+ calculatedHashes.add(fileHeaderHash);
+ } finally {
+ close();
+ }
+ }
+
+ public byte[] getHash() throws IOException {
+ if (null == fileHeader)
+ readStart();
+ return fileHeader.getHash();
+ }
+
+ public List<byte[]> getCalculatedHashes() {
+ return calculatedHashes;
+ }
+
+ public boolean hasSignature() throws IOException {
+ if (null == fileHeader)
+ readStart();
+ return moduleSignatureBytes != null;
+ }
+
+ public Integer getSignatureType() throws IOException {
+ if (null == fileHeader)
+ readStart();
+ return moduleSignatureType;
+ }
+
+ public byte[] getSignature() throws IOException {
+ if (null == fileHeader)
+ readStart();
+ return moduleSignatureBytes != null
+ ? moduleSignatureBytes.clone()
+ : null;
+ }
+
+ byte[] getSignatureNoClone() {
+ return moduleSignatureBytes;
+ }
+
+ private JarOutputStream contentStream = null;
+
+ private JarOutputStream contentStream() throws IOException {
+ if (contentStream == null) {
+ if (extract) {
+ FileOutputStream fos
+ = new FileOutputStream(computeRealPath("classes"));
+ contentStream
+ = new JarOutputStream(new BufferedOutputStream(fos));
+ } else {
+ contentStream = new JarOutputStream(new NullOutputStream());
+ }
+ }
+ return contentStream;
+ }
+
+ public void close() throws IOException {
+ try {
+ if (contentStream != null) {
+ contentStream.close();
+ contentStream = null;
+ }
+ } finally {
+ if (fileIn != null) {
+ fileIn.close();
+ fileIn = null;
+ }
+ }
+ }
+
+ public void readModule() throws IOException {
+ extract = false;
+ readStart();
+ readRest();
+ }
+
+ public void readModule(File dst) throws IOException {
+ readStart();
+ readRest(dst);
+ }
+
+ private void readSignatureSection(DataInputStream stream,
+ DigestInputStream dis)
+ throws IOException
+ {
+
+ // Turn off digest computation before reading Signature Section
+ dis.on(false);
+
+ // Mark the starting position
+ stream.mark(MAX_SECTION_HEADER_LENGTH);
+ if (stream.read() != -1) {
+ stream.reset();
+ SectionHeader header = SectionHeader.read(stream);
+ if (header != null &&
+ header.getType() == SectionType.SIGNATURE) {
+ readSectionContent(header, stream);
+ } else {
+ // Revert back to the starting position
+ stream.reset();
+ }
+ }
+
+ // Turn on digest computation again
+ dis.on(true);
+ }
+
+ private SectionType readSection(DataInputStream stream)
+ throws IOException
+ {
+ SectionHeader header = SectionHeader.read(stream);
+ readSectionContent(header, stream);
+ return header.getType();
+ }
+
+ private void readSectionContent(SectionHeader header,
+ DataInputStream stream)
+ throws IOException
+ {
+ SectionType type = header.getType();
+ Compressor compressor = header.getCompressor();
+ int csize = header.getCSize();
+ short subsections =
+ type.hasFiles() ? header.getSubsections() : 1;
+
+ CountingInputStream cs = new CountingInputStream(stream, csize);
+ sectionDigest.reset();
+ DigestInputStream dis = new DigestInputStream(cs, sectionDigest);
+ DataInputStream in = new DataInputStream(dis);
+
+ for (int subsection = 0; subsection < subsections; subsection++)
+ readFile(in, compressor, type, csize);
+
+ byte[] headerHash = header.getHashNoClone();
+ checkHashMatch(headerHash, sectionDigest.digest());
+ if (header.getType() != SectionType.SIGNATURE) {
+ calculatedHashes.add(headerHash);
+ }
+ }
+
+ public void readFile(DataInputStream in,
+ Compressor compressor,
+ SectionType type,
+ int csize)
+ throws IOException
+ {
+ switch (compressor) {
+ case NONE:
+ if (type == SectionType.MODULE_INFO) {
+ moduleInfoBytes = readModuleInfo(in, csize);
+
+ } else if (type == SectionType.SIGNATURE) {
+ // Examine the Signature header
+ moduleSignatureType = (int)in.readShort();
+ int length = in.readInt();
+ moduleSignatureBytes = readModuleSignature(in, csize - 6);
+ if (length != moduleSignatureBytes.length) {
+ throw new IOException("Invalid Signature length");
+ }
+ } else {
+ readUncompressedFile(in, type, csize);
+ }
+ break;
+ case GZIP:
+ readGZIPCompressedFile(in, type);
+ break;
+ case PACK200_GZIP:
+ readClasses(
+ new DataInputStream(new CountingInputStream(in, csize)));
+ break;
+ default:
+ throw new IOException("Unsupported Compressor for files: " +
+ compressor);
+ }
+ }
+
+ public void readClasses(DataInputStream in) throws IOException {
+ unpack200gzip(in);
+ }
+
+ private File currentPath = null;
+
+ private OutputStream openOutputStream(SectionType type,
+ String path)
+ throws IOException
+ {
+ if (!extract)
+ return new NullOutputStream();
+ currentPath = null;
+ assert type != SectionType.CLASSES;
+ if (type == SectionType.RESOURCES)
+ return Files.newOutputStream(contentStream(), path);
+ currentPath = computeRealPath(type, path);
+ File parent = currentPath.getParentFile();
+ if (!parent.exists())
+ Files.mkdirs(parent, currentPath.getName());
+ return new BufferedOutputStream(new FileOutputStream(currentPath));
+ }
+
+ private static class NullOutputStream extends OutputStream {
+ @Override
+ public void write(int b) throws IOException {}
+ @Override
+ public void write(byte[] b) throws IOException {}
+ @Override
+ public void write(byte[] b, int off, int len) throws IOException {}
+ }
+
+ public void readGZIPCompressedFile(DataInputStream in,
+ SectionType type)
+ throws IOException
+ {
+ SubSectionFileHeader header = SubSectionFileHeader.read(in);
+ int csize = header.getCSize();
+
+ // Splice off the compressed file from input stream
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ copyStream(new CountingInputStream(in, csize), baos, csize);
+
+ byte[] compressedfile = baos.toByteArray();
+ ByteArrayInputStream bain
+ = new ByteArrayInputStream(compressedfile);
+ try (GZIPInputStream gin = new GZIPInputStream(bain);
+ OutputStream out = openOutputStream(type, header.getPath())) {
+ copyStream(gin, out);
+ }
+
+ if (extract)
+ markNativeCodeExecutable(type, currentPath);
+ }
+
+ public void readUncompressedFile(DataInputStream in,
+ SectionType type,
+ int csize)
+ throws IOException
+ {
+ assert type != SectionType.MODULE_INFO;
+ SubSectionFileHeader header = SubSectionFileHeader.read(in);
+ csize = header.getCSize();
+ try (OutputStream out = openOutputStream(type, header.getPath())) {
+ CountingInputStream cin = new CountingInputStream(in, csize);
+ byte[] buf = new byte[8192];
+ int n;
+ while ((n = cin.read(buf)) >= 0)
+ out.write(buf, 0, n);
+ }
+ markNativeCodeExecutable(type, currentPath);
+ }
+
+ public byte[] readModuleInfo(DataInputStream in, int csize)
+ throws IOException
+ {
+ CountingInputStream cin = new CountingInputStream(in, csize);
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ byte[] buf = new byte[8192];
+ int n;
+ while ((n = cin.read(buf)) >= 0)
+ out.write(buf, 0, n);
+ return out.toByteArray();
+ }
+
+ public byte[] readModuleSignature(DataInputStream in, int csize)
+ throws IOException
+ {
+ return readModuleInfo(in, csize); // signature has the same format
+ }
+
+ private File computeRealPath(String storedpath) throws IOException {
+
+ String convertedpath = storedpath.replace('/', File.separatorChar);
+ File path = new File(convertedpath);
+
+ // Absolute path names are not permitted.
+ ensureNonAbsolute(path);
+ path = resolveAndNormalize(destination, convertedpath);
+ // Create the parent directories if necessary
+ File parent = path.getParentFile();
+ if (!parent.exists())
+ Files.mkdirs(parent, path.getName());
+
+ return path;
+ }
+
+ private File computeRealPath(SectionType type,
+ String storedpath)
+ throws IOException
+ {
+ String dir = getSubdirOfSection(type);
+ return computeRealPath(dir + File.separatorChar + storedpath);
+ }
+
+ private static void markNativeCodeExecutable(SectionType type,
+ File file)
+ {
+ if (type == SectionType.NATIVE_CMDS
+ || (type == SectionType.NATIVE_LIBS
+ && System.getProperty("os.name").startsWith("Windows")))
+ {
+ file.setExecutable(true);
+ }
+ }
+
+ private void unpack200gzip(DataInputStream in) throws IOException {
+ GZIPInputStream gis = new GZIPInputStream(in) {
+ public void close() throws IOException {}
+ };
+ Pack200.Unpacker unpacker = Pack200.newUnpacker();
+ unpacker.unpack(gis, contentStream());
+ }
+
+ }
+
+ private static void checkCompressor(SectionType type,
+ Compressor compressor) {
+
+ if ((SectionType.MODULE_INFO == type &&
+ Compressor.NONE != compressor)
+ || (SectionType.CLASSES == type &&
+ Compressor.PACK200_GZIP != compressor))
+ throw new IllegalArgumentException(type
+ + " may not use compressor "
+ + compressor);
+ }
+
+ private static void checkSubsectionCount(SectionType type,
+ short subsections) {
+ if (!type.hasFiles() && subsections != 0)
+ throw new IllegalArgumentException(type
+ + " subsection count not 0: "
+ + subsections);
+ else if (type.hasFiles() && subsections == 0)
+ throw new IllegalArgumentException(type + " subsection count is 0");
+ }
+
+ private static void copyStream(InputStream in, DataOutput out)
+ throws IOException
+ {
+
+ byte[] buffer = new byte[1024 * 8];
+ for (int b_read = in.read(buffer);
+ -1 != b_read;
+ b_read = in.read(buffer))
+ out.write(buffer, 0, b_read);
+ }
+
+ private static void copyStream(InputStream in, OutputStream out)
+ throws IOException
+ {
+ copyStream(in, (DataOutput) new DataOutputStream(out));
+ }
+
+ private static void copyStream(InputStream in, DataOutput out,
+ int count)
+ throws IOException
+ {
+ byte[] buffer = new byte[1024 * 8];
+
+ while(count > 0) {
+ int b_read = in.read(buffer, 0, Math.min(count, buffer.length));
+ if (-1 == b_read)
+ return;
+ out.write(buffer, 0, b_read);
+ count-=b_read;
+ }
+ }
+
+ private static void copyStream(InputStream in, OutputStream out,
+ int count)
+ throws IOException
+ {
+ copyStream(in, (DataOutput) new DataOutputStream(out), count);
+ }
+
+ private static void ensureNonAbsolute(File path) throws IOException {
+ if (path.isAbsolute())
+ throw new IOException("Abolute path instead of relative: " + path);
+ }
+
+ private static void ensureNonNegativity(long size, String parameter) {
+ if (size < 0)
+ throw new IllegalArgumentException(parameter + "<0: " + size);
+ }
+
+ private static void ensureNonNull(Object reference, String parameter) {
+ if (null == reference)
+ throw new IllegalArgumentException(parameter + " == null");
+ }
+
+ private static void ensureMatch(int found, int expected, String field)
+ throws IOException
+ {
+ if (found != expected)
+ throw new IOException(field + " expected : "
+ + Integer.toHexString(expected) + " found: "
+ + Integer.toHexString(found));
+ }
+
+ private static void ensureShortNativePath(File path, String name)
+ throws IOException
+ {
+ // TODO: check for native code file in a stricter way
+ if (path.canExecute()
+ && name.indexOf('/') != -1)
+ throw new IOException("Native code path too long: " + path);
+ }
+
+ private static void ensureValidFileSize(long size, File path)
+ throws IOException
+ {
+ if (size < 0 || size > Integer.MAX_VALUE)
+ throw new IOException("File " + path + " too large: " + size);
+ }
+
+ static MessageDigest getHashInstance(HashType hashtype)
+ throws IOException
+ {
+ try {
+ switch(hashtype) {
+ case SHA256:
+ return MessageDigest.getInstance("SHA-256");
+ default:
+ throw new IOException("Unknown hash type: " + hashtype);
+ }
+ }
+ catch (NoSuchAlgorithmException ex) {
+ throw (IOException) (new IOException(hashtype + " not found"))
+ .initCause(ex);
+ }
+ }
+
+ private static short getMUTF8Length(String name) {
+ short size = 2;
+
+ for (int i = name.length()-1; i >= 0; i--) {
+ char ch = name.charAt(i);
+
+ if ('\u0001' <= ch && ch <= '\u007F')
+ size += 1;
+ else if ('\u0000' == ch
+ || '\u0080' <= ch && ch <= '\u07FF')
+ size += 2;
+ else
+ size += 3;
+ }
+
+ return size;
+ }
+
+ private static String hashHexString(byte[] hash) {
+ StringBuilder hex = new StringBuilder("0x");
+ for (int i = 0; i < hash.length; i++) {
+ int val = (hash[i] & 0xFF);
+ if (val <= 16)
+ hex.append("0");
+ hex.append(Integer.toHexString(val));
+ }
+ return hex.toString();
+ }
+
+ private static File resolveAndNormalize(File directory, String path)
+ throws IOException
+ {
+ File realpath = new File(directory, path);
+ if (directory != null &&
+ ! realpath.toPath().startsWith(directory.toPath()))
+ throw new IOException("Bogus relative path: " + path);
+
+ return realpath;
+ }
+
+ private static short readHashLength(DataInputStream in) throws IOException {
+ final short hashLength = in.readShort();
+ ensureNonNegativity(hashLength, "hashLength");
+
+ return hashLength;
+ }
+
+ private static byte[] readHashBytes(DataInputStream in, short hashLength)
+ throws IOException
+ {
+
+ final byte[] hash = new byte[hashLength];
+ in.readFully(hash);
+
+ return hash;
+ }
+
+ private static byte[] readHash(DataInputStream in) throws IOException {
+ return readHashBytes(in, readHashLength(in));
+ }
+
+ private static byte[] readFileHash(DigestInputStream dis)
+ throws IOException
+ {
+
+ DataInputStream in = new DataInputStream(dis);
+
+ final short hashLength = readHashLength(in);
+
+ // Turn digest computation off before reading the file hash
+ dis.on(false);
+ byte[] hash = readHashBytes(in, hashLength);
+ // Turn digest computation on again afterwards.
+ dis.on(true);
+
+ return hash;
+ }
+
+ public final static class ModuleFileHeader {
+ public static final int LENGTH_WITHOUT_HASH = 30;
+ public static final int LENGTH =
+ LENGTH_WITHOUT_HASH + HashType.SHA256.length();
+
+ // Fields are specified as unsigned. Treat signed values as bugs.
+ private final int magic; // MAGIC
+ private final FileConstants.Type type; // Type.MODULE_FILE
+ private final short major; // ModuleFile.MAJOR_VERSION
+ private final short minor; // ModuleFile.MINOR_VERSION
+ private final long csize; // Size of rest of file, compressed
+ private final long usize; // Space required for uncompressed contents
+ // (upper private final ound; need not be exact)
+ private final HashType hashType; // One of ModuleFile.HashType
+ // (applies final o all hashes in this file)
+ private final byte[] hash; // Hash of entire file (except this hash
+ // and the Signature section, if present)
+
+ public byte[] getHash() {
+ return hash.clone();
+ }
+
+ private byte[] getHashNoClone() {
+ return hash;
+ }
+
+ public ModuleFileHeader(long csize, long usize,
+ HashType hashType, byte[] hash) {
+ ensureNonNegativity(csize, "csize");
+ ensureNonNegativity(usize, "usize");
+
+ magic = FileConstants.MAGIC;
+ type = FileConstants.Type.MODULE_FILE;
+ major = MAJOR_VERSION;
+ minor = MINOR_VERSION;
+
+ this.csize = csize;
+ this.usize = usize;
+ this.hashType = hashType;
+ this.hash = hash.clone();
+ }
+
+ public void write(final DataOutput out) throws IOException {
+ out.writeInt(magic);
+ out.writeShort(type.value());
+ out.writeShort(major);
+ out.writeShort(minor);
+ out.writeLong(csize);
+ out.writeLong(usize);
+ out.writeShort(hashType.value());
+ writeHash(out, hash);
+ }
+
+ private static HashType lookupHashType(short value) {
+ for (HashType i : HashType.class.getEnumConstants()) {
+ if (i.value() == value) return i;
+ }
+
+ throw new IllegalArgumentException("No HashType exists with value "
+ + value);
+ }
+
+ public static ModuleFileHeader read(final DigestInputStream dis)
+ throws IOException
+ {
+ DataInputStream in = new DataInputStream(dis);
+
+ final int magic = in.readInt();
+ ensureMatch(magic, FileConstants.MAGIC,
+ "FileConstants.MAGIC");
+
+ final short type = in.readShort();
+ ensureMatch(type, FileConstants.Type.MODULE_FILE.value(),
+ "Type.MODULE_FILE");
+
+ final short major = in.readShort();
+ ensureMatch(major, MAJOR_VERSION,
+ "ModuleFile.MAJOR_VERSION");
+
+ final short minor = in.readShort();
+ ensureMatch(minor, MINOR_VERSION,
+ "ModuleFile.MINOR_VERSION");
+
+ final long csize = in.readLong();
+ final long usize = in.readLong();
+ final short hashTypeValue = in.readShort();
+ HashType hashType = lookupHashType(hashTypeValue);
+ final byte[] hash = readFileHash(dis);
+
+ return new ModuleFileHeader(csize, usize, hashType, hash);
+ }
+
+ public String toString() {
+ return "MODULE{csize=" + csize +
+ ", hash=" + hashHexString(hash) + "}";
+ }
+ }
+
+ public final static class SectionHeader {
+ public static final int LENGTH_WITHOUT_HASH = 12;
+ public static final int LENGTH =
+ LENGTH_WITHOUT_HASH + HashType.SHA256.length();
+
+ // Fields are specified as unsigned. Treat signed values as bugs.
+ private final SectionType type;
+ private final Compressor compressor;
+ private final int csize; // Size of section content, compressed
+ private final short subsections; // Number of following subsections
+ private final byte[] hash; // Hash of section content
+
+ public SectionHeader(SectionType type,
+ Compressor compressor,
+ int csize, short subsections, byte[] hash) {
+ ensureNonNull(type, "type");
+ ensureNonNull(compressor, "compressor");
+ ensureNonNegativity(csize, "csize");
+ ensureNonNegativity(subsections, "subsections");
+ ensureNonNull(hash, "hash");
+ checkSubsectionCount(type, subsections);
+ checkCompressor(type, compressor);
+
+ this.type = type;
+ this.compressor = compressor;
+ this.csize = csize;
+ this.subsections = subsections;
+ this.hash = hash.clone();
+ }
+
+ public void write(DataOutput out) throws IOException {
+ out.writeShort(type.value());
+ out.writeShort(compressor.value());
+ out.writeInt(csize);
+ out.writeShort(subsections);
+ writeHash(out, hash);
+ }
+
+ private static SectionType lookupSectionType(short value) {
+ for (SectionType i : SectionType.class.getEnumConstants()) {
+ if (i.value() == value) return i;
+ }
+
+ throw new
+ IllegalArgumentException("No SectionType exists with value "
+ + value);
+ }
+
+ private static Compressor lookupCompressor(short value) {
+ for (Compressor i : Compressor.class.getEnumConstants()) {
+ if (i.value() == value) return i;
+ }
+
+ throw new
+ IllegalArgumentException("No Compressor exists with value "
+ + value);
+ }
+
+ public static SectionHeader read(DataInputStream in) throws IOException {
+ short tvalue = in.readShort();
+ final SectionType type = lookupSectionType(tvalue);
+ short cvalue = in.readShort();
+ final Compressor compressor = lookupCompressor(cvalue);
+ final int csize = in.readInt();
+ final short sections = in.readShort();
+ final byte[] hash = readHash(in);
+
+ return new SectionHeader(type, compressor, csize,
+ sections, hash);
+ }
+
+ public SectionType getType() {
+ return type;
+ }
+
+ public Compressor getCompressor() {
+ return compressor;
+ }
+
+ public int getCSize() {
+ return csize;
+ }
+
+ public short getSubsections() {
+ return subsections;
+ }
+
+ public byte[] getHash() {
+ return hash.clone();
+ }
+
+ private byte[] getHashNoClone() {
+ return hash;
+ }
+
+ public String toString() {
+ return "SectionHeader{type= " + type
+ + ", compressor=" + compressor
+ + ", csize=" + csize
+ + ", subsections=" + subsections
+ + ", hash=" + hashHexString(hash) + "}";
+ }
+ }
+
+ public final static class SubSectionFileHeader {
+ private final int csize; // Size of file, compressed
+ private final String path; // Path name, in Java-modified UTF-8
+
+ public int getCSize() {
+ return csize;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public SubSectionFileHeader(int csize, String path) {
+ ensureNonNegativity(csize, "csize");
+ ensureNonNull(path, "path");
+
+ this.csize = csize;
+ this.path = path;
+ }
+
+ public void write(DataOutput out) throws IOException {
+ out.writeShort(SubSectionType.FILE.value());
+ out.writeInt(csize);
+ out.writeUTF(path);
+ }
+
+ public static SubSectionFileHeader read(DataInputStream in)
+ throws IOException
+ {
+ final short type = in.readShort();
+ ensureMatch(type, SubSectionType.FILE.value(),
+ "ModuleFile.SubSectionType.FILE");
+ final int csize = in.readInt();
+ final String path = in.readUTF();
+
+ return new SubSectionFileHeader(csize, path);
+ }
+ }
+
+ private static void writeHash(DataOutput out, byte[] hash)
+ throws IOException
+ {
+ out.writeShort(hash.length);
+ out.write(hash);
+ }
+}
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileSigner.java b/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileSigner.java
index 45f0a76..fc877db 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileSigner.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileSigner.java
@@ -29,7 +29,7 @@ import java.net.URI;
import java.security.*;
import java.security.cert.Certificate;
-import static org.openjdk.jigsaw.FileConstants.*;
+import static org.openjdk.jigsaw.FileConstants.ModuleFile.SignatureType;
/**
* Generate a digital signature for a module file.
@@ -43,7 +43,7 @@ public interface ModuleFileSigner {
*
* @see FileConstants.ModuleFile.SignatureType
*/
- public ModuleFile.SignatureType getSignatureType();
+ public SignatureType getSignatureType();
/**
* Generates the digital signature.
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileVerifier.java b/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileVerifier.java
index a200bea..c33833f 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileVerifier.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileVerifier.java
@@ -30,7 +30,7 @@ import java.security.*;
import java.security.cert.*;
import java.util.Set;
-import static org.openjdk.jigsaw.FileConstants.*;
+import static org.openjdk.jigsaw.FileConstants.ModuleFile.SignatureType;
/**
* Validate the digital signature of a module file.
@@ -43,7 +43,7 @@ public interface ModuleFileVerifier {
*
* @see FileConstants.ModuleFile.SignatureType
*/
- public ModuleFile.SignatureType getSignatureType();
+ public SignatureType getSignatureType();
/**
* Verifies the module file signature and performs certificate path
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileWriter.java b/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileWriter.java
new file mode 100644
index 0000000..7f75885
--- /dev/null
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/ModuleFileWriter.java
@@ -0,0 +1,528 @@
+/*
+ * Copyright (c) 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package org.openjdk.jigsaw;
+
+import java.nio.file.attribute.BasicFileAttributes;
+import java.io.*;
+import java.nio.ByteBuffer;
+import java.nio.channels.*;
+import java.nio.file.*;
+import java.nio.file.Files;
+import java.security.MessageDigest;
+import java.util.*;
+import java.util.jar.*;
+import java.util.zip.*;
+import static org.openjdk.jigsaw.FileConstants.ModuleFile.*;
+import static org.openjdk.jigsaw.ModuleFile.*;
+
+/**
+ *
+ */
+public class ModuleFileWriter {
+ private final File outfile;
+ private final HashType hashtype;
+ private final boolean fastestCompression;
+ private long usize;
+
+ public ModuleFileWriter(File outfile) {
+ this(outfile, false);
+ }
+
+ public ModuleFileWriter(File outfile, boolean useFastestCompression) {
+ this.outfile = outfile;
+ this.hashtype = HashType.SHA256;
+ this.fastestCompression = useFastestCompression;
+ }
+
+ /*
+ * Generates an unsigned module file.
+ */
+ public void writeModule(File mdir,
+ File nativelibs,
+ File nativecmds,
+ File config)
+ throws IOException
+ {
+ if (!mdir.isDirectory()) {
+ throw new IOException("Not a directory: " + mdir);
+ }
+
+ try (RandomAccessFile file = new RandomAccessFile(outfile, "rw")) {
+ // Truncate the file if it already exists
+ file.setLength(0);
+
+ // Reset module file to right after module header
+ file.seek(ModuleFileHeader.LENGTH);
+
+ // Write out the Module-Info Section
+ File miclass = new File(mdir, "module-info.class");
+ if (!miclass.exists()) {
+ throw new IOException(miclass + " does not exist");
+ }
+ writeSection(file,
+ SectionType.MODULE_INFO,
+ mdir,
+ Collections.singletonList(miclass.toPath()),
+ Compressor.NONE);
+
+ long remainderStart = file.getFilePointer();
+
+ // Write out the optional file sections
+ writeOptionalSections(file, mdir, nativelibs, nativecmds, config);
+
+ // Write out the module file header
+ writeModuleFileHeader(file, remainderStart);
+ }
+ }
+
+ /*
+ * Write a section to the given module file.
+ *
+ * @params file RandomAccessFile for the resulting jmod file
+ * @params type section type
+ * @params sourcedir the directory containing the files to be written
+ * @params files list of files to be written
+ * @params compressor compression type
+ */
+ private void writeSection(RandomAccessFile file,
+ SectionType type,
+ File sourcedir,
+ List<Path> files,
+ Compressor compressor) throws IOException {
+ // Start of section header
+ final long start = file.getFilePointer();
+
+ // Start of section content
+ final long cstart = start + SectionHeader.LENGTH;
+ // Seek to start of section content
+ file.seek(cstart);
+
+ writeSectionContent(file, type, sourcedir, files, compressor);
+
+ // End of section
+ final long end = file.getFilePointer();
+ final int csize = (int) (end - cstart);
+
+ // A section type that has no files has a section count of 0.
+ int count = type.hasFiles() ? files.size() : 0;
+ if (count > Short.MAX_VALUE) {
+ throw new IOException("Too many files: " + count);
+ }
+ writeSectionHeader(file, type, compressor, start, csize, (short) count);
+ }
+
+ private void writeSectionContent(RandomAccessFile file,
+ SectionType type,
+ File sourcedir,
+ List<Path> files,
+ Compressor compressor) throws IOException {
+
+ if (type.hasFiles()) {
+ for (Path p : files) {
+ writeSubSection(file, sourcedir, p, compressor);
+ }
+ } else if (type == SectionType.CLASSES) {
+ writeClassesContent(file, sourcedir, files, compressor);
+ } else if (files.size() == 1) {
+ writeFileContent(file, files.get(0), compressor);
+ } else {
+ throw new IllegalArgumentException("Section type: " + type
+ + " can only have one single file but given " + files);
+ }
+ }
+
+ private void writeSectionHeader(RandomAccessFile file,
+ SectionType type,
+ Compressor compressor,
+ long start, int csize,
+ short subsections) throws IOException {
+
+ // Compute hash of content
+ MessageDigest md = getHashInstance(hashtype);
+ FileChannel channel = file.getChannel();
+ ByteBuffer content = ByteBuffer.allocate(csize);
+
+ final long cstart = start + SectionHeader.LENGTH;
+ int n = channel.read(content, cstart);
+ if (n != csize) {
+ throw new IOException("too few bytes read");
+ }
+ content.position(0);
+ md.update(content);
+ final byte[] hash = md.digest();
+
+ // Write section header at section header start,
+ // and seek to end of section.
+ SectionHeader header =
+ new SectionHeader(type, compressor, csize, subsections, hash);
+ file.seek(start);
+ header.write(file);
+ file.seek(cstart + csize);
+ }
+
+ private void writeClassesContent(DataOutput out,
+ File sourcedir,
+ List<Path> files,
+ Compressor compressor) throws IOException {
+ CompressedClassOutputStream cos =
+ CompressedClassOutputStream.newInstance(sourcedir.toPath(),
+ files,
+ compressor,
+ fastestCompression);
+ usize += cos.getUSize();
+ cos.writeTo(out);
+ }
+
+ private void writeFileContent(DataOutput out,
+ Path p,
+ Compressor compressor) throws IOException {
+ CompressedOutputStream cos = CompressedOutputStream.newInstance(p, compressor);
+ usize += cos.getUSize();
+ cos.writeTo(out);
+ }
+
+ /*
+ * Write a subsection to the given module file.
+ *
+ * @params file RandomAccessFile for the resulting jmod file
+ * @params sourcedir the directory containing the file to be written
+ * @params p Path of a file to be written
+ * @params compressor compression type
+ */
+ private void writeSubSection(RandomAccessFile file,
+ File sourcedir,
+ Path p,
+ Compressor compressor) throws IOException {
+ CompressedOutputStream cos = CompressedOutputStream.newInstance(p, compressor);
+ usize += cos.getUSize();
+
+ String storedpath = relativePath(sourcedir.toPath(), p);
+ SubSectionFileHeader header = new SubSectionFileHeader((int)cos.getCSize(), storedpath);
+ header.write(file);
+ cos.writeTo(file);
+ }
+
+
+ /*
+ * Processes each of the optional file sections.
+ */
+ private void writeOptionalSections(RandomAccessFile file,
+ File mdir,
+ File nativelibs,
+ File nativecmds,
+ File config)
+ throws IOException
+ {
+ List<Path> classes = new ArrayList<>();
+ List<Path> resources = new ArrayList<>();
+ listClassesResources(mdir.toPath(), classes, resources);
+
+ if (!classes.isEmpty()) {
+ writeSection(file,
+ SectionType.CLASSES,
+ mdir,
+ classes,
+ Compressor.PACK200_GZIP);
+ }
+ if (!resources.isEmpty()) {
+ writeSection(file,
+ SectionType.RESOURCES,
+ mdir,
+ resources,
+ Compressor.GZIP);
+ }
+
+ if (nativelibs != null && directoryIsNotEmpty(nativelibs)) {
+ writeSection(file,
+ SectionType.NATIVE_LIBS,
+ nativelibs,
+ listFiles(nativelibs.toPath()),
+ Compressor.GZIP);
+ }
+ if (nativecmds != null && directoryIsNotEmpty(nativecmds)) {
+ writeSection(file,
+ SectionType.NATIVE_CMDS,
+ nativecmds,
+ listFiles(nativecmds.toPath()),
+ Compressor.GZIP);
+ }
+ if (config != null && directoryIsNotEmpty(config)) {
+ writeSection(file,
+ SectionType.CONFIG,
+ config,
+ listFiles(config.toPath()),
+ Compressor.GZIP);
+ }
+ }
+
+ /*
+ * Writes out the module file header.
+ */
+ private void writeModuleFileHeader(RandomAccessFile file,
+ long remainderStart)
+ throws IOException
+ {
+
+ long csize = file.length() - remainderStart;
+
+ // Header Step 1
+ // Write out the module file header (using a dummy file hash value)
+ ModuleFileHeader header =
+ new ModuleFileHeader(csize, usize, hashtype,
+ new byte[hashtype.length()]);
+ file.seek(0);
+ header.write(file);
+
+ // Generate the module file hash
+ byte[] fileHash = generateFileHash(file);
+
+ // Header Step 2
+ // Write out the module file header (using correct file hash value)
+ header = new ModuleFileHeader(csize, usize, hashtype, fileHash);
+ file.seek(0);
+ header.write(file);
+ }
+
+ private void listClassesResources(Path dir,
+ final List<Path> classes,
+ final List<Path> resources)
+ throws IOException
+ {
+
+ Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+ throws IOException {
+ if (!file.endsWith("module-info.class")) {
+ if (file.toFile().getName().endsWith(".class")) {
+ classes.add(file);
+ } else {
+ resources.add(file);
+ }
+ }
+ return FileVisitResult.CONTINUE;
+ }
+ });
+ }
+
+ // CompressedOutputStream and CompressedClassOutputStream are
+ // subclass of ByteArrayOutputStream to avoid the array copy
+ // from the compressed bytes and write buf directly to DataOutput
+ static class CompressedOutputStream extends ByteArrayOutputStream {
+ protected long size = 0; // uncompressed size
+ protected CompressedOutputStream() {
+ }
+
+ private CompressedOutputStream(Path p) throws IOException {
+ // no compression
+ size += Files.copy(p, this);
+ }
+
+ long getUSize() {
+ return size;
+ }
+
+ long getCSize() {
+ return count;
+ }
+
+ void writeTo(DataOutput out) throws IOException {
+ out.write(buf, 0, count);
+ }
+
+ static CompressedOutputStream newInstance(Path p, Compressor type)
+ throws IOException
+ {
+ switch (type) {
+ case NONE:
+ return new CompressedOutputStream(p);
+ case GZIP:
+ return new GZIPCompressedOutputStream(p);
+ case PACK200_GZIP:
+ default:
+ throw new IllegalArgumentException("Unsupported type: " + type);
+ }
+ }
+
+ static class GZIPCompressedOutputStream extends CompressedOutputStream {
+ GZIPCompressedOutputStream(Path p) throws IOException {
+ super();
+ size += p.toFile().length();
+ try (GZIPOutputStream gos = new GZIPOutputStream(this)) {
+ Files.copy(p, gos);
+ gos.finish();
+ }
+ }
+ }
+ }
+
+ static abstract class CompressedClassOutputStream extends ByteArrayOutputStream {
+ protected long size = 0;
+ long getUSize() {
+ return size;
+ }
+
+ long getCSize() {
+ return count;
+ }
+
+ void writeTo(DataOutput out) throws IOException {
+ out.write(buf, 0, count);
+ }
+
+ static CompressedClassOutputStream newInstance(Path sourcepath,
+ List<Path> classes,
+ Compressor type,
+ boolean fastestCompression)
+ throws IOException
+ {
+ switch (type) {
+ case PACK200_GZIP:
+ Pack200GZipOutputStream pos =
+ new Pack200GZipOutputStream(fastestCompression);
+ pos.compress(sourcepath, classes);
+ return pos;
+ default:
+ throw new IllegalArgumentException("Unsupported type: " + type);
+ }
+ }
+
+ static class Pack200GZipOutputStream extends CompressedClassOutputStream {
+ final Pack200.Packer packer = Pack200.newPacker();
+ Pack200GZipOutputStream(boolean fastestCompression) {
+ Map<String, String> p = packer.properties();
+ p.put(Pack200.Packer.SEGMENT_LIMIT, "-1");
+ if (fastestCompression) {
+ p.put(Pack200.Packer.EFFORT, "1");
+ }
+ p.put(Pack200.Packer.KEEP_FILE_ORDER, Pack200.Packer.FALSE);
+ p.put(Pack200.Packer.MODIFICATION_TIME, Pack200.Packer.LATEST);
+ p.put(Pack200.Packer.DEFLATE_HINT, Pack200.Packer.FALSE);
+ }
+
+ void compress(Path sourcepath, List<Path> classes) throws IOException {
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ try (JarOutputStream jos = new JarOutputStream(os)) {
+ jos.setLevel(0);
+ for (Path file : classes) {
+ // write to the JarInputStream for later pack200 compression
+ String name = file.toFile().getName().toLowerCase();
+ String p = sourcepath.relativize(file).toString();
+ if (!p.equals("module-info.class")) {
+ JarEntry entry = new JarEntry(p);
+ jos.putNextEntry(entry);
+ Files.copy(file, jos);
+ jos.closeEntry();
+ }
+ size += file.toFile().length();
+ }
+ }
+
+ byte[] data = os.toByteArray();
+ try (JarInputStream jin =
+ new JarInputStream(new ByteArrayInputStream(data));
+ GZIPOutputStream gout = new GZIPOutputStream(this)) {
+ packer.pack(jin, gout);
+ }
+ }
+ }
+ }
+
+ private String relativePath(Path sourcepath, Path path) throws IOException {
+ Path relativepath = sourcepath.relativize(path);
+
+ // The '/' character separates nested directories in path names.
+ String pathseparator = relativepath.getFileSystem().getSeparator();
+ String stored = relativepath.toString().replace(pathseparator, "/");
+
+ // The path names of native-code files
+ // must not include more than one element.
+ // ## Temporarily turn off this check until the location of
+ // ## the native libraries in jdk modules are changed
+ // ensureShortNativePath(realpath, stored);
+ return stored;
+ }
+
+ private List<Path> listFiles(Path path) throws IOException {
+ final List<Path> list = new ArrayList<>();
+ Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
+
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+ throws IOException {
+ list.add(file);
+ return FileVisitResult.CONTINUE;
+ }
+ });
+ return list;
+ }
+
+ /*
+ * Generates the hash value for a module file.
+ * Excludes itself (the hash bytes in the module file header).
+ */
+ private byte[] generateFileHash(RandomAccessFile file)
+ throws IOException
+ {
+ MessageDigest md = getHashInstance(hashtype);
+
+ long remainderSize = file.length() - ModuleFileHeader.LENGTH;
+ FileChannel channel = file.getChannel();
+
+ // Module file header without the hash bytes
+ ByteBuffer content = ByteBuffer.allocate(ModuleFileHeader.LENGTH_WITHOUT_HASH);
+ int n = channel.read(content, 0);
+ if (n != ModuleFileHeader.LENGTH_WITHOUT_HASH) {
+ throw new IOException("too few bytes read");
+ }
+ content.position(0);
+ md.update(content);
+
+ // Remainder of file (read in chunks)
+ content = ByteBuffer.allocate(8192);
+ channel.position(ModuleFileHeader.LENGTH);
+ n = channel.read(content);
+ while (n != -1) {
+ content.limit(n);
+ content.position(0);
+ md.update(content);
+ content = ByteBuffer.allocate(8192);
+ n = channel.read(content);
+ }
+
+ return md.digest();
+ }
+
+ /*
+ * Check if a given directory is not empty.
+ */
+ private static boolean directoryIsNotEmpty(File dir)
+ throws IOException {
+ try (DirectoryStream<Path> ds =
+ Files.newDirectoryStream(dir.toPath())) {
+ return ds.iterator().hasNext();
+ }
+ }
+}
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/SignedModule.java b/jdk/src/share/classes/org/openjdk/jigsaw/SignedModule.java
index 0ac6abd..3c3bac3 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/SignedModule.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/SignedModule.java
@@ -52,7 +52,7 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
-import static org.openjdk.jigsaw.FileConstants.*;
+import org.openjdk.jigsaw.FileConstants.ModuleFile.SignatureType;
import sun.security.pkcs.PKCS7;
import sun.security.pkcs.SignerInfo;
import sun.security.validator.KeyStores;
@@ -94,9 +94,9 @@ public final class SignedModule {
public final static class PKCS7Signer implements ModuleFileSigner {
- public ModuleFile.SignatureType getSignatureType()
+ public SignatureType getSignatureType()
{
- return ModuleFile.SignatureType.PKCS7;
+ return SignatureType.PKCS7;
}
public byte[] generateSignature(byte[] toBeSigned,
@@ -179,7 +179,7 @@ public final class SignedModule {
private final List<byte[]> calculatedHashes;
private final List<byte[]> expectedHashes;
- public PKCS7Verifier(ModuleFileFormat.Reader reader)
+ public PKCS7Verifier(ModuleFile.Reader reader)
throws SignatureException
{
try {
@@ -217,8 +217,8 @@ public final class SignedModule {
return hashes;
}
- public ModuleFile.SignatureType getSignatureType() {
- return ModuleFile.SignatureType.PKCS7;
+ public SignatureType getSignatureType() {
+ return SignatureType.PKCS7;
}
// ## Need to improve exception handling
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java b/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java
index b31878e..c942919 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java
@@ -778,7 +778,7 @@ public final class SimpleLibrary
addToIndex(ClassInfo.read(f), ix);
}
});
- } else {
+ } else if (cd.isFile()) {
FileInputStream fis = new FileInputStream(cd);
ZipInputStream zis = new ZipInputStream(fis);
ZipEntry ze;
@@ -847,14 +847,13 @@ public final class SimpleLibrary
public boolean accept(File f) throws IOException {
if (f.isDirectory())
return true;
- return addToIndex(ClassInfo.read(f), ix);
+ if (f.getName().endsWith(".class")) {
+ return addToIndex(ClassInfo.read(f), ix);
+ } else {
+ return true;
+ }
}});
ix.store();
-
- // Copy resources
- for (File rsrc : mf.resources())
- Files.copyTree(rsrc, cldst);
-
} else {
FileOutputStream fos
@@ -869,14 +868,13 @@ public final class SimpleLibrary
public boolean accept(File f) throws IOException {
if (f.isDirectory())
return true;
- return addToIndex(ClassInfo.read(f), ix);
+ if (f.getName().endsWith(".class")) {
+ return addToIndex(ClassInfo.read(f), ix);
+ } else {
+ return true;
+ }
}});
ix.store();
-
- // Copy resources
- for (File rsrc : mf.resources())
- Files.storeTree(rsrc, jos);
-
} finally {
jos.close();
}
@@ -907,7 +905,7 @@ public final class SimpleLibrary
BufferedInputStream bin = new BufferedInputStream(is);
DataInputStream in = new DataInputStream(bin);
File md = null;
- try (ModuleFileFormat.Reader mr = new ModuleFileFormat.Reader(in)) {
+ try (ModuleFile.Reader mr = new ModuleFile.Reader(in)) {
byte[] mib = mr.readStart();
ModuleInfo mi = jms.parseModuleInfo(mib);
md = moduleDir(mi.id());
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Librarian.java b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Librarian.java
index 9ec23bd..37bdbf6 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Librarian.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Librarian.java
@@ -121,7 +121,7 @@ public class Librarian {
File classes = null;
try (FileInputStream fis = new FileInputStream(module);
DataInputStream dis = new DataInputStream(fis);
- ModuleFileFormat.Reader reader = new ModuleFileFormat.Reader(dis)) {
+ ModuleFile.Reader reader = new ModuleFile.Reader(dis)) {
ModuleInfo mi = jms.parseModuleInfo(reader.readStart());
classes = new File(mi.id().name());
@@ -163,11 +163,6 @@ public class Librarian {
while (hasArg())
mfs.add(Manifest.create(takeArg(), kf));
finishArgs();
- if (!mfs.isEmpty() && opts.has(resourcePath)) {
- // ## Single -r option only applies to first module
- // ## Should support one -r option for each module
- mfs.get(0).addResources(opts.valueOf(resourcePath));
- }
try {
lib.installFromManifests(mfs);
} catch (ConfigurationException x) {
@@ -255,11 +250,6 @@ public class Librarian {
List<Manifest> mfs = new ArrayList<Manifest>();
while (hasArg())
mfs.add(Manifest.create(takeArg(), classes));
- if (!mfs.isEmpty() && opts.has(resourcePath)) {
- // ## Single -r option only applies to first module
- // ## Should support one -r option for each module
- mfs.get(0).addResources(opts.valueOf(resourcePath));
- }
finishArgs();
try {
lib.preInstall(mfs, dst);
@@ -455,8 +445,7 @@ public class Librarian {
}
}
}
-
-
+
private static Map<String,Class<? extends Command<SimpleLibrary>>> commands
= new HashMap<>();
@@ -481,7 +470,6 @@ public class Librarian {
private OptionParser parser;
- private static OptionSpec<File> resourcePath; // ##
private static OptionSpec<Integer> repoIndex; // ##
private void usage() {
@@ -496,7 +484,7 @@ public class Librarian {
out.format(" jmod identify%n");
out.format(" jmod install [--noverify] [-n] <module-id-query> ...%n");
out.format(" jmod install [--noverify] <module-file> ...%n");
- out.format(" jmod install <classes-dir> [-r <resource-dir>] <module-name> ...%n");
+ out.format(" jmod install <classes-dir> <module-name> ...%n");
out.format(" jmod list [-v] [-p] [-R] [<module-id-query>]%n");
out.format(" jmod preinstall <classes-dir> <dst-dir> <module-name> ...%n");
out.format(" jmod refresh [-f] [-n] [-v]%n");
@@ -542,12 +530,6 @@ public class Librarian {
"Show this help message");
parser.acceptsAll(Arrays.asList("p", "parent"),
"Apply operation to parent library, if any");
- resourcePath
- = (parser.acceptsAll(Arrays.asList("r", "resources"),
- "Directory of resources to be processed")
- .withRequiredArg()
- .describedAs("path")
- .ofType(File.class));
repoIndex
= (parser.acceptsAll(Arrays.asList("i"),
"Repository-list index")
@@ -563,7 +545,7 @@ public class Librarian {
parser.acceptsAll(Arrays.asList("noverify"),
"Do not verify module signatures. "
+ "Treat as unsigned.");
-
+
if (args.length == 0)
usage();
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java
index f91d49a..b358be3 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java
@@ -45,7 +45,6 @@ jpkg [-v] [-L <library>] [-r <resource-dir>] [-i include-dir] \
-v : verbose output
-L : library the modules are installed to
- -r : directory with resources to bundle as part of the module
-i : directory with files to include as part of the package
-m : directory with modules to package
-d : destination directory to put the package in
@@ -89,9 +88,6 @@ public class Packager {
/** Command launcher for main class */
private String bincmd;
- /** Directory with optional loadable resources in module */
- private File resources;
-
/** Directory with optional files to include in package */
private File includes;
@@ -171,12 +167,9 @@ public class Packager {
+ outputfilename + " for "
+ modulename);
outputfile = new File(destination, outputfilename);
- ModuleFileFormat.Writer writer
- = new ModuleFileFormat.Writer(outputfile, classes);
- writer.useFastestCompression(fast || jigsawDevMode);
-
- writer.writeModule(classes, resources,
- natlibs, natcmds, config_dir);
+ ModuleFileWriter writer
+ = new ModuleFileWriter(outputfile, (fast || jigsawDevMode));
+ writer.writeModule(classes, natlibs, natcmds, config_dir);
}
catch (IOException x) {
if (outputfile != null && !outputfile.delete()) {
@@ -570,12 +563,8 @@ public class Packager {
throws Command.Exception
{
List<Manifest> mfs = new ArrayList<>();
- while (hasArg())
+ while (hasArg()) {
mfs.add(Manifest.create(takeArg(), classes));
- if (!mfs.isEmpty() && null != resources) {
- // ## Single -r option only applies to first module
- // ## Should support one -r option for each module
- mfs.get(0).addResources(resources);
}
finishArgs();
@@ -669,13 +658,6 @@ public class Packager {
.describedAs("path")
.ofType(File.class));
- OptionSpec<File> resourcePath
- = (parser.acceptsAll(Arrays.asList("r", "resources"),
- "Directory of resources to be processed")
- .withRequiredArg()
- .describedAs("path")
- .ofType(File.class));
-
OptionSpec<File> includePath
= (parser.acceptsAll(Arrays.asList("i", "include"),
"Directory of files to be included")
@@ -792,10 +774,6 @@ public class Packager {
if (jm != null)
library = new File(jm);
}
- if (opts.has(resourcePath)) {
- resources = opts.valueOf(resourcePath);
- checkPathArgument(resources, "Resource");
- }
if (opts.has(includePath))
includes = opts.valueOf(includePath);
if (opts.has(javaHomePath))
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Signer.java b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Signer.java
index 36dd1d2..4664946 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Signer.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Signer.java
@@ -58,8 +58,7 @@ import static java.security.KeyStore.PasswordProtection;
import static java.security.KeyStore.PrivateKeyEntry;
import org.openjdk.jigsaw.*;
-import static org.openjdk.jigsaw.ModuleFileFormat.Reader;
-import static org.openjdk.jigsaw.ModuleFileFormat.SectionHeader;
+import static org.openjdk.jigsaw.ModuleFile.*;
import static org.openjdk.jigsaw.SignedModule.SignerParameters;
import org.openjdk.internal.joptsimple.OptionException;
import org.openjdk.internal.joptsimple.OptionParser;
@@ -243,8 +242,8 @@ public class Signer {
// Transfer header and module-info from module file
// to signed module file.
- long remainderStart = ModuleFileFormat.FILE_HEADER_LENGTH
- + ModuleFileFormat.SECTION_HEADER_LENGTH
+ long remainderStart = ModuleFileHeader.LENGTH
+ + SectionHeader.LENGTH
+ moduleInfoBytes.length;
FileChannel source = mraf.getChannel();
FileChannel dest = raf.getChannel();
@@ -430,10 +429,12 @@ public class Signer {
byte[] hash = md.digest();
// Write out the Signature Section
- new SectionHeader(FileConstants.ModuleFile.SectionType.SIGNATURE,
- FileConstants.ModuleFile.Compressor.NONE,
- signature.length + 6,
- (short)0, hash).write(out);
+ SectionHeader header =
+ new SectionHeader(FileConstants.ModuleFile.SectionType.SIGNATURE,
+ FileConstants.ModuleFile.Compressor.NONE,
+ signature.length + 6,
+ (short)0, hash);
+ header.write(out);
out.write(signatureHeader);
out.write(signature);
}
diff --git a/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java b/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java
index 7e8e2db..2b85b6b 100644
--- a/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java
+++ b/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2011, 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
@@ -185,7 +185,7 @@ public class OffScreenImageSource implements ImageProducer {
theConsumer.setDimensions(image.getWidth(), image.getHeight());
theConsumer.setProperties(properties);
sendPixels();
- theConsumer.imageComplete(ImageConsumer.SINGLEFRAMEDONE);
+ theConsumer.imageComplete(ImageConsumer.STATICIMAGEDONE);
} catch (NullPointerException e) {
if (theConsumer != null) {
theConsumer.imageComplete(ImageConsumer.IMAGEERROR);
diff --git a/jdk/src/share/classes/sun/misc/VM.java b/jdk/src/share/classes/sun/misc/VM.java
index bcec901..e1fb584 100644
--- a/jdk/src/share/classes/sun/misc/VM.java
+++ b/jdk/src/share/classes/sun/misc/VM.java
@@ -371,6 +371,12 @@ public class VM {
private final static int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
private final static int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
+ /*
+ * Returns the first non-null class loader up the execution stack,
+ * or null if only code from the null class loader is on the stack.
+ */
+ public static native ClassLoader latestUserDefinedLoader();
+
static {
initialize();
}
diff --git a/jdk/src/share/classes/sun/net/ResourceManager.java b/jdk/src/share/classes/sun/net/ResourceManager.java
index 11bfc46..068b848 100644
--- a/jdk/src/share/classes/sun/net/ResourceManager.java
+++ b/jdk/src/share/classes/sun/net/ResourceManager.java
@@ -41,13 +41,14 @@ public class ResourceManager {
/* default maximum number of udp sockets per VM
* when a security manager is enabled.
- * The default is 1024 which is high enough to be useful
+ * The default is 25 which is high enough to be useful
* but low enough to be well below the maximum number
- * of port numbers actually available on all OSes for
- * such sockets (5000 on some versions of windows)
+ * of port numbers actually available on all OSes
+ * when multiplied by the maximum feasible number of VM processes
+ * that could practically be spawned.
*/
- private static final int DEFAULT_MAX_SOCKETS = 1024;
+ private static final int DEFAULT_MAX_SOCKETS = 25;
private static final int maxSockets;
private static final AtomicInteger numSockets;
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index e14ce8d..3a7737a 100644
--- a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -1661,7 +1661,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
public IOException run() throws Exception {
return (IOException)
rememberedException.getClass()
- .getConstructor(new Class[] { String.class })
+ .getConstructor(new Class<?>[] { String.class })
.newInstance(args);
}
});
diff --git a/jdk/src/share/classes/sun/nio/ch/Util.java b/jdk/src/share/classes/sun/nio/ch/Util.java
index 9aa7c16..fafc48f 100644
--- a/jdk/src/share/classes/sun/nio/ch/Util.java
+++ b/jdk/src/share/classes/sun/nio/ch/Util.java
@@ -363,10 +363,10 @@ class Util {
try {
Class<?> cl = Class.forName("java.nio.DirectByteBuffer");
Constructor<?> ctor = cl.getDeclaredConstructor(
- new Class[] { int.class,
- long.class,
- FileDescriptor.class,
- Runnable.class });
+ new Class<?>[] { int.class,
+ long.class,
+ FileDescriptor.class,
+ Runnable.class });
ctor.setAccessible(true);
directByteBufferConstructor = ctor;
} catch (ClassNotFoundException |
@@ -408,10 +408,10 @@ class Util {
try {
Class<?> cl = Class.forName("java.nio.DirectByteBufferR");
Constructor<?> ctor = cl.getDeclaredConstructor(
- new Class[] { int.class,
- long.class,
- FileDescriptor.class,
- Runnable.class });
+ new Class<?>[] { int.class,
+ long.class,
+ FileDescriptor.class,
+ Runnable.class });
ctor.setAccessible(true);
directByteBufferRConstructor = ctor;
} catch (ClassNotFoundException |
diff --git a/jdk/src/share/classes/sun/nio/cs/CESU_8.java b/jdk/src/share/classes/sun/nio/cs/CESU_8.java
new file mode 100644
index 0000000..40711f8
--- /dev/null
+++ b/jdk/src/share/classes/sun/nio/cs/CESU_8.java
@@ -0,0 +1,604 @@
+/*
+ * Copyright (c) 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.nio.cs;
+
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+
+/* Legal CESU-8 Byte Sequences
+ *
+ * # Code Points Bits Bit/Byte pattern
+ * 1 7 0xxxxxxx
+ * U+0000..U+007F 00..7F
+ *
+ * 2 11 110xxxxx 10xxxxxx
+ * U+0080..U+07FF C2..DF 80..BF
+ *
+ * 3 16 1110xxxx 10xxxxxx 10xxxxxx
+ * U+0800..U+0FFF E0 A0..BF 80..BF
+ * U+1000..U+FFFF E1..EF 80..BF 80..BF
+ *
+ */
+
+class CESU_8 extends Unicode
+{
+ public CESU_8() {
+ super("CESU-8", StandardCharsets.aliases_CESU_8);
+ }
+
+ public String historicalName() {
+ return "CESU8";
+ }
+
+ public CharsetDecoder newDecoder() {
+ return new Decoder(this);
+ }
+
+ public CharsetEncoder newEncoder() {
+ return new Encoder(this);
+ }
+
+ private static final void updatePositions(Buffer src, int sp,
+ Buffer dst, int dp) {
+ src.position(sp - src.arrayOffset());
+ dst.position(dp - dst.arrayOffset());
+ }
+
+ private static class Decoder extends CharsetDecoder
+ implements ArrayDecoder {
+ private Decoder(Charset cs) {
+ super(cs, 1.0f, 1.0f);
+ }
+
+ private static boolean isNotContinuation(int b) {
+ return (b & 0xc0) != 0x80;
+ }
+
+ // [E0] [A0..BF] [80..BF]
+ // [E1..EF] [80..BF] [80..BF]
+ private static boolean isMalformed3(int b1, int b2, int b3) {
+ return (b1 == (byte)0xe0 && (b2 & 0xe0) == 0x80) ||
+ (b2 & 0xc0) != 0x80 || (b3 & 0xc0) != 0x80;
+ }
+
+ // only used when there is only one byte left in src buffer
+ private static boolean isMalformed3_2(int b1, int b2) {
+ return (b1 == (byte)0xe0 && (b2 & 0xe0) == 0x80) ||
+ (b2 & 0xc0) != 0x80;
+ }
+
+
+ // [F0] [90..BF] [80..BF] [80..BF]
+ // [F1..F3] [80..BF] [80..BF] [80..BF]
+ // [F4] [80..8F] [80..BF] [80..BF]
+ // only check 80-be range here, the [0xf0,0x80...] and [0xf4,0x90-...]
+ // will be checked by Character.isSupplementaryCodePoint(uc)
+ private static boolean isMalformed4(int b2, int b3, int b4) {
+ return (b2 & 0xc0) != 0x80 || (b3 & 0xc0) != 0x80 ||
+ (b4 & 0xc0) != 0x80;
+ }
+
+ // only used when there is less than 4 bytes left in src buffer
+ private static boolean isMalformed4_2(int b1, int b2) {
+ return (b1 == 0xf0 && b2 == 0x90) ||
+ (b2 & 0xc0) != 0x80;
+ }
+
+ private static boolean isMalformed4_3(int b3) {
+ return (b3 & 0xc0) != 0x80;
+ }
+
+ private static CoderResult malformedN(ByteBuffer src, int nb) {
+ switch (nb) {
+ case 1:
+ case 2: // always 1
+ return CoderResult.malformedForLength(1);
+ case 3:
+ int b1 = src.get();
+ int b2 = src.get(); // no need to lookup b3
+ return CoderResult.malformedForLength(
+ ((b1 == (byte)0xe0 && (b2 & 0xe0) == 0x80) ||
+ isNotContinuation(b2)) ? 1 : 2);
+ case 4: // we don't care the speed here
+ b1 = src.get() & 0xff;
+ b2 = src.get() & 0xff;
+ if (b1 > 0xf4 ||
+ (b1 == 0xf0 && (b2 < 0x90 || b2 > 0xbf)) ||
+ (b1 == 0xf4 && (b2 & 0xf0) != 0x80) ||
+ isNotContinuation(b2))
+ return CoderResult.malformedForLength(1);
+ if (isNotContinuation(src.get()))
+ return CoderResult.malformedForLength(2);
+ return CoderResult.malformedForLength(3);
+ default:
+ assert false;
+ return null;
+ }
+ }
+
+ private static CoderResult malformed(ByteBuffer src, int sp,
+ CharBuffer dst, int dp,
+ int nb)
+ {
+ src.position(sp - src.arrayOffset());
+ CoderResult cr = malformedN(src, nb);
+ updatePositions(src, sp, dst, dp);
+ return cr;
+ }
+
+
+ private static CoderResult malformed(ByteBuffer src,
+ int mark, int nb)
+ {
+ src.position(mark);
+ CoderResult cr = malformedN(src, nb);
+ src.position(mark);
+ return cr;
+ }
+
+ private static CoderResult malformedForLength(ByteBuffer src,
+ int sp,
+ CharBuffer dst,
+ int dp,
+ int malformedNB)
+ {
+ updatePositions(src, sp, dst, dp);
+ return CoderResult.malformedForLength(malformedNB);
+ }
+
+ private static CoderResult malformedForLength(ByteBuffer src,
+ int mark,
+ int malformedNB)
+ {
+ src.position(mark);
+ return CoderResult.malformedForLength(malformedNB);
+ }
+
+
+ private static CoderResult xflow(Buffer src, int sp, int sl,
+ Buffer dst, int dp, int nb) {
+ updatePositions(src, sp, dst, dp);
+ return (nb == 0 || sl - sp < nb)
+ ? CoderResult.UNDERFLOW : CoderResult.OVERFLOW;
+ }
+
+ private static CoderResult xflow(Buffer src, int mark, int nb) {
+ src.position(mark);
+ return (nb == 0 || src.remaining() < nb)
+ ? CoderResult.UNDERFLOW : CoderResult.OVERFLOW;
+ }
+
+ private CoderResult decodeArrayLoop(ByteBuffer src,
+ CharBuffer dst)
+ {
+ // This method is optimized for ASCII input.
+ byte[] sa = src.array();
+ int sp = src.arrayOffset() + src.position();
+ int sl = src.arrayOffset() + src.limit();
+
+ char[] da = dst.array();
+ int dp = dst.arrayOffset() + dst.position();
+ int dl = dst.arrayOffset() + dst.limit();
+ int dlASCII = dp + Math.min(sl - sp, dl - dp);
+
+ // ASCII only loop
+ while (dp < dlASCII && sa[sp] >= 0)
+ da[dp++] = (char) sa[sp++];
+ while (sp < sl) {
+ int b1 = sa[sp];
+ if (b1 >= 0) {
+ // 1 byte, 7 bits: 0xxxxxxx
+ if (dp >= dl)
+ return xflow(src, sp, sl, dst, dp, 1);
+ da[dp++] = (char) b1;
+ sp++;
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
+ // 2 bytes, 11 bits: 110xxxxx 10xxxxxx
+ if (sl - sp < 2 || dp >= dl)
+ return xflow(src, sp, sl, dst, dp, 2);
+ int b2 = sa[sp + 1];
+ if (isNotContinuation(b2))
+ return malformedForLength(src, sp, dst, dp, 1);
+ da[dp++] = (char) (((b1 << 6) ^ b2)
+ ^
+ (((byte) 0xC0 << 6) ^
+ ((byte) 0x80 << 0)));
+ sp += 2;
+ } else if ((b1 >> 4) == -2) {
+ // 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
+ int srcRemaining = sl - sp;
+ if (srcRemaining < 3 || dp >= dl) {
+ if (srcRemaining > 1 && isMalformed3_2(b1, sa[sp + 1]))
+ return malformedForLength(src, sp, dst, dp, 1);
+ return xflow(src, sp, sl, dst, dp, 3);
+ }
+ int b2 = sa[sp + 1];
+ int b3 = sa[sp + 2];
+ if (isMalformed3(b1, b2, b3))
+ return malformed(src, sp, dst, dp, 3);
+ da[dp++] = (char)
+ ((b1 << 12) ^
+ (b2 << 6) ^
+ (b3 ^
+ (((byte) 0xE0 << 12) ^
+ ((byte) 0x80 << 6) ^
+ ((byte) 0x80 << 0))));
+ sp += 3;
+ } else {
+ return malformed(src, sp, dst, dp, 1);
+ }
+ }
+ return xflow(src, sp, sl, dst, dp, 0);
+ }
+
+ private CoderResult decodeBufferLoop(ByteBuffer src,
+ CharBuffer dst)
+ {
+ int mark = src.position();
+ int limit = src.limit();
+ while (mark < limit) {
+ int b1 = src.get();
+ if (b1 >= 0) {
+ // 1 byte, 7 bits: 0xxxxxxx
+ if (dst.remaining() < 1)
+ return xflow(src, mark, 1); // overflow
+ dst.put((char) b1);
+ mark++;
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
+ // 2 bytes, 11 bits: 110xxxxx 10xxxxxx
+ if (limit - mark < 2|| dst.remaining() < 1)
+ return xflow(src, mark, 2);
+ int b2 = src.get();
+ if (isNotContinuation(b2))
+ return malformedForLength(src, mark, 1);
+ dst.put((char) (((b1 << 6) ^ b2)
+ ^
+ (((byte) 0xC0 << 6) ^
+ ((byte) 0x80 << 0))));
+ mark += 2;
+ } else if ((b1 >> 4) == -2) {
+ // 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
+ int srcRemaining = limit - mark;
+ if (srcRemaining < 3 || dst.remaining() < 1) {
+ if (srcRemaining > 1 && isMalformed3_2(b1, src.get()))
+ return malformedForLength(src, mark, 1);
+ return xflow(src, mark, 3);
+ }
+ int b2 = src.get();
+ int b3 = src.get();
+ if (isMalformed3(b1, b2, b3))
+ return malformed(src, mark, 3);
+ dst.put((char)
+ ((b1 << 12) ^
+ (b2 << 6) ^
+ (b3 ^
+ (((byte) 0xE0 << 12) ^
+ ((byte) 0x80 << 6) ^
+ ((byte) 0x80 << 0)))));
+ mark += 3;
+ } else {
+ return malformed(src, mark, 1);
+ }
+ }
+ return xflow(src, mark, 0);
+ }
+
+ protected CoderResult decodeLoop(ByteBuffer src,
+ CharBuffer dst)
+ {
+ if (src.hasArray() && dst.hasArray())
+ return decodeArrayLoop(src, dst);
+ else
+ return decodeBufferLoop(src, dst);
+ }
+
+ private static ByteBuffer getByteBuffer(ByteBuffer bb, byte[] ba, int sp)
+ {
+ if (bb == null)
+ bb = ByteBuffer.wrap(ba);
+ bb.position(sp);
+ return bb;
+ }
+
+ // returns -1 if there is/are malformed byte(s) and the
+ // "action" for malformed input is not REPLACE.
+ public int decode(byte[] sa, int sp, int len, char[] da) {
+ final int sl = sp + len;
+ int dp = 0;
+ int dlASCII = Math.min(len, da.length);
+ ByteBuffer bb = null; // only necessary if malformed
+
+ // ASCII only optimized loop
+ while (dp < dlASCII && sa[sp] >= 0)
+ da[dp++] = (char) sa[sp++];
+
+ while (sp < sl) {
+ int b1 = sa[sp++];
+ if (b1 >= 0) {
+ // 1 byte, 7 bits: 0xxxxxxx
+ da[dp++] = (char) b1;
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
+ // 2 bytes, 11 bits: 110xxxxx 10xxxxxx
+ if (sp < sl) {
+ int b2 = sa[sp++];
+ if (isNotContinuation(b2)) {
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement().charAt(0);
+ sp--; // malformedN(bb, 2) always returns 1
+ } else {
+ da[dp++] = (char) (((b1 << 6) ^ b2)^
+ (((byte) 0xC0 << 6) ^
+ ((byte) 0x80 << 0)));
+ }
+ continue;
+ }
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement().charAt(0);
+ return dp;
+ } else if ((b1 >> 4) == -2) {
+ // 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
+ if (sp + 1 < sl) {
+ int b2 = sa[sp++];
+ int b3 = sa[sp++];
+ if (isMalformed3(b1, b2, b3)) {
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement().charAt(0);
+ sp -=3;
+ bb = getByteBuffer(bb, sa, sp);
+ sp += malformedN(bb, 3).length();
+ } else {
+ da[dp++] = (char)((b1 << 12) ^
+ (b2 << 6) ^
+ (b3 ^
+ (((byte) 0xE0 << 12) ^
+ ((byte) 0x80 << 6) ^
+ ((byte) 0x80 << 0))));
+ }
+ continue;
+ }
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ if (sp < sl && isMalformed3_2(b1, sa[sp])) {
+ da[dp++] = replacement().charAt(0);
+ continue;
+
+ }
+ da[dp++] = replacement().charAt(0);
+ return dp;
+ } else {
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement().charAt(0);
+ }
+ }
+ return dp;
+ }
+ }
+
+ private static class Encoder extends CharsetEncoder
+ implements ArrayEncoder {
+
+ private Encoder(Charset cs) {
+ super(cs, 1.1f, 3.0f);
+ }
+
+ public boolean canEncode(char c) {
+ return !Character.isSurrogate(c);
+ }
+
+ public boolean isLegalReplacement(byte[] repl) {
+ return ((repl.length == 1 && repl[0] >= 0) ||
+ super.isLegalReplacement(repl));
+ }
+
+ private static CoderResult overflow(CharBuffer src, int sp,
+ ByteBuffer dst, int dp) {
+ updatePositions(src, sp, dst, dp);
+ return CoderResult.OVERFLOW;
+ }
+
+ private static CoderResult overflow(CharBuffer src, int mark) {
+ src.position(mark);
+ return CoderResult.OVERFLOW;
+ }
+
+ private static void to3Bytes(byte[] da, int dp, char c) {
+ da[dp] = (byte)(0xe0 | ((c >> 12)));
+ da[dp + 1] = (byte)(0x80 | ((c >> 6) & 0x3f));
+ da[dp + 2] = (byte)(0x80 | (c & 0x3f));
+ }
+
+ private static void to3Bytes(ByteBuffer dst, char c) {
+ dst.put((byte)(0xe0 | ((c >> 12))));
+ dst.put((byte)(0x80 | ((c >> 6) & 0x3f)));
+ dst.put((byte)(0x80 | (c & 0x3f)));
+ }
+
+ private Surrogate.Parser sgp;
+ private char[] c2;
+ private CoderResult encodeArrayLoop(CharBuffer src,
+ ByteBuffer dst)
+ {
+ char[] sa = src.array();
+ int sp = src.arrayOffset() + src.position();
+ int sl = src.arrayOffset() + src.limit();
+
+ byte[] da = dst.array();
+ int dp = dst.arrayOffset() + dst.position();
+ int dl = dst.arrayOffset() + dst.limit();
+ int dlASCII = dp + Math.min(sl - sp, dl - dp);
+
+ // ASCII only loop
+ while (dp < dlASCII && sa[sp] < '\u0080')
+ da[dp++] = (byte) sa[sp++];
+ while (sp < sl) {
+ char c = sa[sp];
+ if (c < 0x80) {
+ // Have at most seven bits
+ if (dp >= dl)
+ return overflow(src, sp, dst, dp);
+ da[dp++] = (byte)c;
+ } else if (c < 0x800) {
+ // 2 bytes, 11 bits
+ if (dl - dp < 2)
+ return overflow(src, sp, dst, dp);
+ da[dp++] = (byte)(0xc0 | (c >> 6));
+ da[dp++] = (byte)(0x80 | (c & 0x3f));
+ } else if (Character.isSurrogate(c)) {
+ // Have a surrogate pair
+ if (sgp == null)
+ sgp = new Surrogate.Parser();
+ int uc = sgp.parse(c, sa, sp, sl);
+ if (uc < 0) {
+ updatePositions(src, sp, dst, dp);
+ return sgp.error();
+ }
+ if (dl - dp < 6)
+ return overflow(src, sp, dst, dp);
+ to3Bytes(da, dp, Character.highSurrogate(uc));
+ dp += 3;
+ to3Bytes(da, dp, Character.lowSurrogate(uc));
+ dp += 3;
+ sp++; // 2 chars
+ } else {
+ // 3 bytes, 16 bits
+ if (dl - dp < 3)
+ return overflow(src, sp, dst, dp);
+ to3Bytes(da, dp, c);
+ dp += 3;
+ }
+ sp++;
+ }
+ updatePositions(src, sp, dst, dp);
+ return CoderResult.UNDERFLOW;
+ }
+
+ private CoderResult encodeBufferLoop(CharBuffer src,
+ ByteBuffer dst)
+ {
+ int mark = src.position();
+ while (src.hasRemaining()) {
+ char c = src.get();
+ if (c < 0x80) {
+ // Have at most seven bits
+ if (!dst.hasRemaining())
+ return overflow(src, mark);
+ dst.put((byte)c);
+ } else if (c < 0x800) {
+ // 2 bytes, 11 bits
+ if (dst.remaining() < 2)
+ return overflow(src, mark);
+ dst.put((byte)(0xc0 | (c >> 6)));
+ dst.put((byte)(0x80 | (c & 0x3f)));
+ } else if (Character.isSurrogate(c)) {
+ // Have a surrogate pair
+ if (sgp == null)
+ sgp = new Surrogate.Parser();
+ int uc = sgp.parse(c, src);
+ if (uc < 0) {
+ src.position(mark);
+ return sgp.error();
+ }
+ if (dst.remaining() < 6)
+ return overflow(src, mark);
+ to3Bytes(dst, Character.highSurrogate(uc));
+ to3Bytes(dst, Character.lowSurrogate(uc));
+ mark++; // 2 chars
+ } else {
+ // 3 bytes, 16 bits
+ if (dst.remaining() < 3)
+ return overflow(src, mark);
+ to3Bytes(dst, c);
+ }
+ mark++;
+ }
+ src.position(mark);
+ return CoderResult.UNDERFLOW;
+ }
+
+ protected final CoderResult encodeLoop(CharBuffer src,
+ ByteBuffer dst)
+ {
+ if (src.hasArray() && dst.hasArray())
+ return encodeArrayLoop(src, dst);
+ else
+ return encodeBufferLoop(src, dst);
+ }
+
+ // returns -1 if there is malformed char(s) and the
+ // "action" for malformed input is not REPLACE.
+ public int encode(char[] sa, int sp, int len, byte[] da) {
+ int sl = sp + len;
+ int dp = 0;
+ int dlASCII = dp + Math.min(len, da.length);
+
+ // ASCII only optimized loop
+ while (dp < dlASCII && sa[sp] < '\u0080')
+ da[dp++] = (byte) sa[sp++];
+
+ while (sp < sl) {
+ char c = sa[sp++];
+ if (c < 0x80) {
+ // Have at most seven bits
+ da[dp++] = (byte)c;
+ } else if (c < 0x800) {
+ // 2 bytes, 11 bits
+ da[dp++] = (byte)(0xc0 | (c >> 6));
+ da[dp++] = (byte)(0x80 | (c & 0x3f));
+ } else if (Character.isSurrogate(c)) {
+ if (sgp == null)
+ sgp = new Surrogate.Parser();
+ int uc = sgp.parse(c, sa, sp - 1, sl);
+ if (uc < 0) {
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement()[0];
+ } else {
+ to3Bytes(da, dp, Character.highSurrogate(uc));
+ dp += 3;
+ to3Bytes(da, dp, Character.lowSurrogate(uc));
+ dp += 3;
+ sp++; // 2 chars
+ }
+ } else {
+ // 3 bytes, 16 bits
+ to3Bytes(da, dp, c);
+ dp += 3;
+ }
+ }
+ return dp;
+ }
+ }
+}
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_8.java b/jdk/src/share/classes/sun/nio/cs/UTF_8.java
index 56d6bcc..1f7edaa 100644
--- a/jdk/src/share/classes/sun/nio/cs/UTF_8.java
+++ b/jdk/src/share/classes/sun/nio/cs/UTF_8.java
@@ -72,8 +72,8 @@ class UTF_8 extends Unicode
return new Encoder(this);
}
- static final void updatePositions(Buffer src, int sp,
- Buffer dst, int dp) {
+ private static final void updatePositions(Buffer src, int sp,
+ Buffer dst, int dp) {
src.position(sp - src.arrayOffset());
dst.position(dp - dst.arrayOffset());
}
@@ -88,11 +88,6 @@ class UTF_8 extends Unicode
return (b & 0xc0) != 0x80;
}
- // [C2..DF] [80..BF]
- private static boolean isMalformed2(int b1, int b2) {
- return (b1 & 0x1e) == 0x0 || (b2 & 0xc0) != 0x80;
- }
-
// [E0] [A0..BF] [80..BF]
// [E1..EF] [80..BF] [80..BF]
private static boolean isMalformed3(int b1, int b2, int b3) {
@@ -100,6 +95,12 @@ class UTF_8 extends Unicode
(b2 & 0xc0) != 0x80 || (b3 & 0xc0) != 0x80;
}
+ // only used when there is only one byte left in src buffer
+ private static boolean isMalformed3_2(int b1, int b2) {
+ return (b1 == (byte)0xe0 && (b2 & 0xe0) == 0x80) ||
+ (b2 & 0xc0) != 0x80;
+ }
+
// [F0] [90..BF] [80..BF] [80..BF]
// [F1..F3] [80..BF] [80..BF] [80..BF]
// [F4] [80..8F] [80..BF] [80..BF]
@@ -110,6 +111,16 @@ class UTF_8 extends Unicode
(b4 & 0xc0) != 0x80;
}
+ // only used when there is less than 4 bytes left in src buffer
+ private static boolean isMalformed4_2(int b1, int b2) {
+ return (b1 == 0xf0 && b2 == 0x90) ||
+ (b2 & 0xc0) != 0x80;
+ }
+
+ private static boolean isMalformed4_3(int b3) {
+ return (b3 & 0xc0) != 0x80;
+ }
+
private static CoderResult lookupN(ByteBuffer src, int n)
{
for (int i = 1; i < n; i++) {
@@ -122,28 +133,14 @@ class UTF_8 extends Unicode
private static CoderResult malformedN(ByteBuffer src, int nb) {
switch (nb) {
case 1:
- int b1 = src.get();
- if ((b1 >> 2) == -2) {
- // 5 bytes 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
- if (src.remaining() < 4)
- return CoderResult.UNDERFLOW;
- return lookupN(src, 5);
- }
- if ((b1 >> 1) == -2) {
- // 6 bytes 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
- if (src.remaining() < 5)
- return CoderResult.UNDERFLOW;
- return lookupN(src, 6);
- }
- return CoderResult.malformedForLength(1);
case 2: // always 1
return CoderResult.malformedForLength(1);
case 3:
- b1 = src.get();
+ int b1 = src.get();
int b2 = src.get(); // no need to lookup b3
return CoderResult.malformedForLength(
((b1 == (byte)0xe0 && (b2 & 0xe0) == 0x80) ||
- isNotContinuation(b2))?1:2);
+ isNotContinuation(b2)) ? 1 : 2);
case 4: // we don't care the speed here
b1 = src.get() & 0xff;
b2 = src.get() & 0xff;
@@ -171,6 +168,7 @@ class UTF_8 extends Unicode
return cr;
}
+
private static CoderResult malformed(ByteBuffer src,
int mark, int nb)
{
@@ -180,18 +178,36 @@ class UTF_8 extends Unicode
return cr;
}
+ private static CoderResult malformedForLength(ByteBuffer src,
+ int sp,
+ CharBuffer dst,
+ int dp,
+ int malformedNB)
+ {
+ updatePositions(src, sp, dst, dp);
+ return CoderResult.malformedForLength(malformedNB);
+ }
+
+ private static CoderResult malformedForLength(ByteBuffer src,
+ int mark,
+ int malformedNB)
+ {
+ src.position(mark);
+ return CoderResult.malformedForLength(malformedNB);
+ }
+
+
private static CoderResult xflow(Buffer src, int sp, int sl,
Buffer dst, int dp, int nb) {
updatePositions(src, sp, dst, dp);
return (nb == 0 || sl - sp < nb)
- ?CoderResult.UNDERFLOW:CoderResult.OVERFLOW;
+ ? CoderResult.UNDERFLOW : CoderResult.OVERFLOW;
}
private static CoderResult xflow(Buffer src, int mark, int nb) {
- CoderResult cr = (nb == 0 || src.remaining() < (nb - 1))
- ?CoderResult.UNDERFLOW:CoderResult.OVERFLOW;
src.position(mark);
- return cr;
+ return (nb == 0 || src.remaining() < nb)
+ ? CoderResult.UNDERFLOW : CoderResult.OVERFLOW;
}
private CoderResult decodeArrayLoop(ByteBuffer src,
@@ -210,7 +226,6 @@ class UTF_8 extends Unicode
// ASCII only loop
while (dp < dlASCII && sa[sp] >= 0)
da[dp++] = (char) sa[sp++];
-
while (sp < sl) {
int b1 = sa[sp];
if (b1 >= 0) {
@@ -219,13 +234,20 @@ class UTF_8 extends Unicode
return xflow(src, sp, sl, dst, dp, 1);
da[dp++] = (char) b1;
sp++;
- } else if ((b1 >> 5) == -2) {
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
// 2 bytes, 11 bits: 110xxxxx 10xxxxxx
+ // [C2..DF] [80..BF]
if (sl - sp < 2 || dp >= dl)
return xflow(src, sp, sl, dst, dp, 2);
int b2 = sa[sp + 1];
- if (isMalformed2(b1, b2))
- return malformed(src, sp, dst, dp, 2);
+ // Now we check the first byte of 2-byte sequence as
+ // if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0)
+ // no longer need to check b1 against c1 & c0 for
+ // malformed as we did in previous version
+ // (b1 & 0x1e) == 0x0 || (b2 & 0xc0) != 0x80;
+ // only need to check the second byte b2.
+ if (isNotContinuation(b2))
+ return malformedForLength(src, sp, dst, dp, 1);
da[dp++] = (char) (((b1 << 6) ^ b2)
^
(((byte) 0xC0 << 6) ^
@@ -233,24 +255,37 @@ class UTF_8 extends Unicode
sp += 2;
} else if ((b1 >> 4) == -2) {
// 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
- if (sl - sp < 3 || dp >= dl)
+ int srcRemaining = sl - sp;
+ if (srcRemaining < 3 || dp >= dl) {
+ if (srcRemaining > 1 && isMalformed3_2(b1, sa[sp + 1]))
+ return malformedForLength(src, sp, dst, dp, 1);
return xflow(src, sp, sl, dst, dp, 3);
+ }
int b2 = sa[sp + 1];
int b3 = sa[sp + 2];
if (isMalformed3(b1, b2, b3))
return malformed(src, sp, dst, dp, 3);
- da[dp++] = (char)
+ char c = (char)
((b1 << 12) ^
(b2 << 6) ^
(b3 ^
(((byte) 0xE0 << 12) ^
((byte) 0x80 << 6) ^
((byte) 0x80 << 0))));
+ if (Character.isSurrogate(c))
+ return malformedForLength(src, sp, dst, dp, 3);
+ da[dp++] = c;
sp += 3;
} else if ((b1 >> 3) == -2) {
// 4 bytes, 21 bits: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
- if (sl - sp < 4 || dl - dp < 2)
+ int srcRemaining = sl - sp;
+ if (srcRemaining < 4 || dl - dp < 2) {
+ if (srcRemaining > 1 && isMalformed4_2(b1, sa[sp + 1]))
+ return malformedForLength(src, sp, dst, dp, 1);
+ if (srcRemaining > 2 && isMalformed4_3(sa[sp + 2]))
+ return malformedForLength(src, sp, dst, dp, 2);
return xflow(src, sp, sl, dst, dp, 4);
+ }
int b2 = sa[sp + 1];
int b3 = sa[sp + 2];
int b4 = sa[sp + 3];
@@ -289,38 +324,51 @@ class UTF_8 extends Unicode
return xflow(src, mark, 1); // overflow
dst.put((char) b1);
mark++;
- } else if ((b1 >> 5) == -2) {
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
// 2 bytes, 11 bits: 110xxxxx 10xxxxxx
if (limit - mark < 2|| dst.remaining() < 1)
return xflow(src, mark, 2);
int b2 = src.get();
- if (isMalformed2(b1, b2))
- return malformed(src, mark, 2);
- dst.put((char) (((b1 << 6) ^ b2)
+ if (isNotContinuation(b2))
+ return malformedForLength(src, mark, 1);
+ dst.put((char) (((b1 << 6) ^ b2)
^
(((byte) 0xC0 << 6) ^
((byte) 0x80 << 0))));
mark += 2;
} else if ((b1 >> 4) == -2) {
// 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
- if (limit - mark < 3 || dst.remaining() < 1)
+ int srcRemaining = limit - mark;
+ if (srcRemaining < 3 || dst.remaining() < 1) {
+ if (srcRemaining > 1 && isMalformed3_2(b1, src.get()))
+ return malformedForLength(src, mark, 1);
return xflow(src, mark, 3);
+ }
int b2 = src.get();
int b3 = src.get();
if (isMalformed3(b1, b2, b3))
return malformed(src, mark, 3);
- dst.put((char)
- ((b1 << 12) ^
- (b2 << 6) ^
- (b3 ^
- (((byte) 0xE0 << 12) ^
- ((byte) 0x80 << 6) ^
- ((byte) 0x80 << 0)))));
+ char c = (char)
+ ((b1 << 12) ^
+ (b2 << 6) ^
+ (b3 ^
+ (((byte) 0xE0 << 12) ^
+ ((byte) 0x80 << 6) ^
+ ((byte) 0x80 << 0))));
+ if (Character.isSurrogate(c))
+ return malformedForLength(src, mark, 3);
+ dst.put(c);
mark += 3;
} else if ((b1 >> 3) == -2) {
// 4 bytes, 21 bits: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
- if (limit - mark < 4 || dst.remaining() < 2)
+ int srcRemaining = limit - mark;
+ if (srcRemaining < 4 || dst.remaining() < 2) {
+ if (srcRemaining > 1 && isMalformed4_2(b1, src.get()))
+ return malformedForLength(src, mark, 1);
+ if (srcRemaining > 2 && isMalformed4_3(src.get()))
+ return malformedForLength(src, mark, 2);
return xflow(src, mark, 4);
+ }
int b2 = src.get();
int b3 = src.get();
int b4 = src.get();
@@ -364,7 +412,7 @@ class UTF_8 extends Unicode
return bb;
}
- // returns -1 if there is malformed byte(s) and the
+ // returns -1 if there is/are malformed byte(s) and the
// "action" for malformed input is not REPLACE.
public int decode(byte[] sa, int sp, int len, char[] da) {
final int sl = sp + len;
@@ -381,11 +429,11 @@ class UTF_8 extends Unicode
if (b1 >= 0) {
// 1 byte, 7 bits: 0xxxxxxx
da[dp++] = (char) b1;
- } else if ((b1 >> 5) == -2) {
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
// 2 bytes, 11 bits: 110xxxxx 10xxxxxx
if (sp < sl) {
int b2 = sa[sp++];
- if (isMalformed2(b1, b2)) {
+ if (isNotContinuation(b2)) {
if (malformedInputAction() != CodingErrorAction.REPLACE)
return -1;
da[dp++] = replacement().charAt(0);
@@ -410,21 +458,33 @@ class UTF_8 extends Unicode
if (malformedInputAction() != CodingErrorAction.REPLACE)
return -1;
da[dp++] = replacement().charAt(0);
- sp -=3;
+ sp -= 3;
bb = getByteBuffer(bb, sa, sp);
sp += malformedN(bb, 3).length();
} else {
- da[dp++] = (char)((b1 << 12) ^
+ char c = (char)((b1 << 12) ^
(b2 << 6) ^
(b3 ^
(((byte) 0xE0 << 12) ^
((byte) 0x80 << 6) ^
((byte) 0x80 << 0))));
+ if (Character.isSurrogate(c)) {
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement().charAt(0);
+ } else {
+ da[dp++] = c;
+ }
}
continue;
}
if (malformedInputAction() != CodingErrorAction.REPLACE)
return -1;
+ if (sp < sl && isMalformed3_2(b1, sa[sp])) {
+ da[dp++] = replacement().charAt(0);
+ continue;
+
+ }
da[dp++] = replacement().charAt(0);
return dp;
} else if ((b1 >> 3) == -2) {
@@ -458,28 +518,29 @@ class UTF_8 extends Unicode
}
if (malformedInputAction() != CodingErrorAction.REPLACE)
return -1;
+
+ if (sp < sl && isMalformed4_2(b1, sa[sp])) {
+ da[dp++] = replacement().charAt(0);
+ continue;
+ }
+ sp++;
+ if (sp < sl && isMalformed4_3(sa[sp])) {
+ da[dp++] = replacement().charAt(0);
+ continue;
+ }
da[dp++] = replacement().charAt(0);
return dp;
} else {
if (malformedInputAction() != CodingErrorAction.REPLACE)
return -1;
da[dp++] = replacement().charAt(0);
- sp--;
- bb = getByteBuffer(bb, sa, sp);
- CoderResult cr = malformedN(bb, 1);
- if (!cr.isError()) {
- // leading byte for 5 or 6-byte, but don't have enough
- // bytes in buffer to check. Consumed rest as malformed.
- return dp;
- }
- sp += cr.length();
}
}
return dp;
}
}
- private static class Encoder extends CharsetEncoder
+ private static final class Encoder extends CharsetEncoder
implements ArrayEncoder {
private Encoder(Charset cs) {
diff --git a/jdk/src/share/classes/sun/nio/cs/standard-charsets b/jdk/src/share/classes/sun/nio/cs/standard-charsets
index 06120fe..2457135 100644
--- a/jdk/src/share/classes/sun/nio/cs/standard-charsets
+++ b/jdk/src/share/classes/sun/nio/cs/standard-charsets
@@ -63,6 +63,10 @@ charset UTF-8 UTF_8
alias UTF8 # JDK historical
alias unicode-1-1-utf-8
+charset CESU-8 CESU_8
+ alias CESU8
+ alias csCESU-8
+
charset UTF-16 UTF_16
alias UTF_16 # JDK historical
alias utf16
diff --git a/jdk/src/share/classes/sun/print/PSPrinterJob.java b/jdk/src/share/classes/sun/print/PSPrinterJob.java
index 722537e..d4a0ffa 100644
--- a/jdk/src/share/classes/sun/print/PSPrinterJob.java
+++ b/jdk/src/share/classes/sun/print/PSPrinterJob.java
@@ -68,14 +68,18 @@ import javax.print.attribute.standard.Sides;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
import java.io.CharConversionException;
import java.io.File;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.IOException;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -673,15 +677,38 @@ public class PSPrinterJob extends RasterPrinterJob {
private class PrinterSpooler implements java.security.PrivilegedAction {
PrinterException pex;
+ private void handleProcessFailure(final Process failedProcess,
+ final String[] execCmd, final int result) throws IOException {
+ try (StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw)) {
+ pw.append("error=").append(Integer.toString(result));
+ pw.append(" running:");
+ for (String arg: execCmd) {
+ pw.append(" '").append(arg).append("'");
+ }
+ try (InputStream is = failedProcess.getErrorStream();
+ InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader br = new BufferedReader(isr)) {
+ while (br.ready()) {
+ pw.println();
+ pw.append("\t\t").append(br.readLine());
+ }
+ } finally {
+ pw.flush();
+ throw new IOException(sw.toString());
+ }
+ }
+ }
+
public Object run() {
+ if (spoolFile == null || !spoolFile.exists()) {
+ pex = new PrinterException("No spool file");
+ return null;
+ }
try {
/**
* Spool to the printer.
*/
- if (spoolFile == null || !spoolFile.exists()) {
- pex = new PrinterException("No spool file");
- return null;
- }
String fileName = spoolFile.getAbsolutePath();
String execCmd[] = printExecCmd(mDestination, mOptions,
mNoJobSheet, getJobNameInt(),
@@ -689,12 +716,16 @@ public class PSPrinterJob extends RasterPrinterJob {
Process process = Runtime.getRuntime().exec(execCmd);
process.waitFor();
- spoolFile.delete();
-
+ final int result = process.exitValue();
+ if (0 != result) {
+ handleProcessFailure(process, execCmd, result);
+ }
} catch (IOException ex) {
pex = new PrinterIOException(ex);
} catch (InterruptedException ie) {
pex = new PrinterException(ie.toString());
+ } finally {
+ spoolFile.delete();
}
return null;
}
diff --git a/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java b/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
index 4878609..db18eb3 100644
--- a/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
+++ b/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
@@ -38,13 +38,23 @@ import java.rmi.server.ServerNotActiveException;
import java.rmi.registry.Registry;
import java.rmi.server.RMIClientSocketFactory;
import java.rmi.server.RMIServerSocketFactory;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.CodeSource;
+import java.security.Policy;
import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.ProtectionDomain;
import java.text.MessageFormat;
+import sun.rmi.server.LoaderHandler;
import sun.rmi.server.UnicastServerRef;
import sun.rmi.server.UnicastServerRef2;
import sun.rmi.transport.LiveRef;
import sun.rmi.transport.ObjectTable;
import sun.rmi.transport.Target;
+import sun.security.action.GetPropertyAction;
/**
* A "registry" exists on every node that allows RMI connections to
@@ -325,6 +335,19 @@ public class RegistryImpl extends java.rmi.server.RemoteServer
URL[] urls = sun.misc.URLClassPath.pathToURLs(envcp);
ClassLoader cl = new URLClassLoader(urls);
+ String codebaseProperty = null;
+ String prop = java.security.AccessController.doPrivileged(
+ new GetPropertyAction("java.rmi.server.codebase"));
+ if (prop != null && prop.trim().length() > 0) {
+ codebaseProperty = prop;
+ }
+ URL[] codebaseURLs = null;
+ if (codebaseProperty != null) {
+ codebaseURLs = sun.misc.URLClassPath.pathToURLs(codebaseProperty);
+ } else {
+ codebaseURLs = new URL[0];
+ }
+
/*
* Fix bugid 4242317: Classes defined by this class loader should
* be annotated with the value of the "java.rmi.server.codebase"
@@ -334,11 +357,19 @@ public class RegistryImpl extends java.rmi.server.RemoteServer
Thread.currentThread().setContextClassLoader(cl);
- int regPort = Registry.REGISTRY_PORT;
- if (args.length >= 1) {
- regPort = Integer.parseInt(args[0]);
+ final int regPort = (args.length >= 1) ? Integer.parseInt(args[0])
+ : Registry.REGISTRY_PORT;
+ try {
+ registry = AccessController.doPrivileged(
+ new PrivilegedExceptionAction<RegistryImpl>() {
+ public RegistryImpl run() throws RemoteException {
+ return new RegistryImpl(regPort);
+ }
+ }, getAccessControlContext(codebaseURLs));
+ } catch (PrivilegedActionException ex) {
+ throw (RemoteException) ex.getException();
}
- registry = new RegistryImpl(regPort);
+
// prevent registry from exiting
while (true) {
try {
@@ -358,4 +389,48 @@ public class RegistryImpl extends java.rmi.server.RemoteServer
}
System.exit(1);
}
+
+ /**
+ * Generates an AccessControlContext from several URLs.
+ * The approach used here is taken from the similar method
+ * getAccessControlContext() in the sun.applet.AppletPanel class.
+ */
+ private static AccessControlContext getAccessControlContext(URL[] urls) {
+ // begin with permissions granted to all code in current policy
+ PermissionCollection perms = AccessController.doPrivileged(
+ new java.security.PrivilegedAction<PermissionCollection>() {
+ public PermissionCollection run() {
+ CodeSource codesource = new CodeSource(null,
+ (java.security.cert.Certificate[]) null);
+ Policy p = java.security.Policy.getPolicy();
+ if (p != null) {
+ return p.getPermissions(codesource);
+ } else {
+ return new Permissions();
+ }
+ }
+ });
+
+ /*
+ * Anyone can connect to the registry and the registry can connect
+ * to and possibly download stubs from anywhere. Downloaded stubs and
+ * related classes themselves are more tightly limited by RMI.
+ */
+ perms.add(new SocketPermission("*", "connect,accept"));
+
+ perms.add(new RuntimePermission("accessClassInPackage.sun.*"));
+
+ // add permissions required to load from codebase URL path
+ LoaderHandler.addPermissionsForURLs(urls, perms, false);
+
+ /*
+ * Create an AccessControlContext that consists of a single
+ * protection domain with only the permissions calculated above.
+ */
+ ProtectionDomain pd = new ProtectionDomain(
+ new CodeSource((urls.length > 0 ? urls[0] : null),
+ (java.security.cert.Certificate[]) null),
+ perms);
+ return new AccessControlContext(new ProtectionDomain[] { pd });
+ }
}
diff --git a/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java b/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
index 541c784..52d9ee5 100644
--- a/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
+++ b/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
@@ -1031,9 +1031,9 @@ public final class LoaderHandler {
* loader. A given permission is only added to the collection if
* it is not already implied by the collection.
*/
- private static void addPermissionsForURLs(URL[] urls,
- PermissionCollection perms,
- boolean forLoader)
+ public static void addPermissionsForURLs(URL[] urls,
+ PermissionCollection perms,
+ boolean forLoader)
{
for (int i = 0; i < urls.length; i++) {
URL url = urls[i];
diff --git a/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java b/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java
index b67e72b..cb32017 100644
--- a/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java
+++ b/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java
@@ -110,14 +110,6 @@ public class MarshalInputStream extends ObjectInputStream {
}
/**
- * Load the "rmi" native library.
- */
- static {
- java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("rmi"));
- }
-
- /**
* Create a new MarshalInputStream object.
*/
public MarshalInputStream(InputStream in)
@@ -262,7 +254,9 @@ public class MarshalInputStream extends ObjectInputStream {
* Returns the first non-null class loader up the execution stack, or null
* if only code from the null class loader is on the stack.
*/
- private static native ClassLoader latestUserDefinedLoader();
+ private static ClassLoader latestUserDefinedLoader() {
+ return sun.misc.VM.latestUserDefinedLoader();
+ }
/**
* Fix for 4179055: Need to assist resolving sun stubs; resolve
diff --git a/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java b/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
index 9a0c1af..fe199a2 100644
--- a/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
+++ b/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
@@ -390,6 +390,12 @@ public class UnicastServerRef extends UnicastRef
ObjectInput in;
try {
in = call.getInputStream();
+ try {
+ Class<?> clazz = Class.forName("sun.rmi.transport.DGCImpl_Skel");
+ if (clazz.isAssignableFrom(skel.getClass())) {
+ ((MarshalInputStream)in).useCodebaseOnly();
+ }
+ } catch (ClassNotFoundException ignore) { }
hash = in.readLong();
} catch (Exception readEx) {
throw new UnmarshalException("error unmarshalling call header",
diff --git a/jdk/src/share/classes/sun/security/ec/ECPublicKeyImpl.java b/jdk/src/share/classes/sun/security/ec/ECPublicKeyImpl.java
index 6d471e9..aae485c 100644
--- a/jdk/src/share/classes/sun/security/ec/ECPublicKeyImpl.java
+++ b/jdk/src/share/classes/sun/security/ec/ECPublicKeyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2011, 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
@@ -51,6 +51,7 @@ public final class ECPublicKeyImpl extends X509Key implements ECPublicKey {
* Construct a key from its components. Used by the
* ECKeyFactory and SunPKCS11.
*/
+ @SuppressWarnings("deprecation")
public ECPublicKeyImpl(ECPoint w, ECParameterSpec params)
throws InvalidKeyException {
this.w = w;
@@ -85,6 +86,7 @@ public final class ECPublicKeyImpl extends X509Key implements ECPublicKey {
// Internal API to get the encoded point. Currently used by SunPKCS11.
// This may change/go away depending on what we do with the public API.
+ @SuppressWarnings("deprecation")
public byte[] getEncodedPublicValue() {
return key.clone();
}
@@ -92,6 +94,7 @@ public final class ECPublicKeyImpl extends X509Key implements ECPublicKey {
/**
* Parse the key. Called by X509Key.
*/
+ @SuppressWarnings("deprecation")
protected void parseKeyBits() throws InvalidKeyException {
try {
AlgorithmParameters algParams = this.algid.getParameters();
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java b/jdk/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java
index c3e2273..a2ad498 100644
--- a/jdk/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java
@@ -94,7 +94,7 @@ class AcceptSecContextToken extends InitialToken {
*/
EncryptionKey subKey = apRep.getSubKey();
if (subKey != null) {
- context.setKey(subKey);
+ context.setKey(Krb5Context.ACCEPTOR_SUBKEY, subKey);
/*
System.out.println("\n\nSub-Session key from AP-REP is: " +
getHexBytes(subKey.getBytes()) + "\n");
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java b/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
index 8e35ef8..edd4bcf 100644
--- a/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
@@ -74,9 +74,9 @@ class InitSecContextToken extends InitialToken {
EncryptionKey subKey = apReq.getSubKey();
if (subKey != null)
- context.setKey(subKey);
+ context.setKey(Krb5Context.INITIATOR_SUBKEY, subKey);
else
- context.setKey(serviceTicket.getSessionKey());
+ context.setKey(Krb5Context.SESSION_KEY, serviceTicket.getSessionKey());
if (!mutualRequired)
context.resetPeerSequenceNumber(0);
@@ -117,13 +117,13 @@ class InitSecContextToken extends InitialToken {
EncryptionKey subKey = apReq.getSubKey();
if (subKey != null) {
- context.setKey(subKey);
+ context.setKey(Krb5Context.INITIATOR_SUBKEY, subKey);
/*
System.out.println("Sub-Session key from authenticator is: " +
getHexBytes(subKey.getBytes()) + "\n");
*/
} else {
- context.setKey(sessionKey);
+ context.setKey(Krb5Context.SESSION_KEY, sessionKey);
//System.out.println("Sub-Session Key Missing in Authenticator.\n");
}
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java b/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
index 3b6467d..37c7b98 100644
--- a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
@@ -67,6 +67,10 @@ class Krb5Context implements GSSContextSpi {
private int state = STATE_NEW;
+ public static final int SESSION_KEY = 0;
+ public static final int INITIATOR_SUBKEY = 1;
+ public static final int ACCEPTOR_SUBKEY = 2;
+
/*
* Optional features that the application can set and their default
* values.
@@ -82,6 +86,7 @@ class Krb5Context implements GSSContextSpi {
private int mySeqNumber;
private int peerSeqNumber;
+ private int keySrc;
private TokenTracker peerTokenTracker;
private CipherHelper cipherHelper = null;
@@ -384,12 +389,17 @@ class Krb5Context implements GSSContextSpi {
}
}
- final void setKey(EncryptionKey key) throws GSSException {
+ final void setKey(int keySrc, EncryptionKey key) throws GSSException {
this.key = key;
+ this.keySrc = keySrc;
// %%% to do: should clear old cipherHelper first
cipherHelper = new CipherHelper(key); // Need to use new key
}
+ public final int getKeySrc() {
+ return keySrc;
+ }
+
private final EncryptionKey getKey() {
return key;
}
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java b/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java
index d76a58b..509773d 100644
--- a/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java
@@ -141,6 +141,7 @@ abstract class MessageToken_v2 extends Krb5Token {
// Context properties
private boolean confState = true;
private boolean initiator = true;
+ private boolean have_acceptor_subkey = false;
/* cipher instance used by the corresponding GSSContext */
CipherHelper cipherHelper = null;
@@ -233,7 +234,6 @@ abstract class MessageToken_v2 extends Krb5Token {
}
if (tokenId == Krb5Token.WRAP_ID_v2) {
- // Does non-confidential data needs a rotate?
rotate();
}
@@ -312,8 +312,7 @@ abstract class MessageToken_v2 extends Krb5Token {
}
// Create a new gss token header as defined in RFC 4121
- tokenHeader = new MessageTokenHeader(tokenId,
- prop.getPrivacy(), true);
+ tokenHeader = new MessageTokenHeader(tokenId, prop.getPrivacy());
// debug("\n\t Message Header = " +
// getHexBytes(tokenHeader.getBytes(), tokenHeader.getBytes().length));
@@ -421,10 +420,12 @@ abstract class MessageToken_v2 extends Krb5Token {
int conf_flag = tokenHeaderBytes[TOKEN_FLAG_POS] &
FLAG_WRAP_CONFIDENTIAL;
- // clear EC in token header for checksum calculation
+ // clear EC and RRC in token header for checksum calculation
if ((conf_flag == 0) && (tokenId == WRAP_ID_v2)) {
tokenHeaderBytes[4] = 0;
tokenHeaderBytes[5] = 0;
+ tokenHeaderBytes[6] = 0;
+ tokenHeaderBytes[7] = 0;
}
return cipherHelper.calculateChecksum(tokenHeaderBytes, data,
offset, len, key_usage);
@@ -460,6 +461,8 @@ abstract class MessageToken_v2 extends Krb5Token {
this.initiator = context.isInitiator();
+ this.have_acceptor_subkey = context.getKeySrc() == Krb5Context.ACCEPTOR_SUBKEY;
+
this.cipherHelper = context.getCipherHelper(null);
// debug("In MessageToken.Cons");
}
@@ -500,8 +503,7 @@ abstract class MessageToken_v2 extends Krb5Token {
private byte[] bytes = new byte[TOKEN_HEADER_SIZE];
// Writes a new token header
- public MessageTokenHeader(int tokenId, boolean conf,
- boolean have_acceptor_subkey) throws GSSException {
+ public MessageTokenHeader(int tokenId, boolean conf) throws GSSException {
this.tokenId = tokenId;
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java b/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java
index 3426d8b..23b4dd8 100644
--- a/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java
+++ b/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java
@@ -144,15 +144,18 @@ public final class KrbAsReqBuilder {
/**
* Retrieves an array of secret keys for the client. This is used when
- * the client supplies password but need keys to act as an acceptor
- * (in JAAS words, isInitiator=true and storeKey=true)
+ * the client supplies password but need keys to act as an acceptor. For
+ * an initiator, it must be called after AS-REQ is performed (state is OK).
+ * For an acceptor, it can be called when this KrbAsReqBuilder object is
+ * constructed (state is INIT).
+ * @param isInitiator if the caller is an initiator
* @return generated keys from password. PA-DATA from server might be used.
* All "default_tkt_enctypes" keys will be generated, Never null.
* @throws IllegalStateException if not constructed from a password
* @throws KrbException
*/
- public EncryptionKey[] getKeys() throws KrbException {
- checkState(State.REQ_OK, "Cannot get keys");
+ public EncryptionKey[] getKeys(boolean isInitiator) throws KrbException {
+ checkState(isInitiator?State.REQ_OK:State.INIT, "Cannot get keys");
if (password != null) {
int[] eTypes = EType.getDefaults("default_tkt_enctypes");
EncryptionKey[] result = new EncryptionKey[eTypes.length];
diff --git a/jdk/src/share/classes/sun/security/pkcs/PKCS7.java b/jdk/src/share/classes/sun/security/pkcs/PKCS7.java
index cd7c1c0..a319878 100644
--- a/jdk/src/share/classes/sun/security/pkcs/PKCS7.java
+++ b/jdk/src/share/classes/sun/security/pkcs/PKCS7.java
@@ -883,7 +883,7 @@ public class PKCS7 {
throw new IOException("Digest algorithm not SHA-1 in "
+ "timestamp token");
}
- if (!messageDigest.isEqual(tst.getHashedMessage(),
+ if (!MessageDigest.isEqual(tst.getHashedMessage(),
tsQuery.getHashedMessage())) {
throw new IOException("Digest octets changed in timestamp token");
}
diff --git a/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java b/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
new file mode 100644
index 0000000..c5418c6
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 1996, 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+
+package sun.security.pkcs10;
+
+import java.io.PrintStream;
+import java.io.IOException;
+import java.math.BigInteger;
+
+import java.security.cert.CertificateException;
+import java.security.NoSuchAlgorithmException;
+import java.security.InvalidKeyException;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.security.PublicKey;
+
+import sun.misc.BASE64Encoder;
+
+import sun.security.util.*;
+import sun.security.x509.AlgorithmId;
+import sun.security.x509.X509Key;
+import sun.security.x509.X500Name;
+
+/**
+ * A PKCS #10 certificate request is created and sent to a Certificate
+ * Authority, which then creates an X.509 certificate and returns it to
+ * the entity that requested it. A certificate request basically consists
+ * of the subject's X.500 name, public key, and optionally some attributes,
+ * signed using the corresponding private key.
+ *
+ * The ASN.1 syntax for a Certification Request is:
+ * <pre>
+ * CertificationRequest ::= SEQUENCE {
+ * certificationRequestInfo CertificationRequestInfo,
+ * signatureAlgorithm SignatureAlgorithmIdentifier,
+ * signature Signature
+ * }
+ *
+ * SignatureAlgorithmIdentifier ::= AlgorithmIdentifier
+ * Signature ::= BIT STRING
+ *
+ * CertificationRequestInfo ::= SEQUENCE {
+ * version Version,
+ * subject Name,
+ * subjectPublicKeyInfo SubjectPublicKeyInfo,
+ * attributes [0] IMPLICIT Attributes
+ * }
+ * Attributes ::= SET OF Attribute
+ * </pre>
+ *
+ * @author David Brownell
+ * @author Amit Kapoor
+ * @author Hemma Prafullchandra
+ */
+public class PKCS10 {
+ /**
+ * Constructs an unsigned PKCS #10 certificate request. Before this
+ * request may be used, it must be encoded and signed. Then it
+ * must be retrieved in some conventional format (e.g. string).
+ *
+ * @param publicKey the public key that should be placed
+ * into the certificate generated by the CA.
+ */
+ public PKCS10(PublicKey publicKey) {
+ subjectPublicKeyInfo = publicKey;
+ attributeSet = new PKCS10Attributes();
+ }
+
+ /**
+ * Constructs an unsigned PKCS #10 certificate request. Before this
+ * request may be used, it must be encoded and signed. Then it
+ * must be retrieved in some conventional format (e.g. string).
+ *
+ * @param publicKey the public key that should be placed
+ * into the certificate generated by the CA.
+ * @param attributes additonal set of PKCS10 attributes requested
+ * for in the certificate.
+ */
+ public PKCS10(PublicKey publicKey, PKCS10Attributes attributes) {
+ subjectPublicKeyInfo = publicKey;
+ attributeSet = attributes;
+ }
+
+ /**
+ * Parses an encoded, signed PKCS #10 certificate request, verifying
+ * the request's signature as it does so. This constructor would
+ * typically be used by a Certificate Authority, from which a new
+ * certificate would then be constructed.
+ *
+ * @param data the DER-encoded PKCS #10 request.
+ * @exception IOException for low level errors reading the data
+ * @exception SignatureException when the signature is invalid
+ * @exception NoSuchAlgorithmException when the signature
+ * algorithm is not supported in this environment
+ */
+ public PKCS10(byte[] data)
+ throws IOException, SignatureException, NoSuchAlgorithmException {
+ DerInputStream in;
+ DerValue[] seq;
+ AlgorithmId id;
+ byte[] sigData;
+ Signature sig;
+
+ encoded = data;
+
+ //
+ // Outer sequence: request, signature algorithm, signature.
+ // Parse, and prepare to verify later.
+ //
+ in = new DerInputStream(data);
+ seq = in.getSequence(3);
+
+ if (seq.length != 3)
+ throw new IllegalArgumentException("not a PKCS #10 request");
+
+ data = seq[0].toByteArray(); // reusing this variable
+ id = AlgorithmId.parse(seq[1]);
+ sigData = seq[2].getBitString();
+
+ //
+ // Inner sequence: version, name, key, attributes
+ //
+ BigInteger serial;
+ DerValue val;
+
+ serial = seq[0].data.getBigInteger();
+ if (!serial.equals(BigInteger.ZERO))
+ throw new IllegalArgumentException("not PKCS #10 v1");
+
+ subject = new X500Name(seq[0].data);
+ subjectPublicKeyInfo = X509Key.parse(seq[0].data.getDerValue());
+
+ // Cope with a somewhat common illegal PKCS #10 format
+ if (seq[0].data.available() != 0)
+ attributeSet = new PKCS10Attributes(seq[0].data);
+ else
+ attributeSet = new PKCS10Attributes();
+
+ if (seq[0].data.available() != 0)
+ throw new IllegalArgumentException("illegal PKCS #10 data");
+
+ //
+ // OK, we parsed it all ... validate the signature using the
+ // key and signature algorithm we found.
+ //
+ try {
+ sig = Signature.getInstance(id.getName());
+ sig.initVerify(subjectPublicKeyInfo);
+ sig.update(data);
+ if (!sig.verify(sigData))
+ throw new SignatureException("Invalid PKCS #10 signature");
+ } catch (InvalidKeyException e) {
+ throw new SignatureException("invalid key");
+ }
+ }
+
+ /**
+ * Create the signed certificate request. This will later be
+ * retrieved in either string or binary format.
+ *
+ * @param subject identifies the signer (by X.500 name).
+ * @param signature private key and signing algorithm to use.
+ * @exception IOException on errors.
+ * @exception CertificateException on certificate handling errors.
+ * @exception SignatureException on signature handling errors.
+ */
+ public void encodeAndSign(X500Name subject, Signature signature)
+ throws CertificateException, IOException, SignatureException {
+ DerOutputStream out, scratch;
+ byte[] certificateRequestInfo;
+ byte[] sig;
+
+ if (encoded != null)
+ throw new SignatureException("request is already signed");
+
+ this.subject = subject;
+
+ /*
+ * Encode cert request info, wrap in a sequence for signing
+ */
+ scratch = new DerOutputStream();
+ scratch.putInteger(BigInteger.ZERO); // PKCS #10 v1.0
+ subject.encode(scratch); // X.500 name
+ scratch.write(subjectPublicKeyInfo.getEncoded()); // public key
+ attributeSet.encode(scratch);
+
+ out = new DerOutputStream();
+ out.write(DerValue.tag_Sequence, scratch); // wrap it!
+ certificateRequestInfo = out.toByteArray();
+ scratch = out;
+
+ /*
+ * Sign it ...
+ */
+ signature.update(certificateRequestInfo, 0,
+ certificateRequestInfo.length);
+ sig = signature.sign();
+
+ /*
+ * Build guts of SIGNED macro
+ */
+ AlgorithmId algId = null;
+ try {
+ algId = AlgorithmId.get(signature.getAlgorithm());
+ } catch (NoSuchAlgorithmException nsae) {
+ throw new SignatureException(nsae);
+ }
+ algId.encode(scratch); // sig algorithm
+ scratch.putBitString(sig); // sig
+
+ /*
+ * Wrap those guts in a sequence
+ */
+ out = new DerOutputStream();
+ out.write(DerValue.tag_Sequence, scratch);
+ encoded = out.toByteArray();
+ }
+
+ /**
+ * Returns the subject's name.
+ */
+ public X500Name getSubjectName() { return subject; }
+
+ /**
+ * Returns the subject's public key.
+ */
+ public PublicKey getSubjectPublicKeyInfo()
+ { return subjectPublicKeyInfo; }
+
+ /**
+ * Returns the additional attributes requested.
+ */
+ public PKCS10Attributes getAttributes()
+ { return attributeSet; }
+
+ /**
+ * Returns the encoded and signed certificate request as a
+ * DER-encoded byte array.
+ *
+ * @return the certificate request, or null if encodeAndSign()
+ * has not yet been called.
+ */
+ public byte[] getEncoded() {
+ if (encoded != null)
+ return encoded.clone();
+ else
+ return null;
+ }
+
+ /**
+ * Prints an E-Mailable version of the certificate request on the print
+ * stream passed. The format is a common base64 encoded one, supported
+ * by most Certificate Authorities because Netscape web servers have
+ * used this for some time. Some certificate authorities expect some
+ * more information, in particular contact information for the web
+ * server administrator.
+ *
+ * @param out the print stream where the certificate request
+ * will be printed.
+ * @exception IOException when an output operation failed
+ * @exception SignatureException when the certificate request was
+ * not yet signed.
+ */
+ public void print(PrintStream out)
+ throws IOException, SignatureException {
+ if (encoded == null)
+ throw new SignatureException("Cert request was not signed");
+
+ BASE64Encoder encoder = new BASE64Encoder();
+
+ out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
+ encoder.encodeBuffer(encoded, out);
+ out.println("-----END NEW CERTIFICATE REQUEST-----");
+ }
+
+ /**
+ * Provides a short description of this request.
+ */
+ public String toString() {
+ return "[PKCS #10 certificate request:\n"
+ + subjectPublicKeyInfo.toString()
+ + " subject: <" + subject + ">" + "\n"
+ + " attributes: " + attributeSet.toString()
+ + "\n]";
+ }
+
+ /**
+ * Compares this object for equality with the specified
+ * object. If the <code>other</code> object is an
+ * <code>instanceof</code> <code>PKCS10</code>, then
+ * its encoded form is retrieved and compared with the
+ * encoded form of this certificate request.
+ *
+ * @param other the object to test for equality with this object.
+ * @return true iff the encoded forms of the two certificate
+ * requests match, false otherwise.
+ */
+ public boolean equals(Object other) {
+ if (this == other)
+ return true;
+ if (!(other instanceof PKCS10))
+ return false;
+ if (encoded == null) // not signed yet
+ return false;
+ byte[] otherEncoded = ((PKCS10)other).getEncoded();
+ if (otherEncoded == null)
+ return false;
+
+ return java.util.Arrays.equals(encoded, otherEncoded);
+ }
+
+ /**
+ * Returns a hashcode value for this certificate request from its
+ * encoded form.
+ *
+ * @return the hashcode value.
+ */
+ public int hashCode() {
+ int retval = 0;
+ if (encoded != null)
+ for (int i = 1; i < encoded.length; i++)
+ retval += encoded[i] * i;
+ return(retval);
+ }
+
+ private X500Name subject;
+ private PublicKey subjectPublicKeyInfo;
+ private PKCS10Attributes attributeSet;
+ private byte[] encoded; // signed
+}
diff --git a/jdk/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java b/jdk/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java
new file mode 100644
index 0000000..c7cac3b
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1997, 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.security.pkcs10;
+
+import java.io.OutputStream;
+import java.io.IOException;
+
+import sun.security.pkcs.PKCS9Attribute;
+import sun.security.util.*;
+
+/**
+ * Represent a PKCS#10 Attribute.
+ *
+ * <p>Attributes are additonal information which can be inserted in a PKCS#10
+ * certificate request. For example a "Driving License Certificate" could have
+ * the driving license number as an attribute.
+ *
+ * <p>Attributes are represented as a sequence of the attribute identifier
+ * (Object Identifier) and a set of DER encoded attribute values.
+ *
+ * ASN.1 definition of Attribute:
+ * <pre>
+ * Attribute :: SEQUENCE {
+ * type AttributeType,
+ * values SET OF AttributeValue
+ * }
+ * AttributeType ::= OBJECT IDENTIFIER
+ * AttributeValue ::= ANY defined by type
+ * </pre>
+ *
+ * @author Amit Kapoor
+ * @author Hemma Prafullchandra
+ */
+public class PKCS10Attribute implements DerEncoder {
+
+ protected ObjectIdentifier attributeId = null;
+ protected Object attributeValue = null;
+
+ /**
+ * Constructs an attribute from a DER encoding.
+ * This constructor expects the value to be encoded as defined above,
+ * i.e. a SEQUENCE of OID and SET OF value(s), not a literal
+ * X.509 v3 extension. Only PKCS9 defined attributes are supported
+ * currently.
+ *
+ * @param derVal the der encoded attribute.
+ * @exception IOException on parsing errors.
+ */
+ public PKCS10Attribute(DerValue derVal) throws IOException {
+ PKCS9Attribute attr = new PKCS9Attribute(derVal);
+ this.attributeId = attr.getOID();
+ this.attributeValue = attr.getValue();
+ }
+
+ /**
+ * Constructs an attribute from individual components of
+ * ObjectIdentifier and the value (any java object).
+ *
+ * @param attributeId the ObjectIdentifier of the attribute.
+ * @param attributeValue an instance of a class that implements
+ * the attribute identified by the ObjectIdentifier.
+ */
+ public PKCS10Attribute(ObjectIdentifier attributeId,
+ Object attributeValue) {
+ this.attributeId = attributeId;
+ this.attributeValue = attributeValue;
+ }
+
+ /**
+ * Constructs an attribute from PKCS9 attribute.
+ *
+ * @param attr the PKCS9Attribute to create from.
+ */
+ public PKCS10Attribute(PKCS9Attribute attr) {
+ this.attributeId = attr.getOID();
+ this.attributeValue = attr.getValue();
+ }
+
+ /**
+ * DER encode this object onto an output stream.
+ * Implements the <code>DerEncoder</code> interface.
+ *
+ * @param out
+ * the OutputStream on which to write the DER encoding.
+ *
+ * @exception IOException on encoding errors.
+ */
+ public void derEncode(OutputStream out) throws IOException {
+ PKCS9Attribute attr = new PKCS9Attribute(attributeId, attributeValue);
+ attr.derEncode(out);
+ }
+
+ /**
+ * Returns the ObjectIdentifier of the attribute.
+ */
+ public ObjectIdentifier getAttributeId() {
+ return (attributeId);
+ }
+
+ /**
+ * Returns the attribute value.
+ */
+ public Object getAttributeValue() {
+ return (attributeValue);
+ }
+
+ /**
+ * Returns the attribute in user readable form.
+ */
+ public String toString() {
+ return (attributeValue.toString());
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java b/jdk/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java
new file mode 100644
index 0000000..d35f3a7
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 1997, 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.security.pkcs10;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.security.cert.CertificateException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import sun.security.util.*;
+
+/**
+ * This class defines the PKCS10 attributes for the request.
+ * The ASN.1 syntax for this is:
+ * <pre>
+ * Attributes ::= SET OF Attribute
+ * </pre>
+ *
+ * @author Amit Kapoor
+ * @author Hemma Prafullchandra
+ * @see PKCS10
+ * @see PKCS10Attribute
+ */
+public class PKCS10Attributes implements DerEncoder {
+
+ private Hashtable<String, PKCS10Attribute> map =
+ new Hashtable<String, PKCS10Attribute>(3);
+
+ /**
+ * Default constructor for the PKCS10 attribute.
+ */
+ public PKCS10Attributes() { }
+
+ /**
+ * Create the object from the array of PKCS10Attribute objects.
+ *
+ * @param attrs the array of PKCS10Attribute objects.
+ */
+ public PKCS10Attributes(PKCS10Attribute[] attrs) {
+ for (int i = 0; i < attrs.length; i++) {
+ map.put(attrs[i].getAttributeId().toString(), attrs[i]);
+ }
+ }
+
+ /**
+ * Create the object, decoding the values from the passed DER stream.
+ * The DER stream contains the SET OF Attribute.
+ *
+ * @param in the DerInputStream to read the attributes from.
+ * @exception IOException on decoding errors.
+ */
+ public PKCS10Attributes(DerInputStream in) throws IOException {
+ DerValue[] attrs = in.getSet(3, true);
+
+ if (attrs == null)
+ throw new IOException("Illegal encoding of attributes");
+ for (int i = 0; i < attrs.length; i++) {
+ PKCS10Attribute attr = new PKCS10Attribute(attrs[i]);
+ map.put(attr.getAttributeId().toString(), attr);
+ }
+ }
+
+ /**
+ * Encode the attributes in DER form to the stream.
+ *
+ * @param out the OutputStream to marshal the contents to.
+ * @exception IOException on encoding errors.
+ */
+ public void encode(OutputStream out) throws IOException {
+ derEncode(out);
+ }
+
+ /**
+ * Encode the attributes in DER form to the stream.
+ * Implements the <code>DerEncoder</code> interface.
+ *
+ * @param out the OutputStream to marshal the contents to.
+ * @exception IOException on encoding errors.
+ */
+ public void derEncode(OutputStream out) throws IOException {
+ // first copy the elements into an array
+ Collection<PKCS10Attribute> allAttrs = map.values();
+ PKCS10Attribute[] attribs =
+ allAttrs.toArray(new PKCS10Attribute[map.size()]);
+
+ DerOutputStream attrOut = new DerOutputStream();
+ attrOut.putOrderedSetOf(DerValue.createTag(DerValue.TAG_CONTEXT,
+ true, (byte)0),
+ attribs);
+ out.write(attrOut.toByteArray());
+ }
+
+ /**
+ * Set the attribute value.
+ */
+ public void setAttribute(String name, Object obj) {
+ if (obj instanceof PKCS10Attribute) {
+ map.put(name, (PKCS10Attribute)obj);
+ }
+ }
+
+ /**
+ * Get the attribute value.
+ */
+ public Object getAttribute(String name) {
+ return map.get(name);
+ }
+
+ /**
+ * Delete the attribute value.
+ */
+ public void deleteAttribute(String name) {
+ map.remove(name);
+ }
+
+ /**
+ * Return an enumeration of names of attributes existing within this
+ * attribute.
+ */
+ public Enumeration<PKCS10Attribute> getElements() {
+ return (map.elements());
+ }
+
+ /**
+ * Return a Collection of attributes existing within this
+ * PKCS10Attributes object.
+ */
+ public Collection<PKCS10Attribute> getAttributes() {
+ return (Collections.unmodifiableCollection(map.values()));
+ }
+
+ /**
+ * Compares this PKCS10Attributes for equality with the specified
+ * object. If the <code>other</code> object is an
+ * <code>instanceof</code> <code>PKCS10Attributes</code>, then
+ * all the entries are compared with the entries from this.
+ *
+ * @param other the object to test for equality with this PKCS10Attributes.
+ * @return true if all the entries match that of the Other,
+ * false otherwise.
+ */
+ public boolean equals(Object other) {
+ if (this == other)
+ return true;
+ if (!(other instanceof PKCS10Attributes))
+ return false;
+
+ Collection<PKCS10Attribute> othersAttribs =
+ ((PKCS10Attributes)other).getAttributes();
+ PKCS10Attribute[] attrs =
+ othersAttribs.toArray(new PKCS10Attribute[othersAttribs.size()]);
+ int len = attrs.length;
+ if (len != map.size())
+ return false;
+ PKCS10Attribute thisAttr, otherAttr;
+ String key = null;
+ for (int i=0; i < len; i++) {
+ otherAttr = attrs[i];
+ key = otherAttr.getAttributeId().toString();
+
+ if (key == null)
+ return false;
+ thisAttr = map.get(key);
+ if (thisAttr == null)
+ return false;
+ if (! thisAttr.equals(otherAttr))
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Returns a hashcode value for this PKCS10Attributes.
+ *
+ * @return the hashcode value.
+ */
+ public int hashCode() {
+ return map.hashCode();
+ }
+
+ /**
+ * Returns a string representation of this <tt>PKCS10Attributes</tt> object
+ * in the form of a set of entries, enclosed in braces and separated
+ * by the ASCII characters "<tt>, </tt>" (comma and space).
+ * <p>Overrides the <tt>toString</tt> method of <tt>Object</tt>.
+ *
+ * @return a string representation of this PKCS10Attributes.
+ */
+ public String toString() {
+ String s = map.size() + "\n" + map.toString();
+ return s;
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/pkcs11/Config.java b/jdk/src/share/classes/sun/security/pkcs11/Config.java
index dbed2cf..08cb6de 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/Config.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/Config.java
@@ -192,6 +192,11 @@ final class Config {
// works only for NSS providers created via the Secmod API
private boolean nssUseSecmodTrust = false;
+ // Flag to indicate whether the X9.63 encoding for EC points shall be used
+ // (true) or whether that encoding shall be wrapped in an ASN.1 OctetString
+ // (false).
+ private boolean useEcX963Encoding = false;
+
private Config(String filename, InputStream in) throws IOException {
if (in == null) {
if (filename.startsWith("--")) {
@@ -320,6 +325,10 @@ final class Config {
return nssUseSecmodTrust;
}
+ boolean getUseEcX963Encoding() {
+ return useEcX963Encoding;
+ }
+
private static String expand(final String s) throws IOException {
try {
return PropertyExpander.expand(s);
@@ -440,6 +449,8 @@ final class Config {
parseNSSArgs(word);
} else if (word.equals("nssUseSecmodTrust")) {
nssUseSecmodTrust = parseBooleanEntry(word);
+ } else if (word.equals("useEcX963Encoding")) {
+ useEcX963Encoding = parseBooleanEntry(word);
} else {
throw new ConfigurationException
("Unknown keyword '" + word + "', line " + st.lineno());
diff --git a/jdk/src/share/classes/sun/security/pkcs11/KeyCache.java b/jdk/src/share/classes/sun/security/pkcs11/KeyCache.java
index 359156f..1687649 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/KeyCache.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/KeyCache.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
@@ -48,7 +48,7 @@ import sun.security.util.Cache;
*/
final class KeyCache {
- private final Cache strongCache;
+ private final Cache<IdentityWrapper, P11Key> strongCache;
private WeakReference<Map<Key,P11Key>> cacheReference;
@@ -77,7 +77,7 @@ final class KeyCache {
}
synchronized P11Key get(Key key) {
- P11Key p11Key = (P11Key)strongCache.get(new IdentityWrapper(key));
+ P11Key p11Key = strongCache.get(new IdentityWrapper(key));
if (p11Key != null) {
return p11Key;
}
@@ -94,8 +94,8 @@ final class KeyCache {
Map<Key,P11Key> map =
(cacheReference == null) ? null : cacheReference.get();
if (map == null) {
- map = new IdentityHashMap<Key,P11Key>();
- cacheReference = new WeakReference<Map<Key,P11Key>>(map);
+ map = new IdentityHashMap<>();
+ cacheReference = new WeakReference<>(map);
}
map.put(key, p11Key);
}
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java b/jdk/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
index d44231a..ef6cf3a 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
@@ -203,14 +203,20 @@ final class P11ECKeyFactory extends P11KeyFactory {
private PublicKey generatePublic(ECPoint point, ECParameterSpec params) throws PKCS11Exception {
byte[] encodedParams = ECParameters.encodeParameters(params);
- byte[] encodedPoint = null;
- DerValue pkECPoint = new DerValue(DerValue.tag_OctetString,
- ECParameters.encodePoint(point, params.getCurve()));
+ byte[] encodedPoint =
+ ECParameters.encodePoint(point, params.getCurve());
- try {
- encodedPoint = pkECPoint.toByteArray();
- } catch (IOException e) {
- throw new IllegalArgumentException("Could not DER encode point", e);
+ // Check whether the X9.63 encoding of an EC point shall be wrapped
+ // in an ASN.1 OCTET STRING
+ if (!token.config.getUseEcX963Encoding()) {
+ try {
+ encodedPoint =
+ new DerValue(DerValue.tag_OctetString, encodedPoint)
+ .toByteArray();
+ } catch (IOException e) {
+ throw new
+ IllegalArgumentException("Could not DER encode point", e);
+ }
}
CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] {
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11Key.java b/jdk/src/share/classes/sun/security/pkcs11/P11Key.java
index 54ccd32..bbce898 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/P11Key.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11Key.java
@@ -1028,28 +1028,21 @@ abstract class P11Key implements Key {
try {
params = P11ECKeyFactory.decodeParameters
(attributes[1].getByteArray());
-
- /*
- * An uncompressed EC point may be in either of two formats.
- * First try the OCTET STRING encoding:
- * 04 <length> 04 <X-coordinate> <Y-coordinate>
- *
- * Otherwise try the raw encoding:
- * 04 <X-coordinate> <Y-coordinate>
- */
byte[] ecKey = attributes[0].getByteArray();
- try {
+ // Check whether the X9.63 encoding of an EC point is wrapped
+ // in an ASN.1 OCTET STRING
+ if (!token.config.getUseEcX963Encoding()) {
DerValue wECPoint = new DerValue(ecKey);
- if (wECPoint.getTag() != DerValue.tag_OctetString)
- throw new IOException("Unexpected tag: " +
- wECPoint.getTag());
+ if (wECPoint.getTag() != DerValue.tag_OctetString) {
+ throw new IOException("Could not DER decode EC point." +
+ " Unexpected tag: " + wECPoint.getTag());
+ }
w = P11ECKeyFactory.decodePoint
(wECPoint.getDataBytes(), params.getCurve());
- } catch (IOException e) {
- // Failover
+ } else {
w = P11ECKeyFactory.decodePoint(ecKey, params.getCurve());
}
diff --git a/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java b/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
index d54c561..b94ca87 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
@@ -1335,10 +1335,10 @@ public final class SunPKCS11 extends AuthProvider {
return null;
}
- Class c = Class.forName
- (defaultHandler,
- true,
- Thread.currentThread().getContextClassLoader());
+ Class<?> c = Class.forName
+ (defaultHandler,
+ true,
+ Thread.currentThread().getContextClassLoader());
return (CallbackHandler)c.newInstance();
}
});
diff --git a/jdk/src/share/classes/sun/security/provider/X509Factory.java b/jdk/src/share/classes/sun/security/provider/X509Factory.java
index 0260ff5..28b7aa5 100644
--- a/jdk/src/share/classes/sun/security/provider/X509Factory.java
+++ b/jdk/src/share/classes/sun/security/provider/X509Factory.java
@@ -64,8 +64,10 @@ public class X509Factory extends CertificateFactorySpi {
private static final int ENC_MAX_LENGTH = 4096 * 1024; // 4 MB MAX
- private static final Cache certCache = Cache.newSoftMemoryCache(750);
- private static final Cache crlCache = Cache.newSoftMemoryCache(750);
+ private static final Cache<Object, X509CertImpl> certCache
+ = Cache.newSoftMemoryCache(750);
+ private static final Cache<Object, X509CRLImpl> crlCache
+ = Cache.newSoftMemoryCache(750);
/**
* Generates an X.509 certificate object and initializes it with
@@ -90,7 +92,7 @@ public class X509Factory extends CertificateFactorySpi {
try {
byte[] encoding = readOneBlock(is);
if (encoding != null) {
- X509CertImpl cert = (X509CertImpl)getFromCache(certCache, encoding);
+ X509CertImpl cert = getFromCache(certCache, encoding);
if (cert != null) {
return cert;
}
@@ -151,7 +153,7 @@ public class X509Factory extends CertificateFactorySpi {
} else {
encoding = c.getEncoded();
}
- X509CertImpl newC = (X509CertImpl)getFromCache(certCache, encoding);
+ X509CertImpl newC = getFromCache(certCache, encoding);
if (newC != null) {
return newC;
}
@@ -181,7 +183,7 @@ public class X509Factory extends CertificateFactorySpi {
} else {
encoding = c.getEncoded();
}
- X509CRLImpl newC = (X509CRLImpl)getFromCache(crlCache, encoding);
+ X509CRLImpl newC = getFromCache(crlCache, encoding);
if (newC != null) {
return newC;
}
@@ -198,18 +200,17 @@ public class X509Factory extends CertificateFactorySpi {
/**
* Get the X509CertImpl or X509CRLImpl from the cache.
*/
- private static synchronized Object getFromCache(Cache cache,
+ private static synchronized <K,V> V getFromCache(Cache<K,V> cache,
byte[] encoding) {
Object key = new Cache.EqualByteArray(encoding);
- Object value = cache.get(key);
- return value;
+ return cache.get(key);
}
/**
* Add the X509CertImpl or X509CRLImpl to the cache.
*/
- private static synchronized void addToCache(Cache cache, byte[] encoding,
- Object value) {
+ private static synchronized <V> void addToCache(Cache<Object, V> cache,
+ byte[] encoding, V value) {
if (encoding.length > ENC_MAX_LENGTH) {
return;
}
@@ -361,7 +362,7 @@ public class X509Factory extends CertificateFactorySpi {
try {
byte[] encoding = readOneBlock(is);
if (encoding != null) {
- X509CRLImpl crl = (X509CRLImpl)getFromCache(crlCache, encoding);
+ X509CRLImpl crl = getFromCache(crlCache, encoding);
if (crl != null) {
return crl;
}
@@ -669,6 +670,23 @@ public class X509Factory extends CertificateFactorySpi {
bout.write(midByte);
bout.write(lowByte);
length = (highByte << 16) | (midByte << 8) | lowByte;
+ } else if (n == 0x84) {
+ int highByte = is.read();
+ int nextByte = is.read();
+ int midByte = is.read();
+ int lowByte = is.read();
+ if (lowByte == -1) {
+ throw new IOException("Incomplete BER/DER length info");
+ }
+ if (highByte > 127) {
+ throw new IOException("Invalid BER/DER data (a little huge?)");
+ }
+ bout.write(highByte);
+ bout.write(nextByte);
+ bout.write(midByte);
+ bout.write(lowByte);
+ length = (highByte << 24 ) | (nextByte << 16) |
+ (midByte << 8) | lowByte;
} else { // ignore longer length forms
throw new IOException("Invalid BER/DER data (too huge?)");
}
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java b/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java
index 891919a..8670778 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, 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
@@ -27,32 +27,87 @@ package sun.security.provider.certpath;
import java.net.URI;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.security.AccessController;
import java.security.NoSuchAlgorithmException;
import java.security.InvalidAlgorithmParameterException;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.security.cert.CertStore;
import java.security.cert.X509CertSelector;
import java.security.cert.X509CRLSelector;
import javax.security.auth.x500.X500Principal;
import java.io.IOException;
+import sun.security.util.Cache;
+
/**
- * Helper used by URICertStore when delegating to another CertStore to
- * fetch certs and CRLs.
+ * Helper used by URICertStore and others when delegating to another CertStore
+ * to fetch certs and CRLs.
*/
-public interface CertStoreHelper {
+public abstract class CertStoreHelper {
+
+ private static final int NUM_TYPES = 2;
+ private final static Map<String,String> classMap = new HashMap<>(NUM_TYPES);
+ static {
+ classMap.put(
+ "LDAP",
+ "sun.security.provider.certpath.ldap.LDAPCertStoreHelper");
+ classMap.put(
+ "SSLServer",
+ "sun.security.provider.certpath.ssl.SSLServerCertStoreHelper");
+ };
+ private static Cache<String, CertStoreHelper> cache
+ = Cache.newSoftMemoryCache(NUM_TYPES);
+
+ public static CertStoreHelper getInstance(final String type)
+ throws NoSuchAlgorithmException
+ {
+ CertStoreHelper helper = cache.get(type);
+ if (helper != null) {
+ return helper;
+ }
+ final String cl = classMap.get(type);
+ if (cl == null) {
+ throw new NoSuchAlgorithmException(type + " not available");
+ }
+ try {
+ helper = AccessController.doPrivileged(
+ new PrivilegedExceptionAction<CertStoreHelper>() {
+ public CertStoreHelper run() throws ClassNotFoundException {
+ try {
+ Class<?> c = Class.forName(cl, true, null);
+ CertStoreHelper csh
+ = (CertStoreHelper)c.newInstance();
+ cache.put(type, csh);
+ return csh;
+ } catch (InstantiationException e) {
+ throw new AssertionError(e);
+ } catch (IllegalAccessException e) {
+ throw new AssertionError(e);
+ }
+ }
+ });
+ return helper;
+ } catch (PrivilegedActionException e) {
+ throw new NoSuchAlgorithmException(type + " not available",
+ e.getException());
+ }
+ }
/**
* Returns a CertStore using the given URI as parameters.
*/
- CertStore getCertStore(URI uri)
+ public abstract CertStore getCertStore(URI uri)
throws NoSuchAlgorithmException, InvalidAlgorithmParameterException;
/**
* Wraps an existing X509CertSelector when needing to avoid DN matching
* issues.
*/
- X509CertSelector wrap(X509CertSelector selector,
+ public abstract X509CertSelector wrap(X509CertSelector selector,
X500Principal certSubject,
String dn)
throws IOException;
@@ -61,7 +116,7 @@ public interface CertStoreHelper {
* Wraps an existing X509CRLSelector when needing to avoid DN matching
* issues.
*/
- X509CRLSelector wrap(X509CRLSelector selector,
+ public abstract X509CRLSelector wrap(X509CRLSelector selector,
Collection<X500Principal> certIssuers,
String dn)
throws IOException;
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java b/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java
index 321f915..6fb7bc7 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java
@@ -30,8 +30,6 @@ import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URLConnection;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException;
import java.security.Provider;
@@ -102,8 +100,7 @@ class URICertStore extends CertStoreSpi {
private final CertificateFactory factory;
// cached Collection of X509Certificates (may be empty, never null)
- private Collection<X509Certificate> certs =
- Collections.<X509Certificate>emptySet();
+ private Collection<X509Certificate> certs = Collections.emptySet();
// cached X509CRL (may be null)
private X509CRL crl;
@@ -120,36 +117,11 @@ class URICertStore extends CertStoreSpi {
// true if URI is ldap
private boolean ldap = false;
+ private CertStoreHelper ldapHelper;
private CertStore ldapCertStore;
private String ldapPath;
/**
- * Holder class to lazily load LDAPCertStoreHelper if present.
- */
- private static class LDAP {
- private static final String CERT_STORE_HELPER =
- "sun.security.provider.certpath.ldap.LDAPCertStoreHelper";
- private static final CertStoreHelper helper =
- AccessController.doPrivileged(
- new PrivilegedAction<CertStoreHelper>() {
- public CertStoreHelper run() {
- try {
- Class<?> c = Class.forName(CERT_STORE_HELPER, true, null);
- return (CertStoreHelper)c.newInstance();
- } catch (ClassNotFoundException cnf) {
- return null;
- } catch (InstantiationException e) {
- throw new AssertionError(e);
- } catch (IllegalAccessException e) {
- throw new AssertionError(e);
- }
- }});
- static CertStoreHelper helper() {
- return helper;
- }
- }
-
- /**
* Creates a URICertStore.
*
* @param parameters specifying the URI
@@ -164,10 +136,9 @@ class URICertStore extends CertStoreSpi {
this.uri = ((URICertStoreParameters) params).uri;
// if ldap URI, use an LDAPCertStore to fetch certs and CRLs
if (uri.getScheme().toLowerCase(Locale.ENGLISH).equals("ldap")) {
- if (LDAP.helper() == null)
- throw new NoSuchAlgorithmException("LDAP not present");
ldap = true;
- ldapCertStore = LDAP.helper().getCertStore(uri);
+ ldapHelper = CertStoreHelper.getInstance("LDAP");
+ ldapCertStore = ldapHelper.getCertStore(uri);
ldapPath = uri.getPath();
// strip off leading '/'
if (ldapPath.charAt(0) == '/') {
@@ -185,14 +156,14 @@ class URICertStore extends CertStoreSpi {
* Returns a URI CertStore. This method consults a cache of
* CertStores (shared per JVM) using the URI as a key.
*/
- private static final Cache certStoreCache =
- Cache.newSoftMemoryCache(CACHE_SIZE);
+ private static final Cache<URICertStoreParameters, CertStore>
+ certStoreCache = Cache.newSoftMemoryCache(CACHE_SIZE);
static synchronized CertStore getInstance(URICertStoreParameters params)
throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
if (debug != null) {
debug.println("CertStore URI:" + params.uri);
}
- CertStore ucs = (CertStore) certStoreCache.get(params);
+ CertStore ucs = certStoreCache.get(params);
if (ucs == null) {
ucs = new UCS(new URICertStore(params), null, "URI", params);
certStoreCache.put(params, ucs);
@@ -251,7 +222,7 @@ class URICertStore extends CertStoreSpi {
if (ldap) {
X509CertSelector xsel = (X509CertSelector) selector;
try {
- xsel = LDAP.helper().wrap(xsel, xsel.getSubject(), ldapPath);
+ xsel = ldapHelper.wrap(xsel, xsel.getSubject(), ldapPath);
} catch (IOException ioe) {
throw new CertStoreException(ioe);
}
@@ -273,62 +244,49 @@ class URICertStore extends CertStoreSpi {
return getMatchingCerts(certs, selector);
}
lastChecked = time;
- InputStream in = null;
try {
URLConnection connection = uri.toURL().openConnection();
if (lastModified != 0) {
connection.setIfModifiedSince(lastModified);
}
- in = connection.getInputStream();
long oldLastModified = lastModified;
- lastModified = connection.getLastModified();
- if (oldLastModified != 0) {
- if (oldLastModified == lastModified) {
- if (debug != null) {
- debug.println("Not modified, using cached copy");
- }
- return getMatchingCerts(certs, selector);
- } else if (connection instanceof HttpURLConnection) {
- // some proxy servers omit last modified
- HttpURLConnection hconn = (HttpURLConnection) connection;
- if (hconn.getResponseCode()
- == HttpURLConnection.HTTP_NOT_MODIFIED) {
+ try (InputStream in = connection.getInputStream()) {
+ lastModified = connection.getLastModified();
+ if (oldLastModified != 0) {
+ if (oldLastModified == lastModified) {
if (debug != null) {
debug.println("Not modified, using cached copy");
}
return getMatchingCerts(certs, selector);
+ } else if (connection instanceof HttpURLConnection) {
+ // some proxy servers omit last modified
+ HttpURLConnection hconn = (HttpURLConnection)connection;
+ if (hconn.getResponseCode()
+ == HttpURLConnection.HTTP_NOT_MODIFIED) {
+ if (debug != null) {
+ debug.println("Not modified, using cached copy");
+ }
+ return getMatchingCerts(certs, selector);
+ }
}
}
+ if (debug != null) {
+ debug.println("Downloading new certificates...");
+ }
+ // Safe cast since factory is an X.509 certificate factory
+ certs = (Collection<X509Certificate>)
+ factory.generateCertificates(in);
}
- if (debug != null) {
- debug.println("Downloading new certificates...");
- }
- // Safe cast since factory is an X.509 certificate factory
- certs = (Collection<X509Certificate>)
- factory.generateCertificates(in);
return getMatchingCerts(certs, selector);
- } catch (IOException e) {
+ } catch (IOException | CertificateException e) {
if (debug != null) {
debug.println("Exception fetching certificates:");
e.printStackTrace();
}
- } catch (CertificateException e) {
- if (debug != null) {
- debug.println("Exception fetching certificates:");
- e.printStackTrace();
- }
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- // ignore
- }
- }
}
// exception, forget previous values
lastModified = 0;
- certs = Collections.<X509Certificate>emptySet();
+ certs = Collections.emptySet();
return certs;
}
@@ -343,8 +301,7 @@ class URICertStore extends CertStoreSpi {
if (selector == null) {
return certs;
}
- List<X509Certificate> matchedCerts =
- new ArrayList<X509Certificate>(certs.size());
+ List<X509Certificate> matchedCerts = new ArrayList<>(certs.size());
for (X509Certificate cert : certs) {
if (selector.match(cert)) {
matchedCerts.add(cert);
@@ -374,7 +331,7 @@ class URICertStore extends CertStoreSpi {
if (ldap) {
X509CRLSelector xsel = (X509CRLSelector) selector;
try {
- xsel = LDAP.helper().wrap(xsel, null, ldapPath);
+ xsel = ldapHelper.wrap(xsel, null, ldapPath);
} catch (IOException ioe) {
throw new CertStoreException(ioe);
}
@@ -395,61 +352,48 @@ class URICertStore extends CertStoreSpi {
return getMatchingCRLs(crl, selector);
}
lastChecked = time;
- InputStream in = null;
try {
URLConnection connection = uri.toURL().openConnection();
if (lastModified != 0) {
connection.setIfModifiedSince(lastModified);
}
- in = connection.getInputStream();
long oldLastModified = lastModified;
- lastModified = connection.getLastModified();
- if (oldLastModified != 0) {
- if (oldLastModified == lastModified) {
- if (debug != null) {
- debug.println("Not modified, using cached copy");
- }
- return getMatchingCRLs(crl, selector);
- } else if (connection instanceof HttpURLConnection) {
- // some proxy servers omit last modified
- HttpURLConnection hconn = (HttpURLConnection) connection;
- if (hconn.getResponseCode()
- == HttpURLConnection.HTTP_NOT_MODIFIED) {
+ try (InputStream in = connection.getInputStream()) {
+ lastModified = connection.getLastModified();
+ if (oldLastModified != 0) {
+ if (oldLastModified == lastModified) {
if (debug != null) {
debug.println("Not modified, using cached copy");
}
return getMatchingCRLs(crl, selector);
+ } else if (connection instanceof HttpURLConnection) {
+ // some proxy servers omit last modified
+ HttpURLConnection hconn = (HttpURLConnection)connection;
+ if (hconn.getResponseCode()
+ == HttpURLConnection.HTTP_NOT_MODIFIED) {
+ if (debug != null) {
+ debug.println("Not modified, using cached copy");
+ }
+ return getMatchingCRLs(crl, selector);
+ }
}
}
+ if (debug != null) {
+ debug.println("Downloading new CRL...");
+ }
+ crl = (X509CRL) factory.generateCRL(in);
}
- if (debug != null) {
- debug.println("Downloading new CRL...");
- }
- crl = (X509CRL) factory.generateCRL(in);
return getMatchingCRLs(crl, selector);
- } catch (IOException e) {
+ } catch (IOException | CRLException e) {
if (debug != null) {
debug.println("Exception fetching CRL:");
e.printStackTrace();
}
- } catch (CRLException e) {
- if (debug != null) {
- debug.println("Exception fetching CRL:");
- e.printStackTrace();
- }
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- // ignore
- }
- }
}
// exception, forget previous values
lastModified = 0;
crl = null;
- return Collections.<X509CRL>emptyList();
+ return Collections.emptyList();
}
/**
@@ -459,9 +403,9 @@ class URICertStore extends CertStoreSpi {
private static Collection<X509CRL> getMatchingCRLs
(X509CRL crl, CRLSelector selector) {
if (selector == null || (crl != null && selector.match(crl))) {
- return Collections.<X509CRL>singletonList(crl);
+ return Collections.singletonList(crl);
} else {
- return Collections.<X509CRL>emptyList();
+ return Collections.emptyList();
}
}
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java b/jdk/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java
index 20d05f7..3228b7e 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -79,7 +79,8 @@ public class X509CertificatePair {
private X509Certificate reverse;
private byte[] encoded;
- private static final Cache cache = Cache.newSoftMemoryCache(750);
+ private static final Cache<Object, X509CertificatePair> cache
+ = Cache.newSoftMemoryCache(750);
/**
* Creates an empty instance of X509CertificatePair.
@@ -114,7 +115,7 @@ public class X509CertificatePair {
*
* For internal use only, external code should use generateCertificatePair.
*/
- private X509CertificatePair(byte[] encoded)throws CertificateException {
+ private X509CertificatePair(byte[] encoded) throws CertificateException {
try {
parse(new DerValue(encoded));
this.encoded = encoded;
@@ -138,7 +139,7 @@ public class X509CertificatePair {
public static synchronized X509CertificatePair generateCertificatePair
(byte[] encoded) throws CertificateException {
Object key = new Cache.EqualByteArray(encoded);
- X509CertificatePair pair = (X509CertificatePair)cache.get(key);
+ X509CertificatePair pair = cache.get(key);
if (pair != null) {
return pair;
}
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java b/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java
index d86404d..eb20b3f 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -103,7 +103,7 @@ import sun.security.action.GetPropertyAction;
* @author Steve Hanna
* @author Andreas Sterbenz
*/
-public class LDAPCertStore extends CertStoreSpi {
+public final class LDAPCertStore extends CertStoreSpi {
private static final Debug debug = Debug.getInstance("certpath");
@@ -160,7 +160,7 @@ public class LDAPCertStore extends CertStoreSpi {
*/
private boolean prefetchCRLs = false;
- private final Cache valueCache;
+ private final Cache<String, byte[][]> valueCache;
private int cacheHits = 0;
private int cacheMisses = 0;
@@ -207,10 +207,11 @@ public class LDAPCertStore extends CertStoreSpi {
* Returns an LDAP CertStore. This method consults a cache of
* CertStores (shared per JVM) using the LDAP server/port as a key.
*/
- private static final Cache certStoreCache = Cache.newSoftMemoryCache(185);
+ private static final Cache<LDAPCertStoreParameters, CertStore>
+ certStoreCache = Cache.newSoftMemoryCache(185);
static synchronized CertStore getInstance(LDAPCertStoreParameters params)
throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
- CertStore lcs = (CertStore) certStoreCache.get(params);
+ CertStore lcs = certStoreCache.get(params);
if (lcs == null) {
lcs = CertStore.getInstance("LDAP", params);
certStoreCache.put(params, lcs);
@@ -232,7 +233,7 @@ public class LDAPCertStore extends CertStoreSpi {
private void createInitialDirContext(String server, int port)
throws InvalidAlgorithmParameterException {
String url = "ldap://" + server + ":" + port;
- Hashtable<String,Object> env = new Hashtable<String,Object>();
+ Hashtable<String,Object> env = new Hashtable<>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.ldap.LdapCtxFactory");
env.put(Context.PROVIDER_URL, url);
@@ -283,7 +284,7 @@ public class LDAPCertStore extends CertStoreSpi {
LDAPRequest(String name) {
this.name = name;
- requestedAttributes = new ArrayList<String>(5);
+ requestedAttributes = new ArrayList<>(5);
}
String getName() {
@@ -311,7 +312,7 @@ public class LDAPCertStore extends CertStoreSpi {
+ cacheMisses);
}
String cacheKey = name + "|" + attrId;
- byte[][] values = (byte[][])valueCache.get(cacheKey);
+ byte[][] values = valueCache.get(cacheKey);
if (values != null) {
cacheHits++;
return values;
@@ -347,7 +348,7 @@ public class LDAPCertStore extends CertStoreSpi {
System.out.println("LDAP requests: " + requests);
}
}
- valueMap = new HashMap<String, byte[][]>(8);
+ valueMap = new HashMap<>(8);
String[] attrIds = requestedAttributes.toArray(STRING0);
Attributes attrs;
try {
@@ -429,10 +430,10 @@ public class LDAPCertStore extends CertStoreSpi {
int n = encodedCert.length;
if (n == 0) {
- return Collections.<X509Certificate>emptySet();
+ return Collections.emptySet();
}
- List<X509Certificate> certs = new ArrayList<X509Certificate>(n);
+ List<X509Certificate> certs = new ArrayList<>(n);
/* decode certs and check if they satisfy selector */
for (int i = 0; i < n; i++) {
ByteArrayInputStream bais = new ByteArrayInputStream(encodedCert[i]);
@@ -477,11 +478,10 @@ public class LDAPCertStore extends CertStoreSpi {
int n = encodedCertPair.length;
if (n == 0) {
- return Collections.<X509CertificatePair>emptySet();
+ return Collections.emptySet();
}
- List<X509CertificatePair> certPairs =
- new ArrayList<X509CertificatePair>(n);
+ List<X509CertificatePair> certPairs = new ArrayList<>(n);
/* decode each cert pair and add it to the Collection */
for (int i = 0; i < n; i++) {
try {
@@ -528,8 +528,7 @@ public class LDAPCertStore extends CertStoreSpi {
getCertPairs(request, CROSS_CERT);
// Find Certificates that match and put them in a list
- ArrayList<X509Certificate> matchingCerts =
- new ArrayList<X509Certificate>();
+ ArrayList<X509Certificate> matchingCerts = new ArrayList<>();
for (X509CertificatePair certPair : certPairs) {
X509Certificate cert;
if (forward != null) {
@@ -587,7 +586,7 @@ public class LDAPCertStore extends CertStoreSpi {
int basicConstraints = xsel.getBasicConstraints();
String subject = xsel.getSubjectAsString();
String issuer = xsel.getIssuerAsString();
- HashSet<X509Certificate> certs = new HashSet<X509Certificate>();
+ HashSet<X509Certificate> certs = new HashSet<>();
if (debug != null) {
debug.println("LDAPCertStore.engineGetCertificates() basicConstraints: "
+ basicConstraints);
@@ -706,10 +705,10 @@ public class LDAPCertStore extends CertStoreSpi {
int n = encodedCRL.length;
if (n == 0) {
- return Collections.<X509CRL>emptySet();
+ return Collections.emptySet();
}
- List<X509CRL> crls = new ArrayList<X509CRL>(n);
+ List<X509CRL> crls = new ArrayList<>(n);
/* decode each crl and check if it matches selector */
for (int i = 0; i < n; i++) {
try {
@@ -765,13 +764,13 @@ public class LDAPCertStore extends CertStoreSpi {
throw new CertStoreException("need X509CRLSelector to find CRLs");
}
X509CRLSelector xsel = (X509CRLSelector) selector;
- HashSet<X509CRL> crls = new HashSet<X509CRL>();
+ HashSet<X509CRL> crls = new HashSet<>();
// Look in directory entry for issuer of cert we're checking.
Collection<Object> issuerNames;
X509Certificate certChecking = xsel.getCertificateChecking();
if (certChecking != null) {
- issuerNames = new HashSet<Object>();
+ issuerNames = new HashSet<>();
X500Principal issuer = certChecking.getIssuerX500Principal();
issuerNames.add(issuer.getName(X500Principal.RFC2253));
} else {
@@ -796,7 +795,7 @@ public class LDAPCertStore extends CertStoreSpi {
issuerName = (String)nameObject;
}
// If all we want is CA certs, try to get the (probably shorter) ARL
- Collection<X509CRL> entryCRLs = Collections.<X509CRL>emptySet();
+ Collection<X509CRL> entryCRLs = Collections.emptySet();
if (certChecking == null || certChecking.getBasicConstraints() != -1) {
LDAPRequest request = new LDAPRequest(issuerName);
request.addRequestedAttribute(CROSS_CERT);
@@ -1028,9 +1027,9 @@ public class LDAPCertStore extends CertStoreSpi {
throws IOException {
this.selector = selector == null ? new X509CRLSelector() : selector;
this.certIssuers = certIssuers;
- issuerNames = new HashSet<Object>();
+ issuerNames = new HashSet<>();
issuerNames.add(ldapDN);
- issuers = new HashSet<X500Principal>();
+ issuers = new HashSet<>();
issuers.add(new X500Name(ldapDN).asX500Principal());
}
// we only override the get (accessor methods) since the set methods
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java b/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
index 7eb65d5..5ec100c 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, 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
@@ -41,11 +41,9 @@ import sun.security.provider.certpath.CertStoreHelper;
* LDAP implementation of CertStoreHelper.
*/
-public class LDAPCertStoreHelper
- implements CertStoreHelper
+public final class LDAPCertStoreHelper
+ extends CertStoreHelper
{
- public LDAPCertStoreHelper() { }
-
@Override
public CertStore getCertStore(URI uri)
throws NoSuchAlgorithmException, InvalidAlgorithmParameterException
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java b/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java
new file mode 100644
index 0000000..5109e13
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.security.provider.certpath.ssl;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.security.GeneralSecurityException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.Provider;
+import java.security.cert.CertificateException;
+import java.security.cert.CertSelector;
+import java.security.cert.CertStore;
+import java.security.cert.CertStoreException;
+import java.security.cert.CertStoreParameters;
+import java.security.cert.CertStoreSpi;
+import java.security.cert.CRLSelector;
+import java.security.cert.X509Certificate;
+import java.security.cert.X509CRL;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+/**
+ * A CertStore that retrieves an SSL server's certificate chain.
+ */
+public final class SSLServerCertStore extends CertStoreSpi {
+
+ private final URI uri;
+
+ SSLServerCertStore(URI uri) throws InvalidAlgorithmParameterException {
+ super(null);
+ this.uri = uri;
+ }
+
+ public synchronized Collection<X509Certificate> engineGetCertificates
+ (CertSelector selector) throws CertStoreException
+ {
+ try {
+ SSLContext sc = SSLContext.getInstance("SSL");
+ GetChainTrustManager xtm = new GetChainTrustManager();
+ sc.init(null, new TrustManager[] { xtm }, null);
+ HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+ HttpsURLConnection.setDefaultHostnameVerifier(
+ new HostnameVerifier() {
+ public boolean verify(String hostname, SSLSession session) {
+ return true;
+ }
+ });
+ uri.toURL().openConnection().connect();
+ return getMatchingCerts(xtm.serverChain, selector);
+ } catch (GeneralSecurityException | IOException e) {
+ throw new CertStoreException(e);
+ }
+ }
+
+ private static List<X509Certificate> getMatchingCerts
+ (List<X509Certificate> certs, CertSelector selector)
+ {
+ // if selector not specified, all certs match
+ if (selector == null) {
+ return certs;
+ }
+ List<X509Certificate> matchedCerts = new ArrayList<>(certs.size());
+ for (X509Certificate cert : certs) {
+ if (selector.match(cert)) {
+ matchedCerts.add(cert);
+ }
+ }
+ return matchedCerts;
+ }
+
+ public Collection<X509CRL> engineGetCRLs(CRLSelector selector)
+ throws CertStoreException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ static synchronized CertStore getInstance(URI uri)
+ throws InvalidAlgorithmParameterException
+ {
+ return new CS(new SSLServerCertStore(uri), null, "SSLServer", null);
+ }
+
+ /*
+ * An X509TrustManager that simply stores a reference to the server's
+ * certificate chain.
+ */
+ private static class GetChainTrustManager implements X509TrustManager {
+ private List<X509Certificate> serverChain;
+
+ public X509Certificate[] getAcceptedIssuers() {
+ throw new UnsupportedOperationException();
+ }
+
+ public void checkClientTrusted(X509Certificate[] chain,
+ String authType)
+ throws CertificateException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void checkServerTrusted(X509Certificate[] chain,
+ String authType)
+ throws CertificateException
+ {
+ this.serverChain = (chain == null)
+ ? Collections.<X509Certificate>emptyList()
+ : Arrays.asList(chain);
+ }
+ }
+
+ /**
+ * This class allows the SSLServerCertStore to be accessed as a CertStore.
+ */
+ private static class CS extends CertStore {
+ protected CS(CertStoreSpi spi, Provider p, String type,
+ CertStoreParameters params)
+ {
+ super(spi, p, type, params);
+ }
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java b/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java
new file mode 100644
index 0000000..fd36adf
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.security.provider.certpath.ssl;
+
+import java.net.URI;
+import java.util.Collection;
+import java.security.NoSuchAlgorithmException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.cert.CertStore;
+import java.security.cert.X509CertSelector;
+import java.security.cert.X509CRLSelector;
+import javax.security.auth.x500.X500Principal;
+import java.io.IOException;
+
+import sun.security.provider.certpath.CertStoreHelper;
+
+/**
+ * SSL implementation of CertStoreHelper.
+ */
+public final class SSLServerCertStoreHelper extends CertStoreHelper {
+
+ @Override
+ public CertStore getCertStore(URI uri)
+ throws NoSuchAlgorithmException, InvalidAlgorithmParameterException
+ {
+ return SSLServerCertStore.getInstance(uri);
+ }
+
+ @Override
+ public X509CertSelector wrap(X509CertSelector selector,
+ X500Principal certSubject,
+ String ldapDN)
+ throws IOException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public X509CRLSelector wrap(X509CRLSelector selector,
+ Collection<X500Principal> certIssuers,
+ String ldapDN)
+ throws IOException
+ {
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java b/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java
index 34f3be6..6be00b8 100644
--- a/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java
+++ b/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, 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
@@ -69,12 +69,38 @@ class AppOutputStream extends OutputStream {
// check if the Socket is invalid (error or closed)
c.checkWrite();
+ /*
+ * By default, we counter chosen plaintext issues on CBC mode
+ * ciphersuites in SSLv3/TLS1.0 by sending one byte of application
+ * data in the first record of every payload, and the rest in
+ * subsequent record(s). Note that the issues have been solved in
+ * TLS 1.1 or later.
+ *
+ * It is not necessary to split the very first application record of
+ * a freshly negotiated TLS session, as there is no previous
+ * application data to guess. To improve compatibility, we will not
+ * split such records.
+ *
+ * This avoids issues in the outbound direction. For a full fix,
+ * the peer must have similar protections.
+ */
+ boolean isFirstRecordOfThePayload = true;
+
// Always flush at the end of each application level record.
// This lets application synchronize read and write streams
// however they like; if we buffered here, they couldn't.
try {
do {
- int howmuch = Math.min(len, r.availableDataBytes());
+ int howmuch;
+ if (isFirstRecordOfThePayload && c.needToSplitPayload()) {
+ howmuch = Math.min(0x01, r.availableDataBytes());
+ } else {
+ howmuch = Math.min(len, r.availableDataBytes());
+ }
+
+ if (isFirstRecordOfThePayload && howmuch != 0) {
+ isFirstRecordOfThePayload = false;
+ }
// NOTE: *must* call c.writeRecord() even for howmuch == 0
if (howmuch > 0) {
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherBox.java b/jdk/src/share/classes/sun/security/ssl/CipherBox.java
index 91f9f36..4305b44 100644
--- a/jdk/src/share/classes/sun/security/ssl/CipherBox.java
+++ b/jdk/src/share/classes/sun/security/ssl/CipherBox.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, 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
@@ -113,6 +113,11 @@ final class CipherBox {
private SecureRandom random;
/**
+ * Is the cipher of CBC mode?
+ */
+ private final boolean isCBCMode;
+
+ /**
* Fixed masks of various block size, as the initial decryption IVs
* for TLS 1.1 or later.
*
@@ -128,6 +133,7 @@ final class CipherBox {
private CipherBox() {
this.protocolVersion = ProtocolVersion.DEFAULT;
this.cipher = null;
+ this.isCBCMode = false;
}
/**
@@ -148,6 +154,7 @@ final class CipherBox {
random = JsseJce.getSecureRandom();
}
this.random = random;
+ this.isCBCMode = bulkCipher.isCBCMode;
/*
* RFC 4346 recommends two algorithms used to generated the
@@ -305,9 +312,11 @@ final class CipherBox {
byte[] buf = null;
int limit = bb.limit();
if (bb.hasArray()) {
+ int arrayOffset = bb.arrayOffset();
buf = bb.array();
- System.arraycopy(buf, pos,
- buf, pos + prefix.length, limit - pos);
+ System.arraycopy(buf, arrayOffset + pos,
+ buf, arrayOffset + pos + prefix.length,
+ limit - pos);
bb.limit(limit + prefix.length);
} else {
buf = new byte[limit - pos];
@@ -491,9 +500,10 @@ final class CipherBox {
byte[] buf = null;
int limit = bb.limit();
if (bb.hasArray()) {
+ int arrayOffset = bb.arrayOffset();
buf = bb.array();
- System.arraycopy(buf, pos + blockSize,
- buf, pos, limit - pos - blockSize);
+ System.arraycopy(buf, arrayOffset + pos + blockSize,
+ buf, arrayOffset + pos, limit - pos - blockSize);
bb.limit(limit - blockSize);
} else {
buf = new byte[limit - pos - blockSize];
@@ -691,4 +701,12 @@ final class CipherBox {
}
}
+ /*
+ * Does the cipher use CBC mode?
+ *
+ * @return true if the cipher use CBC mode, false otherwise.
+ */
+ boolean isCBCMode() {
+ return isCBCMode;
+ }
}
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
index 116afa4..bbf66ad 100644
--- a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
+++ b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
@@ -420,10 +420,16 @@ final class CipherSuite implements Comparable<CipherSuite> {
// exportable under 512/40 bit rules
final boolean exportable;
+ // Is the cipher algorithm of Cipher Block Chaining (CBC) mode?
+ final boolean isCBCMode;
+
BulkCipher(String transformation, int keySize,
int expandedKeySize, int ivSize, boolean allowed) {
this.transformation = transformation;
- this.algorithm = transformation.split("/")[0];
+ String[] splits = transformation.split("/");
+ this.algorithm = splits[0];
+ this.isCBCMode =
+ splits.length <= 1 ? false : "CBC".equalsIgnoreCase(splits[1]);
this.description = this.algorithm + "/" + (keySize << 3);
this.keySize = keySize;
this.ivSize = ivSize;
@@ -436,7 +442,10 @@ final class CipherSuite implements Comparable<CipherSuite> {
BulkCipher(String transformation, int keySize,
int ivSize, boolean allowed) {
this.transformation = transformation;
- this.algorithm = transformation.split("/")[0];
+ String[] splits = transformation.split("/");
+ this.algorithm = splits[0];
+ this.isCBCMode =
+ splits.length <= 1 ? false : "CBC".equalsIgnoreCase(splits[1]);
this.description = this.algorithm + "/" + (keySize << 3);
this.keySize = keySize;
this.ivSize = ivSize;
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
index 60a4283..707fd04 100644
--- a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
@@ -46,6 +46,7 @@ import sun.misc.HexDumpEncoder;
*/
final class EngineOutputRecord extends OutputRecord {
+ private SSLEngineImpl engine;
private EngineWriter writer;
private boolean finishedMsg = false;
@@ -62,6 +63,7 @@ final class EngineOutputRecord extends OutputRecord {
*/
EngineOutputRecord(byte type, SSLEngineImpl engine) {
super(type, recordSize(type));
+ this.engine = engine;
writer = engine.writer;
}
@@ -227,12 +229,51 @@ final class EngineOutputRecord extends OutputRecord {
* implementations are fragile and don't like to see empty
* records, so this increases robustness.
*/
- int length = Math.min(ea.getAppRemaining(), maxDataSize);
- if (length == 0) {
+ if (ea.getAppRemaining() == 0) {
return;
}
/*
+ * By default, we counter chosen plaintext issues on CBC mode
+ * ciphersuites in SSLv3/TLS1.0 by sending one byte of application
+ * data in the first record of every payload, and the rest in
+ * subsequent record(s). Note that the issues have been solved in
+ * TLS 1.1 or later.
+ *
+ * It is not necessary to split the very first application record of
+ * a freshly negotiated TLS session, as there is no previous
+ * application data to guess. To improve compatibility, we will not
+ * split such records.
+ *
+ * Because of the compatibility, we'd better produce no more than
+ * SSLSession.getPacketBufferSize() net data for each wrap. As we
+ * need a one-byte record at first, the 2nd record size should be
+ * equal to or less than Record.maxDataSizeMinusOneByteRecord.
+ *
+ * This avoids issues in the outbound direction. For a full fix,
+ * the peer must have similar protections.
+ */
+ int length;
+ if (engine.needToSplitPayload(writeCipher, protocolVersion)) {
+ write(ea, writeMAC, writeCipher, 0x01);
+ ea.resetLim(); // reset application data buffer limit
+ length = Math.min(ea.getAppRemaining(),
+ maxDataSizeMinusOneByteRecord);
+ } else {
+ length = Math.min(ea.getAppRemaining(), maxDataSize);
+ }
+
+ // Don't bother to really write empty records.
+ if (length > 0) {
+ write(ea, writeMAC, writeCipher, length);
+ }
+
+ return;
+ }
+
+ void write(EngineArgs ea, MAC writeMAC, CipherBox writeCipher,
+ int length) throws IOException {
+ /*
* Copy out existing buffer values.
*/
ByteBuffer dstBB = ea.netData;
diff --git a/jdk/src/share/classes/sun/security/ssl/MAC.java b/jdk/src/share/classes/sun/security/ssl/MAC.java
index 8002148..ae5c9d4 100644
--- a/jdk/src/share/classes/sun/security/ssl/MAC.java
+++ b/jdk/src/share/classes/sun/security/ssl/MAC.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, 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
@@ -172,10 +172,10 @@ final class MAC {
* when there are only 2^8 sequence numbers left.
*/
return (block != null && mac != null &&
- block[0] == 0xFF && block[1] == 0xFF &&
- block[2] == 0xFF && block[3] == 0xFF &&
- block[4] == 0xFF && block[5] == 0xFF &&
- block[6] == 0xFF);
+ block[0] == (byte)0xFF && block[1] == (byte)0xFF &&
+ block[2] == (byte)0xFF && block[3] == (byte)0xFF &&
+ block[4] == (byte)0xFF && block[5] == (byte)0xFF &&
+ block[6] == (byte)0xFF);
}
/*
@@ -192,7 +192,7 @@ final class MAC {
* only 2^48 sequence numbers left.
*/
return (block != null && mac != null &&
- block[0] == 0xFF && block[1] == 0xFF);
+ block[0] == (byte)0xFF && block[1] == (byte)0xFF);
}
// increment the sequence number in the block array
diff --git a/jdk/src/share/classes/sun/security/ssl/Record.java b/jdk/src/share/classes/sun/security/ssl/Record.java
index 1378e10..92c8a3e 100644
--- a/jdk/src/share/classes/sun/security/ssl/Record.java
+++ b/jdk/src/share/classes/sun/security/ssl/Record.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, 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
@@ -67,6 +67,23 @@ interface Record {
+ maxPadding // padding
+ trailerSize; // MAC
+ static final boolean enableCBCProtection =
+ Debug.getBooleanProperty("jsse.enableCBCProtection", true);
+
+ /*
+ * For CBC protection in SSL3/TLS1, we break some plaintext into two
+ * packets. Max application data size for the second packet.
+ */
+ static final int maxDataSizeMinusOneByteRecord =
+ maxDataSize // max data size
+ - ( // max one byte record size
+ headerSize // header
+ + maxIVLength // iv
+ + 1 // one byte data
+ + maxPadding // padding
+ + trailerSize // MAC
+ );
+
/*
* The maximum large record size.
*
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
index 461cbaa..8616a71 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -309,6 +309,11 @@ final public class SSLEngineImpl extends SSLEngine {
Object writeLock;
/*
+ * Is it the first application record to write?
+ */
+ private boolean isFirstAppOutputRecord = true;
+
+ /*
* Class and subclass dynamic debugging support
*/
private static final Debug debug = Debug.getInstance("ssl");
@@ -612,6 +617,9 @@ final public class SSLEngineImpl extends SSLEngine {
// See comment above.
oldCipher.dispose();
+
+ // reset the flag of the first application record
+ isFirstAppOutputRecord = true;
}
/*
@@ -1286,10 +1294,36 @@ final public class SSLEngineImpl extends SSLEngine {
}
}
+ /*
+ * turn off the flag of the first application record if we really
+ * consumed at least byte.
+ */
+ if (isFirstAppOutputRecord && ea.deltaApp() > 0) {
+ isFirstAppOutputRecord = false;
+ }
+
return hsStatus;
}
/*
+ * Need to split the payload except the following cases:
+ *
+ * 1. protocol version is TLS 1.1 or later;
+ * 2. bulk cipher does not use CBC mode, including null bulk cipher suites.
+ * 3. the payload is the first application record of a freshly
+ * negotiated TLS session.
+ * 4. the CBC protection is disabled;
+ *
+ * More details, please refer to
+ * EngineOutputRecord.write(EngineArgs, MAC, CipherBox).
+ */
+ boolean needToSplitPayload(CipherBox cipher, ProtocolVersion protocol) {
+ return (protocol.v <= ProtocolVersion.TLS10.v) &&
+ cipher.isCBCMode() && !isFirstAppOutputRecord &&
+ Record.enableCBCProtection;
+ }
+
+ /*
* Non-application OutputRecords go through here.
*/
void writeRecord(EngineOutputRecord eor) throws IOException {
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java
index ce1336b..7d0ea3f 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, 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
@@ -43,11 +43,14 @@ import javax.net.ssl.SSLPeerUnverifiedException;
import javax.net.ssl.SSLSession;
import sun.security.util.Cache;
+import sun.security.util.Cache.CacheVisitor;
final class SSLSessionContextImpl implements SSLSessionContext {
- private Cache sessionCache; // session cache, session id as key
- private Cache sessionHostPortCache; // session cache, "host:port" as key
+ private Cache<SessionId, SSLSessionImpl> sessionCache;
+ // session cache, session id as key
+ private Cache<String, SSLSessionImpl> sessionHostPortCache;
+ // session cache, "host:port" as key
private int cacheLimit; // the max cache size
private int timeout; // timeout in seconds
@@ -71,8 +74,7 @@ final class SSLSessionContextImpl implements SSLSessionContext {
throw new NullPointerException("session id cannot be null");
}
- SSLSessionImpl sess =
- (SSLSessionImpl)sessionCache.get(new SessionId(sessionId));
+ SSLSessionImpl sess = sessionCache.get(new SessionId(sessionId));
if (!isTimedout(sess)) {
return sess;
}
@@ -157,8 +159,7 @@ final class SSLSessionContextImpl implements SSLSessionContext {
return null;
}
- SSLSessionImpl sess =
- (SSLSessionImpl)sessionHostPortCache.get(getKey(hostname, port));
+ SSLSessionImpl sess = sessionHostPortCache.get(getKey(hostname, port));
if (!isTimedout(sess)) {
return sess;
}
@@ -193,7 +194,7 @@ final class SSLSessionContextImpl implements SSLSessionContext {
// package-private method, remove a cached SSLSession
void remove(SessionId key) {
- SSLSessionImpl s = (SSLSessionImpl)sessionCache.get(key);
+ SSLSessionImpl s = sessionCache.get(key);
if (s != null) {
sessionCache.remove(key);
sessionHostPortCache.remove(
@@ -233,17 +234,17 @@ final class SSLSessionContextImpl implements SSLSessionContext {
}
final class SessionCacheVisitor
- implements sun.security.util.Cache.CacheVisitor {
+ implements Cache.CacheVisitor<SessionId, SSLSessionImpl> {
Vector<byte[]> ids = null;
- // public void visit(java.util.Map<Object, Object> map) {}
- public void visit(java.util.Map<Object, Object> map) {
- ids = new Vector<byte[]>(map.size());
+ // public void visit(java.util.Map<K,V> map) {}
+ public void visit(java.util.Map<SessionId, SSLSessionImpl> map) {
+ ids = new Vector<>(map.size());
- for (Object key : map.keySet()) {
- SSLSessionImpl value = (SSLSessionImpl)map.get(key);
+ for (SessionId key : map.keySet()) {
+ SSLSessionImpl value = map.get(key);
if (!isTimedout(value)) {
- ids.addElement(((SessionId)key).getId());
+ ids.addElement(key.getId());
}
}
}
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
index 5bfdd46..814f7d2 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -369,6 +369,11 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
/* Class and subclass dynamic debugging support */
private static final Debug debug = Debug.getInstance("ssl");
+ /*
+ * Is it the first application record to write?
+ */
+ private boolean isFirstAppOutputRecord = true;
+
//
// CONSTRUCTORS AND INITIALIZATION CODE
//
@@ -802,8 +807,35 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
if (connectionState < cs_ERROR) {
checkSequenceNumber(writeMAC, r.contentType());
}
+
+ // turn off the flag of the first application record
+ if (isFirstAppOutputRecord &&
+ r.contentType() == Record.ct_application_data) {
+ isFirstAppOutputRecord = false;
+ }
}
+ /*
+ * Need to split the payload except the following cases:
+ *
+ * 1. protocol version is TLS 1.1 or later;
+ * 2. bulk cipher does not use CBC mode, including null bulk cipher suites.
+ * 3. the payload is the first application record of a freshly
+ * negotiated TLS session.
+ * 4. the CBC protection is disabled;
+ *
+ * More details, please refer to AppOutputStream.write(byte[], int, int).
+ */
+ boolean needToSplitPayload() {
+ writeLock.lock();
+ try {
+ return (protocolVersion.v <= ProtocolVersion.TLS10.v) &&
+ writeCipher.isCBCMode() && !isFirstAppOutputRecord &&
+ Record.enableCBCProtection;
+ } finally {
+ writeLock.unlock();
+ }
+ }
/*
* Read an application data record. Alerts and handshake
@@ -2030,6 +2062,9 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
// See comment above.
oldCipher.dispose();
+
+ // reset the flag of the first application record
+ isFirstAppOutputRecord = true;
}
/*
diff --git a/jdk/src/share/classes/sun/security/timestamp/TSRequest.java b/jdk/src/share/classes/sun/security/timestamp/TSRequest.java
index 8c5dd76..9b32219 100644
--- a/jdk/src/share/classes/sun/security/timestamp/TSRequest.java
+++ b/jdk/src/share/classes/sun/security/timestamp/TSRequest.java
@@ -96,7 +96,7 @@ public class TSRequest {
}
public byte[] getHashedMessage() {
- return (byte[])hashValue.clone();
+ return hashValue.clone();
}
/**
diff --git a/jdk/src/share/classes/sun/security/timestamp/TSResponse.java b/jdk/src/share/classes/sun/security/timestamp/TSResponse.java
index a6c10cc..1d6e084 100644
--- a/jdk/src/share/classes/sun/security/timestamp/TSResponse.java
+++ b/jdk/src/share/classes/sun/security/timestamp/TSResponse.java
@@ -317,12 +317,14 @@ public class TSResponse {
*/
private void parse(byte[] tsReply) throws IOException {
// Decode TimeStampResp
+
DerValue derValue = new DerValue(tsReply);
if (derValue.tag != DerValue.tag_Sequence) {
throw new IOException("Bad encoding for timestamp response");
}
// Parse status
+
DerValue statusInfo = derValue.data.getDerValue();
this.status = statusInfo.data.getInteger();
if (debug != null) {
diff --git a/jdk/src/share/classes/sun/security/tools/CertAndKeyGen.java b/jdk/src/share/classes/sun/security/tools/CertAndKeyGen.java
new file mode 100644
index 0000000..4c32a33
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/CertAndKeyGen.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright (c) 1996, 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.security.tools;
+
+import java.io.IOException;
+import java.security.cert.X509Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateEncodingException;
+import java.security.*;
+import java.util.Date;
+
+import sun.security.pkcs10.PKCS10;
+import sun.security.x509.AlgorithmId;
+import sun.security.x509.CertificateAlgorithmId;
+import sun.security.x509.CertificateIssuerName;
+import sun.security.x509.CertificateSerialNumber;
+import sun.security.x509.CertificateSubjectName;
+import sun.security.x509.CertificateValidity;
+import sun.security.x509.CertificateVersion;
+import sun.security.x509.CertificateX509Key;
+import sun.security.x509.X500Name;
+import sun.security.x509.X509CertImpl;
+import sun.security.x509.X509CertInfo;
+import sun.security.x509.X509Key;
+
+
+/**
+ * Generate a pair of keys, and provide access to them. This class is
+ * provided primarily for ease of use.
+ *
+ * <P>This provides some simple certificate management functionality.
+ * Specifically, it allows you to create self-signed X.509 certificates
+ * as well as PKCS 10 based certificate signing requests.
+ *
+ * <P>Keys for some public key signature algorithms have algorithm
+ * parameters, such as DSS/DSA. Some sites' Certificate Authorities
+ * adopt fixed algorithm parameters, which speeds up some operations
+ * including key generation and signing. <em>At this time, this interface
+ * does not provide a way to provide such algorithm parameters, e.g.
+ * by providing the CA certificate which includes those parameters.</em>
+ *
+ * <P>Also, note that at this time only signature-capable keys may be
+ * acquired through this interface. Diffie-Hellman keys, used for secure
+ * key exchange, may be supported later.
+ *
+ * @author David Brownell
+ * @author Hemma Prafullchandra
+ * @see PKCS10
+ * @see X509CertImpl
+ */
+public final class CertAndKeyGen {
+ /**
+ * Creates a CertAndKeyGen object for a particular key type
+ * and signature algorithm.
+ *
+ * @param keyType type of key, e.g. "RSA", "DSA"
+ * @param sigAlg name of the signature algorithm, e.g. "MD5WithRSA",
+ * "MD2WithRSA", "SHAwithDSA".
+ * @exception NoSuchAlgorithmException on unrecognized algorithms.
+ */
+ public CertAndKeyGen (String keyType, String sigAlg)
+ throws NoSuchAlgorithmException
+ {
+ keyGen = KeyPairGenerator.getInstance(keyType);
+ this.sigAlg = sigAlg;
+ }
+
+ /**
+ * Creates a CertAndKeyGen object for a particular key type,
+ * signature algorithm, and provider.
+ *
+ * @param keyType type of key, e.g. "RSA", "DSA"
+ * @param sigAlg name of the signature algorithm, e.g. "MD5WithRSA",
+ * "MD2WithRSA", "SHAwithDSA".
+ * @param providerName name of the provider
+ * @exception NoSuchAlgorithmException on unrecognized algorithms.
+ * @exception NoSuchProviderException on unrecognized providers.
+ */
+ public CertAndKeyGen (String keyType, String sigAlg, String providerName)
+ throws NoSuchAlgorithmException, NoSuchProviderException
+ {
+ if (providerName == null) {
+ keyGen = KeyPairGenerator.getInstance(keyType);
+ } else {
+ try {
+ keyGen = KeyPairGenerator.getInstance(keyType, providerName);
+ } catch (Exception e) {
+ // try first available provider instead
+ keyGen = KeyPairGenerator.getInstance(keyType);
+ }
+ }
+ this.sigAlg = sigAlg;
+ }
+
+ /**
+ * Sets the source of random numbers used when generating keys.
+ * If you do not provide one, a system default facility is used.
+ * You may wish to provide your own source of random numbers
+ * to get a reproducible sequence of keys and signatures, or
+ * because you may be able to take advantage of strong sources
+ * of randomness/entropy in your environment.
+ */
+ public void setRandom (SecureRandom generator)
+ {
+ prng = generator;
+ }
+
+ // want "public void generate (X509Certificate)" ... inherit DSA/D-H param
+
+ /**
+ * Generates a random public/private key pair, with a given key
+ * size. Different algorithms provide different degrees of security
+ * for the same key size, because of the "work factor" involved in
+ * brute force attacks. As computers become faster, it becomes
+ * easier to perform such attacks. Small keys are to be avoided.
+ *
+ * <P>Note that not all values of "keyBits" are valid for all
+ * algorithms, and not all public key algorithms are currently
+ * supported for use in X.509 certificates. If the algorithm
+ * you specified does not produce X.509 compatible keys, an
+ * invalid key exception is thrown.
+ *
+ * @param keyBits the number of bits in the keys.
+ * @exception InvalidKeyException if the environment does not
+ * provide X.509 public keys for this signature algorithm.
+ */
+ public void generate (int keyBits)
+ throws InvalidKeyException
+ {
+ KeyPair pair;
+
+ try {
+ if (prng == null) {
+ prng = new SecureRandom();
+ }
+ keyGen.initialize(keyBits, prng);
+ pair = keyGen.generateKeyPair();
+
+ } catch (Exception e) {
+ throw new IllegalArgumentException(e.getMessage());
+ }
+
+ publicKey = pair.getPublic();
+ privateKey = pair.getPrivate();
+ }
+
+
+ /**
+ * Returns the public key of the generated key pair if it is of type
+ * <code>X509Key</code>, or null if the public key is of a different type.
+ *
+ * XXX Note: This behaviour is needed for backwards compatibility.
+ * What this method really should return is the public key of the
+ * generated key pair, regardless of whether or not it is an instance of
+ * <code>X509Key</code>. Accordingly, the return type of this method
+ * should be <code>PublicKey</code>.
+ */
+ public X509Key getPublicKey()
+ {
+ if (!(publicKey instanceof X509Key)) {
+ return null;
+ }
+ return (X509Key)publicKey;
+ }
+
+
+ /**
+ * Returns the private key of the generated key pair.
+ *
+ * <P><STRONG><em>Be extremely careful when handling private keys.
+ * When private keys are not kept secret, they lose their ability
+ * to securely authenticate specific entities ... that is a huge
+ * security risk!</em></STRONG>
+ */
+ public PrivateKey getPrivateKey ()
+ {
+ return privateKey;
+ }
+
+
+ /**
+ * Returns a self-signed X.509v3 certificate for the public key.
+ * The certificate is immediately valid. No extensions.
+ *
+ * <P>Such certificates normally are used to identify a "Certificate
+ * Authority" (CA). Accordingly, they will not always be accepted by
+ * other parties. However, such certificates are also useful when
+ * you are bootstrapping your security infrastructure, or deploying
+ * system prototypes.
+ *
+ * @param myname X.500 name of the subject (who is also the issuer)
+ * @param firstDate the issue time of the certificate
+ * @param validity how long the certificate should be valid, in seconds
+ * @exception CertificateException on certificate handling errors.
+ * @exception InvalidKeyException on key handling errors.
+ * @exception SignatureException on signature handling errors.
+ * @exception NoSuchAlgorithmException on unrecognized algorithms.
+ * @exception NoSuchProviderException on unrecognized providers.
+ */
+ public X509Certificate getSelfCertificate (
+ X500Name myname, Date firstDate, long validity)
+ throws CertificateException, InvalidKeyException, SignatureException,
+ NoSuchAlgorithmException, NoSuchProviderException
+ {
+ X509CertImpl cert;
+ Date lastDate;
+
+ try {
+ lastDate = new Date ();
+ lastDate.setTime (firstDate.getTime () + validity * 1000);
+
+ CertificateValidity interval =
+ new CertificateValidity(firstDate,lastDate);
+
+ X509CertInfo info = new X509CertInfo();
+ // Add all mandatory attributes
+ info.set(X509CertInfo.VERSION,
+ new CertificateVersion(CertificateVersion.V3));
+ info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(
+ new java.util.Random().nextInt() & 0x7fffffff));
+ AlgorithmId algID = AlgorithmId.get(sigAlg);
+ info.set(X509CertInfo.ALGORITHM_ID,
+ new CertificateAlgorithmId(algID));
+ info.set(X509CertInfo.SUBJECT, new CertificateSubjectName(myname));
+ info.set(X509CertInfo.KEY, new CertificateX509Key(publicKey));
+ info.set(X509CertInfo.VALIDITY, interval);
+ info.set(X509CertInfo.ISSUER, new CertificateIssuerName(myname));
+
+ cert = new X509CertImpl(info);
+ cert.sign(privateKey, this.sigAlg);
+
+ return (X509Certificate)cert;
+
+ } catch (IOException e) {
+ throw new CertificateEncodingException("getSelfCert: " +
+ e.getMessage());
+ }
+ }
+
+ // Keep the old method
+ public X509Certificate getSelfCertificate (X500Name myname, long validity)
+ throws CertificateException, InvalidKeyException, SignatureException,
+ NoSuchAlgorithmException, NoSuchProviderException
+ {
+ return getSelfCertificate(myname, new Date(), validity);
+ }
+
+ /**
+ * Returns a PKCS #10 certificate request. The caller uses either
+ * <code>PKCS10.print</code> or <code>PKCS10.toByteArray</code>
+ * operations on the result, to get the request in an appropriate
+ * transmission format.
+ *
+ * <P>PKCS #10 certificate requests are sent, along with some proof
+ * of identity, to Certificate Authorities (CAs) which then issue
+ * X.509 public key certificates.
+ *
+ * @param myname X.500 name of the subject
+ * @exception InvalidKeyException on key handling errors.
+ * @exception SignatureException on signature handling errors.
+ */
+ public PKCS10 getCertRequest (X500Name myname)
+ throws InvalidKeyException, SignatureException
+ {
+ PKCS10 req = new PKCS10 (publicKey);
+
+ try {
+ Signature signature = Signature.getInstance(sigAlg);
+ signature.initSign (privateKey);
+ req.encodeAndSign(myname, signature);
+
+ } catch (CertificateException e) {
+ throw new SignatureException (sigAlg + " CertificateException");
+
+ } catch (IOException e) {
+ throw new SignatureException (sigAlg + " IOException");
+
+ } catch (NoSuchAlgorithmException e) {
+ // "can't happen"
+ throw new SignatureException (sigAlg + " unavailable?");
+ }
+ return req;
+ }
+
+ private SecureRandom prng;
+ private String sigAlg;
+ private KeyPairGenerator keyGen;
+ private PublicKey publicKey;
+ private PrivateKey privateKey;
+}
diff --git a/jdk/src/share/classes/sun/security/tools/KeyTool.java b/jdk/src/share/classes/sun/security/tools/KeyTool.java
index 2e67bce..0d92820 100644
--- a/jdk/src/share/classes/sun/security/tools/KeyTool.java
+++ b/jdk/src/share/classes/sun/security/tools/KeyTool.java
@@ -38,10 +38,12 @@ import java.security.Signature;
import java.security.Timestamp;
import java.security.UnrecoverableEntryException;
import java.security.UnrecoverableKeyException;
+import java.security.NoSuchAlgorithmException;
import java.security.Principal;
import java.security.Provider;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
+import java.security.cert.CertStoreException;
import java.security.cert.CRL;
import java.security.cert.X509Certificate;
import java.security.cert.CertificateException;
@@ -63,23 +65,16 @@ import java.security.cert.X509CRLSelector;
import javax.security.auth.x500.X500Principal;
import sun.misc.BASE64Encoder;
import sun.security.util.ObjectIdentifier;
-import sun.security.pkcs.PKCS10;
+import sun.security.pkcs10.PKCS10;
+import sun.security.pkcs10.PKCS10Attribute;
import sun.security.provider.X509Factory;
+import sun.security.provider.certpath.CertStoreHelper;
import sun.security.util.Password;
-import sun.security.util.PathList;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
import sun.misc.BASE64Decoder;
-import sun.security.pkcs.PKCS10Attribute;
import sun.security.pkcs.PKCS9Attribute;
-import sun.security.provider.certpath.ldap.LDAPCertStoreHelper;
import sun.security.util.DerValue;
import sun.security.x509.*;
@@ -917,18 +912,13 @@ public final class KeyTool {
// Perform the specified command
if (command == CERTREQ) {
- PrintStream ps = null;
if (filename != null) {
- ps = new PrintStream(new FileOutputStream
- (filename));
- out = ps;
- }
- try {
- doCertReq(alias, sigAlgName, out);
- } finally {
- if (ps != null) {
- ps.close();
+ try (PrintStream ps = new PrintStream(new FileOutputStream
+ (filename))) {
+ doCertReq(alias, sigAlgName, ps);
}
+ } else {
+ doCertReq(alias, sigAlgName, out);
}
if (verbose && filename != null) {
MessageFormat form = new MessageFormat(rb.getString
@@ -941,18 +931,13 @@ public final class KeyTool {
doDeleteEntry(alias);
kssave = true;
} else if (command == EXPORTCERT) {
- PrintStream ps = null;
if (filename != null) {
- ps = new PrintStream(new FileOutputStream
- (filename));
- out = ps;
- }
- try {
- doExportCert(alias, out);
- } finally {
- if (ps != null) {
- ps.close();
+ try (PrintStream ps = new PrintStream(new FileOutputStream
+ (filename))) {
+ doExportCert(alias, ps);
}
+ } else {
+ doExportCert(alias, out);
}
if (filename != null) {
MessageFormat form = new MessageFormat(rb.getString
@@ -973,16 +958,12 @@ public final class KeyTool {
doGenSecretKey(alias, keyAlgName, keysize);
kssave = true;
} else if (command == IDENTITYDB) {
- InputStream inStream = System.in;
if (filename != null) {
- inStream = new FileInputStream(filename);
- }
- try {
- doImportIdentityDatabase(inStream);
- } finally {
- if (inStream != System.in) {
- inStream.close();
+ try (InputStream inStream = new FileInputStream(filename)) {
+ doImportIdentityDatabase(inStream);
}
+ } else {
+ doImportIdentityDatabase(System.in);
}
} else if (command == IMPORTCERT) {
InputStream inStream = System.in;
@@ -1101,29 +1082,21 @@ public final class KeyTool {
if (alias == null) {
alias = keyAlias;
}
- PrintStream ps = null;
if (filename != null) {
- ps = new PrintStream(new FileOutputStream(filename));
- out = ps;
- }
- try {
- doGenCRL(out);
- } finally {
- if (ps != null) {
- ps.close();
+ try (PrintStream ps =
+ new PrintStream(new FileOutputStream(filename))) {
+ doGenCRL(ps);
}
+ } else {
+ doGenCRL(out);
}
} else if (command == PRINTCERTREQ) {
- InputStream inStream = System.in;
if (filename != null) {
- inStream = new FileInputStream(filename);
- }
- try {
- doPrintCertReq(inStream, out);
- } finally {
- if (inStream != System.in) {
- inStream.close();
+ try (InputStream inStream = new FileInputStream(filename)) {
+ doPrintCertReq(inStream, out);
}
+ } else {
+ doPrintCertReq(System.in, out);
}
} else if (command == PRINTCRL) {
doPrintCRL(filename, out);
@@ -2070,12 +2043,13 @@ public final class KeyTool {
}
}
} else { // must be LDAP, and uri is not null
+ // Lazily load LDAPCertStoreHelper if present
+ CertStoreHelper helper = CertStoreHelper.getInstance("LDAP");
String path = uri.getPath();
if (path.charAt(0) == '/') path = path.substring(1);
- LDAPCertStoreHelper h = new LDAPCertStoreHelper();
- CertStore s = h.getCertStore(uri);
+ CertStore s = helper.getCertStore(uri);
X509CRLSelector sel =
- h.wrap(new X509CRLSelector(), null, path);
+ helper.wrap(new X509CRLSelector(), null, path);
return s.getCRLs(sel);
}
}
@@ -2259,18 +2233,12 @@ public final class KeyTool {
int pos = 0;
while (entries.hasMoreElements()) {
JarEntry je = entries.nextElement();
- InputStream is = null;
- try {
- is = jf.getInputStream(je);
+ try (InputStream is = jf.getInputStream(je)) {
while (is.read(buffer) != -1) {
// we just read. this will throw a SecurityException
// if a signature/digest check fails. This also
// populate the signers
}
- } finally {
- if (is != null) {
- is.close();
- }
}
CodeSigner[] signers = je.getCodeSigners();
if (signers != null) {
@@ -2316,85 +2284,52 @@ public final class KeyTool {
out.println(rb.getString("Not.a.signed.jar.file"));
}
} else if (sslserver != null) {
- SSLContext sc = SSLContext.getInstance("SSL");
- final boolean[] certPrinted = new boolean[1];
- sc.init(null, new TrustManager[] {
- new X509TrustManager() {
-
- public java.security.cert.X509Certificate[] getAcceptedIssuers() {
- return null;
- }
+ // Lazily load SSLCertStoreHelper if present
+ CertStoreHelper helper = CertStoreHelper.getInstance("SSLServer");
+ CertStore cs = helper.getCertStore(new URI("https://" + sslserver));
+ Collection<? extends Certificate> chain;
+ try {
+ chain = cs.getCertificates(null);
+ if (chain.isEmpty()) {
+ // If the certs are not retrieved, we consider it an error
+ // even if the URL connection is successful.
+ throw new Exception(rb.getString(
+ "No.certificate.from.the.SSL.server"));
+ }
+ } catch (CertStoreException cse) {
+ if (cse.getCause() instanceof IOException) {
+ throw new Exception(rb.getString(
+ "No.certificate.from.the.SSL.server"),
+ cse.getCause());
+ } else {
+ throw cse;
+ }
+ }
- public void checkClientTrusted(
- java.security.cert.X509Certificate[] certs, String authType) {
+ int i = 0;
+ for (Certificate cert : chain) {
+ try {
+ if (rfc) {
+ dumpCert(cert, out);
+ } else {
+ out.println("Certificate #" + i++);
+ out.println("====================================");
+ printX509Cert((X509Certificate)cert, out);
+ out.println();
}
-
- public void checkServerTrusted(
- java.security.cert.X509Certificate[] certs, String authType) {
- for (int i=0; i<certs.length; i++) {
- X509Certificate cert = certs[i];
- try {
- if (rfc) {
- dumpCert(cert, out);
- } else {
- out.println("Certificate #" + i);
- out.println("====================================");
- printX509Cert(cert, out);
- out.println();
- }
- } catch (Exception e) {
- if (debug) {
- e.printStackTrace();
- }
- }
- }
-
- // Set to true where there's something to print
- if (certs.length > 0) {
- certPrinted[0] = true;
- }
+ } catch (Exception e) {
+ if (debug) {
+ e.printStackTrace();
}
}
- }, null);
- HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
- HttpsURLConnection.setDefaultHostnameVerifier(
- new HostnameVerifier() {
- public boolean verify(String hostname, SSLSession session) {
- return true;
- }
- });
- // HTTPS instead of raw SSL, so that -Dhttps.proxyHost and
- // -Dhttps.proxyPort can be used. Since we only go through
- // the handshake process, an HTTPS server is not needed.
- // This program should be able to deal with any SSL-based
- // network service.
- Exception ex = null;
- try {
- new URL("https://" + sslserver).openConnection().connect();
- } catch (Exception e) {
- ex = e;
- }
- // If the certs are not printed out, we consider it an error even
- // if the URL connection is successful.
- if (!certPrinted[0]) {
- Exception e = new Exception(
- rb.getString("No.certificate.from.the.SSL.server"));
- if (ex != null) {
- e.initCause(ex);
- }
- throw e;
}
} else {
- InputStream inStream = System.in;
if (filename != null) {
- inStream = new FileInputStream(filename);
- }
- try {
- printCertFromStream(inStream, out);
- } finally {
- if (inStream != System.in) {
- inStream.close();
+ try (FileInputStream inStream = new FileInputStream(filename)) {
+ printCertFromStream(inStream, out);
}
+ } else {
+ printCertFromStream(System.in, out);
}
}
}
@@ -2590,9 +2525,7 @@ public final class KeyTool {
X509Certificate cert = null;
try {
cert = (X509Certificate)cf.generateCertificate(in);
- } catch (ClassCastException cce) {
- throw new Exception(rb.getString("Input.not.an.X.509.certificate"));
- } catch (CertificateException ce) {
+ } catch (ClassCastException | CertificateException ce) {
throw new Exception(rb.getString("Input.not.an.X.509.certificate"));
}
@@ -3441,16 +3374,10 @@ public final class KeyTool {
if (!file.exists()) {
return null;
}
- FileInputStream fis = null;
KeyStore caks = null;
- try {
- fis = new FileInputStream(file);
+ try (FileInputStream fis = new FileInputStream(file)) {
caks = KeyStore.getInstance(JKS);
caks.load(fis, null);
- } finally {
- if (fis != null) {
- fis.close();
- }
}
return caks;
}
diff --git a/jdk/src/share/classes/sun/security/tools/PathList.java b/jdk/src/share/classes/sun/security/tools/PathList.java
new file mode 100644
index 0000000..f059a5e
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/tools/PathList.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2004, 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.security.tools;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.String;
+import java.util.StringTokenizer;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.MalformedURLException;
+
+/**
+ * A utility class for handle path list
+ *
+ */
+public class PathList {
+ /**
+ * Utility method for appending path from pathFrom to pathTo.
+ *
+ * @param pathTo the target path
+ * @param pathSource the path to be appended to pathTo
+ * @return the resulting path
+ */
+ public static String appendPath(String pathTo, String pathFrom) {
+ if (pathTo == null || pathTo.length() == 0) {
+ return pathFrom;
+ } else if (pathFrom == null || pathFrom.length() == 0) {
+ return pathTo;
+ } else {
+ return pathTo + File.pathSeparator + pathFrom;
+ }
+ }
+
+ /**
+ * Utility method for converting a search path string to an array
+ * of directory and JAR file URLs.
+ *
+ * @param path the search path string
+ * @return the resulting array of directory and JAR file URLs
+ */
+ public static URL[] pathToURLs(String path) {
+ StringTokenizer st = new StringTokenizer(path, File.pathSeparator);
+ URL[] urls = new URL[st.countTokens()];
+ int count = 0;
+ while (st.hasMoreTokens()) {
+ URL url = fileToURL(new File(st.nextToken()));
+ if (url != null) {
+ urls[count++] = url;
+ }
+ }
+ if (urls.length != count) {
+ URL[] tmp = new URL[count];
+ System.arraycopy(urls, 0, tmp, 0, count);
+ urls = tmp;
+ }
+ return urls;
+ }
+
+ /**
+ * Returns the directory or JAR file URL corresponding to the specified
+ * local file name.
+ *
+ * @param file the File object
+ * @return the resulting directory or JAR file URL, or null if unknown
+ */
+ private static URL fileToURL(File file) {
+ String name;
+ try {
+ name = file.getCanonicalPath();
+ } catch (IOException e) {
+ name = file.getAbsolutePath();
+ }
+ name = name.replace(File.separatorChar, '/');
+ if (!name.startsWith("/")) {
+ name = "/" + name;
+ }
+ // If the file does not exist, then assume that it's a directory
+ if (!file.isFile()) {
+ name = name + "/";
+ }
+ try {
+ return new URL("file", "", name);
+ } catch (MalformedURLException e) {
+ throw new IllegalArgumentException("file");
+ }
+ }
+}
diff --git a/jdk/src/share/classes/sun/security/tools/TimestampedSigner.java b/jdk/src/share/classes/sun/security/tools/TimestampedSigner.java
index b58405a..4848a40 100644
--- a/jdk/src/share/classes/sun/security/tools/TimestampedSigner.java
+++ b/jdk/src/share/classes/sun/security/tools/TimestampedSigner.java
@@ -144,7 +144,7 @@ public final class TimestampedSigner extends ContentSigner {
* <tt>accessLocation</tt> field should contain an HTTP or HTTPS URL.
*
* @param tsaCertificate An X.509 certificate for the TSA.
- * @return An HTTP URI or null if none was found.
+ * @return An HTTP or HTTPS URI or null if none was found.
*/
public static URI getTimestampingURI(X509Certificate tsaCertificate) {
diff --git a/jdk/src/share/classes/sun/security/util/Cache.java b/jdk/src/share/classes/sun/security/util/Cache.java
index 7c7f072..8037324 100644
--- a/jdk/src/share/classes/sun/security/util/Cache.java
+++ b/jdk/src/share/classes/sun/security/util/Cache.java
@@ -43,7 +43,7 @@ import java.lang.ref.*;
*
* . optional lifetime, specified in seconds.
*
- * . save for concurrent use by multiple threads
+ * . safe for concurrent use by multiple threads
*
* . values are held by either standard references or via SoftReferences.
* SoftReferences have the advantage that they are automatically cleared
@@ -69,7 +69,7 @@ import java.lang.ref.*;
*
* @author Andreas Sterbenz
*/
-public abstract class Cache {
+public abstract class Cache<K,V> {
protected Cache() {
// empty
@@ -88,12 +88,12 @@ public abstract class Cache {
/**
* Add an entry to the cache.
*/
- public abstract void put(Object key, Object value);
+ public abstract void put(K key, V value);
/**
* Get a value from the cache.
*/
- public abstract Object get(Object key);
+ public abstract V get(Object key);
/**
* Remove an entry from the cache.
@@ -113,14 +113,14 @@ public abstract class Cache {
/**
* accept a visitor
*/
- public abstract void accept(CacheVisitor visitor);
+ public abstract void accept(CacheVisitor<K,V> visitor);
/**
* Return a new memory cache with the specified maximum size, unlimited
* lifetime for entries, with the values held by SoftReferences.
*/
- public static Cache newSoftMemoryCache(int size) {
- return new MemoryCache(true, size);
+ public static <K,V> Cache<K,V> newSoftMemoryCache(int size) {
+ return new MemoryCache<>(true, size);
}
/**
@@ -128,23 +128,24 @@ public abstract class Cache {
* specified maximum lifetime (in seconds), with the values held
* by SoftReferences.
*/
- public static Cache newSoftMemoryCache(int size, int timeout) {
- return new MemoryCache(true, size, timeout);
+ public static <K,V> Cache<K,V> newSoftMemoryCache(int size, int timeout) {
+ return new MemoryCache<>(true, size, timeout);
}
/**
* Return a new memory cache with the specified maximum size, unlimited
* lifetime for entries, with the values held by standard references.
*/
- public static Cache newHardMemoryCache(int size) {
- return new MemoryCache(false, size);
+ public static <K,V> Cache<K,V> newHardMemoryCache(int size) {
+ return new MemoryCache<>(false, size);
}
/**
* Return a dummy cache that does nothing.
*/
- public static Cache newNullCache() {
- return NullCache.INSTANCE;
+ @SuppressWarnings("unchecked")
+ public static <K,V> Cache<K,V> newNullCache() {
+ return (Cache<K,V>) NullCache.INSTANCE;
}
/**
@@ -152,8 +153,8 @@ public abstract class Cache {
* specified maximum lifetime (in seconds), with the values held
* by standard references.
*/
- public static Cache newHardMemoryCache(int size, int timeout) {
- return new MemoryCache(false, size, timeout);
+ public static <K,V> Cache<K,V> newHardMemoryCache(int size, int timeout) {
+ return new MemoryCache<>(false, size, timeout);
}
/**
@@ -193,15 +194,15 @@ public abstract class Cache {
}
}
- public interface CacheVisitor {
- public void visit(Map<Object, Object> map);
+ public interface CacheVisitor<K,V> {
+ public void visit(Map<K,V> map);
}
}
-class NullCache extends Cache {
+class NullCache<K,V> extends Cache<K,V> {
- final static Cache INSTANCE = new NullCache();
+ final static Cache<Object,Object> INSTANCE = new NullCache<>();
private NullCache() {
// empty
@@ -215,11 +216,11 @@ class NullCache extends Cache {
// empty
}
- public void put(Object key, Object value) {
+ public void put(K key, V value) {
// empty
}
- public Object get(Object key) {
+ public V get(Object key) {
return null;
}
@@ -235,23 +236,26 @@ class NullCache extends Cache {
// empty
}
- public void accept(CacheVisitor visitor) {
+ public void accept(CacheVisitor<K,V> visitor) {
// empty
}
}
-class MemoryCache extends Cache {
+class MemoryCache<K,V> extends Cache<K,V> {
private final static float LOAD_FACTOR = 0.75f;
// XXXX
private final static boolean DEBUG = false;
- private final Map<Object, CacheEntry> cacheMap;
+ private final Map<K, CacheEntry<K,V>> cacheMap;
private int maxSize;
private long lifetime;
- private final ReferenceQueue<Object> queue;
+
+ // ReferenceQueue is of type V instead of Cache<K,V>
+ // to allow SoftCacheEntry to extend SoftReference<V>
+ private final ReferenceQueue<V> queue;
public MemoryCache(boolean soft, int maxSize) {
this(soft, maxSize, 0);
@@ -260,10 +264,13 @@ class MemoryCache extends Cache {
public MemoryCache(boolean soft, int maxSize, int lifetime) {
this.maxSize = maxSize;
this.lifetime = lifetime * 1000;
- this.queue = soft ? new ReferenceQueue<Object>() : null;
+ if (soft)
+ this.queue = new ReferenceQueue<>();
+ else
+ this.queue = null;
+
int buckets = (int)(maxSize / LOAD_FACTOR) + 1;
- cacheMap = new LinkedHashMap<Object, CacheEntry>(buckets,
- LOAD_FACTOR, true);
+ cacheMap = new LinkedHashMap<>(buckets, LOAD_FACTOR, true);
}
/**
@@ -279,16 +286,17 @@ class MemoryCache extends Cache {
}
int startSize = cacheMap.size();
while (true) {
- CacheEntry entry = (CacheEntry)queue.poll();
+ @SuppressWarnings("unchecked")
+ CacheEntry<K,V> entry = (CacheEntry<K,V>)queue.poll();
if (entry == null) {
break;
}
- Object key = entry.getKey();
+ K key = entry.getKey();
if (key == null) {
// key is null, entry has already been removed
continue;
}
- CacheEntry currentEntry = cacheMap.remove(key);
+ CacheEntry<K,V> currentEntry = cacheMap.remove(key);
// check if the entry in the map corresponds to the expired
// entry. If not, readd the entry
if ((currentEntry != null) && (entry != currentEntry)) {
@@ -314,9 +322,9 @@ class MemoryCache extends Cache {
}
int cnt = 0;
long time = System.currentTimeMillis();
- for (Iterator<CacheEntry> t = cacheMap.values().iterator();
+ for (Iterator<CacheEntry<K,V>> t = cacheMap.values().iterator();
t.hasNext(); ) {
- CacheEntry entry = t.next();
+ CacheEntry<K,V> entry = t.next();
if (entry.isValid(time) == false) {
t.remove();
cnt++;
@@ -339,7 +347,7 @@ class MemoryCache extends Cache {
if (queue != null) {
// if this is a SoftReference cache, first invalidate() all
// entries so that GC does not have to enqueue them
- for (CacheEntry entry : cacheMap.values()) {
+ for (CacheEntry<K,V> entry : cacheMap.values()) {
entry.invalidate();
}
while (queue.poll() != null) {
@@ -349,12 +357,12 @@ class MemoryCache extends Cache {
cacheMap.clear();
}
- public synchronized void put(Object key, Object value) {
+ public synchronized void put(K key, V value) {
emptyQueue();
long expirationTime = (lifetime == 0) ? 0 :
System.currentTimeMillis() + lifetime;
- CacheEntry newEntry = newEntry(key, value, expirationTime, queue);
- CacheEntry oldEntry = cacheMap.put(key, newEntry);
+ CacheEntry<K,V> newEntry = newEntry(key, value, expirationTime, queue);
+ CacheEntry<K,V> oldEntry = cacheMap.put(key, newEntry);
if (oldEntry != null) {
oldEntry.invalidate();
return;
@@ -362,8 +370,8 @@ class MemoryCache extends Cache {
if (maxSize > 0 && cacheMap.size() > maxSize) {
expungeExpiredEntries();
if (cacheMap.size() > maxSize) { // still too large?
- Iterator<CacheEntry> t = cacheMap.values().iterator();
- CacheEntry lruEntry = t.next();
+ Iterator<CacheEntry<K,V>> t = cacheMap.values().iterator();
+ CacheEntry<K,V> lruEntry = t.next();
if (DEBUG) {
System.out.println("** Overflow removal "
+ lruEntry.getKey() + " | " + lruEntry.getValue());
@@ -374,9 +382,9 @@ class MemoryCache extends Cache {
}
}
- public synchronized Object get(Object key) {
+ public synchronized V get(Object key) {
emptyQueue();
- CacheEntry entry = cacheMap.get(key);
+ CacheEntry<K,V> entry = cacheMap.get(key);
if (entry == null) {
return null;
}
@@ -393,7 +401,7 @@ class MemoryCache extends Cache {
public synchronized void remove(Object key) {
emptyQueue();
- CacheEntry entry = cacheMap.remove(key);
+ CacheEntry<K,V> entry = cacheMap.remove(key);
if (entry != null) {
entry.invalidate();
}
@@ -402,9 +410,9 @@ class MemoryCache extends Cache {
public synchronized void setCapacity(int size) {
expungeExpiredEntries();
if (size > 0 && cacheMap.size() > size) {
- Iterator<CacheEntry> t = cacheMap.values().iterator();
+ Iterator<CacheEntry<K,V>> t = cacheMap.values().iterator();
for (int i = cacheMap.size() - size; i > 0; i--) {
- CacheEntry lruEntry = t.next();
+ CacheEntry<K,V> lruEntry = t.next();
if (DEBUG) {
System.out.println("** capacity reset removal "
+ lruEntry.getKey() + " | " + lruEntry.getValue());
@@ -431,60 +439,61 @@ class MemoryCache extends Cache {
}
// it is a heavyweight method.
- public synchronized void accept(CacheVisitor visitor) {
+ public synchronized void accept(CacheVisitor<K,V> visitor) {
expungeExpiredEntries();
- Map<Object, Object> cached = getCachedEntries();
+ Map<K,V> cached = getCachedEntries();
visitor.visit(cached);
}
- private Map<Object, Object> getCachedEntries() {
- Map<Object,Object> kvmap = new HashMap<Object,Object>(cacheMap.size());
+ private Map<K,V> getCachedEntries() {
+ Map<K,V> kvmap = new HashMap<>(cacheMap.size());
- for (CacheEntry entry : cacheMap.values()) {
+ for (CacheEntry<K,V> entry : cacheMap.values()) {
kvmap.put(entry.getKey(), entry.getValue());
}
return kvmap;
}
- protected CacheEntry newEntry(Object key, Object value,
- long expirationTime, ReferenceQueue<Object> queue) {
+ protected CacheEntry<K,V> newEntry(K key, V value,
+ long expirationTime, ReferenceQueue<V> queue) {
if (queue != null) {
- return new SoftCacheEntry(key, value, expirationTime, queue);
+ return new SoftCacheEntry<>(key, value, expirationTime, queue);
} else {
- return new HardCacheEntry(key, value, expirationTime);
+ return new HardCacheEntry<>(key, value, expirationTime);
}
}
- private static interface CacheEntry {
+ private static interface CacheEntry<K,V> {
boolean isValid(long currentTime);
void invalidate();
- Object getKey();
+ K getKey();
- Object getValue();
+ V getValue();
}
- private static class HardCacheEntry implements CacheEntry {
+ private static class HardCacheEntry<K,V> implements CacheEntry<K,V> {
- private Object key, value;
+ private K key;
+ private V value;
private long expirationTime;
- HardCacheEntry(Object key, Object value, long expirationTime) {
+ HardCacheEntry(K key, V value, long expirationTime) {
this.key = key;
this.value = value;
this.expirationTime = expirationTime;
}
- public Object getKey() {
+ public K getKey() {
return key;
}
- public Object getValue() {
+ public V getValue() {
return value;
}
@@ -503,24 +512,25 @@ class MemoryCache extends Cache {
}
}
- private static class SoftCacheEntry
- extends SoftReference<Object> implements CacheEntry {
+ private static class SoftCacheEntry<K,V>
+ extends SoftReference<V>
+ implements CacheEntry<K,V> {
- private Object key;
+ private K key;
private long expirationTime;
- SoftCacheEntry(Object key, Object value, long expirationTime,
- ReferenceQueue<Object> queue) {
+ SoftCacheEntry(K key, V value, long expirationTime,
+ ReferenceQueue<V> queue) {
super(value, queue);
this.key = key;
this.expirationTime = expirationTime;
}
- public Object getKey() {
+ public K getKey() {
return key;
}
- public Object getValue() {
+ public V getValue() {
return get();
}
diff --git a/jdk/src/share/classes/sun/security/validator/PKIXValidator.java b/jdk/src/share/classes/sun/security/validator/PKIXValidator.java
index a1860a7..7c010e1 100644
--- a/jdk/src/share/classes/sun/security/validator/PKIXValidator.java
+++ b/jdk/src/share/classes/sun/security/validator/PKIXValidator.java
@@ -327,6 +327,7 @@ public final class PKIXValidator extends Validator {
* Set the check date (for debugging).
*/
private void setDate(PKIXBuilderParameters params) {
+ @SuppressWarnings("deprecation")
Date date = validationDate;
if (date != null) {
params.setDate(date);
diff --git a/jdk/src/share/classes/sun/security/validator/SimpleValidator.java b/jdk/src/share/classes/sun/security/validator/SimpleValidator.java
index dc68032..850dfa0 100644
--- a/jdk/src/share/classes/sun/security/validator/SimpleValidator.java
+++ b/jdk/src/share/classes/sun/security/validator/SimpleValidator.java
@@ -131,6 +131,7 @@ public final class SimpleValidator extends Validator {
// make sure chain includes a trusted cert
chain = buildTrustedChain(chain);
+ @SuppressWarnings("deprecation")
Date date = validationDate;
if (date == null) {
date = new Date();
diff --git a/jdk/src/share/classes/sun/security/x509/X509CertImpl.java b/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
index 83f9588..178f797 100644
--- a/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
+++ b/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
@@ -1323,7 +1323,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
for (Extension ex : exts.getAllExtensions()) {
ObjectIdentifier inCertOID = ex.getExtensionId();
- if (inCertOID.equals(findOID)) {
+ if (inCertOID.equals((Object)findOID)) {
certExt = ex;
break;
}
diff --git a/jdk/src/share/classes/sun/swing/SwingUtilities2.java b/jdk/src/share/classes/sun/swing/SwingUtilities2.java
index fc7fbf4..2094ec0 100644
--- a/jdk/src/share/classes/sun/swing/SwingUtilities2.java
+++ b/jdk/src/share/classes/sun/swing/SwingUtilities2.java
@@ -524,55 +524,66 @@ public class SwingUtilities2 {
}
// If we get here we're not printing
- AATextInfo info = drawTextAntialiased(c);
- if (info != null && (g instanceof Graphics2D)) {
+ if (g instanceof Graphics2D) {
+ AATextInfo info = drawTextAntialiased(c);
Graphics2D g2 = (Graphics2D)g;
- Object oldContrast = null;
- Object oldAAValue = g2.getRenderingHint(KEY_TEXT_ANTIALIASING);
- if (info.aaHint != oldAAValue) {
- g2.setRenderingHint(KEY_TEXT_ANTIALIASING, info.aaHint);
- } else {
- oldAAValue = null;
- }
- if (info.lcdContrastHint != null) {
- oldContrast = g2.getRenderingHint(KEY_TEXT_LCD_CONTRAST);
- if (info.lcdContrastHint.equals(oldContrast)) {
- oldContrast = null;
- } else {
- g2.setRenderingHint(KEY_TEXT_LCD_CONTRAST,
- info.lcdContrastHint);
- }
- }
-
boolean needsTextLayout = ((c != null) &&
(c.getClientProperty(TextAttribute.NUMERIC_SHAPING) != null));
+
if (needsTextLayout) {
synchronized(charsBufferLock) {
int length = syncCharsBuffer(text);
needsTextLayout = isComplexLayout(charsBuffer, 0, length);
}
}
- if (needsTextLayout) {
- TextLayout layout = createTextLayout(c, text, g2.getFont(),
+
+ if (info != null) {
+ Object oldContrast = null;
+ Object oldAAValue = g2.getRenderingHint(KEY_TEXT_ANTIALIASING);
+ if (info.aaHint != oldAAValue) {
+ g2.setRenderingHint(KEY_TEXT_ANTIALIASING, info.aaHint);
+ } else {
+ oldAAValue = null;
+ }
+ if (info.lcdContrastHint != null) {
+ oldContrast = g2.getRenderingHint(KEY_TEXT_LCD_CONTRAST);
+ if (info.lcdContrastHint.equals(oldContrast)) {
+ oldContrast = null;
+ } else {
+ g2.setRenderingHint(KEY_TEXT_LCD_CONTRAST,
+ info.lcdContrastHint);
+ }
+ }
+
+ if (needsTextLayout) {
+ TextLayout layout = createTextLayout(c, text, g2.getFont(),
g2.getFontRenderContext());
- layout.draw(g2, x, y);
- } else {
- g.drawString(text, x, y);
- }
+ layout.draw(g2, x, y);
+ } else {
+ g.drawString(text, x, y);
+ }
- if (oldAAValue != null) {
- g2.setRenderingHint(KEY_TEXT_ANTIALIASING, oldAAValue);
+ if (oldAAValue != null) {
+ g2.setRenderingHint(KEY_TEXT_ANTIALIASING, oldAAValue);
+ }
+ if (oldContrast != null) {
+ g2.setRenderingHint(KEY_TEXT_LCD_CONTRAST, oldContrast);
+ }
+
+ return;
}
- if (oldContrast != null) {
- g2.setRenderingHint(KEY_TEXT_LCD_CONTRAST, oldContrast);
+
+ if (needsTextLayout){
+ TextLayout layout = createTextLayout(c, text, g2.getFont(),
+ g2.getFontRenderContext());
+ layout.draw(g2, x, y);
+ return;
}
}
- else {
- g.drawString(text, x, y);
- }
- }
+ g.drawString(text, x, y);
+ }
/**
* Draws the string at the specified location underlining the specified
diff --git a/jdk/src/share/classes/sun/text/resources/CollationData_th.java b/jdk/src/share/classes/sun/text/resources/CollationData_th.java
index 0adc262..311a11f 100644
--- a/jdk/src/share/classes/sun/text/resources/CollationData_th.java
+++ b/jdk/src/share/classes/sun/text/resources/CollationData_th.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -103,18 +103,13 @@ public class CollationData_th extends ListResourceBundle {
//
// Normal vowels
//
+ + "< \u0E4D " // NIKHAHIT
+ "< \u0E30 " // SARA A
+ "< \u0E31 " // MAI HAN-AKAT
+ "< \u0E32 " // SARA AA
- // Normalizer will decompose this character to \u0e4d\u0e32. This is
- // a Bad Thing, because we want the separate characters to sort
- // differently than this individual one. Since there's no public way to
- // set the decomposition to be used when creating a collator, there's
- // no way around this right now.
- // It's best to go ahead and leave the character in, because it occurs
- // this way a lot more often than it occurs as separate characters.
- + "< \u0E33 " // SARA AM
+ // Normalizer will decompose this character to \u0e4d\u0e32.
+ + "< \u0E33 = \u0E4D\u0E32 " // SARA AM
+ "< \u0E34 " // SARA I
@@ -133,62 +128,58 @@ public class CollationData_th extends ListResourceBundle {
+ "< \u0E43 " // SARA AI MAIMUAN
+ "< \u0E44 " // SARA AI MAIMALAI
- //
- // Digits
- //
- + "< \u0E50 " // DIGIT ZERO
- + "< \u0E51 " // DIGIT ONE
- + "< \u0E52 " // DIGIT TWO
- + "< \u0E53 " // DIGIT THREE
- + "< \u0E54 " // DIGIT FOUR
- + "< \u0E55 " // DIGIT FIVE
- + "< \u0E56 " // DIGIT SIX
- + "< \u0E57 " // DIGIT SEVEN
- + "< \u0E58 " // DIGIT EIGHT
- + "< \u0E59 " // DIGIT NINE
-
- // Sorta tonal marks, but maybe not really
- + "< \u0E4D " // NIKHAHIT
- //
- // Thai symbols are supposed to sort "after white space".
- // I'm treating this as making them sort just after the normal Latin-1
- // symbols, which are in turn after the white space.
- //
- + "&'\u007d'" // right-brace
- + "< \u0E2F " // PAIYANNOI (ellipsis, abbreviation)
- + "< \u0E46 " // MAIYAMOK
- + "< \u0E4F " // FONGMAN
- + "< \u0E5A " // ANGKHANKHU
- + "< \u0E5B " // KHOMUT
- + "< \u0E3F " // CURRENCY SYMBOL BAHT
-
- // These symbols are supposed to be "after all characters"
- + "< \u0E4E " // YAMAKKAN
-
- // This rare symbol also comes after all characters. But when it is
- // used in combination with RU and LU, the combination is treated as
- // a separate letter, ala "CH" sorting after "C" in traditional Spanish.
+ //according to CLDR, it's after 0e44
+ + "< \u0E3A " // PHINTHU
+
+
+
+ // This rare symbol comes after all characters.
+ "< \u0E45 " // LAKKHANGYAO
- + "& \u0E24 < \u0E24\u0E45 "
- + "& \u0E26 < \u0E26\u0E45 "
+ + "& \u0E32 , \0E45 " // According to CLDR, 0E45 is after 0E32 in tertiary level
+
- // Tonal marks are primary ignorables but are treated as secondary
- // differences
+
+
+ // Below are thai puntuation marks and Tonal(Accent) marks. According to CLDR 1.9 and
+ // ISO/IEC 14651, Annex C, C.2.1 Thai ordering principles, 0E2F to 0E5B are punctuaion marks that need to be ignored
+ // in the first three leveles. 0E4E to 0E4B are tonal marks to be compared in secondary level.
+ // In real implmentation, set puncutation marks in tertiary as there is no fourth level in Java.
+ // Set all these special marks after \u0301, the accute accent.
+ "& \u0301 " // acute accent
+
+ //puncutation marks
+ + ", \u0E2F " // PAIYANNOI (ellipsis, abbreviation)
+ + ", \u0E46 " // MAIYAMOK
+ + ", \u0E4F " // FONGMAN
+ + ", \u0E5A " // ANGKHANKHU
+ + ", \u0E5B " // KHOMUT
+
+ //tonal marks
+ + "; \u0E4E " // YAMAKKAN
+ + "; \u0E4C " // THANTHAKHAT
+ "; \u0E47 " // MAITAIKHU
+ "; \u0E48 " // MAI EK
+ "; \u0E49 " // MAI THO
+ "; \u0E4A " // MAI TRI
+ "; \u0E4B " // MAI CHATTAWA
- + "; \u0E4C " // THANTHAKHAT
-
- // These are supposed to be ignored, so I'm treating them as controls
- + "& \u0001 "
- + "= \u0E3A " // PHINTHU
- + "= '.' " // period
- }
+ //
+ // Digits are equal to their corresponding Arabic digits in the first level
+ //
+ + "& 0 = \u0E50 " // DIGIT ZERO
+ + "& 1 = \u0E51 " // DIGIT ONE
+ + "& 2 = \u0E52 " // DIGIT TWO
+ + "& 3 = \u0E53 " // DIGIT THREE
+ + "& 4 = \u0E54 " // DIGIT FOUR
+ + "& 5 = \u0E55 " // DIGIT FIVE
+ + "& 6 = \u0E56 " // DIGIT SIX
+ + "& 7 = \u0E57 " // DIGIT SEVEN
+ + "& 8 = \u0E58 " // DIGIT EIGHT
+ + "& 9 = \u0E59 " // DIGIT NINE
+
+
+ }
};
}
}
diff --git a/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java b/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java
index 5b6c04e..c45100d 100644
--- a/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java
+++ b/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java
@@ -40,6 +40,7 @@ import java.util.ResourceBundle.Control;
import java.util.ServiceLoader;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.spi.LocaleServiceProvider;
import sun.util.logging.PlatformLogger;
@@ -57,8 +58,8 @@ public final class LocaleServiceProviderPool {
* A Map that holds singleton instances of this class. Each instance holds a
* set of provider implementations of a particular locale sensitive service.
*/
- private static Map<Class, LocaleServiceProviderPool> poolOfPools =
- new ConcurrentHashMap<Class, LocaleServiceProviderPool>();
+ private static ConcurrentMap<Class, LocaleServiceProviderPool> poolOfPools =
+ new ConcurrentHashMap<>();
/**
* A Set containing locale service providers that implement the
@@ -109,7 +110,7 @@ public final class LocaleServiceProviderPool {
if (pool == null) {
LocaleServiceProviderPool newPool =
new LocaleServiceProviderPool(providerClass);
- pool = poolOfPools.put(providerClass, newPool);
+ pool = poolOfPools.putIfAbsent(providerClass, newPool);
if (pool == null) {
pool = newPool;
}
@@ -257,10 +258,11 @@ public final class LocaleServiceProviderPool {
synchronized (LocaleServiceProviderPool.class) {
if (availableJRELocales == null) {
Locale[] allLocales = LocaleData.getAvailableLocales();
- availableJRELocales = new ArrayList<Locale>(allLocales.length);
+ List<Locale> tmpList = new ArrayList<>(allLocales.length);
for (Locale locale : allLocales) {
- availableJRELocales.add(getLookupLocale(locale));
+ tmpList.add(getLookupLocale(locale));
}
+ availableJRELocales = tmpList;
}
}
}
diff --git a/jdk/src/share/classes/sun/util/resources/CalendarData_lv.properties b/jdk/src/share/classes/sun/util/resources/CalendarData_lv.properties
index 36167c9..126532a 100644
--- a/jdk/src/share/classes/sun/util/resources/CalendarData_lv.properties
+++ b/jdk/src/share/classes/sun/util/resources/CalendarData_lv.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, 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
@@ -23,21 +23,45 @@
# questions.
#
-# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
-# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved
#
-# The original version of this source code and documentation
-# is copyrighted and owned by Taligent, Inc., a wholly-owned
-# subsidiary of IBM. These materials are provided under terms
-# of a License Agreement between Taligent and Sun. This technology
-# is protected by multiple US and International patents.
+# COPYRIGHT AND PERMISSION NOTICE
#
-# This notice and attribution to Taligent may not be removed.
-# Taligent is a registered trademark of Taligent, Inc.
-
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
+# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
+#
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
-# This bundle is empty because the data of the base bundle
-# is adequate for this locale.
-# The bundle is necessary to prevent the resource
-# bundle lookup from falling back to the default
-# locale.
+#
+# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
+#
+firstDayOfWeek=2
+minimalDaysInFirstWeek=4
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
index c4862dc..9a19451 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
@@ -103,6 +103,8 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Eastern Daylight Time", "EDT"};
String EST_NSW[] = new String[] {"Eastern Standard Time (New South Wales)", "EST",
"Eastern Summer Time (New South Wales)", "EST"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"Ghana Mean Time", "GMT",
"Ghana Summer Time", "GHST"};
String GAMBIER[] = new String[] {"Gambier Time", "GAMT",
@@ -186,7 +188,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"Samoa Standard Time", "SST",
"Samoa Daylight Time", "SDT"};
String WST_SAMOA[] = new String[] {"West Samoa Time", "WST",
- "West Samoa Summer Time", "WSST"};
+ "West Samoa Daylight Time", "WSDT"};
String ChST[] = new String[] {"Chamorro Standard Time", "ChST",
"Chamorro Daylight Time", "ChDT"};
String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Tajikistan Summer Time", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd Time", "HOVT",
@@ -674,9 +677,8 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -684,7 +686,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -697,14 +699,14 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Samara Summer Time", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -713,7 +715,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Volgograd Summer Time", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java
index 763f7f5..cd6dce6 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java
@@ -103,6 +103,8 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"\u00d6stliche Sommerzeit", "EDT"};
String EST_NSW[] = new String[] {"\u00d6stliche Normalzeit (New South Wales)", "EST",
"\u00d6stliche Sommerzeit (New South Wales)", "EST"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"Ghanaische Normalzeit", "GMT",
"Ghanaische Sommerzeit", "GHST"};
String GAMBIER[] = new String[] {"Gambier Zeit", "GAMT",
@@ -186,7 +188,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"Samoa Normalzeit", "SST",
"Samoa Sommerzeit", "SDT"};
String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WST",
- "West Samoa Sommerzeit", "WSST"};
+ "West Samoa Sommerzeit", "WSDT"};
String ChST[] = new String[] {"Chamorro Normalzeit", "ChST",
"Chamorro Sommerzeit", "ChDT"};
String VICTORIA[] = new String[] {"\u00d6stliche Normalzeit (Victoria)", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Tadschikische Sommerzeit", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd Zeit", "HOVT",
@@ -674,9 +677,8 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -684,7 +686,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -697,14 +699,14 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Samarische Sommerzeit", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -713,7 +715,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Wolgograder Sommerzeit", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java
index 1c09f1e..ba28d63 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java
@@ -103,6 +103,8 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
"Hora de verano Oriental", "EDT"};
String EST_NSW[] = new String[] {"Hora est\u00e1ndar Oriental (Nueva Gales del Sur)", "EST",
"Hora de verano Oriental (Nueva Gales del Sur)", "EST"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"Hora central de Ghana", "GMT",
"Hora de verano de Ghana", "GHST"};
String GAMBIER[] = new String[] {"Hora de Gambier", "GAMT",
@@ -186,7 +188,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST",
"Hora de verano de Samoa", "SDT"};
String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST",
- "Hora de verano de Samoa Occidental", "WSST"};
+ "Hora de verano de Samoa Occidental", "WSDT"};
String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST",
"Hora de verano de Chamorro", "ChDT"};
String VICTORIA[] = new String[] {"Hora est\u00e1ndar del Este (Victoria)", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
"Hora de verano de Tajikist\u00e1n", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hora de Hovd", "HOVT",
@@ -674,9 +677,8 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -684,7 +686,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -697,14 +699,14 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
"Hora de verano de Samara", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -713,7 +715,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
"Hora de verano de Volgogrado", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java
index fba1e82..1cb8bbc 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java
@@ -103,6 +103,8 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure avanc\u00e9e de l'Est", "EDT"} ;
String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST",
"Heure d'\u00e9t\u00e9 de l'Est (Nouvelle-Galles du Sud)", "EST"} ;
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"Heure du Ghana", "GMT",
"Heure d'\u00e9t\u00e9 du Ghana", "GHST"};
String GAMBIER[] = new String[] {"Heure de Gambi", "GAMT",
@@ -186,7 +188,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"Heure standard de Samoa", "SST",
"Heure avanc\u00e9e de Samoa", "SDT"};
String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST",
- "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSST"} ;
+ "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT"} ;
String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST",
"Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"};
String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure d'\u00e9t\u00e9 du Tadjikistan", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Heure de Hovd", "HOVT",
@@ -674,9 +677,8 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -684,7 +686,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -697,14 +699,14 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure d'\u00e9t\u00e9 de Samara", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -713,7 +715,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure d'\u00e9t\u00e9 de Volgograd", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java
index c2bb1d6..216f9dc 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java
@@ -103,6 +103,8 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora legale USA orientale", "EDT"};
String EST_NSW[] = new String[] {"Ora solare dell'Australia orientale (Nuovo Galles del Sud)", "EST",
"Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"Ora media del Ghana", "GMT",
"Ora legale del Ghana", "GHST"};
String GAMBIER[] = new String[] {"Ora di Gambier", "GAMT",
@@ -186,7 +188,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"Ora standard di Samoa", "SST",
"Ora legale di Samoa", "SDT"};
String WST_SAMOA[] = new String[] {"Ora di Samoa", "WST",
- "Ora estiva di Samoa", "WSST"};
+ "Ora estiva di Samoa", "WSDT"};
String ChST[] = new String[] {"Ora standard di Chamorro", "ChST",
"Ora legale di Chamorro", "ChDT"};
String VICTORIA[] = new String[] {"Ora orientale standard (Victoria)", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora estiva del Tagikistan", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Ora di Hovd", "HOVT",
@@ -674,9 +677,8 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -684,7 +686,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -697,14 +699,14 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora estiva di Samara", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -713,7 +715,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora estiva di Volgograd", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java
index a0d9d7c..fdf98fc 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java
@@ -103,6 +103,8 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u6771\u90e8\u590f\u6642\u9593", "EDT"};
String EST_NSW[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST",
"\u6771\u90e8\u590f\u6642\u9593 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"\u30ac\u30fc\u30ca\u6a19\u6e96\u6642", "GMT",
"\u30ac\u30fc\u30ca\u590f\u6642\u9593", "GHST"};
String GAMBIER[] = new String[] {"\u30ac\u30f3\u30d3\u30a2\u6642\u9593", "GAMT",
@@ -186,7 +188,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST",
"\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT"};
String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST",
- "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSST"};
+ "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT"};
String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST",
"\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT"};
String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"\u30db\u30d6\u30c9\u6642\u9593", "HOVT",
@@ -674,9 +677,8 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -684,7 +686,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -697,14 +699,14 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u30b5\u30de\u30e9\u590f\u6642\u9593", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -713,7 +715,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u30dc\u30eb\u30b4\u30b0\u30e9\u30fc\u30c9\u590f\u6642\u9593", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java
index 2079655..060e6b3 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java
@@ -103,6 +103,8 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT"};
String EST_NSW[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST",
"\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"\uac00\ub098 \ud45c\uc900\uc2dc", "GMT",
"\uac00\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GHST"};
String GAMBIER[] = new String[] {"\uac10\ube44\uc544 \uc2dc\uac04", "GAMT",
@@ -186,7 +188,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST",
"\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT"};
String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST",
- "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSST"};
+ "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT"};
String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST",
"\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT"};
String VICTORIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ube45\ud1a0\ub9ac\uc544)", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd \uc2dc\uac04", "HOVT",
@@ -674,9 +677,8 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -684,7 +686,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -697,14 +699,14 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\uc0ac\ub9c8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -713,7 +715,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\ubcfc\uace0\uadf8\ub77c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java
index 89191d0..3135636 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java
@@ -101,6 +101,8 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Hor\u00e1rio de luz natural oriental", "EDT"};
String EST_NSW[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Nova Gales do Sul)", "EST",
"Fuso hor\u00e1rio de ver\u00e3o oriental (Nova Gales do Sul)", "EST"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT",
"Fuso hor\u00e1rio de ver\u00e3o de Gana", "GHST"};
String GAMBIER[] = new String[] {"Fuso hor\u00e1rio de Gambier", "GAMT",
@@ -184,7 +186,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST",
"Hor\u00e1rio de luz natural de Samoa", "SDT"};
String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST",
- "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSST"};
+ "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT"};
String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST",
"Hor\u00e1rio de luz natural de Chamorro", "ChDT"};
String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Fuso hor\u00e1rio de ver\u00e3o do Tadjiquist\u00e3o", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Fuso hor\u00e1rio de Hovd", "HOVT",
@@ -674,9 +677,8 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -684,7 +686,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -697,14 +699,14 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -713,7 +715,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Fuso hor\u00e1rio de ver\u00e3o de Volgogrado", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java
index 007e553..f399e0d 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java
@@ -103,6 +103,8 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Eastern, sommartid", "EDT"};
String EST_NSW[] = new String[] {"Eastern, normaltid (Nya Sydwales)", "EST",
"Eastern, sommartid (Nya Sydwales)", "EST"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"Ghana, normaltid", "GMT",
"Ghana, sommartid", "GHST"};
String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT",
@@ -186,7 +188,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"Samoa, normaltid", "SST",
"Samoa, sommartid", "SDT"};
String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST",
- "V\u00e4stsamoansk sommartid", "WSST"};
+ "V\u00e4stsamoansk sommartid", "WSDT"};
String ChST[] = new String[] {"Chamorro, normaltid", "ChST",
"Chamorro, sommartid", "ChDT"};
String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Tadzjikistan, sommartid", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd, normaltid", "HOVT",
@@ -674,9 +677,8 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -684,7 +686,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -697,14 +699,14 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Samara, sommartid", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -713,7 +715,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Volgograd, sommartid", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java
index d752137..28dd24f 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java
@@ -103,6 +103,8 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT"};
String EST_NSW[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST",
"\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"\u52a0\u7eb3\u65f6\u95f4", "GMT",
"\u52a0\u7eb3\u590f\u4ee4\u65f6", "GHST"};
String GAMBIER[] = new String[] {"\u5188\u6bd4\u4e9a\u65f6\u95f4", "GAMT",
@@ -186,7 +188,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST",
"\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT"};
String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST",
- "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSST"};
+ "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT"};
String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST",
"Chamorro \u590f\u4ee4\u65f6", "ChDT"};
String VICTORIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u5854\u5409\u514b\u65af\u5766\u590f\u4ee4\u65f6", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"\u79d1\u5e03\u591a\u65f6\u95f4", "HOVT",
@@ -674,9 +677,8 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -684,7 +686,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -697,14 +699,14 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u6c99\u9a6c\u62c9\u590f\u4ee4\u65f6", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -713,7 +715,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u4f0f\u5c14\u52a0\u683c\u52d2\u590f\u4ee4\u65f6", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java
index 9a7fbe9..bafb87e 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java
@@ -103,6 +103,8 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT"};
String EST_NSW[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST",
"\u6771\u65b9\u590f\u4ee4\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"\u8fe6\u7d0d\u5e73\u5747\u6642\u9593", "GMT",
"\u8fe6\u7d0d\u590f\u4ee4\u6642\u9593", "GHST"};
String GAMBIER[] = new String[] {"\u7518\u6bd4\u723e\u6642\u9593", "GAMT",
@@ -186,7 +188,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST",
"\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT"};
String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST",
- "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSST"};
+ "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT"};
String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST",
"\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT"};
String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST",
@@ -511,6 +513,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"\u5854\u5409\u514b\u590f\u4ee4\u6642\u9593", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Hebron", EET},
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"\u4faf\u5fb7 (Hovd) \u6642\u9593", "HOVT",
@@ -675,9 +678,8 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT",
- "Kaliningrad Summer Time", "KALST"}},
- {"Europe/Kiev", EET},
+ {"Europe/Kaliningrad", FET},
+ {"Europe/Kiev", FET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},
@@ -685,7 +687,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
- {"Europe/Minsk", EET},
+ {"Europe/Minsk", FET},
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
@@ -698,14 +700,14 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"\u6c99\u99ac\u62c9\u590f\u4ee4\u6642\u9593", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", FET},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
- {"Europe/Uzhgorod", EET},
+ {"Europe/Uzhgorod", FET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
@@ -714,7 +716,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"\u4f0f\u723e\u52a0\u683c\u52d2\u590f\u4ee4\u6642\u9593", "VOLST"}},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
- {"Europe/Zaporozhye", EET},
+ {"Europe/Zaporozhye", FET},
{"Europe/Zurich", CET},
{"GB", GMTBST},
{"GB-Eire", GMTBST},
diff --git a/jdk/src/share/classes/sun/util/xml/XMLUtils.java b/jdk/src/share/classes/sun/util/xml/XMLUtils.java
index ab7ca85..0767733 100644
--- a/jdk/src/share/classes/sun/util/xml/XMLUtils.java
+++ b/jdk/src/share/classes/sun/util/xml/XMLUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
@@ -76,7 +76,7 @@ public class XMLUtils {
} catch (SAXException saxe) {
throw new InvalidPropertiesFormatException(saxe);
}
- Element propertiesElement = (Element)doc.getChildNodes().item(1);
+ Element propertiesElement = doc.getDocumentElement();
String xmlVersion = propertiesElement.getAttribute("version");
if (xmlVersion.compareTo(EXTERNAL_XML_VERSION) > 0)
throw new InvalidPropertiesFormatException(
diff --git a/jdk/src/share/demo/jfc/TransparentRuler/README.txt b/jdk/src/share/demo/jfc/TransparentRuler/README.txt
index ddcf9de..0b66bd2 100644
--- a/jdk/src/share/demo/jfc/TransparentRuler/README.txt
+++ b/jdk/src/share/demo/jfc/TransparentRuler/README.txt
@@ -1,14 +1,10 @@
To run the Ruler demo:
- java -jar Ruler.jar
+ java -jar TransparentRuler.jar
These instructions assume that this installation's version of the java
command is in your path. If it isn't, then you should either
specify the complete path to the java command or update your
PATH environment variable as described in the installation
instructions for the Java(TM) SE Development Kit.
-
-KNOWN ISSUES:
-Context menu is clipped with the window shape. The issues are:
-CR 7027486 JPopupMenu doesn't take window shape into account
diff --git a/jdk/src/share/javavm/export/jvm.h b/jdk/src/share/javavm/export/jvm.h
index d4a44b3..c867f1b 100644
--- a/jdk/src/share/javavm/export/jvm.h
+++ b/jdk/src/share/javavm/export/jvm.h
@@ -1430,7 +1430,8 @@ typedef struct {
*/
unsigned int thread_park_blocker : 1;
unsigned int post_vm_init_hook_enabled : 1;
- unsigned int : 30;
+ unsigned int pending_list_uses_discovered_field : 1;
+ unsigned int : 29;
unsigned int : 32;
unsigned int : 32;
} jdk_version_info;
diff --git a/jdk/src/share/lib/security/sunpkcs11-solaris.cfg b/jdk/src/share/lib/security/sunpkcs11-solaris.cfg
index daf03a4..3b3f7fa 100644
--- a/jdk/src/share/lib/security/sunpkcs11-solaris.cfg
+++ b/jdk/src/share/lib/security/sunpkcs11-solaris.cfg
@@ -11,6 +11,9 @@ library = /usr/lib/$ISA/libpkcs11.so
handleStartupErrors = ignoreAll
+# Use the X9.63 encoding for EC points (do not wrap in an ASN.1 OctetString).
+useEcX963Encoding = true
+
attributes = compatibility
disabledMechanisms = {
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
index 17c48a4..cee146d 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
@@ -1112,11 +1112,14 @@ void unpacker::read_Utf8_values(entry* cpMap, int len) {
uint size3 = suffix * 3;
if (suffix == 0) continue; // done with empty string
chars.malloc(size3);
+ CHECK;
byte* chp = chars.ptr;
band saved_band = cp_Utf8_big_chars;
cp_Utf8_big_chars.readData(suffix);
+ CHECK;
for (int j = 0; j < suffix; j++) {
unsigned short ch = cp_Utf8_big_chars.getInt();
+ CHECK;
chp = store_Utf8_char(chp, ch);
}
chars.realloc(chp - chars.ptr);
@@ -1134,10 +1137,12 @@ void unpacker::read_Utf8_values(entry* cpMap, int len) {
CHECK;
int prevlen = 0; // previous string length (in chars)
tmallocs.add(bigbuf.ptr); // free after this block
+ CHECK;
cp_Utf8_prefix.rewind();
for (i = 0; i < len; i++) {
bytes& chars = allsuffixes[i];
int prefix = (i < PREFIX_SKIP_2)? 0: cp_Utf8_prefix.getInt();
+ CHECK;
int suffix = (int)chars.len;
byte* fillp;
// by induction, the buffer is already filled with the prefix
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
index 0f770d8..e5197e1 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2011, 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
@@ -52,7 +52,7 @@ void* must_malloc(size_t size) {
if (msize >= 0 && msize < sizeof(int))
msize = sizeof(int); // see 0xbaadf00d below
#endif
- void* ptr = (msize > PSIZE_MAX) ? null : malloc(msize);
+ void* ptr = (msize > PSIZE_MAX || msize <= 0) ? null : malloc(msize);
if (ptr != null) {
memset(ptr, 0, size);
} else {
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h
index d24e5b5..8961931 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2011, 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
@@ -33,7 +33,7 @@ void mtrace(char c, void* ptr, size_t size);
#endif
// overflow management
-#define OVERFLOW ((size_t)-1)
+#define OVERFLOW ((uint)-1)
#define PSIZE_MAX (OVERFLOW/2) /* normal size limit */
inline size_t scale_size(size_t size, size_t scale) {
diff --git a/jdk/src/share/native/common/jdk_util.c b/jdk/src/share/native/common/jdk_util.c
index e737982..8fe32bf 100644
--- a/jdk/src/share/native/common/jdk_util.c
+++ b/jdk/src/share/native/common/jdk_util.c
@@ -101,5 +101,5 @@ JDK_GetVersionInfo0(jdk_version_info* info, size_t info_size) {
// Advertise presence of sun.misc.PostVMInitHook:
// future optimization: detect if this is enabled.
info->post_vm_init_hook_enabled = 1;
-
+ info->pending_list_uses_discovered_field = 1;
}
diff --git a/jdk/src/share/native/java/io/ObjectInputStream.c b/jdk/src/share/native/java/io/ObjectInputStream.c
index 8b8a710..1e288e9 100644
--- a/jdk/src/share/native/java/io/ObjectInputStream.c
+++ b/jdk/src/share/native/java/io/ObjectInputStream.c
@@ -173,16 +173,3 @@ Java_java_io_ObjectInputStream_bytesToDoubles(JNIEnv *env,
(*env)->ReleasePrimitiveArrayCritical(env, dst, doubles, 0);
}
-/*
- * Class: java_io_ObjectInputStream
- * Method: latestUserDefinedLoader
- * Signature: ()Ljava/lang/ClassLoader;
- *
- * Returns the first non-null class loader up the execution stack, or null
- * if only code from the null class loader is on the stack.
- */
-JNIEXPORT jobject JNICALL
-Java_java_io_ObjectInputStream_latestUserDefinedLoader(JNIEnv *env, jclass cls)
-{
- return JVM_LatestUserDefinedLoader(env);
-}
diff --git a/jdk/src/share/native/sun/java2d/loops/TransformHelper.c b/jdk/src/share/native/sun/java2d/loops/TransformHelper.c
index a511774..23bba35 100644
--- a/jdk/src/share/native/sun/java2d/loops/TransformHelper.c
+++ b/jdk/src/share/native/sun/java2d/loops/TransformHelper.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2011, 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
@@ -284,7 +284,7 @@ Java_sun_java2d_loops_TransformHelper_Transform
TransformHelperFunc *pHelperFunc;
TransformInterpFunc *pInterpFunc;
jdouble xorig, yorig;
- jint numedges;
+ jlong numedges;
jint *pEdges;
jint edgebuf[2 + MAXEDGES * 2];
union {
@@ -379,19 +379,44 @@ Java_sun_java2d_loops_TransformHelper_Transform
}
Region_IntersectBounds(&clipInfo, &dstInfo.bounds);
- numedges = (dstInfo.bounds.y2 - dstInfo.bounds.y1);
- if (numedges > MAXEDGES) {
- pEdges = malloc((2 + 2 * numedges) * sizeof (*pEdges));
- if (pEdges == NULL) {
- SurfaceData_InvokeUnlock(env, dstOps, &dstInfo);
- SurfaceData_InvokeUnlock(env, srcOps, &srcInfo);
- /* edgeArray should already contain zeros for min/maxy */
- return;
- }
+ numedges = (((jlong) dstInfo.bounds.y2) - ((jlong) dstInfo.bounds.y1));
+ if (numedges <= 0) {
+ pEdges = NULL;
+ } else if (!JNU_IsNull(env, edgeArray)) {
+ /*
+ * Ideally Java should allocate an array large enough, but if
+ * we ever have a miscommunication about the number of edge
+ * lines, or if the Java array calculation should overflow to
+ * a positive number and succeed in allocating an array that
+ * is too small, we need to verify that it can still hold the
+ * number of integers that we plan to store to be safe.
+ */
+ jsize edgesize = (*env)->GetArrayLength(env, edgeArray);
+ /* (edgesize/2 - 1) should avoid any overflow or underflow. */
+ pEdges = (((edgesize / 2) - 1) >= numedges)
+ ? (*env)->GetPrimitiveArrayCritical(env, edgeArray, NULL)
+ : NULL;
+ } else if (numedges > MAXEDGES) {
+ /* numedges variable (jlong) can be at most ((1<<32)-1) */
+ /* memsize can overflow a jint, but not a jlong */
+ jlong memsize = ((numedges * 2) + 2) * sizeof(*pEdges);
+ pEdges = (memsize == ((size_t) memsize))
+ ? malloc((size_t) memsize)
+ : NULL;
} else {
pEdges = edgebuf;
}
+ if (pEdges == NULL) {
+ if (numedges > 0) {
+ JNU_ThrowInternalError(env, "Unable to allocate edge list");
+ }
+ SurfaceData_InvokeUnlock(env, dstOps, &dstInfo);
+ SurfaceData_InvokeUnlock(env, srcOps, &srcInfo);
+ /* edgeArray should already contain zeros for min/maxy */
+ return;
+ }
+
Transform_GetInfo(env, itxform, &itxInfo);
if (!Region_IsEmpty(&clipInfo)) {
@@ -500,14 +525,14 @@ Java_sun_java2d_loops_TransformHelper_Transform
} else {
pEdges[0] = pEdges[1] = 0;
}
- SurfaceData_InvokeUnlock(env, dstOps, &dstInfo);
- SurfaceData_InvokeUnlock(env, srcOps, &srcInfo);
+
if (!JNU_IsNull(env, edgeArray)) {
- (*env)->SetIntArrayRegion(env, edgeArray, 0, 2+numedges*2, pEdges);
- }
- if (pEdges != edgebuf) {
+ (*env)->ReleasePrimitiveArrayCritical(env, edgeArray, pEdges, 0);
+ } else if (pEdges != edgebuf) {
free(pEdges);
}
+ SurfaceData_InvokeUnlock(env, dstOps, &dstInfo);
+ SurfaceData_InvokeUnlock(env, srcOps, &srcInfo);
}
static void
diff --git a/jdk/src/share/native/sun/misc/VM.c b/jdk/src/share/native/sun/misc/VM.c
index 8744da7..2dbeb98 100644
--- a/jdk/src/share/native/sun/misc/VM.c
+++ b/jdk/src/share/native/sun/misc/VM.c
@@ -111,6 +111,11 @@ Java_sun_misc_VM_getThreadStateValues(JNIEnv *env, jclass cls,
get_thread_state_info(env, JAVA_THREAD_STATE_TERMINATED, values, names);
}
+JNIEXPORT jobject JNICALL
+Java_sun_misc_VM_latestUserDefinedLoader(JNIEnv *env, jclass cls) {
+ return JVM_LatestUserDefinedLoader(env);
+}
+
typedef void (JNICALL *GetJvmVersionInfo_fp)(JNIEnv*, jvm_version_info*, size_t);
JNIEXPORT void JNICALL
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
index c32a278..3408023 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
@@ -273,7 +273,7 @@ CK_VERSION_PTR jVersionToCKVersionPtr(JNIEnv *env, jobject jVersion)
/* allocate memory for CK_VERSION pointer */
ckpVersion = (CK_VERSION_PTR) malloc(sizeof(CK_VERSION));
if (ckpVersion == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
ckpVersion->major = jByteToCKByte(jMajor);
@@ -326,7 +326,7 @@ CK_DATE * jDateObjectPtrToCKDatePtr(JNIEnv *env, jobject jDate)
/* allocate memory for CK_DATE pointer */
ckpDate = (CK_DATE *) malloc(sizeof(CK_DATE));
if (ckpDate == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
@@ -340,7 +340,7 @@ CK_DATE * jDateObjectPtrToCKDatePtr(JNIEnv *env, jobject jDate)
jTempChars = (jchar*) malloc((ckLength) * sizeof(jchar));
if (jTempChars == NULL) {
free(ckpDate);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
(*env)->GetCharArrayRegion(env, jYear, 0, ckLength, jTempChars);
@@ -364,7 +364,7 @@ CK_DATE * jDateObjectPtrToCKDatePtr(JNIEnv *env, jobject jDate)
jTempChars = (jchar*) malloc((ckLength) * sizeof(jchar));
if (jTempChars == NULL) {
free(ckpDate);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
(*env)->GetCharArrayRegion(env, jMonth, 0, ckLength, jTempChars);
@@ -388,7 +388,7 @@ CK_DATE * jDateObjectPtrToCKDatePtr(JNIEnv *env, jobject jDate)
jTempChars = (jchar*) malloc((ckLength) * sizeof(jchar));
if (jTempChars == NULL) {
free(ckpDate);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
(*env)->GetCharArrayRegion(env, jDay, 0, ckLength, jTempChars);
@@ -558,7 +558,7 @@ CK_TLS_PRF_PARAMS jTlsPrfParamsToCKTlsPrfParam(JNIEnv *env, jobject jParam)
if (ckParam.pulOutputLen == NULL) {
free(ckParam.pSeed);
free(ckParam.pLabel);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return ckParam;
}
jByteArrayToCKByteArray(env, jOutput, &(ckParam.pOutput), ckParam.pulOutputLen);
@@ -665,7 +665,7 @@ CK_SSL3_KEY_MAT_PARAMS jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject
if (ckParam.pReturnedKeyMaterial == NULL) {
free(ckParam.RandomInfo.pClientRandom);
free(ckParam.RandomInfo.pServerRandom);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return ckParam;
}
@@ -1013,7 +1013,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_SSL3_MASTER_KEY_DERIVE_PARAMS_PTR) malloc(sizeof(CK_SSL3_MASTER_KEY_DERIVE_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1040,7 +1040,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_SSL3_KEY_MAT_PARAMS_PTR) malloc(sizeof(CK_SSL3_KEY_MAT_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1067,7 +1067,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_TLS_PRF_PARAMS_PTR) malloc(sizeof(CK_TLS_PRF_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1094,7 +1094,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_AES_CTR_PARAMS_PTR) malloc(sizeof(CK_AES_CTR_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1121,7 +1121,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_RSA_PKCS_OAEP_PARAMS_PTR) malloc(sizeof(CK_RSA_PKCS_OAEP_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1148,7 +1148,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_PBE_PARAMS_PTR) malloc(sizeof(CK_PBE_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1175,7 +1175,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_PKCS5_PBKD2_PARAMS_PTR) malloc(sizeof(CK_PKCS5_PBKD2_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1202,7 +1202,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_RSA_PKCS_PSS_PARAMS_PTR) malloc(sizeof(CK_RSA_PKCS_PSS_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1229,7 +1229,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_ECDH1_DERIVE_PARAMS_PTR) malloc(sizeof(CK_ECDH1_DERIVE_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1256,7 +1256,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_ECDH2_DERIVE_PARAMS_PTR) malloc(sizeof(CK_ECDH2_DERIVE_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1283,7 +1283,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_X9_42_DH1_DERIVE_PARAMS_PTR) malloc(sizeof(CK_X9_42_DH1_DERIVE_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
@@ -1310,7 +1310,7 @@ void jMechanismParameterToCKMechanismParameterSlow(JNIEnv *env, jobject jParam,
ckpParam = (CK_X9_42_DH2_DERIVE_PARAMS_PTR) malloc(sizeof(CK_X9_42_DH2_DERIVE_PARAMS));
if (ckpParam == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
index b7288c1..d33e4e2 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
@@ -131,7 +131,7 @@ JNIEXPORT jint JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestSingle
/* always use single part op, even for large data */
bufP = (CK_BYTE_PTR) malloc((size_t)jInLen);
if (bufP == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return 0;
}
}
@@ -190,7 +190,7 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestUpdate
bufLen = min(MAX_HEAP_BUFFER_LEN, jInLen);
bufP = (CK_BYTE_PTR) malloc((size_t)bufLen);
if (bufP == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
}
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
index 1d030c5..a76e404 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
@@ -92,7 +92,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestEn
ckpEncryptedPart = (CK_BYTE_PTR) malloc(ckEncryptedPartLength * sizeof(CK_BYTE));
if (ckpEncryptedPart == NULL) {
free(ckpPart);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
@@ -144,7 +144,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptD
ckpPart = (CK_BYTE_PTR) malloc(ckPartLength * sizeof(CK_BYTE));
if (ckpPart == NULL) {
free(ckpEncryptedPart);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
@@ -196,7 +196,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignEncr
ckpEncryptedPart = (CK_BYTE_PTR) malloc(ckEncryptedPartLength * sizeof(CK_BYTE));
if (ckpEncryptedPart == NULL) {
free(ckpPart);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
@@ -248,7 +248,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptV
ckpPart = (CK_BYTE_PTR) malloc(ckPartLength * sizeof(CK_BYTE));
if (ckpPart == NULL) {
free(ckpEncryptedPart);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
index a48c08b..14085a1 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
@@ -71,7 +71,10 @@ jfieldID mech_pParameterID;
jclass jByteArrayClass;
jclass jLongClass;
+JavaVM* jvm = NULL;
+
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
+ jvm = vm;
return JNI_VERSION_1_4;
}
@@ -351,7 +354,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetSlotList
ckpSlotList = (CK_SLOT_ID_PTR) malloc(ckTokenNumber * sizeof(CK_SLOT_ID));
if (ckpSlotList == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
@@ -652,7 +655,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetMechanismList
ckpMechanismList = (CK_MECHANISM_TYPE_PTR)
malloc(ckMechanismNumber * sizeof(CK_MECHANISM_TYPE));
if (ckpMechanismList == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
index 7f987fb..e74230f 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
@@ -165,7 +165,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1Generate
if (ckMechanism.pParameter != NULL_PTR) {
free(ckMechanism.pParameter);
}
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
ckpPublicKeyHandle = ckpKeyHandles; /* first element of array is Public Key */
@@ -253,7 +253,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1WrapKey
if (ckMechanism.pParameter != NULL_PTR) {
free(ckMechanism.pParameter);
}
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
index 6bc1edc..29c80b8 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
@@ -92,7 +92,7 @@ CK_C_INITIALIZE_ARGS_PTR makeCKInitArgsAdapter(JNIEnv *env, jobject jInitArgs)
/* convert the Java InitArgs object to a pointer to a CK_C_INITIALIZE_ARGS structure */
ckpInitArgs = (CK_C_INITIALIZE_ARGS_PTR) malloc(sizeof(CK_C_INITIALIZE_ARGS));
if (ckpInitArgs == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL_PTR;
}
@@ -141,7 +141,7 @@ CK_C_INITIALIZE_ARGS_PTR makeCKInitArgsAdapter(JNIEnv *env, jobject jInitArgs)
ckpGlobalInitArgs = (CK_C_INITIALIZE_ARGS_PTR) malloc(sizeof(CK_C_INITIALIZE_ARGS));
if (ckpGlobalInitArgs == NULL) {
free(ckpInitArgs);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL_PTR;
}
@@ -178,9 +178,8 @@ CK_C_INITIALIZE_ARGS_PTR makeCKInitArgsAdapter(JNIEnv *env, jobject jInitArgs)
*/
CK_RV callJCreateMutex(CK_VOID_PTR_PTR ppMutex)
{
- JavaVM *jvm;
+ extern JavaVM *jvm;
JNIEnv *env;
- jsize actualNumberVMs;
jint returnValue;
jthrowable pkcs11Exception;
jclass pkcs11ExceptionClass;
@@ -196,8 +195,7 @@ CK_RV callJCreateMutex(CK_VOID_PTR_PTR ppMutex)
/* Get the currently running Java VM */
- returnValue = JNI_GetCreatedJavaVMs(&jvm, (jsize) 1, &actualNumberVMs);
- if ((returnValue != 0) || (actualNumberVMs <= 0)) { return rv ;} /* there is no VM running */
+ if (jvm == NULL) { return rv ;} /* there is no VM running */
/* Determine, if current thread is already attached */
returnValue = (*jvm)->GetEnv(jvm, (void **) &env, JNI_VERSION_1_2);
@@ -273,9 +271,8 @@ CK_RV callJCreateMutex(CK_VOID_PTR_PTR ppMutex)
*/
CK_RV callJDestroyMutex(CK_VOID_PTR pMutex)
{
- JavaVM *jvm;
+ extern JavaVM *jvm;
JNIEnv *env;
- jsize actualNumberVMs;
jint returnValue;
jthrowable pkcs11Exception;
jclass pkcs11ExceptionClass;
@@ -291,8 +288,7 @@ CK_RV callJDestroyMutex(CK_VOID_PTR pMutex)
/* Get the currently running Java VM */
- returnValue = JNI_GetCreatedJavaVMs(&jvm, (jsize) 1, &actualNumberVMs);
- if ((returnValue != 0) || (actualNumberVMs <= 0)) { return rv ; } /* there is no VM running */
+ if (jvm == NULL) { return rv ; } /* there is no VM running */
/* Determine, if current thread is already attached */
returnValue = (*jvm)->GetEnv(jvm, (void **) &env, JNI_VERSION_1_2);
@@ -367,9 +363,8 @@ CK_RV callJDestroyMutex(CK_VOID_PTR pMutex)
*/
CK_RV callJLockMutex(CK_VOID_PTR pMutex)
{
- JavaVM *jvm;
+ extern JavaVM *jvm;
JNIEnv *env;
- jsize actualNumberVMs;
jint returnValue;
jthrowable pkcs11Exception;
jclass pkcs11ExceptionClass;
@@ -385,8 +380,7 @@ CK_RV callJLockMutex(CK_VOID_PTR pMutex)
/* Get the currently running Java VM */
- returnValue = JNI_GetCreatedJavaVMs(&jvm, (jsize) 1, &actualNumberVMs);
- if ((returnValue != 0) || (actualNumberVMs <= 0)) { return rv ; } /* there is no VM running */
+ if (jvm == NULL) { return rv ; } /* there is no VM running */
/* Determine, if current thread is already attached */
returnValue = (*jvm)->GetEnv(jvm, (void **) &env, JNI_VERSION_1_2);
@@ -457,9 +451,8 @@ CK_RV callJLockMutex(CK_VOID_PTR pMutex)
*/
CK_RV callJUnlockMutex(CK_VOID_PTR pMutex)
{
- JavaVM *jvm;
+ extern JavaVM *jvm;
JNIEnv *env;
- jsize actualNumberVMs;
jint returnValue;
jthrowable pkcs11Exception;
jclass pkcs11ExceptionClass;
@@ -475,8 +468,7 @@ CK_RV callJUnlockMutex(CK_VOID_PTR pMutex)
/* Get the currently running Java VM */
- returnValue = JNI_GetCreatedJavaVMs(&jvm, (jsize) 1, &actualNumberVMs);
- if ((returnValue != 0) || (actualNumberVMs <= 0)) { return rv ; } /* there is no VM running */
+ if (jvm == NULL) { return rv ; } /* there is no VM running */
/* Determine, if current thread is already attached */
returnValue = (*jvm)->GetEnv(jvm, (void **) &env, JNI_VERSION_1_2);
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
index aea03ee..910453e 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
@@ -258,7 +258,7 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetAttributeVa
ckpAttributes[i].pValue = (void *) malloc(ckBufferLength);
if (ckpAttributes[i].pValue == NULL) {
freeCKAttributeArray(ckpAttributes, i);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
ckpAttributes[i].ulValueLen = ckBufferLength;
@@ -390,7 +390,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1FindObje
ckMaxObjectLength = jLongToCKULong(jMaxObjectCount);
ckpObjectHandleArray = (CK_OBJECT_HANDLE_PTR) malloc(sizeof(CK_OBJECT_HANDLE) * ckMaxObjectLength);
if (ckpObjectHandleArray == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
index 1b7538a..524fde0 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
@@ -98,7 +98,7 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1OpenSession
if (jNotify != NULL) {
notifyEncapsulation = (NotifyEncapsulation *) malloc(sizeof(NotifyEncapsulation));
if (notifyEncapsulation == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return 0L;
}
notifyEncapsulation->jApplicationData = (jApplication != NULL)
@@ -301,7 +301,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetOpera
ckpState = (CK_BYTE_PTR) malloc(ckStateLength);
if (ckpState == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
@@ -435,7 +435,7 @@ void putNotifyEntry(JNIEnv *env, CK_SESSION_HANDLE hSession, NotifyEncapsulation
newNode = (NotifyListNode *) malloc(sizeof(NotifyListNode));
if (newNode == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
newNode->hSession = hSession;
@@ -558,9 +558,8 @@ CK_RV notifyCallback(
)
{
NotifyEncapsulation *notifyEncapsulation;
- JavaVM *jvm;
+ extern JavaVM *jvm;
JNIEnv *env;
- jsize actualNumberVMs;
jint returnValue;
jlong jSessionHandle;
jlong jEvent;
@@ -577,8 +576,7 @@ CK_RV notifyCallback(
notifyEncapsulation = (NotifyEncapsulation *) pApplication;
/* Get the currently running Java VM */
- returnValue = JNI_GetCreatedJavaVMs(&jvm, (jsize) 1, &actualNumberVMs);
- if ((returnValue != 0) || (actualNumberVMs <= 0)) { return rv ; } /* there is no VM running */
+ if (jvm == NULL) { return rv ; } /* there is no VM running */
/* Determine, if current thread is already attached */
returnValue = (*jvm)->GetEnv(jvm, (void **) &env, JNI_VERSION_1_2);
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
index e4a4393..e07bcf5 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
@@ -132,7 +132,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1Sign
ckpSignature = (CK_BYTE_PTR) malloc(ckSignatureLength * sizeof(CK_BYTE));
if (ckpSignature == NULL) {
free(ckpData);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
@@ -146,7 +146,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1Sign
ckpSignature = (CK_BYTE_PTR) malloc(256 * sizeof(CK_BYTE));
if (ckpSignature == NULL) {
free(ckpData);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
rv = (*ckpFunctions->C_Sign)(ckSessionHandle, ckpData, ckDataLength, ckpSignature, &ckSignatureLength);
@@ -156,7 +156,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1Sign
ckpSignature = (CK_BYTE_PTR) malloc(ckSignatureLength * sizeof(CK_BYTE));
if (ckpSignature == NULL) {
free(ckpData);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
rv = (*ckpFunctions->C_Sign)(ckSessionHandle, ckpData, ckDataLength, ckpSignature, &ckSignatureLength);
@@ -210,7 +210,7 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignUpdate
bufLen = min(MAX_HEAP_BUFFER_LEN, jInLen);
bufP = (CK_BYTE_PTR) malloc((size_t)bufLen);
if (bufP == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
}
@@ -270,7 +270,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignFina
if (rv == CKR_BUFFER_TOO_SMALL) {
bufP = (CK_BYTE_PTR) malloc(ckSignatureLength);
if (bufP == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
rv = (*ckpFunctions->C_SignFinal)(ckSessionHandle, bufP, &ckSignatureLength);
@@ -355,7 +355,7 @@ JNIEXPORT jint JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignRecover
} else {
inBufP = (CK_BYTE_PTR) malloc((size_t)jInLen);
if (inBufP == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return 0;
}
}
@@ -373,7 +373,7 @@ JNIEXPORT jint JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignRecover
if (inBufP != INBUF) {
free(inBufP);
}
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return 0;
}
rv = (*ckpFunctions->C_SignRecover)(ckSessionHandle, inBufP, jInLen, outBufP, &ckSignatureLength);
@@ -508,7 +508,7 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyUpdate
bufLen = min(MAX_HEAP_BUFFER_LEN, jInLen);
bufP = (CK_BYTE_PTR) malloc((size_t)bufLen);
if (bufP == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
}
@@ -638,7 +638,7 @@ JNIEXPORT jint JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyRecover
} else {
inBufP = (CK_BYTE_PTR) malloc((size_t)jInLen);
if (inBufP == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return 0;
}
}
@@ -656,7 +656,7 @@ JNIEXPORT jint JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyRecover
outBufP = (CK_BYTE_PTR) malloc(ckDataLength);
if (outBufP == NULL) {
if (inBufP != INBUF) { free(inBufP); }
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return 0;
}
rv = (*ckpFunctions->C_VerifyRecover)(ckSessionHandle, inBufP, jInLen, outBufP, &ckDataLength);
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
index 36a4b15..9436f1e 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
@@ -213,28 +213,52 @@ jlong ckAssertReturnValueOK(JNIEnv *env, CK_RV returnValue)
return jErrorCode ;
}
+
/*
- * This function simply throws an IOException
- *
- * @param env Used to call JNI funktions and to get the Exception class.
- * @param message The message string of the Exception object.
+ * Throws a Java Exception by name
+ */
+void throwByName(JNIEnv *env, const char *name, const char *msg)
+{
+ jclass cls = (*env)->FindClass(env, name);
+
+ if (cls != 0) /* Otherwise an exception has already been thrown */
+ (*env)->ThrowNew(env, cls, msg);
+}
+
+/*
+ * Throws java.lang.OutOfMemoryError
+ */
+void throwOutOfMemoryError(JNIEnv *env, const char *msg)
+{
+ throwByName(env, "java/lang/OutOfMemoryError", msg);
+}
+
+/*
+ * Throws java.lang.NullPointerException
+ */
+void throwNullPointerException(JNIEnv *env, const char *msg)
+{
+ throwByName(env, "java/lang/NullPointerException", msg);
+}
+
+/*
+ * Throws java.io.IOException
*/
-void throwIOException(JNIEnv *env, const char *message)
+void throwIOException(JNIEnv *env, const char *msg)
{
- JNU_ThrowByName(env, CLASS_IO_EXCEPTION, message);
+ throwByName(env, "java/io/IOException", msg);
}
/*
* This function simply throws a PKCS#11RuntimeException with the given
- * string as its message. If the message is NULL, the exception is created
- * using the default constructor.
+ * string as its message.
*
* @param env Used to call JNI funktions and to get the Exception class.
* @param jmessage The message string of the Exception object.
*/
void throwPKCS11RuntimeException(JNIEnv *env, const char *message)
{
- JNU_ThrowByName(env, CLASS_PKCS11RUNTIMEEXCEPTION, message);
+ throwByName(env, CLASS_PKCS11RUNTIMEEXCEPTION, message);
}
/*
@@ -318,7 +342,7 @@ void jBooleanArrayToCKBBoolArray(JNIEnv *env, const jbooleanArray jArray, CK_BBO
*ckpLength = (*env)->GetArrayLength(env, jArray);
jpTemp = (jboolean*) malloc((*ckpLength) * sizeof(jboolean));
if (jpTemp == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
(*env)->GetBooleanArrayRegion(env, jArray, 0, *ckpLength, jpTemp);
@@ -330,7 +354,7 @@ void jBooleanArrayToCKBBoolArray(JNIEnv *env, const jbooleanArray jArray, CK_BBO
*ckpArray = (CK_BBOOL*) malloc ((*ckpLength) * sizeof(CK_BBOOL));
if (*ckpArray == NULL) {
free(jpTemp);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
for (i=0; i<(*ckpLength); i++) {
@@ -360,7 +384,7 @@ void jByteArrayToCKByteArray(JNIEnv *env, const jbyteArray jArray, CK_BYTE_PTR *
*ckpLength = (*env)->GetArrayLength(env, jArray);
jpTemp = (jbyte*) malloc((*ckpLength) * sizeof(jbyte));
if (jpTemp == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
(*env)->GetByteArrayRegion(env, jArray, 0, *ckpLength, jpTemp);
@@ -376,7 +400,7 @@ void jByteArrayToCKByteArray(JNIEnv *env, const jbyteArray jArray, CK_BYTE_PTR *
*ckpArray = (CK_BYTE_PTR) malloc ((*ckpLength) * sizeof(CK_BYTE));
if (*ckpArray == NULL) {
free(jpTemp);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
for (i=0; i<(*ckpLength); i++) {
@@ -407,7 +431,7 @@ void jLongArrayToCKULongArray(JNIEnv *env, const jlongArray jArray, CK_ULONG_PTR
*ckpLength = (*env)->GetArrayLength(env, jArray);
jTemp = (jlong*) malloc((*ckpLength) * sizeof(jlong));
if (jTemp == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
(*env)->GetLongArrayRegion(env, jArray, 0, *ckpLength, jTemp);
@@ -419,7 +443,7 @@ void jLongArrayToCKULongArray(JNIEnv *env, const jlongArray jArray, CK_ULONG_PTR
*ckpArray = (CK_ULONG_PTR) malloc (*ckpLength * sizeof(CK_ULONG));
if (*ckpArray == NULL) {
free(jTemp);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
for (i=0; i<(*ckpLength); i++) {
@@ -449,7 +473,7 @@ void jCharArrayToCKCharArray(JNIEnv *env, const jcharArray jArray, CK_CHAR_PTR *
*ckpLength = (*env)->GetArrayLength(env, jArray);
jpTemp = (jchar*) malloc((*ckpLength) * sizeof(jchar));
if (jpTemp == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
(*env)->GetCharArrayRegion(env, jArray, 0, *ckpLength, jpTemp);
@@ -461,7 +485,7 @@ void jCharArrayToCKCharArray(JNIEnv *env, const jcharArray jArray, CK_CHAR_PTR *
*ckpArray = (CK_CHAR_PTR) malloc (*ckpLength * sizeof(CK_CHAR));
if (*ckpArray == NULL) {
free(jpTemp);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
for (i=0; i<(*ckpLength); i++) {
@@ -491,7 +515,7 @@ void jCharArrayToCKUTF8CharArray(JNIEnv *env, const jcharArray jArray, CK_UTF8CH
*ckpLength = (*env)->GetArrayLength(env, jArray);
jTemp = (jchar*) malloc((*ckpLength) * sizeof(jchar));
if (jTemp == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
(*env)->GetCharArrayRegion(env, jArray, 0, *ckpLength, jTemp);
@@ -503,7 +527,7 @@ void jCharArrayToCKUTF8CharArray(JNIEnv *env, const jcharArray jArray, CK_UTF8CH
*ckpArray = (CK_UTF8CHAR_PTR) malloc (*ckpLength * sizeof(CK_UTF8CHAR));
if (*ckpArray == NULL) {
free(jTemp);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
for (i=0; i<(*ckpLength); i++) {
@@ -538,7 +562,7 @@ void jStringToCKUTF8CharArray(JNIEnv *env, const jstring jArray, CK_UTF8CHAR_PTR
*ckpArray = (CK_UTF8CHAR_PTR) malloc((*ckpLength + 1) * sizeof(CK_UTF8CHAR));
if (*ckpArray == NULL) {
(*env)->ReleaseStringUTFChars(env, (jstring) jArray, pCharArray);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
strcpy((char*)*ckpArray, pCharArray);
@@ -571,7 +595,7 @@ void jAttributeArrayToCKAttributeArray(JNIEnv *env, jobjectArray jArray, CK_ATTR
*ckpLength = jLongToCKULong(jLength);
*ckpArray = (CK_ATTRIBUTE_PTR) malloc(*ckpLength * sizeof(CK_ATTRIBUTE));
if (*ckpArray == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
TRACE1(", converting %d attibutes", jLength);
@@ -613,7 +637,7 @@ jbyteArray ckByteArrayToJByteArray(JNIEnv *env, const CK_BYTE_PTR ckpArray, CK_U
} else {
jpTemp = (jbyte*) malloc((ckLength) * sizeof(jbyte));
if (jpTemp == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
for (i=0; i<ckLength; i++) {
@@ -647,7 +671,7 @@ jlongArray ckULongArrayToJLongArray(JNIEnv *env, const CK_ULONG_PTR ckpArray, CK
jpTemp = (jlong*) malloc((ckLength) * sizeof(jlong));
if (jpTemp == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
for (i=0; i<ckLength; i++) {
@@ -678,7 +702,7 @@ jcharArray ckCharArrayToJCharArray(JNIEnv *env, const CK_CHAR_PTR ckpArray, CK_U
jpTemp = (jchar*) malloc(ckLength * sizeof(jchar));
if (jpTemp == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
for (i=0; i<ckLength; i++) {
@@ -709,7 +733,7 @@ jcharArray ckUTF8CharArrayToJCharArray(JNIEnv *env, const CK_UTF8CHAR_PTR ckpArr
jpTemp = (jchar*) malloc(ckLength * sizeof(jchar));
if (jpTemp == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
for (i=0; i<ckLength; i++) {
@@ -812,7 +836,7 @@ CK_BBOOL* jBooleanObjectToCKBBoolPtr(JNIEnv *env, jobject jObject)
jValue = (*env)->CallBooleanMethod(env, jObject, jValueMethod);
ckpValue = (CK_BBOOL *) malloc(sizeof(CK_BBOOL));
if (ckpValue == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
*ckpValue = jBooleanToCKBBool(jValue);
@@ -842,7 +866,7 @@ CK_BYTE_PTR jByteObjectToCKBytePtr(JNIEnv *env, jobject jObject)
jValue = (*env)->CallByteMethod(env, jObject, jValueMethod);
ckpValue = (CK_BYTE_PTR) malloc(sizeof(CK_BYTE));
if (ckpValue == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
*ckpValue = jByteToCKByte(jValue);
@@ -871,7 +895,7 @@ CK_ULONG* jIntegerObjectToCKULongPtr(JNIEnv *env, jobject jObject)
jValue = (*env)->CallIntMethod(env, jObject, jValueMethod);
ckpValue = (CK_ULONG *) malloc(sizeof(CK_ULONG));
if (ckpValue == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
*ckpValue = jLongToCKLong(jValue);
@@ -900,7 +924,7 @@ CK_ULONG* jLongObjectToCKULongPtr(JNIEnv *env, jobject jObject)
jValue = (*env)->CallLongMethod(env, jObject, jValueMethod);
ckpValue = (CK_ULONG *) malloc(sizeof(CK_ULONG));
if (ckpValue == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
*ckpValue = jLongToCKULong(jValue);
@@ -930,7 +954,7 @@ CK_CHAR_PTR jCharObjectToCKCharPtr(JNIEnv *env, jobject jObject)
jValue = (*env)->CallCharMethod(env, jObject, jValueMethod);
ckpValue = (CK_CHAR_PTR) malloc(sizeof(CK_CHAR));
if (ckpValue == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return NULL;
}
*ckpValue = jCharToCKChar(jValue);
@@ -1087,7 +1111,7 @@ void jObjectToPrimitiveCKObjectPtrPtr(JNIEnv *env, jobject jObject, CK_VOID_PTR
malloc((strlen(exceptionMsgPrefix) + strlen(classNameString) + 1));
if (exceptionMsg == NULL) {
(*env)->ReleaseStringUTFChars(env, jClassNameString, classNameString);
- JNU_ThrowOutOfMemoryError(env, 0);
+ throwOutOfMemoryError(env, 0);
return;
}
strcpy(exceptionMsg, exceptionMsgPrefix);
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h b/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
index ff6d550..bf3adf8 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
@@ -228,7 +228,6 @@
#define CLASS_PKCS11EXCEPTION "sun/security/pkcs11/wrapper/PKCS11Exception"
#define CLASS_PKCS11RUNTIMEEXCEPTION "sun/security/pkcs11/wrapper/PKCS11RuntimeException"
#define CLASS_FILE_NOT_FOUND_EXCEPTION "java/io/FileNotFoundException"
-#define CLASS_IO_EXCEPTION "java/io/IOException"
#define CLASS_C_INITIALIZE_ARGS "sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS"
#define CLASS_CREATEMUTEX "sun/security/pkcs11/wrapper/CK_CREATEMUTEX"
#define CLASS_DESTROYMUTEX "sun/security/pkcs11/wrapper/CK_DESTROYMUTEX"
@@ -280,6 +279,8 @@
*/
jlong ckAssertReturnValueOK(JNIEnv *env, CK_RV returnValue);
+void throwOutOfMemoryError(JNIEnv *env, const char *message);
+void throwNullPointerException(JNIEnv *env, const char *message);
void throwIOException(JNIEnv *env, const char *message);
void throwPKCS11RuntimeException(JNIEnv *env, const char *message);
void throwDisconnectedRuntimeException(JNIEnv *env);
diff --git a/jdk/src/solaris/bin/java_md.c b/jdk/src/solaris/bin/java_md.c
index 361454f..e049450 100644
--- a/jdk/src/solaris/bin/java_md.c
+++ b/jdk/src/solaris/bin/java_md.c
@@ -820,7 +820,6 @@ GetJREPath(char *path, jint pathsize, const char * arch, jboolean speculative)
jboolean
LoadJavaVM(const char *jvmpath, InvocationFunctions *ifn)
{
- Dl_info dlinfo;
void *libjvm;
JLI_TraceLauncher("JVM path is %s\n", jvmpath);
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java
index 7dd3812..6375a7b 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java
@@ -466,12 +466,16 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
if (true) {
switch(e.getID()) {
case PaintEvent.UPDATE:
- log.finer("XCP coalescePaintEvent : UPDATE : add : x = " +
+ if (log.isLoggable(PlatformLogger.FINER)) {
+ log.finer("XCP coalescePaintEvent : UPDATE : add : x = " +
r.x + ", y = " + r.y + ", width = " + r.width + ",height = " + r.height);
+ }
return;
case PaintEvent.PAINT:
- log.finer("XCP coalescePaintEvent : PAINT : add : x = " +
+ if (log.isLoggable(PlatformLogger.FINER)) {
+ log.finer("XCP coalescePaintEvent : PAINT : add : x = " +
r.x + ", y = " + r.y + ", width = " + r.width + ",height = " + r.height);
+ }
return;
}
}
@@ -1248,7 +1252,9 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
* ButtonPress, ButtonRelease, KeyPress, KeyRelease, EnterNotify, LeaveNotify, MotionNotify
*/
protected boolean isEventDisabled(XEvent e) {
- enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable"));
+ if (enableLog.isLoggable(PlatformLogger.FINEST)) {
+ enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable"));
+ }
if (!isEnabled()) {
switch (e.get_type()) {
case XConstants.ButtonPress:
@@ -1258,7 +1264,9 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
case XConstants.EnterNotify:
case XConstants.LeaveNotify:
case XConstants.MotionNotify:
- enableLog.finer("Event {0} is disable", e);
+ if (enableLog.isLoggable(PlatformLogger.FINER)) {
+ enableLog.finer("Event {0} is disable", e);
+ }
return true;
}
}
diff --git a/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java b/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java
index 272fda8..7ad7386 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java
@@ -678,7 +678,7 @@ public class WrapperGenerator {
public void writeToString(StructType stp, PrintWriter pw) {
int type;
pw.println("\n\n\tString getName() {\n\t\treturn \"" + stp.getName()+ "\"; \n\t}");
- pw.println("\n\n\tString getFieldsAsString() {\n\t\tString ret=\"\";\n");
+ pw.println("\n\n\tString getFieldsAsString() {\n\t\tStringBuilder ret = new StringBuilder(" + stp.getNumFields() * 40 + ");\n");
for (Enumeration e = stp.getMembers() ; e.hasMoreElements() ;) {
AtomicType tp = (AtomicType) e.nextElement();
@@ -688,24 +688,24 @@ public class WrapperGenerator {
if ((name != null) && (name.length() > 0))
{
if (type == AtomicType.TYPE_ATOM) {
- pw.println("\t\tret += \"\"+\"" + name + " = \" + XAtom.get(get_" + name + "()) +\", \";");
+ pw.println("\t\tret.append(\"" + name + " = \" ).append( XAtom.get(get_" + name + "()) ).append(\", \");");
} else if (name.equals("type")) {
- pw.println("\t\tret += \"\"+\"type = \" + XlibWrapper.eventToString[get_type()] +\", \";");
+ pw.println("\t\tret.append(\"type = \").append( XlibWrapper.eventToString[get_type()] ).append(\", \");");
} else if (name.equals("window")){
- pw.println("\t\tret += \"\"+\"window = \" + getWindow(get_window()) + \", \";");
+ pw.println("\t\tret.append(\"window = \" ).append( getWindow(get_window()) ).append(\", \");");
} else if (type == AtomicType.TYPE_ARRAY) {
- pw.print("\t\tret += \"{\"");
+ pw.print("\t\tret.append(\"{\")");
for (int i = 0; i < tp.getArrayLength(); i++) {
- pw.print(" + get_" + name + "(" + i + ") + \" \"");
+ pw.print("\n\t\t.append( get_" + name + "(" + i + ") ).append(\" \")");
}
- pw.println(" + \"}\";");
+ pw.println(".append( \"}\");");
} else {
- pw.println("\t\tret += \"\"+\"" + name +" = \" + get_"+ name+"() +\", \";");
+ pw.println("\t\tret.append(\"" + name +" = \").append( get_"+ name+"() ).append(\", \");");
}
}
}
- pw.println("\t\treturn ret;\n\t}\n\n");
+ pw.println("\t\treturn ret.toString();\n\t}\n\n");
}
public void writeStubs(StructType stp, PrintWriter pw) {
diff --git a/jdk/src/solaris/classes/sun/print/UnixPrintJob.java b/jdk/src/solaris/classes/sun/print/UnixPrintJob.java
index 912442a..206650d 100644
--- a/jdk/src/solaris/classes/sun/print/UnixPrintJob.java
+++ b/jdk/src/solaris/classes/sun/print/UnixPrintJob.java
@@ -38,7 +38,9 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.IOException;
+import java.io.PrintWriter;
import java.io.Reader;
+import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.util.Vector;
@@ -955,23 +957,49 @@ public class UnixPrintJob implements CancelablePrintJob {
private class PrinterSpooler implements java.security.PrivilegedAction {
PrintException pex;
+ private void handleProcessFailure(final Process failedProcess,
+ final String[] execCmd, final int result) throws IOException {
+ try (StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw)) {
+ pw.append("error=").append(Integer.toString(result));
+ pw.append(" running:");
+ for (String arg: execCmd) {
+ pw.append(" '").append(arg).append("'");
+ }
+ try (InputStream is = failedProcess.getErrorStream();
+ InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader br = new BufferedReader(isr)) {
+ while (br.ready()) {
+ pw.println();
+ pw.append("\t\t").append(br.readLine());
+ }
+ } finally {
+ pw.flush();
+ throw new IOException(sw.toString());
+ }
+ }
+ }
+
public Object run() {
+ if (spoolFile == null || !spoolFile.exists()) {
+ pex = new PrintException("No spool file");
+ notifyEvent(PrintJobEvent.JOB_FAILED);
+ return null;
+ }
try {
/**
* Spool to the printer.
*/
- if (spoolFile == null || !spoolFile.exists()) {
- pex = new PrintException("No spool file");
- notifyEvent(PrintJobEvent.JOB_FAILED);
- return null;
- }
String fileName = spoolFile.getAbsolutePath();
String execCmd[] = printExecCmd(mDestination, mOptions,
mNoJobSheet, jobName, copies, fileName);
Process process = Runtime.getRuntime().exec(execCmd);
process.waitFor();
- spoolFile.delete();
+ final int result = process.exitValue();
+ if (0 != result) {
+ handleProcessFailure(process, execCmd, result);
+ }
notifyEvent(PrintJobEvent.DATA_TRANSFER_COMPLETE);
} catch (IOException ex) {
notifyEvent(PrintJobEvent.JOB_FAILED);
@@ -981,6 +1009,7 @@ public class UnixPrintJob implements CancelablePrintJob {
notifyEvent(PrintJobEvent.JOB_FAILED);
pex = new PrintException(ie);
} finally {
+ spoolFile.delete();
notifyEvent(PrintJobEvent.NO_MORE_EVENTS);
}
return null;
diff --git a/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java b/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
index f65a571..e607659 100644
--- a/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
+++ b/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
@@ -189,7 +189,7 @@ public class UnixPrintServiceLookup extends PrintServiceLookup
if (printServices == null) {
return new PrintService[0];
} else {
- return printServices;
+ return (PrintService[])printServices.clone();
}
}
diff --git a/jdk/src/solaris/native/java/util/TimeZone_md.c b/jdk/src/solaris/native/java/util/TimeZone_md.c
index 9a2a0b4..7e95d53 100644
--- a/jdk/src/solaris/native/java/util/TimeZone_md.c
+++ b/jdk/src/solaris/native/java/util/TimeZone_md.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, 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,13 +30,13 @@
#include <limits.h>
#include <errno.h>
#include <stddef.h>
-
-#ifdef __linux__
-#include <string.h>
-#include <dirent.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <string.h>
+#include <dirent.h>
#include <unistd.h>
+#ifdef __solaris__
+#include <libscf.h>
#endif
#include "jvm.h"
@@ -54,17 +54,22 @@
static const char *ETC_TIMEZONE_FILE = "/etc/timezone";
static const char *ZONEINFO_DIR = "/usr/share/zoneinfo";
static const char *DEFAULT_ZONEINFO_FILE = "/etc/localtime";
+#else
+static const char *SYS_INIT_FILE = "/etc/default/init";
+static const char *ZONEINFO_DIR = "/usr/share/lib/zoneinfo";
+static const char *DEFAULT_ZONEINFO_FILE = "/usr/share/lib/zoneinfo/localtime";
+#endif /*__linux__*/
/*
- * Returns a point to the zone ID portion of the given zoneinfo file
- * name.
+ * Returns a pointer to the zone ID portion of the given zoneinfo file
+ * name, or NULL if the given string doesn't contain "zoneinfo/".
*/
static char *
getZoneName(char *str)
{
static const char *zidir = "zoneinfo/";
- char * pos = strstr((const char *)str, zidir);
+ char *pos = strstr((const char *)str, zidir);
if (pos == NULL) {
return NULL;
}
@@ -74,7 +79,7 @@ getZoneName(char *str)
/*
* Returns a path name created from the given 'dir' and 'name' under
* UNIX. This function allocates memory for the pathname calling
- * malloc().
+ * malloc(). NULL is returned if malloc() fails.
*/
static char *
getPathName(const char *dir, const char *name) {
@@ -89,19 +94,18 @@ getPathName(const char *dir, const char *name) {
/*
* Scans the specified directory and its subdirectories to find a
- * zoneinfo file which has the same content as /etc/localtime given in
- * 'buf'. Returns a zone ID if found, otherwise, NULL is returned.
+ * zoneinfo file which has the same content as /etc/localtime on Linux
+ * or /usr/share/lib/zoneinfo/localtime (most likely a symbolic link)
+ * on Solaris given in 'buf'. Returns a zone ID if found, otherwise,
+ * NULL is returned.
*/
static char *
findZoneinfoFile(char *buf, size_t size, const char *dir)
{
DIR *dirp = NULL;
struct stat statbuf;
- union {
- struct dirent d;
- char b[offsetof (struct dirent, d_name) + NAME_MAX + 1];
- } entry;
- struct dirent *dp;
+ struct dirent *dp = NULL;
+ struct dirent *entry = NULL;
char *pathname = NULL;
int fd = -1;
char *dbuf = NULL;
@@ -112,7 +116,19 @@ findZoneinfoFile(char *buf, size_t size, const char *dir)
return NULL;
}
- while (readdir_r(dirp, &entry.d, &dp) == 0 && dp != NULL) {
+ entry = (struct dirent *) malloc((size_t) pathconf(dir, _PC_NAME_MAX));
+ if (entry == NULL) {
+ (void) closedir(dirp);
+ return NULL;
+ }
+
+#if defined(__linux__) || (defined(__solaris__) && (defined(_POSIX_PTHREAD_SEMANTICS) || \
+ defined(_LP64)))
+ while (readdir_r(dirp, entry, &dp) == 0 && dp != NULL) {
+#else
+ while ((dp = readdir_r(dirp, entry)) != NULL) {
+#endif
+
/*
* Skip '.' and '..' (and possibly other .* files)
*/
@@ -121,11 +137,17 @@ findZoneinfoFile(char *buf, size_t size, const char *dir)
}
/*
- * Skip "ROC", "posixrules", and "localtime" since Java doesn't
- * support them.
+ * Skip "ROC", "posixrules", and "localtime".
*/
if ((strcmp(dp->d_name, "ROC") == 0)
|| (strcmp(dp->d_name, "posixrules") == 0)
+#ifdef __solaris__
+ /*
+ * Skip the "src" and "tab" directories on Solaris.
+ */
+ || (strcmp(dp->d_name, "src") == 0)
+ || (strcmp(dp->d_name, "tab") == 0)
+#endif
|| (strcmp(dp->d_name, "localtime") == 0)) {
continue;
}
@@ -149,7 +171,6 @@ findZoneinfoFile(char *buf, size_t size, const char *dir)
break;
}
if ((fd = open(pathname, O_RDONLY)) == -1) {
- fd = 0;
break;
}
if (read(fd, dbuf, size) != (ssize_t) size) {
@@ -165,19 +186,22 @@ findZoneinfoFile(char *buf, size_t size, const char *dir)
free((void *) dbuf);
dbuf = NULL;
(void) close(fd);
- fd = 0;
+ fd = -1;
}
free((void *) pathname);
pathname = NULL;
}
+ if (entry != NULL) {
+ free((void *) entry);
+ }
if (dirp != NULL) {
(void) closedir(dirp);
}
if (pathname != NULL) {
free((void *) pathname);
}
- if (fd != 0) {
+ if (fd != -1) {
(void) close(fd);
}
if (dbuf != NULL) {
@@ -186,8 +210,10 @@ findZoneinfoFile(char *buf, size_t size, const char *dir)
return tz;
}
+#ifdef __linux__
+
/*
- * Performs libc implementation specific mapping and returns a zone ID
+ * Performs Linux specific mapping and returns a zone ID
* if found. Otherwise, NULL is returned.
*/
static char *
@@ -408,12 +434,11 @@ filegets(char *s, int n, FILE *stream)
}
#endif /* not __sparcv9 */
-static const char *sys_init_file = "/etc/default/init";
/*
- * Performs libc implementation dependent mapping. Returns a zone ID
- * if found. Otherwise, NULL is returned. Solaris libc looks up
- * "/etc/default/init" to get a default TZ value if TZ is not defined
+ * Performs Solaris dependent mapping. Returns a zone ID if
+ * found. Otherwise, NULL is returned. Solaris libc looks up
+ * "/etc/default/init" to get the default TZ value if TZ is not defined
* as an environment variable.
*/
static char *
@@ -425,7 +450,7 @@ getPlatformTimeZoneID()
/*
* Try the TZ entry in /etc/default/init.
*/
- if ((fp = fileopen(sys_init_file, "r")) != NULL) {
+ if ((fp = fileopen(SYS_INIT_FILE, "r")) != NULL) {
char line[256];
char quote = '\0';
@@ -473,8 +498,113 @@ getPlatformTimeZoneID()
return tz;
}
-#endif
-#endif
+#define TIMEZONE_FMRI "svc:/system/timezone:default"
+#define TIMEZONE_PG "timezone"
+#define LOCALTIME_PROP "localtime"
+
+static void
+cleanupScf(scf_handle_t *h,
+ scf_snapshot_t *snap,
+ scf_instance_t *inst,
+ scf_propertygroup_t *pg,
+ scf_property_t *prop,
+ scf_value_t *val,
+ char *buf) {
+ if (buf != NULL) {
+ free(buf);
+ }
+ if (snap != NULL) {
+ scf_snapshot_destroy(snap);
+ }
+ if (val != NULL) {
+ scf_value_destroy(val);
+ }
+ if (prop != NULL) {
+ scf_property_destroy(prop);
+ }
+ if (pg != NULL) {
+ scf_pg_destroy(pg);
+ }
+ if (inst != NULL) {
+ scf_instance_destroy(inst);
+ }
+ if (h != NULL) {
+ scf_handle_destroy(h);
+ }
+}
+
+/*
+ * Retruns a zone ID of Solaris when the TZ value is "localtime".
+ * First, it tries scf. If scf fails, it looks for the same file as
+ * /usr/share/lib/zoneinfo/localtime under /usr/share/lib/zoneinfo/.
+ */
+static char *
+getSolarisDefaultZoneID() {
+ char *tz = NULL;
+ struct stat statbuf;
+ size_t size;
+ char *buf;
+ int fd;
+ /* scf specific variables */
+ scf_handle_t *h = NULL;
+ scf_snapshot_t *snap = NULL;
+ scf_instance_t *inst = NULL;
+ scf_propertygroup_t *pg = NULL;
+ scf_property_t *prop = NULL;
+ scf_value_t *val = NULL;
+
+ if ((h = scf_handle_create(SCF_VERSION)) != NULL
+ && scf_handle_bind(h) == 0
+ && (inst = scf_instance_create(h)) != NULL
+ && (snap = scf_snapshot_create(h)) != NULL
+ && (pg = scf_pg_create(h)) != NULL
+ && (prop = scf_property_create(h)) != NULL
+ && (val = scf_value_create(h)) != NULL
+ && scf_handle_decode_fmri(h, TIMEZONE_FMRI, NULL, NULL, inst,
+ NULL, NULL, SCF_DECODE_FMRI_REQUIRE_INSTANCE) == 0
+ && scf_instance_get_snapshot(inst, "running", snap) == 0
+ && scf_instance_get_pg_composed(inst, snap, TIMEZONE_PG, pg) == 0
+ && scf_pg_get_property(pg, LOCALTIME_PROP, prop) == 0
+ && scf_property_get_value(prop, val) == 0) {
+ ssize_t len;
+
+ /* Gets the length of the zone ID string */
+ len = scf_value_get_astring(val, NULL, 0);
+ if (len != -1) {
+ tz = malloc(++len); /* +1 for a null byte */
+ if (tz != NULL && scf_value_get_astring(val, tz, len) != -1) {
+ cleanupScf(h, snap, inst, pg, prop, val, NULL);
+ return tz;
+ }
+ }
+ }
+ cleanupScf(h, snap, inst, pg, prop, val, tz);
+
+ if (stat(DEFAULT_ZONEINFO_FILE, &statbuf) == -1) {
+ return NULL;
+ }
+ size = (size_t) statbuf.st_size;
+ buf = malloc(size);
+ if (buf == NULL) {
+ return NULL;
+ }
+ if ((fd = open(DEFAULT_ZONEINFO_FILE, O_RDONLY)) == -1) {
+ free((void *) buf);
+ return NULL;
+ }
+
+ if (read(fd, buf, size) != (ssize_t) size) {
+ (void) close(fd);
+ free((void *) buf);
+ return NULL;
+ }
+ (void) close(fd);
+ tz = findZoneinfoFile(buf, size, ZONEINFO_DIR);
+ free((void *) buf);
+ return tz;
+}
+#endif /*__solaris__*/
+#endif /*__linux__*/
/*
* findJavaTZ_md() maps platform time zone ID to Java time zone ID
@@ -504,10 +634,21 @@ findJavaTZ_md(const char *java_home_dir, const char *country)
freetz = tz;
}
+ /*
+ * Remove any preceding ':'
+ */
+ if (tz != NULL && *tz == ':') {
+ tz++;
+ }
+
+#ifdef __solaris__
+ if (strcmp(tz, "localtime") == 0) {
+ tz = getSolarisDefaultZoneID();
+ freetz = tz;
+ }
+#endif
+
if (tz != NULL) {
- if (*tz == ':') {
- tz++;
- }
#ifdef __linux__
/*
* Ignore "posix/" prefix.
@@ -525,24 +666,36 @@ findJavaTZ_md(const char *java_home_dir, const char *country)
}
/**
- * Returns a GMT-offset-based time zone ID. (e.g., "GMT-08:00")
+ * Returns a GMT-offset-based zone ID. (e.g., "GMT-08:00")
*/
char *
getGMTOffsetID()
{
time_t offset;
- char sign, buf[16];
+ char sign, buf[32];
+#ifdef __solaris__
+ struct tm localtm;
+ time_t currenttime;
+
+ currenttime = time(NULL);
+ if (localtime_r(¤ttime, &localtm) == NULL) {
+ return NULL;
+ }
+
+ offset = localtm.tm_isdst ? altzone : timezone;
+#else
+ offset = timezone;
+#endif /*__linux__*/
- if (timezone == 0) {
+ if (offset == 0) {
return strdup("GMT");
}
/* Note that the time offset direction is opposite. */
- if (timezone > 0) {
- offset = timezone;
+ if (offset > 0) {
sign = '-';
} else {
- offset = -timezone;
+ offset = -offset;
sign = '+';
}
sprintf(buf, (const char *)"GMT%c%02d:%02d",
diff --git a/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_config.h b/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_config.h
index bb03165..e312c2b 100644
--- a/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_config.h
+++ b/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_config.h
@@ -32,7 +32,7 @@
#include <X11/Xutil.h>
#include <X11/extensions/shape.h>
#include <sys/types.h>
-#include <sys/unistd.h>
+#include <unistd.h>
#include <pthread.h>
#include <signal.h>
#include <inttypes.h>
diff --git a/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c b/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c
index cf32e63..08c5ec7 100644
--- a/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c
+++ b/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, 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
@@ -334,6 +334,7 @@ SplashRedrawWindow(Splash * splash) {
XDestroyImage(ximage);
SplashRemoveDecoration(splash);
XMapWindow(splash->display, splash->window);
+ XFlush(splash->display);
}
void SplashReconfigureNow(Splash * splash) {
diff --git a/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c b/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c
index df46398..346bfbb 100644
--- a/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c
+++ b/jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c
@@ -27,7 +27,7 @@
#include <errno.h>
#include <unistd.h>
#include <sys/acl.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
#include <sys/stat.h>
/**
diff --git a/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c b/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c
index ea48d4d..56984a7 100644
--- a/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c
+++ b/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
#include <sys/stat.h>
/**
diff --git a/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c b/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
index b445899..b763bc2 100644
--- a/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
+++ b/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
@@ -40,7 +40,7 @@ void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
if (fAddress == NULL) {
char errorMessage[256];
snprintf(errorMessage, sizeof(errorMessage), "Symbol not found: %s", functionName);
- JNU_ThrowNullPointerException(env, errorMessage);
+ throwNullPointerException(env, errorMessage);
return NULL;
}
return fAddress;
@@ -69,7 +69,7 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_Secmod_nssLoadLibrary
dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
if (hModule == NULL) {
- JNU_ThrowIOException(env, dlerror());
+ throwIOException(env, dlerror());
return 0;
}
diff --git a/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c b/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c
index 67e452d..c737981 100644
--- a/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c
+++ b/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c
@@ -51,12 +51,40 @@ FPTR_SCardBeginTransaction scardBeginTransaction;
FPTR_SCardEndTransaction scardEndTransaction;
FPTR_SCardControl scardControl;
+/*
+ * Throws a Java Exception by name
+ */
+void throwByName(JNIEnv *env, const char *name, const char *msg)
+{
+ jclass cls = (*env)->FindClass(env, name);
+
+ if (cls != 0) /* Otherwise an exception has already been thrown */
+ (*env)->ThrowNew(env, cls, msg);
+}
+
+/*
+ * Throws java.lang.NullPointerException
+ */
+void throwNullPointerException(JNIEnv *env, const char *msg)
+{
+ throwByName(env, "java/lang/NullPointerException", msg);
+}
+
+/*
+ * Throws java.io.IOException
+ */
+void throwIOException(JNIEnv *env, const char *msg)
+{
+ throwByName(env, "java/io/IOException", msg);
+}
+
+
void *findFunction(JNIEnv *env, void *hModule, char *functionName) {
void *fAddress = dlsym(hModule, functionName);
if (fAddress == NULL) {
char errorMessage[256];
snprintf(errorMessage, sizeof(errorMessage), "Symbol not found: %s", functionName);
- JNU_ThrowNullPointerException(env, errorMessage);
+ throwNullPointerException(env, errorMessage);
return NULL;
}
return fAddress;
@@ -69,7 +97,7 @@ JNIEXPORT void JNICALL Java_sun_security_smartcardio_PlatformPCSC_initialize
(*env)->ReleaseStringUTFChars(env, jLibName, libName);
if (hModule == NULL) {
- JNU_ThrowIOException(env, dlerror());
+ throwIOException(env, dlerror());
return;
}
scardEstablishContext = (FPTR_SCardEstablishContext)findFunction(env, hModule, "SCardEstablishContext");
diff --git a/jdk/src/windows/classes/java/lang/ProcessImpl.java b/jdk/src/windows/classes/java/lang/ProcessImpl.java
index 0589116..88486e5 100644
--- a/jdk/src/windows/classes/java/lang/ProcessImpl.java
+++ b/jdk/src/windows/classes/java/lang/ProcessImpl.java
@@ -60,10 +60,11 @@ final class ProcessImpl extends Process {
throws IOException
{
if (append) {
+ String path = f.getPath();
SecurityManager sm = System.getSecurityManager();
if (sm != null)
- sm.checkWrite(f.getPath());
- long handle = openForAtomicAppend(f.getPath());
+ sm.checkWrite(path);
+ long handle = openForAtomicAppend(path);
final FileDescriptor fd = new FileDescriptor();
fdAccess.setHandle(fd, handle);
return AccessController.doPrivileged(
diff --git a/jdk/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java b/jdk/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java
index ebd5e52..5fa9dbf 100644
--- a/jdk/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java
+++ b/jdk/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java
@@ -70,7 +70,7 @@ class TwoStacksPlainDatagramSocketImpl extends AbstractPlainDatagramSocketImpl
fd1 = new FileDescriptor();
try {
super.create();
- } catch (IOException e) {
+ } catch (SocketException e) {
fd1 = null;
throw e;
}
@@ -99,10 +99,11 @@ class TwoStacksPlainDatagramSocketImpl extends AbstractPlainDatagramSocketImpl
}
if (optID == SO_BINDADDR) {
- if (fd != null && fd1 != null) {
+ if ((fd != null && fd1 != null) && !connected) {
return anyLocalBoundAddr;
}
- return socketGetOption(optID);
+ int family = connectedAddress == null ? -1 : connectedAddress.family;
+ return socketLocalAddress(family);
} else
return super.getOption(optID);
}
@@ -161,6 +162,8 @@ class TwoStacksPlainDatagramSocketImpl extends AbstractPlainDatagramSocketImpl
protected native void connect0(InetAddress address, int port) throws SocketException;
+ protected native Object socketLocalAddress(int family) throws SocketException;
+
protected native void disconnect0(int family);
/**
diff --git a/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java b/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java
index 533a989..0b020b3 100644
--- a/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java
+++ b/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java
@@ -26,6 +26,7 @@ package java.net;
import java.io.IOException;
import java.io.FileDescriptor;
+import sun.net.ResourceManager;
/*
* This class defines the plain SocketImpl that is used for all
@@ -81,7 +82,12 @@ class TwoStacksPlainSocketImpl extends AbstractPlainSocketImpl
*/
protected synchronized void create(boolean stream) throws IOException {
fd1 = new FileDescriptor();
- super.create(stream);
+ try {
+ super.create(stream);
+ } catch (IOException e) {
+ fd1 = null;
+ throw e;
+ }
}
/**
@@ -120,6 +126,9 @@ class TwoStacksPlainSocketImpl extends AbstractPlainSocketImpl
protected void close() throws IOException {
synchronized(fdLock) {
if (fd != null || fd1 != null) {
+ if (!stream) {
+ ResourceManager.afterUdpClose();
+ }
if (fdUseCount == 0) {
if (closePending) {
return;
diff --git a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java b/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
index 01eb239..a482fd9 100644
--- a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
+++ b/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
@@ -615,6 +615,14 @@ public abstract class WComponentPeer extends WObjectPeer
_dispose();
}
+ public void disposeLater() {
+ postEvent(new InvocationEvent(Toolkit.getDefaultToolkit(), new Runnable() {
+ public void run() {
+ dispose();
+ }
+ }));
+ }
+
public synchronized void setForeground(Color c) {
foreground = c;
_setForeground(c.getRGB());
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java b/jdk/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
index 50a51a6..d37db9e 100644
--- a/jdk/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
+++ b/jdk/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
@@ -486,7 +486,7 @@ public class D3DSurfaceData extends SurfaceData implements AccelSurface {
int dataType = 0;
int scanStride = width;
- if (dcm.getPixelSize() == 24 || dcm.getPixelSize() == 32) {
+ if (dcm.getPixelSize() > 16) {
dataType = DataBuffer.TYPE_INT;
} else {
// 15, 16
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java b/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java
index 9a461f9..02309ff 100644
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java
@@ -124,26 +124,27 @@ class WindowsDirectoryStream
private boolean atEof;
private String first;
private Path nextEntry;
+ private String prefix;
WindowsDirectoryIterator(String first) {
atEof = false;
this.first = first;
+ if (dir.needsSlashWhenResolving()) {
+ prefix = dir.toString() + "\\";
+ } else {
+ prefix = dir.toString();
+ }
+ }
+
+ // links to self and parent directories are ignored
+ private boolean isSelfOrParent(String name) {
+ return name.equals(".") || name.equals("..");
}
// applies filter and also ignores "." and ".."
private Path acceptEntry(String s, BasicFileAttributes attrs) {
- if (s.equals(".") || s.equals(".."))
- return null;
- if (dir.needsSlashWhenResolving()) {
- StringBuilder sb = new StringBuilder(dir.toString());
- sb.append('\\');
- sb.append(s);
- s = sb.toString();
- } else {
- s = dir + s;
- }
Path entry = WindowsPath
- .createFromNormalizedPath(dir.getFileSystem(), s, attrs);
+ .createFromNormalizedPath(dir.getFileSystem(), prefix + s, attrs);
try {
if (filter.accept(entry))
return entry;
@@ -157,7 +158,7 @@ class WindowsDirectoryStream
private Path readNextEntry() {
// handle first element returned by search
if (first != null) {
- nextEntry = acceptEntry(first, null);
+ nextEntry = isSelfOrParent(first) ? null : acceptEntry(first, null);
first = null;
if (nextEntry != null)
return nextEntry;
@@ -184,6 +185,10 @@ class WindowsDirectoryStream
return null;
}
+ // ignore link to self and parent directories
+ if (isSelfOrParent(name))
+ continue;
+
// grab the attributes from the WIN32_FIND_DATA structure
// (needs to be done while holding closeLock because close
// will release the buffer)
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java b/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java
index f1158e5..c45858b 100644
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java
@@ -120,12 +120,18 @@ class WindowsPathParser {
off = next;
} else {
if (isLetter(c0) && c1 == ':') {
- root = input.substring(0, 2);
- if (len > 2 && isSlash(input.charAt(2))) {
+ char c2;
+ if (len > 2 && isSlash(c2 = input.charAt(2))) {
+ // avoid concatenation when root is "D:\"
+ if (c2 == '\\') {
+ root = input.substring(0, 3);
+ } else {
+ root = input.substring(0, 2) + '\\';
+ }
off = 3;
- root += "\\";
type = WindowsPathType.ABSOLUTE;
} else {
+ root = input.substring(0, 2);
off = 2;
type = WindowsPathType.DRIVE_RELATIVE;
}
diff --git a/jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c b/jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c
index 5ca6736..1610177 100644
--- a/jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c
+++ b/jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c
@@ -2181,30 +2181,6 @@ Java_java_net_TwoStacksPlainDatagramSocketImpl_socketGetOption(JNIEnv *env, jobj
return getMulticastInterface(env, this, fd, fd1, opt);
}
- if (opt == java_net_SocketOptions_SO_BINDADDR) {
- /* find out local IP address */
- SOCKETADDRESS him;
- int len = 0;
- int port;
- jobject iaObj;
-
- len = sizeof (struct sockaddr_in);
-
- if (fd == -1) {
- fd = fd1; /* must be IPv6 only */
- len = sizeof (struct SOCKADDR_IN6);
- }
-
- if (getsockname(fd, (struct sockaddr *)&him, &len) == -1) {
- NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "Error getting socket name");
- return NULL;
- }
- iaObj = NET_SockaddrToInetAddress(env, (struct sockaddr *)&him, &port);
-
- return iaObj;
- }
-
/*
* Map the Java level socket option to the platform specific
* level and option name.
@@ -2253,6 +2229,61 @@ Java_java_net_TwoStacksPlainDatagramSocketImpl_socketGetOption(JNIEnv *env, jobj
}
/*
+ * Returns local address of the socket.
+ *
+ * Class: java_net_TwoStacksPlainDatagramSocketImpl
+ * Method: socketLocalAddress
+ * Signature: (I)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL
+Java_java_net_TwoStacksPlainDatagramSocketImpl_socketLocalAddress(JNIEnv *env, jobject this,
+ jint family) {
+
+ int fd=-1, fd1=-1;
+ SOCKETADDRESS him;
+ int len = 0;
+ int port;
+ jobject iaObj;
+ int ipv6_supported = ipv6_available();
+
+ fd = getFD(env, this);
+ if (ipv6_supported) {
+ fd1 = getFD1(env, this);
+ }
+
+ if (fd < 0 && fd1 < 0) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
+ "Socket closed");
+ return NULL;
+ }
+
+ /* find out local IP address */
+
+ len = sizeof (struct sockaddr_in);
+
+ /* family==-1 when socket is not connected */
+ if ((family == IPv6) || (family == -1 && fd == -1)) {
+ fd = fd1; /* must be IPv6 only */
+ len = sizeof (struct SOCKADDR_IN6);
+ }
+
+ if (fd == -1) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
+ "Socket closed");
+ return NULL;
+ }
+
+ if (getsockname(fd, (struct sockaddr *)&him, &len) == -1) {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
+ "Error getting socket name");
+ return NULL;
+ }
+ iaObj = NET_SockaddrToInetAddress(env, (struct sockaddr *)&him, &port);
+
+ return iaObj;
+}
+
+/*
* Class: java_net_TwoStacksPlainDatagramSocketImpl
* Method: setTimeToLive
* Signature: (I)V
diff --git a/jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c b/jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
index 4a8d758..fac24a6 100644
--- a/jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
+++ b/jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
@@ -37,7 +37,7 @@ void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
if (fAddress == NULL) {
char errorMessage[256];
_snprintf(errorMessage, sizeof(errorMessage), "Symbol not found: %s", functionName);
- JNU_ThrowNullPointerException(env, errorMessage);
+ throwNullPointerException(env, errorMessage);
return NULL;
}
return fAddress;
@@ -78,7 +78,7 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_Secmod_nssLoadLibrary
NULL
);
dprintf1("-error: %s\n", lpMsgBuf);
- JNU_ThrowIOException(env, (char*)lpMsgBuf);
+ throwIOException(env, (char*)lpMsgBuf);
LocalFree(lpMsgBuf);
return 0;
}
diff --git a/jdk/src/windows/native/sun/windows/awt_Component.cpp b/jdk/src/windows/native/sun/windows/awt_Component.cpp
index a6ada9c..57d1733 100644
--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp
@@ -183,6 +183,7 @@ jmethodID AwtComponent::isEnabledMID;
jmethodID AwtComponent::getLocationOnScreenMID;
jmethodID AwtComponent::replaceSurfaceDataMID;
jmethodID AwtComponent::replaceSurfaceDataLaterMID;
+jmethodID AwtComponent::disposeLaterMID;
HKL AwtComponent::m_hkl = ::GetKeyboardLayout(0);
LANGID AwtComponent::m_idLang = LOWORD(::GetKeyboardLayout(0));
@@ -246,6 +247,7 @@ AwtComponent::AwtComponent()
m_hCursorCache = NULL;
m_bSubclassed = FALSE;
+ m_bPauseDestroy = FALSE;
m_MessagesProcessing = 0;
m_wheelRotationAmount = 0;
@@ -319,6 +321,12 @@ void AwtComponent::Dispose()
m_brushBackground = NULL;
}
+ if (m_bPauseDestroy) {
+ // AwtComponent::WmNcDestroy could be released now
+ m_bPauseDestroy = FALSE;
+ m_hwnd = NULL;
+ }
+
// The component instance is deleted using AwtObject::Dispose() method
AwtObject::Dispose();
}
@@ -1377,6 +1385,7 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
case WM_CREATE: mr = WmCreate(); break;
case WM_CLOSE: mr = WmClose(); break;
case WM_DESTROY: mr = WmDestroy(); break;
+ case WM_NCDESTROY: mr = WmNcDestroy(); break;
case WM_ERASEBKGND:
mr = WmEraseBkgnd((HDC)wParam, *(BOOL*)&retValue); break;
@@ -1965,10 +1974,24 @@ LRESULT AwtComponent::DefWindowProc(UINT msg, WPARAM wParam, LPARAM lParam)
*/
MsgRouting AwtComponent::WmDestroy()
{
- // fix for 6259348: we should enter the SyncCall critical section before
- // disposing the native object, that is value 1 of lParam is intended for
- if(m_peerObject != NULL) { // is not being terminating
- AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)m_peerObject, (LPARAM)1);
+ return mrConsume;
+}
+
+/*
+ * This message should only be received when a window is destroyed by
+ * Windows, and not Java. It is sent only after child windows were destroyed.
+ */
+MsgRouting AwtComponent::WmNcDestroy()
+{
+ if (m_peerObject != NULL) { // is not being terminating
+ // Stay in this handler until AwtComponent::Dispose is called.
+ m_bPauseDestroy = TRUE;
+
+ JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+ // Post invocation event for WObjectPeer.dispose to EDT
+ env->CallVoidMethod(m_peerObject, AwtComponent::disposeLaterMID);
+ // Wait until AwtComponent::Dispose is called
+ AwtToolkit::GetInstance().PumpToDestroy(this);
}
return mrConsume;
@@ -6300,6 +6323,7 @@ Java_java_awt_Component_initIDs(JNIEnv *env, jclass cls)
env->GetMethodID(peerCls, "replaceSurfaceData", "()V");
AwtComponent::replaceSurfaceDataLaterMID =
env->GetMethodID(peerCls, "replaceSurfaceDataLater", "()V");
+ AwtComponent::disposeLaterMID = env->GetMethodID(peerCls, "disposeLater", "()V");
DASSERT(AwtComponent::xID);
DASSERT(AwtComponent::yID);
@@ -6318,6 +6342,8 @@ Java_java_awt_Component_initIDs(JNIEnv *env, jclass cls)
DASSERT(AwtComponent::getLocationOnScreenMID);
DASSERT(AwtComponent::replaceSurfaceDataMID);
DASSERT(AwtComponent::replaceSurfaceDataLaterMID);
+ DASSERT(AwtComponent::disposeLaterMID);
+
CATCH_BAD_ALLOC;
}
diff --git a/jdk/src/windows/native/sun/windows/awt_Component.h b/jdk/src/windows/native/sun/windows/awt_Component.h
index ece5c3b..3257c51 100644
--- a/jdk/src/windows/native/sun/windows/awt_Component.h
+++ b/jdk/src/windows/native/sun/windows/awt_Component.h
@@ -119,6 +119,7 @@ public:
static jmethodID getLocationOnScreenMID;
static jmethodID replaceSurfaceDataMID;
static jmethodID replaceSurfaceDataLaterMID;
+ static jmethodID disposeLaterMID;
static const UINT WmAwtIsComponent;
static jint * masks; //InputEvent mask array
@@ -490,6 +491,7 @@ public:
virtual MsgRouting WmCreate() {return mrDoDefault;}
virtual MsgRouting WmClose() {return mrDoDefault;}
virtual MsgRouting WmDestroy();
+ virtual MsgRouting WmNcDestroy();
virtual MsgRouting WmActivate(UINT nState, BOOL fMinimized, HWND opposite)
{
@@ -711,6 +713,10 @@ public:
return m_MessagesProcessing == 0;
}
+ BOOL IsDestroyPaused() const {
+ return m_bPauseDestroy;
+ }
+
protected:
static AwtComponent* GetComponentImpl(HWND hWnd);
@@ -752,6 +758,7 @@ private:
UINT m_mouseButtonClickAllowed;
BOOL m_bSubclassed;
+ BOOL m_bPauseDestroy;
COLORREF m_colorForeground;
COLORREF m_colorBackground;
diff --git a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
index 00f9b32..9135403 100644
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
@@ -733,26 +733,13 @@ LRESULT CALLBACK AwtToolkit::WndProc(HWND hWnd, UINT message,
return 0;
}
case WM_AWT_DISPOSE: {
- BOOL canDispose = TRUE;
- CriticalSection &syncCS = AwtToolkit::GetInstance().GetSyncCS();
- int shouldEnterCriticalSection = (int)lParam;
- if (shouldEnterCriticalSection == 1) {
- canDispose = syncCS.TryEnter();
- }
- if (canDispose) {
- if(wParam != NULL) {
- jobject self = (jobject)wParam;
- AwtObject *o = (AwtObject *) JNI_GET_PDATA(self);
- env->DeleteGlobalRef(self);
- if(o != NULL && theAwtObjectList.Remove(o)) {
- o->Dispose();
- }
- if (shouldEnterCriticalSection) {
- syncCS.Leave();
- }
+ if(wParam != NULL) {
+ jobject self = (jobject)wParam;
+ AwtObject *o = (AwtObject *) JNI_GET_PDATA(self);
+ env->DeleteGlobalRef(self);
+ if(o != NULL && theAwtObjectList.Remove(o)) {
+ o->Dispose();
}
- } else {
- AwtToolkit::GetInstance().PostMessage(WM_AWT_DISPOSE, wParam, lParam);
}
return 0;
}
@@ -1340,27 +1327,48 @@ BOOL AwtToolkit::PumpWaitingMessages(PEEKMESSAGEPROC lpPeekMessageFunc)
while (!m_breakMessageLoop && (*lpPeekMessageFunc)(msg)) {
foundOne = TRUE;
- if (msg.message == WM_QUIT) {
- m_breakMessageLoop = TRUE;
- m_messageLoopResult = static_cast<UINT>(msg.wParam);
- if (m_messageLoopResult == EXIT_ALL_ENCLOSING_LOOPS)
- ::PostQuitMessage(static_cast<int>(msg.wParam)); // make sure all loops exit
- break;
- }
- else if (msg.message != WM_NULL) {
- /*
- * The AWT in standalone mode (that is, dynamically loaded from the
- * Java VM) doesn't have any translation tables to worry about, so
- * TranslateAccelerator isn't called.
- */
-
- ::TranslateMessage(&msg);
- ::DispatchMessage(&msg);
- }
+ ProcessMsg(msg);
}
return foundOne;
}
+void AwtToolkit::PumpToDestroy(class AwtComponent* p)
+{
+ MSG msg;
+
+ DASSERT(AwtToolkit::PrimaryIdleFunc != NULL);
+ DASSERT(AwtToolkit::CommonPeekMessageFunc != NULL);
+
+ while (p->IsDestroyPaused() && !m_breakMessageLoop) {
+
+ PrimaryIdleFunc();
+
+ while (p->IsDestroyPaused() && !m_breakMessageLoop && CommonPeekMessageFunc(msg)) {
+ ProcessMsg(msg);
+ }
+ }
+}
+
+void AwtToolkit::ProcessMsg(MSG& msg)
+{
+ if (msg.message == WM_QUIT) {
+ m_breakMessageLoop = TRUE;
+ m_messageLoopResult = static_cast<UINT>(msg.wParam);
+ if (m_messageLoopResult == EXIT_ALL_ENCLOSING_LOOPS)
+ ::PostQuitMessage(static_cast<int>(msg.wParam)); // make sure all loops exit
+ }
+ else if (msg.message != WM_NULL) {
+ /*
+ * The AWT in standalone mode (that is, dynamically loaded from the
+ * Java VM) doesn't have any translation tables to worry about, so
+ * TranslateAccelerator isn't called.
+ */
+
+ ::TranslateMessage(&msg);
+ ::DispatchMessage(&msg);
+ }
+}
+
VOID CALLBACK
AwtToolkit::PrimaryIdleFunc() {
AwtToolkit::SetBusy(FALSE);
diff --git a/jdk/src/windows/native/sun/windows/awt_Toolkit.h b/jdk/src/windows/native/sun/windows/awt_Toolkit.h
index 3ebd465..f3e7e74 100644
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.h
+++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.h
@@ -305,6 +305,8 @@ public:
UINT MessageLoop(IDLEPROC lpIdleFunc, PEEKMESSAGEPROC lpPeekMessageFunc);
BOOL PumpWaitingMessages(PEEKMESSAGEPROC lpPeekMessageFunc);
+ void PumpToDestroy(class AwtComponent* p);
+ void ProcessMsg(MSG& msg);
BOOL PreProcessMsg(MSG& msg);
BOOL PreProcessMouseMsg(class AwtComponent* p, MSG& msg);
BOOL PreProcessKeyMsg(class AwtComponent* p, MSG& msg);
diff --git a/jdk/src/windows/native/sun/windows/awt_Window.cpp b/jdk/src/windows/native/sun/windows/awt_Window.cpp
index c742aca..83f6f0b 100644
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp
@@ -355,7 +355,7 @@ void AwtWindow::RepositionSecurityWarning(JNIEnv *env)
RECT rect;
CalculateWarningWindowBounds(env, &rect);
- ::SetWindowPos(warningWindow, IsAlwaysOnTop() ? HWND_TOPMOST : GetHWnd(),
+ ::SetWindowPos(warningWindow, IsAlwaysOnTop() ? HWND_TOPMOST : HWND_NOTOPMOST,
rect.left, rect.top,
rect.right - rect.left, rect.bottom - rect.top,
SWP_ASYNCWINDOWPOS | SWP_NOACTIVATE |
@@ -835,7 +835,7 @@ void AwtWindow::StartSecurityAnimation(AnimationKind kind)
if (securityAnimationKind == akShow) {
::SetWindowPos(warningWindow,
- IsAlwaysOnTop() ? HWND_TOPMOST : GetHWnd(),
+ IsAlwaysOnTop() ? HWND_TOPMOST : HWND_NOTOPMOST,
0, 0, 0, 0,
SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE |
SWP_SHOWWINDOW | SWP_NOOWNERZORDER);
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index c2fd9fc..0860daf 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -195,9 +195,6 @@ java/beans/XMLEncoder/6329581/Test6329581.java generic-all
# jdk_lang
-# requires junit
-java/lang/invoke/InvokeDynamicPrintArgs.java generic-all
-
# 7079093
java/lang/instrument/ManifestTest.sh windows-all
@@ -377,6 +374,12 @@ java/net/ipv6tests/UdpTest.java linux-all
# 7081476
java/net/InetSocketAddress/B6469803.java generic-all
+# 7102670
+java/net/InetAddress/CheckJNI.java linux-all
+
+# failing on vista 32/64 on nightly
+# 7102702
+java/net/PortUnreachableException/OneExceptionOnly.java windows-all
############################################################################
# jdk_io
@@ -484,9 +487,6 @@ sun/security/pkcs11/ec/TestECDSA.java solaris-i586
#sun/security/pkcs11/ec/TestKeyFactory.java solaris-i586
sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java solaris-i586
-# Directly references PKCS11 class
-sun/security/pkcs11/Provider/Absolute.java windows-x64
-
# Fails on Fedora 9/Ubuntu 10.04 64bit, PKCS11Exception: CKR_DEVICE_ERROR
sun/security/pkcs11/KeyAgreement/TestDH.java generic-all
@@ -517,9 +517,6 @@ sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java generic-all
# 7079203 sun/security/tools/keytool/printssl.sh fails on solaris with timeout
sun/security/tools/keytool/printssl.sh solaris-all
-# 7054637
-sun/security/tools/jarsigner/ec.sh solaris-all
-
# 7081817
sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java generic-all
diff --git a/jdk/test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java b/jdk/test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java
new file mode 100644
index 0000000..9fae77d
--- /dev/null
+++ b/jdk/test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2011, 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 7094377
+ * @summary Com.sun.jndi.ldap.read.timeout doesn't work with ldaps.
+ */
+
+import java.net.Socket;
+import java.net.ServerSocket;
+import java.io.*;
+import javax.naming.*;
+import javax.naming.directory.*;
+import java.util.Hashtable;
+
+public class LdapsReadTimeoutTest {
+
+ public static void main(String[] args) throws Exception {
+ boolean passed = false;
+
+ // create the server
+ try (Server server = Server.create()) {
+ // Set up the environment for creating the initial context
+ Hashtable<String,Object> env = new Hashtable<>(11);
+ env.put(Context.INITIAL_CONTEXT_FACTORY,
+ "com.sun.jndi.ldap.LdapCtxFactory");
+ env.put("com.sun.jndi.ldap.connect.timeout", "1000");
+ env.put("com.sun.jndi.ldap.read.timeout", "1000");
+ env.put(Context.PROVIDER_URL, "ldaps://localhost:" + server.port());
+
+
+ // Create initial context
+ DirContext ctx = new InitialDirContext(env);
+ try {
+ System.out.println("LDAP Client: Connected to the Server");
+
+ SearchControls scl = new SearchControls();
+ scl.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ System.out.println("Performing Search");
+ NamingEnumeration<SearchResult> answer =
+ ctx.search("ou=People,o=JNDITutorial", "(objectClass=*)", scl);
+ } finally {
+ // Close the context when we're done
+ ctx.close();
+ }
+ } catch (NamingException e) {
+ passed = true;
+ e.printStackTrace();
+ }
+
+ if (!passed) {
+ throw new Exception("Read timeout test failed," +
+ " read timeout exception not thrown");
+ }
+ System.out.println("The test PASSED");
+ }
+
+ static class Server implements Runnable, Closeable {
+ private final ServerSocket ss;
+ private Socket sref;
+
+ private Server(ServerSocket ss) {
+ this.ss = ss;
+ }
+
+ static Server create() throws IOException {
+ Server server = new Server(new ServerSocket(0));
+ new Thread(server).start();
+ return server;
+ }
+
+ int port() {
+ return ss.getLocalPort();
+ }
+
+ public void run() {
+ try (Socket s = ss.accept()) {
+ sref = s;
+ System.out.println("Server: Connection accepted");
+ BufferedInputStream bis =
+ new BufferedInputStream(s.getInputStream());
+ byte[] buf = new byte[100];
+ int n;
+ do {
+ n = bis.read(buf);
+ } while (n > 0);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+
+ public void close() throws IOException {
+ ss.close();
+ sref.close();
+ }
+ }
+}
diff --git a/jdk/test/java/lang/invoke/CallSiteTest.java b/jdk/test/java/lang/invoke/CallSiteTest.java
new file mode 100644
index 0000000..ee60499
--- /dev/null
+++ b/jdk/test/java/lang/invoke/CallSiteTest.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2011, 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
+ * @summary smoke tests for CallSite
+ *
+ * @build indify.Indify
+ * @compile CallSiteTest.java
+ * @run main/othervm
+ * indify.Indify
+ * --expand-properties --classpath ${test.classes}
+ * --java test.java.lang.invoke.CallSiteTest
+ */
+
+package test.java.lang.invoke;
+
+import java.io.*;
+
+import java.lang.invoke.*;
+import static java.lang.invoke.MethodHandles.*;
+import static java.lang.invoke.MethodType.*;
+
+public class CallSiteTest {
+ private final static Class CLASS = CallSiteTest.class;
+
+ private static CallSite mcs;
+ private static CallSite vcs;
+ private static MethodHandle mh_foo;
+ private static MethodHandle mh_bar;
+
+ static {
+ try {
+ mh_foo = lookup().findStatic(CLASS, "foo", methodType(int.class, int.class, int.class));
+ mh_bar = lookup().findStatic(CLASS, "bar", methodType(int.class, int.class, int.class));
+ mcs = new MutableCallSite(mh_foo);
+ vcs = new VolatileCallSite(mh_foo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String... av) throws Throwable {
+ testMutableCallSite();
+ testVolatileCallSite();
+ }
+
+ private final static int N = Integer.MAX_VALUE / 100;
+ private final static int RESULT1 = 762786192;
+ private final static int RESULT2 = -21474836;
+
+ private static void assertEquals(int expected, int actual) {
+ if (expected != actual)
+ throw new AssertionError("expected: " + expected + ", actual: " + actual);
+ }
+
+ private static void testMutableCallSite() throws Throwable {
+ // warm-up
+ for (int i = 0; i < 20000; i++) {
+ mcs.setTarget(mh_foo);
+ }
+ // run
+ for (int n = 0; n < 2; n++) {
+ mcs.setTarget(mh_foo);
+ for (int i = 0; i < 5; i++) {
+ assertEquals(RESULT1, runMutableCallSite());
+ }
+ mcs.setTarget(mh_bar);
+ for (int i = 0; i < 5; i++) {
+ assertEquals(RESULT2, runMutableCallSite());
+ }
+ }
+ }
+ private static void testVolatileCallSite() throws Throwable {
+ // warm-up
+ for (int i = 0; i < 20000; i++) {
+ vcs.setTarget(mh_foo);
+ }
+ // run
+ for (int n = 0; n < 2; n++) {
+ vcs.setTarget(mh_foo);
+ for (int i = 0; i < 5; i++) {
+ assertEquals(RESULT1, runVolatileCallSite());
+ }
+ vcs.setTarget(mh_bar);
+ for (int i = 0; i < 5; i++) {
+ assertEquals(RESULT2, runVolatileCallSite());
+ }
+ }
+ }
+
+ private static int runMutableCallSite() throws Throwable {
+ int sum = 0;
+ for (int i = 0; i < N; i++) {
+ sum += (int) INDY_mcs().invokeExact(i, i+1);
+ }
+ return sum;
+ }
+ private static int runVolatileCallSite() throws Throwable {
+ int sum = 0;
+ for (int i = 0; i < N; i++) {
+ sum += (int) INDY_vcs().invokeExact(i, i+1);
+ }
+ return sum;
+ }
+
+ static int foo(int a, int b) { return a + b; }
+ static int bar(int a, int b) { return a - b; }
+
+ private static MethodType MT_bsm() {
+ shouldNotCallThis();
+ return methodType(CallSite.class, Lookup.class, String.class, MethodType.class);
+ }
+
+ private static CallSite bsm_mcs(Lookup caller, String name, MethodType type) throws ReflectiveOperationException {
+ return mcs;
+ }
+ private static MethodHandle MH_bsm_mcs() throws ReflectiveOperationException {
+ shouldNotCallThis();
+ return lookup().findStatic(lookup().lookupClass(), "bsm_mcs", MT_bsm());
+ }
+ private static MethodHandle INDY_mcs() throws Throwable {
+ shouldNotCallThis();
+ return ((CallSite) MH_bsm_mcs().invoke(lookup(), "foo", methodType(int.class, int.class, int.class))).dynamicInvoker();
+ }
+
+ private static CallSite bsm_vcs(Lookup caller, String name, MethodType type) throws ReflectiveOperationException {
+ return vcs;
+ }
+ private static MethodHandle MH_bsm_vcs() throws ReflectiveOperationException {
+ shouldNotCallThis();
+ return lookup().findStatic(lookup().lookupClass(), "bsm_vcs", MT_bsm());
+ }
+ private static MethodHandle INDY_vcs() throws Throwable {
+ shouldNotCallThis();
+ return ((CallSite) MH_bsm_vcs().invoke(lookup(), "foo", methodType(int.class, int.class, int.class))).dynamicInvoker();
+ }
+
+ private static void shouldNotCallThis() {
+ // if this gets called, the transformation has not taken place
+ throw new AssertionError("this code should be statically transformed away by Indify");
+ }
+}
diff --git a/jdk/test/java/lang/invoke/InvokeDynamicPrintArgs.java b/jdk/test/java/lang/invoke/InvokeDynamicPrintArgs.java
index 89d2fdb..a318676 100644
--- a/jdk/test/java/lang/invoke/InvokeDynamicPrintArgs.java
+++ b/jdk/test/java/lang/invoke/InvokeDynamicPrintArgs.java
@@ -38,8 +38,6 @@
package test.java.lang.invoke;
-import org.junit.Test;
-
import java.util.*;
import java.io.*;
@@ -99,21 +97,6 @@ public class InvokeDynamicPrintArgs {
System.setSecurityManager(new SM());
}
- @Test
- public void testInvokeDynamicPrintArgs() throws IOException {
- System.err.println(System.getProperties());
- String testClassPath = System.getProperty("build.test.classes.dir");
- if (testClassPath == null) throw new RuntimeException();
- String[] args = new String[]{
- "--verify-specifier-count=3",
- "--verbose",
- "--expand-properties", "--classpath", testClassPath,
- "--java", "test.java.lang.invoke.InvokeDynamicPrintArgs", "--check-output"
- };
- System.err.println("Indify: "+Arrays.toString(args));
- indify.Indify.main(args);
- }
-
private static PrintStream oldOut;
private static ByteArrayOutputStream buf;
private static void openBuf() {
diff --git a/jdk/test/java/lang/ref/ReferenceEnqueue.java b/jdk/test/java/lang/ref/ReferenceEnqueue.java
new file mode 100644
index 0000000..25907a0
--- /dev/null
+++ b/jdk/test/java/lang/ref/ReferenceEnqueue.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2011, 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 4268317
+ * @summary Test if Reference.enqueue() works properly with GC
+ */
+
+import java.lang.ref.*;
+
+public class ReferenceEnqueue {
+
+ public static void main(String args[]) throws Exception {
+ for (int i=0; i < 5; i++)
+ new WeakRef().run();
+ System.out.println("Test passed.");
+ }
+
+ static class WeakRef {
+ final ReferenceQueue<Object> queue = new ReferenceQueue<Object>();
+ final Reference<Object> ref;
+ final int iterations = 1000;
+
+ WeakRef() {
+ this.ref = new WeakReference<Object>(new Object(), queue);
+ }
+
+ void run() throws InterruptedException {
+ System.gc();
+ for (int i = 0; i < iterations; i++) {
+ System.gc();
+ if (ref.isEnqueued()) {
+ break;
+ }
+
+ Thread.sleep(100);
+ }
+
+ if (ref.isEnqueued() == false) {
+ // GC have not enqueued refWeak for the timeout period
+ System.out.println("Reference not enqueued yet");
+ return;
+ }
+
+ if (ref.enqueue() == true) {
+ // enqueue() should return false since
+ // ref is already enqueued by the GC
+ throw new RuntimeException("Error: enqueue() returned true;"
+ + " expected false");
+ }
+
+ if (queue.poll() == null) {
+ // poll() should return ref enqueued by the GC
+ throw new RuntimeException("Error: poll() returned null;"
+ + " expected ref object");
+ }
+ }
+ }
+}
diff --git a/jdk/test/java/lang/ref/ReferenceEnqueuePending.java b/jdk/test/java/lang/ref/ReferenceEnqueuePending.java
new file mode 100644
index 0000000..0e8868f
--- /dev/null
+++ b/jdk/test/java/lang/ref/ReferenceEnqueuePending.java
@@ -0,0 +1,201 @@
+/* Copyright (c) 2011, 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 4243978
+ * @summary Test if Reference.enqueue() works properly with pending references
+ */
+import java.lang.ref.*;
+
+public class ReferenceEnqueuePending {
+ static class NumberedWeakReference extends WeakReference<Integer> {
+ // Add an integer to identify the weak reference object.
+ int number;
+
+ NumberedWeakReference(Integer referent, ReferenceQueue<Integer> q, int i) {
+ super(referent, q);
+ number = i;
+ }
+ }
+
+ final static boolean debug = System.getProperty("test.debug") != null;
+ final static int iterations = 1000;
+ final static int gc_trigger = 99;
+ static int[] a = new int[2 * iterations];
+ // Keep all weak references alive with the following array.
+ static NumberedWeakReference[] b = new NumberedWeakReference[iterations];
+
+ public static void main(String[] argv) throws Exception {
+ if (debug) {
+ System.out.println("Starting the test.");
+ }
+ // Raise thread priority to match the referenceHandler
+ // priority, so that they can race also on a uniprocessor.
+ raisePriority();
+
+ ReferenceQueue<Integer> refQueue = new ReferenceQueue<>();
+
+ // Our objective is to let the mutator enqueue
+ // a Reference object that may already be in the
+ // pending state because of having been identified
+ // as weakly reachable at a previous garbage collection.
+ // To this end, we create many Reference objects, each with a
+ // a unique integer object as its referant.
+ // We let the referents become eligible for collection,
+ // while racing with the garbage collector which may
+ // have pended some of these Reference objects.
+ // Finally we check that all of the Reference objects
+ // end up on the their queue. The test was originally
+ // submitted to show that such races could break the
+ // pending list and/or the reference queue, because of sharing
+ // the same link ("next") for maintaining both lists, thus
+ // losing some of the Reference objects on either queue.
+
+ Integer obj = new Integer(0);
+ NumberedWeakReference weaky = new NumberedWeakReference(obj, refQueue, 0);
+ for (int i = 1; i < iterations; i++) {
+ // Create a new object, dropping the onlY strong reference to
+ // the previous Integer object.
+ obj = new Integer(i);
+ // Trigger gc each gc_trigger iterations.
+ if ((i % gc_trigger) == 0) {
+ forceGc(0);
+ }
+ // Enqueue every other weaky.
+ if ((i % 2) == 0) {
+ weaky.enqueue();
+ }
+ // Remember the Reference objects, for testing later.
+ b[i - 1] = weaky;
+ // Get a new weaky for the Integer object just
+ // created, which may be explicitly enqueued in
+ // our next trip around the loop.
+ weaky = new NumberedWeakReference(obj, refQueue, i);
+ }
+
+ // Do a final collection to discover and process all
+ // Reference objects created above, allowing enough time
+ // for the ReferenceHandler thread to queue the References.
+ forceGc(100);
+ forceGc(100);
+
+ // Verify that all WeakReference objects ended up queued.
+ checkResult(refQueue, obj, iterations-1);
+ System.out.println("Test passed.");
+ }
+
+ private static void checkResult(ReferenceQueue<Integer> queue,
+ Integer obj,
+ int expected) {
+ if (debug) {
+ System.out.println("Reading the queue");
+ }
+
+ // Empty the queue and record numbers into a[];
+ NumberedWeakReference weakRead = (NumberedWeakReference) queue.poll();
+ int length = 0;
+ while (weakRead != null) {
+ a[length++] = weakRead.number;
+ weakRead = (NumberedWeakReference) queue.poll();
+ }
+ if (debug) {
+ System.out.println("Reference Queue had " + length + " elements");
+ }
+ // Use the last Reference object of those created above, so as to keep it "alive".
+ System.out.println("I must write " + obj + " to prevent compiler optimizations.");
+
+
+ // verify the queued references: all but the last Reference object
+ // should have been in the queue.
+ if (debug) {
+ System.out.println("Start of final check");
+ }
+
+ // Sort the first "length" elements in array "a[]".
+ sort(length);
+
+ boolean fail = (length != expected);
+ for (int i = 0; i < length; i++) {
+ if (a[i] != i) {
+ if (debug) {
+ System.out.println("a[" + i + "] is not " + i + " but " + a[i]);
+ }
+ fail = true;
+ }
+ }
+ if (fail) {
+ printMissingElements(length, expected);
+ throw new RuntimeException("TEST FAILED: only " + length
+ + " reference objects have been queued out of "
+ + expected);
+ }
+ }
+
+ private static void printMissingElements(int length, int expected) {
+ System.out.println("The following numbers were not found in the reference queue: ");
+ int missing = 0;
+ int element = 0;
+ for (int i = 0; i < length; i++) {
+ while ((a[i] != element) & (element < expected)) {
+ System.out.print(element + " ");
+ if (missing % 20 == 19) {
+ System.out.println(" ");
+ }
+ missing++;
+ element++;
+ }
+ element++;
+ }
+ System.out.print("\n");
+ }
+
+ private static void forceGc(long millis) throws InterruptedException {
+ Runtime.getRuntime().gc();
+ Thread.sleep(millis);
+ }
+
+ // Bubble sort the first "length" elements in array "a".
+ private static void sort(int length) {
+ int hold;
+ if (debug) {
+ System.out.println("Sorting. Length=" + length);
+ }
+ for (int pass = 1; pass < length; pass++) { // passes over the array
+ for (int i = 0; i < length - pass; i++) { // a single pass
+ if (a[i] > a[i + 1]) { // then swap
+ hold = a[i];
+ a[i] = a[i + 1];
+ a[i + 1] = hold;
+ }
+ } // End of i loop
+ } // End of pass loop
+ }
+
+ // Raise thread priority so as to increase the
+ // probability of the mutator succeeding in enqueueing
+ // an object that is still in the pending state.
+ // This is (probably) only required for a uniprocessor.
+ static void raisePriority() {
+ Thread tr = Thread.currentThread();
+ tr.setPriority(Thread.MAX_PRIORITY);
+ }
+} // End of class ReferenceEnqueuePending
diff --git a/jdk/test/java/net/CookieHandler/NullUriCookieTest.java b/jdk/test/java/net/CookieHandler/NullUriCookieTest.java
new file mode 100644
index 0000000..60d0550
--- /dev/null
+++ b/jdk/test/java/net/CookieHandler/NullUriCookieTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2011, 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 6953455
+ * @summary CookieStore.add() cannot handle null URI parameter
+ */
+
+import java.net.CookieManager;
+import java.net.CookieStore;
+import java.net.HttpCookie;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+public class NullUriCookieTest {
+ static boolean fail = false;
+
+ public static void main(String[] args) throws Exception {
+ checkCookieNullUri();
+ }
+
+ static void checkCookieNullUri() throws Exception {
+ //get a cookie store implementation and add a cookie to the store with null URI
+ CookieStore cookieStore = (new CookieManager()).getCookieStore();
+ HttpCookie cookie = new HttpCookie("MY_COOKIE", "MY_COOKIE_VALUE");
+ cookie.setDomain("foo.com");
+ cookieStore.add(null, cookie);
+
+ //Retrieve added cookie
+ URI uri = new URI("http://foo.com");
+ List<HttpCookie> addedCookieList = cookieStore.get(uri);
+
+ //Verify CookieStore behaves well
+ if (addedCookieList.size() != 1) {
+ fail = true;
+ }
+ checkFail("Abnormal size of cookie jar");
+
+ for (HttpCookie chip : addedCookieList) {
+ if (!chip.equals(cookie)) {
+ fail = true;
+ }
+ }
+ checkFail("Cookie not retrieved from Cookie Jar");
+ boolean ret = cookieStore.remove(null,cookie);
+ if (!ret) {
+ fail = true;
+ }
+ checkFail("Abnormal removal behaviour from Cookie Jar");
+ }
+
+ static void checkFail(String exp) {
+ if (fail) {
+ throw new RuntimeException(exp);
+ }
+ }
+}
+
diff --git a/jdk/test/java/net/URLConnection/Redirect307Test.java b/jdk/test/java/net/URLConnection/Redirect307Test.java
index b9e7749..d9e980f 100644
--- a/jdk/test/java/net/URLConnection/Redirect307Test.java
+++ b/jdk/test/java/net/URLConnection/Redirect307Test.java
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 4380568
+ * @bug 4380568 7095949
* @summary HttpURLConnection does not support 307 redirects
*/
import java.io.*;
@@ -31,10 +31,9 @@ import java.net.*;
class RedirServer extends Thread {
- ServerSocket s;
- Socket s1;
- InputStream is;
- OutputStream os;
+ static final int TIMEOUT = 10 * 1000;
+
+ ServerSocket ss;
int port;
String reply1Part1 = "HTTP/1.1 307 Temporary Redirect\r\n" +
@@ -46,10 +45,10 @@ class RedirServer extends Thread {
"Content-Type: text/html; charset=iso-8859-1\r\n\r\n" +
"<html>Hello</html>";
- RedirServer (ServerSocket y) {
- s = y;
- port = s.getLocalPort();
- System.out.println("Server created listening on " + port);
+ RedirServer (ServerSocket ss) throws IOException {
+ this.ss = ss;
+ this.ss.setSoTimeout(TIMEOUT);
+ port = this.ss.getLocalPort();
}
String reply2 = "HTTP/1.1 200 Ok\r\n" +
@@ -59,74 +58,63 @@ class RedirServer extends Thread {
"Content-Type: text/html; charset=iso-8859-1\r\n\r\n" +
"World";
+ static final byte[] requestEnd = new byte[] {'\r', '\n', '\r', '\n' };
+
+ // Read until the end of a HTTP request
+ void readOneRequest(InputStream is) throws IOException {
+ int requestEndCount = 0, r;
+ while ((r = is.read()) != -1) {
+ if (r == requestEnd[requestEndCount]) {
+ requestEndCount++;
+ if (requestEndCount == 4) {
+ break;
+ }
+ } else {
+ requestEndCount = 0;
+ }
+ }
+ }
+
public void run () {
try {
- s1 = s.accept ();
- is = s1.getInputStream ();
- os = s1.getOutputStream ();
- is.read ();
- String reply = reply1Part1 + port + reply1Part2;
- os.write (reply.getBytes());
- os.close();
+ try (Socket s = ss.accept()) {
+ s.setSoTimeout(TIMEOUT);
+ readOneRequest(s.getInputStream());
+ String reply = reply1Part1 + port + reply1Part2;
+ s.getOutputStream().write(reply.getBytes());
+ }
+
/* wait for redirected connection */
- s.setSoTimeout (5000);
- s1 = s.accept ();
- is = s1.getInputStream ();
- os = s1.getOutputStream ();
- is.read();
- os.write (reply2.getBytes());
- os.close();
- }
- catch (Exception e) {
- /* Just need thread to terminate */
- System.out.println("Server: caught " + e);
+ try (Socket s = ss.accept()) {
+ s.setSoTimeout(TIMEOUT);
+ readOneRequest(s.getInputStream());
+ s.getOutputStream().write(reply2.getBytes());
+ }
+ } catch (Exception e) {
e.printStackTrace();
} finally {
- try { s.close(); } catch (IOException unused) {}
+ try { ss.close(); } catch (IOException unused) {}
}
}
};
-
public class Redirect307Test {
-
- public static final int DELAY = 10;
-
public static void main(String[] args) throws Exception {
- int port;
- RedirServer server;
- ServerSocket sock;
-
- try {
- sock = new ServerSocket (0);
- port = sock.getLocalPort ();
- }
- catch (Exception e) {
- System.out.println ("Exception: " + e);
- return;
- }
-
- server = new RedirServer(sock);
- server.start ();
-
- try {
-
- String s = "http://localhost:" + port;
- URL url = new URL(s);
- URLConnection conURL = url.openConnection();
-
- conURL.setDoInput(true);
- conURL.setAllowUserInteraction(false);
- conURL.setUseCaches(false);
-
- InputStream in = conURL.getInputStream();
+ ServerSocket sock = new ServerSocket(0);
+ int port = sock.getLocalPort();
+ RedirServer server = new RedirServer(sock);
+ server.start();
+
+ URL url = new URL("http://localhost:" + port);
+ URLConnection conURL = url.openConnection();
+ conURL.setDoInput(true);
+ conURL.setAllowUserInteraction(false);
+ conURL.setUseCaches(false);
+
+ try (InputStream in = conURL.getInputStream()) {
if ((in.read() != (int)'W') || (in.read()!=(int)'o')) {
throw new RuntimeException ("Unexpected string read");
}
}
- catch(IOException e) {
- e.printStackTrace();
- throw new RuntimeException ("Exception caught + " + e);
- }
}
}
diff --git a/jdk/test/java/net/URLConnection/RedirectLimit.java b/jdk/test/java/net/URLConnection/RedirectLimit.java
index 5fe65a1..ea90c69 100644
--- a/jdk/test/java/net/URLConnection/RedirectLimit.java
+++ b/jdk/test/java/net/URLConnection/RedirectLimit.java
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 4458085
+ * @bug 4458085 7095949
* @summary Redirects Limited to 5
*/
@@ -57,29 +57,43 @@ class RedirLimitServer extends Thread {
final ServerSocket ss;
final int port;
- RedirLimitServer(ServerSocket ss) {
+ RedirLimitServer(ServerSocket ss) throws IOException {
this.ss = ss;
- port = ss.getLocalPort();
+ port = this.ss.getLocalPort();
+ this.ss.setSoTimeout(TIMEOUT);
+ }
+
+ static final byte[] requestEnd = new byte[] {'\r', '\n', '\r', '\n' };
+
+ // Read until the end of a HTTP request
+ void readOneRequest(InputStream is) throws IOException {
+ int requestEndCount = 0, r;
+ while ((r = is.read()) != -1) {
+ if (r == requestEnd[requestEndCount]) {
+ requestEndCount++;
+ if (requestEndCount == 4) {
+ break;
+ }
+ } else {
+ requestEndCount = 0;
+ }
+ }
}
public void run() {
try {
- ss.setSoTimeout(TIMEOUT);
for (int i=0; i<NUM_REDIRECTS; i++) {
try (Socket s = ss.accept()) {
s.setSoTimeout(TIMEOUT);
- InputStream is = s.getInputStream();
- OutputStream os = s.getOutputStream();
- is.read();
+ readOneRequest(s.getInputStream());
String reply = reply1 + port + "/redirect" + i + reply2;
- os.write(reply.getBytes());
+ s.getOutputStream().write(reply.getBytes());
}
}
try (Socket s = ss.accept()) {
- InputStream is = s.getInputStream();
- OutputStream os = s.getOutputStream();
- is.read();
- os.write(reply3.getBytes());
+ s.setSoTimeout(TIMEOUT);
+ readOneRequest(s.getInputStream());
+ s.getOutputStream().write(reply3.getBytes());
}
} catch (Exception e) {
e.printStackTrace();
@@ -96,21 +110,17 @@ public class RedirectLimit {
RedirLimitServer server = new RedirLimitServer(ss);
server.start();
- InputStream in = null;
- try {
- URL url = new URL("http://localhost:" + port);
- URLConnection conURL = url.openConnection();
+ URL url = new URL("http://localhost:" + port);
+ URLConnection conURL = url.openConnection();
- conURL.setDoInput(true);
- conURL.setAllowUserInteraction(false);
- conURL.setUseCaches(false);
+ conURL.setDoInput(true);
+ conURL.setAllowUserInteraction(false);
+ conURL.setUseCaches(false);
- in = conURL.getInputStream();
+ try (InputStream in = conURL.getInputStream()) {
if ((in.read() != (int)'W') || (in.read()!=(int)'o')) {
throw new RuntimeException("Unexpected string read");
}
- } finally {
- if ( in != null ) { in.close(); }
}
}
}
diff --git a/jdk/test/java/nio/charset/coders/Errors.java b/jdk/test/java/nio/charset/coders/Errors.java
index be19c0b..0b74001 100644
--- a/jdk/test/java/nio/charset/coders/Errors.java
+++ b/jdk/test/java/nio/charset/coders/Errors.java
@@ -23,7 +23,7 @@
/* @test
* @summary Check that error cases are replaced correctly in String/ISR/OSW
- * @bug 4457851
+ * @bug 4457851 7096080
*
* @build Errors Util
* @run main Errors
@@ -193,11 +193,9 @@ public class Errors {
t.test("\uFFFF", new byte[] { (byte)0xEF, (byte)0xBF, (byte)0xBF });
t.test(new byte[] { X, (byte)0x7f, Y }, "x\u007Fy");
t.test(new byte[] { X, (byte)0x80, Y }, "x\uFFFDy");
- t.test(new byte[] { (byte)0xf0, (byte)0xf0 }, "\uFFFD");
}
public static void main(String[] args) throws Exception {
-
test_US_ASCII(new TestString("US-ASCII"));
test_US_ASCII(new TestStream("US-ASCII"));
diff --git a/jdk/test/java/util/Collections/CheckedQueue.java b/jdk/test/java/util/Collections/CheckedQueue.java
new file mode 100644
index 0000000..6f28e12
--- /dev/null
+++ b/jdk/test/java/util/Collections/CheckedQueue.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2011, 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 5020931
+ * @summary Unit test for Collections.checkedQueue
+ */
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Queue;
+import java.util.concurrent.ArrayBlockingQueue;
+
+public class CheckedQueue {
+ static int status = 0;
+
+ public static void main(String[] args) throws Exception {
+ new CheckedQueue();
+ }
+
+ public CheckedQueue() throws Exception {
+ run();
+ }
+
+ private void run() throws Exception {
+ Method[] methods = this.getClass().getDeclaredMethods();
+
+ for (int i = 0; i < methods.length; i++) {
+ Method method = methods[i];
+ String methodName = method.getName();
+
+ if (methodName.startsWith("test")) {
+ try {
+ Object obj = method.invoke(this, new Object[0]);
+ } catch(Exception e) {
+ throw new Exception(this.getClass().getName() + "." +
+ methodName + " test failed, test exception "
+ + "follows\n" + e.getCause());
+ }
+ }
+ }
+ }
+
+ /**
+ * This test adds items to a queue.
+ */
+ private void test00() {
+ int arrayLength = 10;
+ ArrayBlockingQueue<String> abq = new ArrayBlockingQueue(arrayLength);
+
+ for (int i = 0; i < arrayLength; i++) {
+ abq.add(new String(Integer.toString(i)));
+ }
+ }
+
+ /**
+ * This test tests the CheckedQueue.add method. It creates a queue of
+ * {@code String}s gets the checked queue, and attempt to add an Integer to
+ * the checked queue.
+ */
+ private void test01() throws Exception {
+ int arrayLength = 10;
+ ArrayBlockingQueue<String> abq = new ArrayBlockingQueue(arrayLength + 1);
+
+ for (int i = 0; i < arrayLength; i++) {
+ abq.add(new String(Integer.toString(i)));
+ }
+
+ Queue q = Collections.checkedQueue(abq, String.class);
+
+ try {
+ q.add(new Integer(0));
+ throw new Exception(this.getClass().getName() + "." + "test01 test"
+ + " failed, should throw ClassCastException.");
+ } catch(ClassCastException cce) {
+ // Do nothing.
+ }
+ }
+
+ /**
+ * This test tests the CheckedQueue.add method. It creates a queue of one
+ * {@code String}, gets the checked queue, and attempt to add an Integer to
+ * the checked queue.
+ */
+ private void test02() throws Exception {
+ ArrayBlockingQueue<String> abq = new ArrayBlockingQueue(1);
+ Queue q = Collections.checkedQueue(abq, String.class);
+
+ try {
+ q.add(new Integer(0));
+ throw new Exception(this.getClass().getName() + "." + "test02 test"
+ + " failed, should throw ClassCastException.");
+ } catch(ClassCastException e) {
+ // Do nothing.
+ }
+ }
+
+ /**
+ * This test tests the Collections.checkedQueue method call for nulls in
+ * each and both of the parameters.
+ */
+ private void test03() throws Exception {
+ ArrayBlockingQueue<String> abq = new ArrayBlockingQueue(1);
+ Queue q;
+
+ try {
+ q = Collections.checkedQueue(null, String.class);
+ throw new Exception(this.getClass().getName() + "." + "test03 test"
+ + " failed, should throw NullPointerException.");
+ } catch(NullPointerException npe) {
+ // Do nothing
+ }
+
+ try {
+ q = Collections.checkedQueue(abq, null);
+ throw new Exception(this.getClass().getName() + "." + "test03 test"
+ + " failed, should throw NullPointerException.");
+ } catch(Exception e) {
+ // Do nothing
+ }
+
+ try {
+ q = Collections.checkedQueue(null, null);
+ throw new Exception(this.getClass().getName() + "." + "test03 test"
+ + " failed, should throw NullPointerException.");
+ } catch(Exception e) {
+ // Do nothing
+ }
+ }
+
+ /**
+ * This test tests the CheckedQueue.offer method.
+ */
+ private void test04() throws Exception {
+ ArrayBlockingQueue<String> abq = new ArrayBlockingQueue(1);
+ Queue q = Collections.checkedQueue(abq, String.class);
+
+ try {
+ q.offer(null);
+ throw new Exception(this.getClass().getName() + "." + "test04 test"
+ + " failed, should throw NullPointerException.");
+ } catch (NullPointerException npe) {
+ // Do nothing
+ }
+
+ try {
+ q.offer(new Integer(0));
+ throw new Exception(this.getClass().getName() + "." + "test04 test"
+ + " failed, should throw ClassCastException.");
+ } catch (ClassCastException cce) {
+ // Do nothing
+ }
+
+ q.offer(new String("0"));
+
+ try {
+ q.offer(new String("1"));
+ throw new Exception(this.getClass().getName() + "." + "test04 test"
+ + " failed, should throw IllegalStateException.");
+ } catch(IllegalStateException ise) {
+ // Do nothing
+ }
+ }
+
+ private void test05() {
+
+ }
+}
diff --git a/jdk/test/java/util/Collections/EmptySortedSet.java b/jdk/test/java/util/Collections/EmptySortedSet.java
new file mode 100644
index 0000000..224400e
--- /dev/null
+++ b/jdk/test/java/util/Collections/EmptySortedSet.java
@@ -0,0 +1,351 @@
+/*
+ * Copyright (c) 2011, 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 4533691
+ * @summary Unit test for Collections.emptySortedSet
+ */
+
+import java.lang.reflect.Method;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+public class EmptySortedSet {
+ static int status = 0;
+ private static final String FAILED = " failed. ";
+ private static final String PERIOD = ".";
+ private final String thisClassName = this.getClass().getName();
+
+ public static void main(String[] args) throws Exception {
+ new EmptySortedSet();
+ }
+
+ public EmptySortedSet() throws Exception {
+ run();
+ }
+
+ /**
+ * Returns {@code true} if the {@link Object} passed in is an empty
+ * {@link SortedSet}.
+ *
+ * @param obj the object to test
+ * @return {@code true} if the {@link Object} is an empty {@link SortedSet}
+ * otherwise {@code false}.
+ */
+ private boolean isEmptySortedSet(Object obj) {
+ boolean isEmptySortedSet = false;
+
+ // We determine if the object is an empty sorted set by testing if it's
+ // an instance of SortedSet, and if so, if it's empty. Currently the
+ // testing doesn't include checks of the other methods.
+ if (obj instanceof SortedSet) {
+ SortedSet ss = (SortedSet) obj;
+
+ if ((ss.isEmpty()) && (ss.size() == 0)) {
+ isEmptySortedSet = true;
+ }
+ }
+
+ return isEmptySortedSet;
+ }
+
+ private void run() throws Exception {
+ Method[] methods = this.getClass().getDeclaredMethods();
+
+ for (int i = 0; i < methods.length; i++) {
+ Method method = methods[i];
+ String methodName = method.getName();
+
+ if (methodName.startsWith("test")) {
+ try {
+ Object obj = method.invoke(this, new Object[0]);
+ } catch(Exception e) {
+ throw new Exception(this.getClass().getName() + "." +
+ methodName + " test failed, test exception "
+ + "follows\n" + e.getCause());
+ }
+ }
+ }
+ }
+
+ private void throwException(String methodName, String reason)
+ throws Exception
+ {
+ StringBuilder sb = new StringBuilder(thisClassName);
+ sb.append(PERIOD);
+ sb.append(methodName);
+ sb.append(FAILED);
+ sb.append(reason);
+ throw new Exception(sb.toString());
+ }
+
+ /**
+ *
+ */
+ private void test00() throws Exception {
+ //throwException("test00", "This test has not been implemented yet.");
+ }
+
+ /**
+ * Tests that the comparator is {@code null}.
+ */
+ private void testComparatorIsNull() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ Comparator comparator = sortedSet.comparator();
+
+ if (comparator != null) {
+ throwException("testComparatorIsNull", "Comparator is not null.");
+ }
+ }
+
+ /**
+ * Tests that the contains method returns {@code false}.
+ */
+ private void testContains() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+
+ if (sortedSet.contains(new Object())) {
+ throwException("testContains", "Should not contain any elements.");
+ }
+ }
+
+ /**
+ * Tests that the containsAll method returns {@code false}.
+ */
+ private void testContainsAll() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ TreeSet treeSet = new TreeSet();
+ treeSet.add("1");
+ treeSet.add("2");
+ treeSet.add("3");
+
+ if (sortedSet.containsAll(treeSet)) {
+ throwException("testContainsAll",
+ "Should not contain any elements.");
+ }
+ }
+
+ /**
+ * Tests that the iterator is empty.
+ */
+ private void testEmptyIterator() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ Iterator emptyIterator = sortedSet.iterator();
+
+ if ((emptyIterator != null) && (emptyIterator.hasNext())) {
+ throwException("testEmptyIterator", "The iterator is not empty.");
+ }
+ }
+
+ /**
+ * Tests that the set is empty.
+ */
+ private void testIsEmpty() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+
+ if ((sortedSet != null) && (!sortedSet.isEmpty())) {
+ throwException("testSizeIsZero", "The set is not empty.");
+ }
+ }
+
+ /**
+ * Tests that the first() method throws NoSuchElementException
+ */
+ private void testFirst() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+
+ try {
+ sortedSet.first();
+ throwException("testFirst",
+ "NoSuchElemenException was not thrown.");
+ } catch(NoSuchElementException nsee) {
+ // Do nothing
+ }
+ }
+
+ /**
+ * Tests the headSet() method.
+ */
+ private void testHeadSet() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ SortedSet ss;
+
+ try {
+ ss = sortedSet.headSet(null);
+ throwException("testHeadSet",
+ "Must throw NullPointerException for null element");
+ } catch(NullPointerException npe) {
+ // Do nothing
+ }
+
+ try {
+ ss = sortedSet.headSet(new Object());
+ throwException("testHeadSet",
+ "Must throw ClassCastException for non-Comparable element");
+ } catch(ClassCastException cce) {
+ // Do nothing.
+ }
+
+ ss = sortedSet.headSet("1");
+
+ if ((ss == null) || !isEmptySortedSet(ss)) {
+ throwException("testHeadSet",
+ "Returned value is null or not an EmptySortedSet.");
+ }
+ }
+
+ /**
+ * Tests that the last() method throws NoSuchElementException
+ */
+ private void testLast() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+
+ try {
+ sortedSet.last();
+ throwException("testLast",
+ "NoSuchElemenException was not thrown.");
+ } catch(NoSuchElementException nsee) {
+ // Do nothing
+ }
+ }
+
+ /**
+ * Tests that the size is 0.
+ */
+ private void testSizeIsZero() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ int size = sortedSet.size();
+
+ if (size > 0) {
+ throwException("testSizeIsZero",
+ "The size of the set is greater then 0.");
+ }
+ }
+
+ /**
+ * Tests the subSet() method.
+ */
+ private void testSubSet() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ SortedSet ss = sortedSet.headSet("1");
+
+ try {
+ ss = sortedSet.subSet(null, BigInteger.TEN);
+ ss = sortedSet.subSet(BigInteger.ZERO, null);
+ ss = sortedSet.subSet(null, null);
+ throwException("testSubSet",
+ "Must throw NullPointerException for null element");
+ } catch(NullPointerException npe) {
+ // Do nothing
+ }
+
+ try {
+ Object obj1 = new Object();
+ Object obj2 = new Object();
+ ss = sortedSet.subSet(obj1, BigInteger.TEN);
+ ss = sortedSet.subSet(BigInteger.ZERO, obj2);
+ ss = sortedSet.subSet(obj1, obj2);
+ throwException("testSubSet",
+ "Must throw ClassCastException for parameter which is "
+ + "not Comparable.");
+ } catch(ClassCastException cce) {
+ // Do nothing.
+ }
+
+ try {
+ ss = sortedSet.subSet(BigInteger.ZERO, BigInteger.ZERO);
+ ss = sortedSet.subSet(BigInteger.TEN, BigInteger.ZERO);
+ throwException("testSubSet",
+ "Must throw IllegalArgumentException when fromElement is "
+ + "not less then then toElement.");
+ } catch(IllegalArgumentException iae) {
+ // Do nothing.
+ }
+
+ ss = sortedSet.subSet(BigInteger.ZERO, BigInteger.TEN);
+
+ if (!isEmptySortedSet(ss)) {
+ throw new Exception("Returned value is not empty sorted set.");
+ }
+ }
+
+ /**
+ * Tests the tailSet() method.
+ */
+ private void testTailSet() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ SortedSet ss;
+
+ try {
+ ss = sortedSet.tailSet(null);
+ throwException("testTailSet",
+ "Must throw NullPointerException for null element");
+ } catch(NullPointerException npe) {
+ // Do nothing
+ }
+
+ try {
+ SortedSet ss2 = sortedSet.tailSet(new Object());
+ throwException("testTailSet",
+ "Must throw ClassCastException for non-Comparable element");
+ } catch(ClassCastException cce) {
+ // Do nothing.
+ }
+
+ ss = sortedSet.tailSet("1");
+
+ if ((ss == null) || !isEmptySortedSet(ss)) {
+ throwException("testTailSet",
+ "Returned value is null or not an EmptySortedSet.");
+ }
+ }
+
+ /**
+ * Tests that the array has a size of 0.
+ */
+ private void testToArray() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ Object[] emptySortedSetArray = sortedSet.toArray();
+
+ if ((emptySortedSetArray == null) || (emptySortedSetArray.length > 0)) {
+ throwException("testToArray",
+ "Returned null array or array with length > 0.");
+ }
+
+ String[] strings = new String[2];
+ strings[0] = "1";
+ strings[1] = "2";
+ emptySortedSetArray = sortedSet.toArray(strings);
+
+ if ((emptySortedSetArray == null) || (emptySortedSetArray[0] != null)) {
+ throwException("testToArray",
+ "Returned null array or array with length > 0.");
+ }
+ }
+}
diff --git a/jdk/test/java/util/Currency/CurrencyTest.java b/jdk/test/java/util/Currency/CurrencyTest.java
index e7ae4fd..c228138 100644
--- a/jdk/test/java/util/Currency/CurrencyTest.java
+++ b/jdk/test/java/util/Currency/CurrencyTest.java
@@ -128,18 +128,20 @@ public class CurrencyTest {
checkCountryCurrency(country1[i], currency1[i]);
}
- // check currency changes
- String[] switchOverCtry = {"DE", "FR", "ES", "IT", "NL", "BE", "TR", "RO", "AZ", "MZ", "GH", "VE"};
- String[] switchOverOld = {"DEM", "FRF", "ESP", "ITL", "NLG", "BEF", "TRL", "ROL", "AZM", "MZM", "GHC", "VEB"};
- String[] switchOverNew = {"EUR", "EUR", "EUR", "EUR", "EUR", "EUR", "TRY", "RON", "AZN", "MZN", "GHS", "VEF"};
- String[] switchOverTZ = {"Europe/Paris", "Europe/Paris", "Europe/Paris", "Europe/Paris",
- "Europe/Paris", "Europe/Paris", "Asia/Istanbul", "Europe/Bucharest",
- "Asia/Baku", "Africa/Maputo", "Africa/Accra", "America/Caracas"};
- int[] switchOverYear = {2002, 2002, 2002, 2002, 2002, 2002, 2005, 2005, 2006, 2006, 2007, 2008};
- int[] switchOverMonth = {Calendar.JANUARY, Calendar.JANUARY, Calendar.JANUARY, Calendar.JANUARY,
- Calendar.JANUARY, Calendar.JANUARY, Calendar.JANUARY, Calendar.JULY,
- Calendar.JANUARY, Calendar.JULY, Calendar.JULY, Calendar.JANUARY};
- int[] switchOverDay = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+ /*
+ * check currency changes
+ * In current implementation, there is no data of old currency and transition date at jdk/src/share/classes/java/util/CurrencyData.properties.
+ * So, all the switch data arrays are empty. In the future, if data of old currency and transition date are necessary for any country, the
+ * arrays here can be updated so that the program can check the currency switch.
+ */
+ String[] switchOverCtry = {};
+ String[] switchOverOld = {};
+ String[] switchOverNew = {};
+ String[] switchOverTZ = {};
+ int[] switchOverYear = {};
+ int[] switchOverMonth = {};
+ int[] switchOverDay = {};
+
for (int i = 0; i < switchOverCtry.length; i++) {
TimeZone.setDefault(TimeZone.getTimeZone(switchOverTZ[i]));
Calendar date = new GregorianCalendar(switchOverYear[i], switchOverMonth[i], switchOverDay[i]);
diff --git a/jdk/test/java/util/Currency/ValidateISO4217.java b/jdk/test/java/util/Currency/ValidateISO4217.java
index 3f50780..679acfa 100644
--- a/jdk/test/java/util/Currency/ValidateISO4217.java
+++ b/jdk/test/java/util/Currency/ValidateISO4217.java
@@ -92,7 +92,7 @@ public class ValidateISO4217 {
/* Codes that are obsolete, do not have related country */
static final String otherCodes =
- "ADP-AFA-ATS-AYM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-NLG-PTE-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZWD-ZWN-ZWR";
+ "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-PTE-ROL-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-VEB-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZWD-ZWN-ZWR";
static boolean err = false;
diff --git a/jdk/test/java/util/Currency/tablea1.txt b/jdk/test/java/util/Currency/tablea1.txt
index 898af09..8b2e1b5 100644
--- a/jdk/test/java/util/Currency/tablea1.txt
+++ b/jdk/test/java/util/Currency/tablea1.txt
@@ -23,7 +23,7 @@ AW AWG 533 2
AU AUD 36 2
AT EUR 978 2
# MA 129
-AZ AZM 31 2 2005-12-31-20-00-00 AZN 944 2
+AZ AZN 944 2
BS BSD 44 2
BH BHD 48 3
BD BDT 50 2
@@ -96,7 +96,7 @@ GA XAF 950 0
GM GMD 270 2
GE GEL 981 2
DE EUR 978 2
-GH GHC 288 2 2007-07-01-00-00-00 GHS 936 2
+GH GHS 936 2
GI GIP 292 2
GR EUR 978 2
GL DKK 208 2
@@ -166,7 +166,7 @@ MN MNT 496 2
MS XCD 951 2
MA MAD 504 2
# MA 130
-MZ MZM 508 2 2006-06-30-22-00-00 MZN 943 2
+MZ MZN 943 2
MM MMK 104 2
# MA 134
ME EUR 978 2
@@ -200,7 +200,7 @@ PT EUR 978 2
PR USD 840 2
QA QAR 634 2
RE EUR 978 2
-RO ROL 946 2 2005-06-30-21-00-00 RON 946 2
+RO RON 946 2
RU RUB 643 2
RW RWF 646 0
SH SHP 654 2
@@ -266,7 +266,7 @@ UM USD 840 2
UY UYU 858 2
UZ UZS 860 2
VU VUV 548 0
-VE VEB 862 2 2008-01-01-04-00-00 VEF 937 2
+VE VEF 937 2
VN VND 704 2
VG USD 840 2
VI USD 840 2
diff --git a/jdk/test/java/util/Locale/Bug6989440.java b/jdk/test/java/util/Locale/Bug6989440.java
index ebf62f9..d524d05 100644
--- a/jdk/test/java/util/Locale/Bug6989440.java
+++ b/jdk/test/java/util/Locale/Bug6989440.java
@@ -37,26 +37,49 @@ import java.util.spi.TimeZoneNameProvider;
import sun.util.LocaleServiceProviderPool;
public class Bug6989440 {
- public static void main(String[] args) {
- TestThread t1 = new TestThread(LocaleNameProvider.class);
- TestThread t2 = new TestThread(TimeZoneNameProvider.class);
- TestThread t3 = new TestThread(DateFormatProvider.class);
-
- t1.start();
- t2.start();
- t3.start();
+ static volatile boolean failed; // false
+ static final int THREADS = 50;
+
+ public static void main(String[] args) throws Exception {
+ Thread[] threads = new Thread[THREADS];
+ for (int i=0; i<threads.length; i++)
+ threads[i] = new TestThread();
+ for (int i=0; i<threads.length; i++)
+ threads[i].start();
+ for (int i=0; i<threads.length; i++)
+ threads[i].join();
+
+ if (failed)
+ throw new RuntimeException("Failed: check output");
}
static class TestThread extends Thread {
private Class<? extends LocaleServiceProvider> cls;
+ private static int count;
public TestThread(Class<? extends LocaleServiceProvider> providerClass) {
cls = providerClass;
}
+ public TestThread() {
+ int which = count++ % 3;
+ switch (which) {
+ case 0 : cls = LocaleNameProvider.class; break;
+ case 1 : cls = TimeZoneNameProvider.class; break;
+ case 2 : cls = DateFormatProvider.class; break;
+ default : throw new AssertionError("Should not reach here");
+ }
+ }
+
public void run() {
- LocaleServiceProviderPool pool = LocaleServiceProviderPool.getPool(cls);
- pool.getAvailableLocales();
+ try {
+ LocaleServiceProviderPool pool = LocaleServiceProviderPool.getPool(cls);
+ pool.getAvailableLocales();
+ } catch (Exception e) {
+ System.out.println(e);
+ e.printStackTrace();
+ failed = true;
+ }
}
}
}
diff --git a/jdk/test/javax/swing/JColorChooser/Test6827032.java b/jdk/test/javax/swing/JColorChooser/Test6827032.java
new file mode 100644
index 0000000..0cb8234
--- /dev/null
+++ b/jdk/test/javax/swing/JColorChooser/Test6827032.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2007, 2011, 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 6827032
+ * @summary Color chooser with drag enabled shouldn't throw NPE
+ * @author Peter Zhelezniakov
+ * @library ../regtesthelpers
+ */
+
+import sun.awt.SunToolkit;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.*;
+import javax.swing.plaf.nimbus.NimbusLookAndFeel;
+
+
+public class Test6827032 {
+
+ private static volatile Point point;
+ private static JColorChooser cc;
+
+ public static void main(String[] args) throws Exception {
+ UIManager.setLookAndFeel(new NimbusLookAndFeel());
+
+ Robot robot = new Robot();
+ robot.setAutoDelay(50);
+
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ createAndShowGUI();
+ }
+ });
+
+ toolkit.realSync();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ Component previewPanel = Util.findSubComponent(cc, "javax.swing.colorchooser.DefaultPreviewPanel");
+ point = previewPanel.getLocationOnScreen();
+ }
+ });
+
+ point.translate(5, 5);
+
+ robot.mouseMove(point.x, point.y);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ }
+
+
+ private static void createAndShowGUI() {
+ JFrame frame = new JFrame(Test6827032.class.getName());
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ cc = new JColorChooser();
+ cc.setDragEnabled(true);
+ frame.add(cc);
+ frame.pack();
+ frame.setVisible(true);
+ }
+}
diff --git a/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java b/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java
new file mode 100644
index 0000000..cf732a9
--- /dev/null
+++ b/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2007, 2011, 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 4492274
+ * @summary Tests if JEditorPane.getPage() correctly returns anchor reference.
+ * @author Denis Sharypov
+ */
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import javax.swing.text.html.HTMLEditorKit;
+import java.awt.*;
+import java.io.File;
+import java.net.URL;
+
+public class bug4492274 {
+
+ private static URL page;
+
+ private static JEditorPane jep;
+
+ public static void main(String args[]) throws Exception {
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ createAndShowGUI();
+ }
+ });
+
+ toolkit.realSync();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ page = new URL(page, "#linkname");
+ jep.setPage(page);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+
+ toolkit.realSync();
+
+ if (getPageAnchor() == null) {
+ throw new RuntimeException("JEditorPane.getPage() returns null anchor reference");
+ }
+
+ }
+
+ private static String getPageAnchor() throws Exception {
+ final String[] result = new String[1];
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ result[0] = jep.getPage().getRef();
+ }
+ });
+
+ return result[0];
+ }
+
+ private static void createAndShowGUI() {
+ try {
+ File file = new File(System.getProperty("test.src", "."), "test.html");
+ page = file.toURI().toURL();
+
+ JFrame f = new JFrame();
+
+ jep = new JEditorPane();
+ jep.setEditorKit(new HTMLEditorKit());
+ jep.setEditable(false);
+ jep.setPage(page);
+
+ JScrollPane sp = new JScrollPane(jep);
+
+ f.getContentPane().add(sp);
+ f.setSize(500, 500);
+ f.setVisible(true);
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/jdk/test/javax/swing/JEditorPane/4492274/test.html b/jdk/test/javax/swing/JEditorPane/4492274/test.html
new file mode 100644
index 0000000..2186cc3
--- /dev/null
+++ b/jdk/test/javax/swing/JEditorPane/4492274/test.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<a name="top">top</a>
+<img src=a.jpg width=500 height=1000>
+<a name="linkname">bottom</a>
+</body>
+</html>
diff --git a/jdk/test/javax/swing/JSlider/6348946/bug6348946.java b/jdk/test/javax/swing/JSlider/6348946/bug6348946.java
new file mode 100644
index 0000000..7183deb
--- /dev/null
+++ b/jdk/test/javax/swing/JSlider/6348946/bug6348946.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2007, 2011, 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 6348946
+ * @summary Tests that JSlider's thumb moves in the right direction
+ * when it is used as a JTable cell editor.
+ * @author Mikhail Lapshin
+*/
+
+import sun.awt.SunToolkit;
+
+import java.awt.*;
+import java.awt.event.InputEvent;
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.table.*;
+
+public class bug6348946 {
+
+ private static JFrame frame;
+
+ private static JPanel panel;
+
+ private static volatile boolean passed = false;
+
+ public static void main(String[] args) throws Exception {
+ String lf = "javax.swing.plaf.metal.MetalLookAndFeel";
+ UIManager.setLookAndFeel(lf);
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ setupUI();
+ }
+ });
+ toolkit.realSync();
+ clickOnSlider();
+ toolkit.realSync();
+ checkResult();
+ } finally {
+ stopEDT();
+ }
+ }
+
+ private static void setupUI() {
+ frame = new JFrame();
+
+ panel = new JPanel();
+ panel.setLayout(new BorderLayout());
+ panel.add(new ParameterTable(), BorderLayout.CENTER);
+ frame.getContentPane().add(panel);
+
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ private static void clickOnSlider() throws Exception {
+ Robot robot = new Robot();
+ robot.setAutoDelay(10);
+
+ Rectangle rect = getPanelRectangle();
+
+ double clickX = rect.getX() + rect.getWidth() / 4;
+ double clickY = rect.getY() + rect.getHeight() / 2;
+ robot.mouseMove((int) clickX, (int) clickY);
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ }
+
+ private static void checkResult(){
+ if (passed) {
+ System.out.println("Test passed");
+ } else {
+ throw new RuntimeException("The thumb moved " +
+ "to the right instead of the left!");
+ }
+ }
+
+ private static void stopEDT() {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ frame.dispose();
+ }
+ });
+ }
+
+ private static class ParameterTable extends JTable {
+ public ParameterTable() {
+ super(new Object[][]{{5}}, new String[]{"Value"});
+ getColumnModel().getColumn(0).setCellRenderer(new Renderer());
+ getColumnModel().getColumn(0).setCellEditor(new Editor());
+ }
+ }
+
+ private static class Renderer implements TableCellRenderer {
+ private JSlider slider = new JSlider(0, 10);
+
+ public Component getTableCellRendererComponent(JTable table,
+ Object value,
+ boolean isSelected,
+ boolean hasFocus,
+ int row, int col) {
+ int val = (Integer) value;
+ slider.setValue(val);
+ return slider;
+ }
+ }
+
+ private static class Editor extends AbstractCellEditor implements TableCellEditor {
+ private JSlider slider = new JSlider(0, 10);
+
+ public Component getTableCellEditorComponent(JTable table, Object value,
+ boolean isSelected,
+ int row, int col) {
+ int val = (Integer) value;
+ slider.setValue(val);
+ return slider;
+ }
+
+ public Editor() {
+ slider.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent e) {
+ if (!slider.getValueIsAdjusting()) {
+ passed = slider.getValue() <= 5;
+ }
+ }
+ });
+ }
+
+ public Object getCellEditorValue() {
+ return slider.getValue();
+ }
+ }
+
+ private static Rectangle getPanelRectangle() throws Exception{
+ final Rectangle[] result = new Rectangle[1];
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ result[0] = new Rectangle(panel.getLocationOnScreen(), panel.getSize());
+ }
+ });
+
+ return result[0];
+ }
+}
diff --git a/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java b/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java
new file mode 100644
index 0000000..e6398b2
--- /dev/null
+++ b/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2011 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.
+ */
+
+/*
+ * Portions Copyright (c) 2011 IBM Corporation
+ */
+
+/* @test
+ * @bug 7049024
+ * @summary DnD fails with JTextArea and JTextField
+ * @author Sean Chou
+ */
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import javax.swing.text.DefaultCaret;
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+
+public class bug7049024 {
+ public static Clipboard clipboard = null;
+
+ public static JTextField textField = null;
+
+ // This button is used to move focus away from textField.
+ public static JButton button = null;
+
+ public static JFrame frame = null;
+
+ public static DefaultCaret caret = null;
+
+ public static void main(String[] args) throws Exception {
+
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ frame = new JFrame("Test");
+ textField = new JTextField("test selection for textfield");
+ button = new JButton("To compete the focus");
+
+ frame.setLayout(new FlowLayout());
+ frame.getContentPane().add(textField);
+ frame.getContentPane().add(button);
+
+ frame.pack();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setVisible(true);
+ }
+ });
+ toolkit.realSync();
+
+ clipboard = textField.getToolkit().getSystemSelection();
+ if (null == clipboard) {
+ return;
+ }
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ textField.requestFocusInWindow();
+ }
+ });
+ toolkit.realSync();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ caret = (DefaultCaret) textField.getCaret();
+ caret.setDot(2);
+ caret.moveDot(4);
+ }
+ });
+ toolkit.realSync();
+
+ String oldSelection = (String) clipboard.getData(DataFlavor.stringFlavor);
+ System.out.println("oldSelection is " + oldSelection);
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ button.requestFocusInWindow();
+ }
+ });
+ toolkit.realSync(); // So JTextField loses the focus.
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ caret.setDot(4);
+ caret.moveDot(6);
+ }
+ });
+ toolkit.realSync();
+
+ String newSelection = (String) clipboard.getData(DataFlavor.stringFlavor);
+ System.out.println("newSelection is " + newSelection);
+
+ boolean passed = newSelection.equals(oldSelection);
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ frame.dispose();
+ }
+ });
+
+ if (!passed) {
+ throw new RuntimeException("The test for bug 7049024 failed");
+ }
+ }
+}
diff --git a/jdk/test/javax/swing/ToolTipManager/Test6256140.java b/jdk/test/javax/swing/ToolTipManager/Test6256140.java
new file mode 100644
index 0000000..12d5df8
--- /dev/null
+++ b/jdk/test/javax/swing/ToolTipManager/Test6256140.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2007, 2011, 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 6256140
+ * @summary Esc key doesn't restore old value in JFormattedtextField when ToolTip is set
+ * @author Alexander Potochkin
+ * @run main Test6256140
+ */
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+
+public class Test6256140 {
+
+ private static volatile JFormattedTextField ft;
+
+ private final static String initialText = "value";
+ private final static JLabel toolTipLabel = new JLabel("tip");
+
+ public static void main(String[] args) throws Exception {
+
+ Robot robot = new Robot();
+ robot.setAutoDelay(10);
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ createAndShowGUI();
+ }
+ });
+ toolkit.realSync();
+
+ Point point = ft.getLocationOnScreen();
+ robot.mouseMove(point.x, point.y);
+ robot.mouseMove(point.x + 3, point.y + 3);
+
+ robot.keyPress(KeyEvent.VK_A);
+ robot.keyRelease(KeyEvent.VK_A);
+ toolkit.realSync();
+
+ if (!isTooltipShowning()) {
+ throw new RuntimeException("Tooltip is not shown");
+ }
+
+ robot.keyPress(KeyEvent.VK_ESCAPE);
+ robot.keyRelease(KeyEvent.VK_ESCAPE);
+ toolkit.realSync();
+
+ if (isTooltipShowning()) {
+ throw new RuntimeException("Tooltip must be hidden now");
+ }
+
+ if (isTextEqual()) {
+ throw new RuntimeException("FormattedTextField must *not* cancel the updated value this time");
+ }
+
+ robot.keyPress(KeyEvent.VK_ESCAPE);
+ robot.keyRelease(KeyEvent.VK_ESCAPE);
+ toolkit.realSync();
+
+ if (!isTextEqual()) {
+ throw new RuntimeException("FormattedTextField must cancel the updated value");
+ }
+ }
+
+ private static boolean isTooltipShowning() throws Exception {
+ final boolean[] result = new boolean[1];
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ result[0] = toolTipLabel.isShowing();
+ }
+ });
+
+ return result[0];
+ }
+
+ private static boolean isTextEqual() throws Exception {
+ final boolean[] result = new boolean[1];
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ result[0] = initialText.equals(ft.getText());
+ }
+ });
+
+ return result[0];
+ }
+
+ private static void createAndShowGUI() {
+ ToolTipManager.sharedInstance().setDismissDelay(Integer.MAX_VALUE);
+ ToolTipManager.sharedInstance().setInitialDelay(0);
+
+ final JFrame frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setLayout(new FlowLayout());
+
+ ft = new JFormattedTextField() {
+
+ public JToolTip createToolTip() {
+ JToolTip toolTip = super.createToolTip();
+ toolTip.setLayout(new BorderLayout());
+ toolTip.add(toolTipLabel);
+ return toolTip;
+ }
+ };
+ ft.setToolTipText(" ");
+ ft.setValue(initialText);
+ frame.add(ft);
+
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ ft.requestFocus();
+ }
+}
diff --git a/jdk/test/javax/swing/regtesthelpers/Util.java b/jdk/test/javax/swing/regtesthelpers/Util.java
index 76217ae..6e61ad3 100644
--- a/jdk/test/javax/swing/regtesthelpers/Util.java
+++ b/jdk/test/javax/swing/regtesthelpers/Util.java
@@ -116,4 +116,28 @@ public class Util {
System.out.println("Got OOME");
}
+
+ /**
+ * Find a sub component by class name.
+ * Always run this method on the EDT thread
+ */
+ public static Component findSubComponent(Component parent, String className) {
+ String parentClassName = parent.getClass().getName();
+
+ if (parentClassName.contains(className)) {
+ return parent;
+ }
+
+ if (parent instanceof Container) {
+ for (Component child : ((Container) parent).getComponents()) {
+ Component subComponent = findSubComponent(child, className);
+
+ if (subComponent != null) {
+ return subComponent;
+ }
+ }
+ }
+
+ return null;
+ }
}
diff --git a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java
index e4a9638..60ce1c6 100644
--- a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java
+++ b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, 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
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 4635230 6283345 6303830 6824440 6867348
+ * @bug 4635230 6283345 6303830 6824440 6867348 7094155
* @summary Basic unit tests for generating XML Signatures with JSR 105
* @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java
* X509KeySelector.java GenerationTests.java
@@ -134,6 +134,7 @@ public class GenerationTests {
test_create_signature_enveloping_sha512_rsa_sha384();
test_create_signature_enveloping_sha512_rsa_sha512();
test_create_signature_reference_dependency();
+ test_create_signature_with_attr_in_no_namespace();
}
private static void setup() throws Exception {
@@ -460,6 +461,52 @@ public class GenerationTests {
System.out.println();
}
+ static void test_create_signature_with_attr_in_no_namespace()
+ throws Exception
+ {
+ System.out.println
+ ("* Generating signature-with-attr-in-no-namespace.xml");
+
+ // create references
+ List<Reference> refs = Collections.singletonList
+ (fac.newReference("#unknown", sha1));
+
+ // create SignedInfo
+ SignedInfo si = fac.newSignedInfo(withoutComments, rsaSha1, refs);
+
+ // create object-1
+ Document doc = db.newDocument();
+ Element nc = doc.createElementNS(null, "NonCommentandus");
+ // add attribute with no namespace
+ nc.setAttribute("Id", "unknown");
+ XMLObject obj = fac.newXMLObject(Collections.singletonList
+ (new DOMStructure(nc)), "object-1", null, null);
+
+ // create XMLSignature
+ XMLSignature sig = fac.newXMLSignature(si, rsa,
+ Collections.singletonList(obj),
+ "signature", null);
+ DOMSignContext dsc = new DOMSignContext(getPrivateKey("RSA"), doc);
+
+ sig.sign(dsc);
+
+// dumpDocument(doc, new PrintWriter(System.out));
+
+ DOMValidateContext dvc = new DOMValidateContext
+ (kvks, doc.getDocumentElement());
+ XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
+
+ if (sig.equals(sig2) == false) {
+ throw new Exception
+ ("Unmarshalled signature is not equal to generated signature");
+ }
+ if (sig2.validate(dvc) == false) {
+ throw new Exception("Validation of generated signature failed");
+ }
+
+ System.out.println();
+ }
+
static void test_create_signature() throws Exception {
System.out.println("* Generating signature.xml");
diff --git a/jdk/test/org/openjdk/jigsaw/circular-deps.sh b/jdk/test/org/openjdk/jigsaw/circular-deps.sh
index 456875c..5f5d944 100644
--- a/jdk/test/org/openjdk/jigsaw/circular-deps.sh
+++ b/jdk/test/org/openjdk/jigsaw/circular-deps.sh
@@ -90,7 +90,7 @@ EOF
mkdir z.modules z.classes
-$BIN/javac -source 7 -d z.modules -modulepath z.modules \
+$BIN/javac -source 8 -d z.modules -modulepath z.modules \
`find z.src -name '*.java'`
$BIN/jmod -J-ea -L z.lib create
$BIN/jmod -J-ea -L z.lib install z.modules `ls z.src`
diff --git a/jdk/test/org/openjdk/jigsaw/cli/JpkgArgsTest.java b/jdk/test/org/openjdk/jigsaw/cli/JpkgArgsTest.java
index c3b65f0..5b7c281 100644
--- a/jdk/test/org/openjdk/jigsaw/cli/JpkgArgsTest.java
+++ b/jdk/test/org/openjdk/jigsaw/cli/JpkgArgsTest.java
@@ -24,7 +24,7 @@
/*
* @test
* @bug 6948144
- * @summary jpkg throws NPE if resource directory does not exist
+ * @summary jpkg throws NPE if input directory does not exist
*/
import java.io.*;
@@ -66,17 +66,16 @@ public class JpkgArgsTest {
compile(files);
}
- private void testIfFileArgExists(boolean res, boolean natlib,
+ private void testIfFileArgExists(boolean natlib,
boolean natcmd, boolean config)
throws Exception {
setUp("NPE if file argument does not exist: "
- + (res? " -r " : "")
+ (natlib? " --natlib " : "")
+ (natcmd? " --natcmd " : "")
+ (config? " --config" : ""));
try {
- compress(res, natlib, natcmd, config);
+ compress(natlib, natcmd, config);
}
// The bug resulted in a NPE being thrown
catch (NullPointerException e) {
@@ -90,23 +89,21 @@ public class JpkgArgsTest {
}
}
- private void testIfFileArgIsNotADirectory(boolean res, boolean natlib,
+ private void testIfFileArgIsNotADirectory(boolean natlib,
boolean natcmd, boolean config)
throws Exception {
setUp("NPE if file argument is not a directory: "
- + (res? " -r " : "")
+ (natlib? " --natlib " : "")
+ (natcmd? " --natcmd " : "")
+ (config? " --config" : ""));
// Create files rather then directories to get the exception
- resourceDir.createNewFile();
natlibDir.createNewFile();
natcmdDir.createNewFile();
configDir.createNewFile();
try {
- compress(res, natlib, natcmd, config);
+ compress(natlib, natcmd, config);
}
// The bug resulted in a NPE being thrown
catch (NullPointerException e) {
@@ -120,24 +117,22 @@ public class JpkgArgsTest {
}
}
- private void testIfFileArgIsNotReadable(boolean res, boolean natlib,
+ private void testIfFileArgIsNotReadable(boolean natlib,
boolean natcmd, boolean config)
throws Exception {
setUp("NPE if file argument is not readable: "
- + (res? " -r " : "")
+ (natlib? " --natlib " : "")
+ (natcmd? " --natcmd " : "")
+ (config? " --config" : ""));
// Create directories and mark then non-readable to get the exception
- if (! (resourceDir.mkdir() && resourceDir.setReadable(false) &&
- natlibDir.mkdir() && natlibDir.setReadable(false) &&
+ if (! (natlibDir.mkdir() && natlibDir.setReadable(false) &&
natcmdDir.mkdir() && natcmdDir.setReadable(false) &&
configDir.mkdir() && configDir.setReadable(false)))
throw new Exception("Can't set up test");
try {
- compress(res, natlib, natcmd, config);
+ compress(natlib, natcmd, config);
}
// The bug resulted in a NPE being thrown
catch (NullPointerException e) {
@@ -150,37 +145,35 @@ public class JpkgArgsTest {
// yay! test passed.
}
finally {
- resourceDir.setReadable(true);
natlibDir.setReadable(true);
natcmdDir.setReadable(true);
configDir.setReadable(true);
}
}
- private void testIfFileArgIsEmpty(boolean res, boolean natlib,
+ private void testIfFileArgIsEmpty(boolean natlib,
boolean natcmd, boolean config)
throws Exception {
setUp("IOException if file argument is an empty directory: "
- + (res? " -r " : "")
+ (natlib? " --natlib " : "")
+ (natcmd? " --natcmd " : "")
+ (config? " --config" : ""));
// Create empty directories for jpkg to ignore
- if (! (resourceDir.mkdir() && natlibDir.mkdir() &&
- natcmdDir.mkdir() && configDir.mkdir()))
+ if (! (natlibDir.mkdir() && natcmdDir.mkdir() && configDir.mkdir()))
throw new Exception("Can't set up test");
- compress(res, natlib, natcmd, config);
+ compress(natlib, natcmd, config);
}
private void testIfModulePathArgIsNotADirectory()
throws Exception {
setUp("Check if module path argument is not a directory");
- resourceDir.createNewFile();
+ File aFile = new File("tmp", "aFile");
+ aFile.createNewFile();
try {
- String [] args = {"-m", resourceDir.toString(), "jmod", "hello"};
+ String [] args = {"-m", aFile.toString(), "jmod", "hello"};
Packager.run(args);
}
// The bug resulted in a NPE being thrown
@@ -194,6 +187,9 @@ public class JpkgArgsTest {
// yay! test passed.
return;
}
+ finally {
+ aFile.delete();
+ }
throw new Exception("Should have caught an exception");
}
@@ -223,11 +219,12 @@ public class JpkgArgsTest {
throws Exception {
setUp("Check if module path argument is not readable");
- if (! (resourceDir.mkdir() && resourceDir.setReadable(false)))
+ File dir = new File("tmp", "notReadableDir");
+ if (! (dir.mkdir() && dir.setReadable(false)))
throw new Exception("Can't set up test");
try {
- String [] args = {"-m", resourceDir.toString(), "jmod", "hello"};
+ String [] args = {"-m", dir.toString(), "jmod", "hello"};
Packager.run(args);
}
// The bug resulted in a NPE being thrown
@@ -242,21 +239,20 @@ public class JpkgArgsTest {
return;
}
finally {
- resourceDir.setReadable(true);
+ dir.setReadable(true);
+ dir.delete();
}
throw new Exception("Should have caught an exception");
}
private void testAbsolutePathArg()
throws Exception {
- setUp("Check if absolute resource path argument is accepted");
+ setUp("Check if absolute module path argument is accepted");
+ File testfile = new File(classesDir, "test");
try {
- resourceDir.mkdir();
- File testfile = new File(resourceDir, "test");
testfile.createNewFile();
String [] args = {"-m", classesDir.getAbsolutePath(),
- "-r", resourceDir.getAbsolutePath(),
"jmod", "hello"};
Packager.run(args);
}
@@ -265,6 +261,9 @@ public class JpkgArgsTest {
// Rethrow the exception if it ever occurs again.
throw (Exception) new Exception().initCause(e);
}
+ finally {
+ testfile.delete();
+ }
}
private void testModulePathArg() throws Exception {
@@ -283,13 +282,10 @@ public class JpkgArgsTest {
bloop = b;
for (boolean cloop = c = false; !cloop; c = true) {
cloop = c;
- for (boolean dloop = d = false; !dloop; d = true) {
- dloop = d;
- testIfFileArgExists(a, b, c, d);
- testIfFileArgIsNotADirectory(a, b, c, d);
- testIfFileArgIsNotReadable(a, b, c, d);
- testIfFileArgIsEmpty(a, b, c, d);
- }
+ testIfFileArgExists(a, b, c);
+ testIfFileArgIsNotADirectory(a, b, c);
+ testIfFileArgIsNotReadable(a, b, c);
+ testIfFileArgIsEmpty(a, b, c);
}
}
}
@@ -302,21 +298,17 @@ public class JpkgArgsTest {
compress(false);
}
- private void compress(boolean haveResources) throws Exception {
- compress(haveResources, false);
- }
-
- private void compress(boolean haveResources, boolean haveNatLibs)
+ private void compress(boolean haveNatLibs)
throws Exception {
- compress(haveResources, haveNatLibs, false);
+ compress(haveNatLibs, false);
}
- private void compress(boolean haveResources, boolean haveNatLibs,
+ private void compress(boolean haveNatLibs,
boolean haveNatCmds) throws Exception {
- compress(haveResources, haveNatLibs, haveNatCmds, false);
+ compress(haveNatLibs, haveNatCmds, false);
}
- private void compress(boolean haveResources, boolean haveNatLibs,
+ private void compress(boolean haveNatLibs,
boolean haveNatCmds, boolean haveConfig)
throws Exception {
List<String> args = new ArrayList<String>();
@@ -324,10 +316,6 @@ public class JpkgArgsTest {
args.add(classesDir.getAbsolutePath());
args.add("-d");
args.add(moduleDir.getAbsolutePath());
- if (haveResources) {
- args.add("-r");
- args.add(resourceDir.toString());
- }
if (haveNatLibs) {
args.add("--natlib");
args.add(natlibDir.toString());
@@ -350,7 +338,7 @@ public class JpkgArgsTest {
*/
private void compile(List<File> files) {
List<String> options = new ArrayList<String>();
- options.addAll(Arrays.asList("-source", "7", "-d", classesDir.getPath()));
+ options.addAll(Arrays.asList("-source", "8", "-d", classesDir.getPath()));
for (File f: files)
options.add(f.getPath());
@@ -436,7 +424,6 @@ public class JpkgArgsTest {
private File srcDir = new File("tmp", "src");
private File classesDir = new File("tmp", "classes");
private File moduleDir = new File("tmp", "modules");
- private File resourceDir = new File(srcDir, "resources");
private File natlibDir = new File(srcDir, "natlib");
private File natcmdDir = new File(srcDir, "natcmd");
private File configDir = new File(srcDir, "config");
diff --git a/jdk/test/org/openjdk/jigsaw/cli/ModuleFileTest.java b/jdk/test/org/openjdk/jigsaw/cli/ModuleFileTest.java
new file mode 100644
index 0000000..b34c856
--- /dev/null
+++ b/jdk/test/org/openjdk/jigsaw/cli/ModuleFileTest.java
@@ -0,0 +1,576 @@
+/*
+ * Copyright (c) 2010, 2011, 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
+ * @summary test module format writing/reading
+ */
+import java.io.*;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.security.CodeSigner;
+import java.security.cert.*;
+import java.util.*;
+import java.util.zip.*;
+import org.openjdk.jigsaw.cli.*;
+import org.openjdk.jigsaw.SignedModule;
+import org.openjdk.jigsaw.ModuleFileVerifier;
+import org.openjdk.jigsaw.ModuleFile;
+import static org.openjdk.jigsaw.FileConstants.ModuleFile.*;
+
+public class ModuleFileTest {
+
+ private static final String MNAME = "hello";
+ private static final String MVER = "0.1";
+
+ public static void main(String[] args) throws Exception {
+ boolean sign = args.length > 0;
+ try {
+ test(sign);
+ } catch (Throwable t) {
+ t.printStackTrace();
+ errors++;
+ }
+ if (errors == 0) {
+ System.out.println(count + " tests passed");
+ } else {
+ throw new Exception(errors + "/" + count + " tests failed");
+ }
+ }
+ final String[] classnames = new String[]{
+ "World", "Another"
+ };
+ final String[] filenames = new String[]{
+ "yo", "Hey"
+ };
+ final int classes;
+ final int resources;
+ final int nativelibs;
+ final int nativecmds;
+ final int configs;
+ final File jmodfile;
+ final File extractedDir;
+ String filecontent = "file content";
+
+ ModuleFileTest(int classes, int resources, int configs,
+ int nativelibs, int nativecmds) throws Exception {
+ count++;
+ this.classes = classes;
+ this.resources = resources;
+ this.nativelibs = nativelibs;
+ this.nativecmds = nativecmds;
+ this.configs = configs;
+ this.jmodfile = new File(moduleDir, MNAME + "@" + MVER + ".jmod");
+ this.extractedDir = new File(MNAME);
+ createModuleContent();
+ }
+
+ void run(boolean sign) throws Exception {
+ jpkg(MNAME);
+ if (sign) {
+ sign(MNAME, MVER);
+ }
+ checkModuleFileContent(MNAME);
+ }
+
+ void setFileContent(String s) {
+ filecontent = s;
+ }
+
+ private void setup() throws IOException {
+ if (tmpDir.exists()) {
+ deleteTree(tmpDir.toPath());
+ }
+ if (extractedDir.exists()) {
+ deleteTree(extractedDir.toPath());
+ }
+ tmpDir.mkdirs();
+ }
+
+ private void createModuleContent() throws IOException {
+ setup();
+
+ String moduleinfo = "module " + MNAME + " @ " + MVER + " {}";
+ List<File> files = new ArrayList<>();
+ files.add(createFile(srcDir, "module-info.java", moduleinfo));
+ for (int i = 0; i < classes; i++) {
+ String cn = classnames[i];
+ String code = String.format("public class %s {}", cn);
+ files.add(createFile(srcDir, cn + ".java", code));
+ }
+ compile(files);
+
+ // create resource files
+ for (int i = 0; i < resources; i++) {
+ createFile(resourcesDir, filenames[i], filecontent);
+ }
+
+ // create native libraries
+ for (int i = 0; i < nativelibs; i++) {
+ createFile(natlibDir, filenames[i] + ".so", filecontent);
+ }
+
+ // create native commands
+ for (int i = 0; i < nativecmds; i++) {
+ createFile(natcmdDir, filenames[i] + ".exe", filecontent);
+ }
+
+ // create config files
+ for (int i = 0; i < configs; i++) {
+ createFile(configDir, filenames[i], filecontent);
+ }
+ }
+
+ /**
+ * Create a test file with given content if the content is not null.
+ */
+ File createFile(File dir, String path, String body) throws IOException {
+ if (body == null) {
+ return null;
+ }
+ if (!dir.exists()) {
+ dir.mkdirs();
+ }
+ File file = new File(dir, path);
+ Files.write(file.toPath(), body.getBytes());
+ return file;
+ }
+
+ void jpkg(String mname) throws Exception {
+ if (!moduleDir.exists()) {
+ moduleDir.mkdirs();
+ }
+
+ List<String> args = new ArrayList<>();
+ args.add("-m");
+ args.add(classesDir.getAbsolutePath());
+ args.add("-d");
+ args.add(moduleDir.getAbsolutePath());
+ if (nativelibs > 0) {
+ args.add("--natlib");
+ args.add(natlibDir.toString());
+ }
+ if (nativecmds > 0) {
+ args.add("--natcmd");
+ args.add(natcmdDir.toString());
+ }
+ if (configs > 0) {
+ args.add("--config");
+ args.add(configDir.toString());
+ }
+ args.add("jmod");
+ args.add(mname);
+ System.out.println(" jpkg arguments: " + args);
+ Packager.main(args.toArray(new String[0]));
+ }
+
+ /**
+ * Extract a module.
+ */
+ void extract() throws Exception {
+ String[] args = {"extract", jmodfile.getAbsolutePath(), "-v"};
+ System.out.println(" jmod arguments: " + Arrays.toString(args));
+ Librarian.main(args);
+ }
+
+ void checkModuleInfo(File mdir) throws IOException {
+ String sectionDirname = ModuleFile.getSubdirOfSection(SectionType.MODULE_INFO);
+ File copyDir = new File(mdir, sectionDirname);
+ compare("module-info.class", classesDir, copyDir);
+ }
+
+ void checkModuleFileContent(String mname) throws Exception {
+ extract();
+
+ checkModuleInfo(extractedDir);
+
+ checkClasses(extractedDir);
+ checkResourceFiles(extractedDir);
+
+ checkFiles(configDir,
+ new File(extractedDir,
+ ModuleFile.getSubdirOfSection(SectionType.CONFIG)),
+ configs, "", false);
+ checkFiles(natcmdDir,
+ new File(extractedDir,
+ ModuleFile.getSubdirOfSection(SectionType.NATIVE_CMDS)),
+ nativecmds, ".exe", true);
+ boolean windows = System.getProperty("os.name").startsWith("Windows");
+ checkFiles(natlibDir,
+ new File(extractedDir,
+ ModuleFile.getSubdirOfSection(SectionType.NATIVE_LIBS)),
+ nativelibs, ".so", windows);
+ }
+
+ void checkClasses(File mdir) throws IOException {
+ File zipfile = new File(mdir, "classes");
+ if (classes == 0) {
+ if (zipfile.exists()) {
+ throw new RuntimeException("No class in this module but "
+ + zipfile + " exists");
+ }
+ return;
+ }
+
+ List<String> classfiles = new ArrayList<>();
+ for (int i = 0; i < classes; i++) {
+ classfiles.add(classnames[i] + ".class");
+ }
+ try (ZipFile content = new ZipFile(zipfile)) {
+ compare(classfiles, classesDir, content);
+ }
+ }
+
+ void checkResourceFiles(File mdir) throws IOException {
+ if (resources == 0) {
+ return;
+ }
+
+ List<String> files = new ArrayList<>();
+ String path = resourcesDir.getName();
+ for (int i = 0; i < resources; i++) {
+ files.add(path + '/' + filenames[i]);
+ }
+ try (ZipFile content = new ZipFile(new File(mdir, "classes"))) {
+ compare(files, classesDir, content);
+ }
+ }
+
+ void checkFiles(File dir, File copyDir,
+ int count, String suffix,
+ boolean executable) throws IOException {
+ List<String> fnames = new ArrayList<>();
+ for (int i = 0; i < count; i++) {
+ fnames.add(filenames[i] + suffix);
+ }
+ compare(fnames, dir, copyDir);
+
+ for (String fname : fnames) {
+ File file = new File(copyDir, fname);
+ if (executable && !file.canExecute()) {
+ throw new IOException("File not marked executable: " + file);
+ }
+ }
+ }
+
+ void sign(String name, String version) throws Exception {
+ List<String> args = new ArrayList<>();
+ args.add("--keystore");
+ args.add("keystore.jks");
+ args.add(jmodfile.getAbsolutePath());
+ args.add("signer");
+ args.add("-v");
+ System.out.println(" jsign arguments: " + args);
+ Signer.main(args.toArray(new String[0]));
+ checkSignature(name, jmodfile);
+ }
+
+ private static void test(boolean sign) throws Exception {
+ testEmptyModule(sign);
+ testSingleClassModule(sign);
+ testMultiClassModule(sign);
+ testSingleResourceModule(sign);
+ testMultiResourceModule(sign);
+ testSingleNatLibModule(sign);
+ testMultiNatLibModule(sign);
+ testSingleNatCmdModule(sign);
+ testMultiNatCmdModule(sign);
+ testSingleConfigModule(sign);
+ testMultiConfigModule(sign);
+ testBloatedModule(sign);
+ }
+
+ private static void testEmptyModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Empty module");
+ new ModuleFileTest(0, 0, 0, 0, 0).run(sign);
+ }
+
+ private static void testSingleClassModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Single class module");
+ new ModuleFileTest(1, 0, 0, 0, 0).run(sign);
+ }
+
+ private static void testMultiClassModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Multiple class module");
+ new ModuleFileTest(2, 0, 0, 0, 0).run(sign);
+ }
+
+ void testSignMultiClassModule() throws Exception {
+ System.out.println("\nTest: Multiple class module");
+ new ModuleFileTest(2, 0, 0, 0, 0).run(true);
+ }
+
+ private static void testSingleResourceModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Single resource module");
+ new ModuleFileTest(2, 1, 0, 0, 0).run(false);
+ }
+
+ private static void testMultiResourceModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Multiple resource module");
+ new ModuleFileTest(2, 2, 0, 0, 0).run(false);
+ }
+
+ private static void testSingleNatLibModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Single native library module");
+ new ModuleFileTest(0, 0, 0, 1, 0).run(false);
+ }
+
+ private static void testMultiNatLibModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Multiple native library module");
+ new ModuleFileTest(0, 0, 0, 2, 0).run(sign);
+ }
+
+ private static void testSingleNatCmdModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Single native command module");
+ new ModuleFileTest(0, 0, 0, 0, 1).run(sign);
+ }
+
+ private static void testMultiNatCmdModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Multi native command module");
+ new ModuleFileTest(0, 0, 0, 0, 2).run(sign);
+ }
+
+ private static void testSingleConfigModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Single config module");
+ new ModuleFileTest(0, 0, 1, 0, 0).run(sign);
+ }
+
+ private static void testMultiConfigModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Multi config module");
+ new ModuleFileTest(0, 0, 2, 0, 0).run(sign);
+ }
+
+ private static void testBloatedModule(boolean sign) throws Exception {
+ System.out.println("\nTest: Bloated module");
+ String largefile = "0";
+
+ for (int i = 0; i < 10000; i++) {
+ largefile += i;
+ }
+ new ModuleFileTest(2, 2, 2, 2, 2).run(sign);
+ }
+
+ void checkSignature(String name, File signedModuleFile) throws Exception {
+ try (FileInputStream fis = new FileInputStream(signedModuleFile);
+ DataInputStream dis = new DataInputStream(fis);
+ ModuleFile.Reader reader = new ModuleFile.Reader(dis)) {
+ if (reader.hasSignature()) {
+ if (reader.getSignatureType() == SignatureType.PKCS7.value()) {
+
+ ModuleFileVerifier verifier = new SignedModule.PKCS7Verifier(reader);
+ ModuleFileVerifier.Parameters verifierParams =
+ new SignedModule.VerifierParameters();
+ int i = 1;
+ System.out.println("Module '" + name + "' is signed by:");
+ for (CodeSigner signer :
+ verifier.verifySignature(verifierParams)) {
+ X509Certificate signerCert =
+ (X509Certificate) signer.getSignerCertPath().getCertificates().get(0);
+ System.out.println(" [" + (i++) + "] "
+ + signerCert.getSubjectX500Principal().getName());
+ }
+ System.out.println();
+ } else {
+ throw new Exception("Unsupported signature format");
+ }
+ } else {
+ throw new Exception("Module '" + name + "' is unsigned");
+ }
+ }
+ }
+
+ /**
+ * Compare an extracted module with original.
+ */
+ void compare(String fname, File origDir, File copyDir)
+ throws IOException {
+ compare(Collections.singletonList(fname), origDir, copyDir);
+ }
+
+ void compare(List<String> fnames, File origDir, File copyDir)
+ throws IOException {
+ for (String fname : fnames) {
+ File file = new File(origDir, fname);
+ File copy = null;
+
+ // Module-info class is extracted into info file.
+ if (fname.equals("module-info.class")) {
+ copy = new File(copyDir, "info");
+ } else {
+ copy = new File(copyDir, fname);
+ }
+ compare(file, copy);
+ }
+ }
+
+ void compare(List<String> fnames, File origDir, ZipFile content)
+ throws IOException {
+ for (String fname : fnames) {
+ File file = new File(origDir, fname.replace('/', File.separatorChar));
+ ZipEntry ze = content.getEntry(fname);
+ if (ze == null) {
+ throw new FileNotFoundException(fname);
+ }
+ compare(file, content.getInputStream(ze));
+ }
+ }
+
+ /**
+ * Compare two files for identity.
+ */
+ void compare(File f1, InputStream i2) throws IOException {
+ // For class files, only compare the ClassFile header as
+ // the class file is modified after being compressed by pack200.
+ long numBytes = f1.getName().endsWith(".class") ? 10 : f1.length();
+ int count = 0;
+ int c1, c2;
+ try (FileInputStream fis = new FileInputStream(f1);
+ InputStream i1 = new BufferedInputStream(fis)) {
+ while ((c1 = i1.read()) != -1 && count < numBytes) {
+ count++;
+ c2 = i2.read();
+ if (c1 != c2) {
+ throw new RuntimeException("file compare failed 1");
+ }
+ }
+ if (c1 == -1 && i2.read() != -1) {
+ throw new RuntimeException("file compare failed 2");
+ }
+ } finally {
+ i2.close();
+ }
+ }
+
+ void compare(File f1, File f2) throws IOException {
+ if (!f1.exists()) {
+ throw new RuntimeException("File not exist: " + f1);
+ }
+ if (!f2.exists()) {
+ throw new RuntimeException("File not exist: " + f2);
+ }
+ compare(f1, new BufferedInputStream(new FileInputStream(f2)));
+ }
+
+ /**
+ * Compile a list of files.
+ */
+ void compile(List<File> files) {
+ List<String> options = new ArrayList<>();
+ if (!classesDir.exists()) {
+ classesDir.mkdirs();
+ }
+ options.addAll(Arrays.asList("-source", "8", "-d", classesDir.getPath()));
+ for (File f : files) {
+ options.add(f.getPath());
+ }
+
+ String[] opts = options.toArray(new String[options.size()]);
+ StringWriter sw = new StringWriter();
+ try (PrintWriter pw = new PrintWriter(sw)) {
+ int rc = com.sun.tools.javac.Main.compile(opts, pw);
+ String out = sw.toString();
+ if (out.trim().length() > 0) {
+ System.err.println(out);
+ }
+ if (rc != 0) {
+ throw new Error("compilation failed: rc=" + rc);
+ }
+ }
+
+ }
+
+ /**
+ * Add a file to a list if the file is not null.
+ */
+ void addFile(List<File> files, File file) {
+ if (file != null) {
+ files.add(file);
+ }
+ }
+
+ /**
+ * Create a test file with given content if the content is not null.
+ */
+ File createFile(String path, String body) throws IOException {
+ if (body == null) {
+ return null;
+ }
+ File file = new File(srcDir, path);
+ return createFile(file, body);
+ }
+
+ File createFile(File file, String body) throws IOException {
+ file.getAbsoluteFile().getParentFile().mkdirs();
+ try (FileWriter out = new FileWriter(file)) {
+ out.write(body);
+ }
+ return file;
+ }
+
+ void deleteTree(Path dir) throws IOException {
+ Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
+
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+ throws IOException {
+ Files.delete(file);
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir, IOException e)
+ throws IOException {
+ if (e == null) {
+ Files.delete(dir);
+ return FileVisitResult.CONTINUE;
+ } else {
+ // directory iteration failed
+ throw e;
+ }
+ }
+ });
+
+ }
+
+ /**
+ * Report an error.
+ */
+ static void error(String msg, String... more) {
+ System.err.println("error: " + msg);
+ for (String s : more) {
+ System.err.println(s);
+ }
+ errors++;
+ }
+ static int count;
+ static int errors;
+ File tmpDir = new File("tmp");
+ File srcDir = new File(tmpDir, "src"); // use "tmp" to help avoid accidents
+ File classesDir = new File(tmpDir, "classes");
+ File resourcesDir = new File(classesDir, "resources");
+ File moduleDir = new File(tmpDir, "modules");
+ File natlibDir = new File(srcDir, "natlib");
+ File natcmdDir = new File(srcDir, "natcmd");
+ File configDir = new File(srcDir, "config");
+ String baseDir = System.getProperty("test.src", ".");
+}
diff --git a/jdk/test/org/openjdk/jigsaw/cli/ModuleFormatHeaderHashTest.java b/jdk/test/org/openjdk/jigsaw/cli/ModuleFormatHeaderHashTest.java
index eff2a97..78c1462 100644
--- a/jdk/test/org/openjdk/jigsaw/cli/ModuleFormatHeaderHashTest.java
+++ b/jdk/test/org/openjdk/jigsaw/cli/ModuleFormatHeaderHashTest.java
@@ -81,8 +81,8 @@ public class ModuleFormatHeaderHashTest {
String fname = moduleDir + File.separator + name + "@" + version + ".jmod";
try (FileInputStream fis = new FileInputStream(fname);
DataInputStream in = new DataInputStream(fis);
- ModuleFileFormat.Reader r = new ModuleFileFormat.Reader(in);) {
- return r.getHash();
+ ModuleFile.Reader r = new ModuleFile.Reader(in);) {
+ return r.getHash();
}
}
@@ -94,7 +94,7 @@ public class ModuleFormatHeaderHashTest {
MessageDigest md = MessageDigest.getInstance(digest);
try (FileInputStream fis = new FileInputStream(fname);
DigestInputStream dis = new DigestInputStream(fis, md)) {
- dis.read(new byte[ModuleFileFormat.FILE_HEADER_LENGTH_WITHOUT_HASH]);
+ dis.read(new byte[ModuleFile.ModuleFileHeader.LENGTH_WITHOUT_HASH]);
dis.on(false);
dis.read(new byte [md.getDigestLength()]);
dis.on(true);
@@ -111,21 +111,17 @@ public class ModuleFormatHeaderHashTest {
compress(name, false);
}
- void compress(String name, boolean haveResources) throws Exception {
- compress(name, haveResources, false);
- }
-
- void compress(String name, boolean haveResources, boolean haveNatLibs)
+ void compress(String name, boolean haveNatLibs)
throws Exception {
- compress(name, haveResources, haveNatLibs, false);
+ compress(name, haveNatLibs, false);
}
- void compress(String name, boolean haveResources, boolean haveNatLibs,
+ void compress(String name, boolean haveNatLibs,
boolean haveNatCmds) throws Exception {
- compress(name, haveResources, haveNatLibs, haveNatCmds, false);
+ compress(name, haveNatLibs, haveNatCmds, false);
}
- void compress(String name, boolean haveResources, boolean haveNatLibs,
+ void compress(String name, boolean haveNatLibs,
boolean haveNatCmds, boolean haveConfig)
throws Exception {
List<String> args = new ArrayList<String>();
@@ -133,10 +129,6 @@ public class ModuleFormatHeaderHashTest {
args.add(classesDir.getAbsolutePath());
args.add("-d");
args.add(moduleDir.getAbsolutePath());
- if (haveResources) {
- args.add("-r");
- args.add(resourceDir.toString());
- }
if (haveNatLibs) {
args.add("--natlib");
args.add(natlibDir.toString());
@@ -159,7 +151,7 @@ public class ModuleFormatHeaderHashTest {
*/
void compile(List<File> files) {
List<String> options = new ArrayList<String>();
- options.addAll(Arrays.asList("-source", "7", "-d", classesDir.getPath()));
+ options.addAll(Arrays.asList("-source", "8", "-d", classesDir.getPath()));
for (File f: files)
options.add(f.getPath());
@@ -244,7 +236,6 @@ public class ModuleFormatHeaderHashTest {
File srcDir = new File("tmp", "src"); // use "tmp" to help avoid accidents
File classesDir = new File("tmp", "classes");
File moduleDir = new File("tmp", "modules");
- File resourceDir = new File(srcDir, "resources");
File natlibDir = new File(srcDir, "natlib");
File natcmdDir = new File(srcDir, "natcmd");
File configDir = new File(srcDir, "config");
diff --git a/jdk/test/org/openjdk/jigsaw/cli/ModuleFormatTestLeftOverBytes.java b/jdk/test/org/openjdk/jigsaw/cli/ModuleFormatTestLeftOverBytes.java
index 0241531..3f4b350 100644
--- a/jdk/test/org/openjdk/jigsaw/cli/ModuleFormatTestLeftOverBytes.java
+++ b/jdk/test/org/openjdk/jigsaw/cli/ModuleFormatTestLeftOverBytes.java
@@ -104,21 +104,17 @@ public class ModuleFormatTestLeftOverBytes {
compress(name, false);
}
- void compress(String name, boolean haveResources) throws Exception {
- compress(name, haveResources, false);
- }
-
- void compress(String name, boolean haveResources, boolean haveNatLibs)
+ void compress(String name, boolean haveNatLibs)
throws Exception {
- compress(name, haveResources, haveNatLibs, false);
+ compress(name, haveNatLibs, false);
}
- void compress(String name, boolean haveResources, boolean haveNatLibs,
+ void compress(String name, boolean haveNatLibs,
boolean haveNatCmds) throws Exception {
- compress(name, haveResources, haveNatLibs, haveNatCmds, false);
+ compress(name, haveNatLibs, haveNatCmds, false);
}
- void compress(String name, boolean haveResources, boolean haveNatLibs,
+ void compress(String name, boolean haveNatLibs,
boolean haveNatCmds, boolean haveConfig)
throws Exception {
List<String> args = new ArrayList<String>();
@@ -126,10 +122,6 @@ public class ModuleFormatTestLeftOverBytes {
args.add(classesDir.getAbsolutePath());
args.add("-d");
args.add(moduleDir.getAbsolutePath());
- if (haveResources) {
- args.add("-r");
- args.add(resourceDir.toString());
- }
if (haveNatLibs) {
args.add("--natlib");
args.add(natlibDir.toString());
@@ -237,7 +229,6 @@ public class ModuleFormatTestLeftOverBytes {
File srcDir = new File("tmp", "src"); // use "tmp" to help avoid accidents
File classesDir = new File("tmp", "classes");
File moduleDir = new File("tmp", "modules");
- File resourceDir = new File(srcDir, "resources");
File natlibDir = new File(srcDir, "natlib");
File natcmdDir = new File(srcDir, "natcmd");
File configDir = new File(srcDir, "config");
diff --git a/jdk/test/org/openjdk/jigsaw/cli/SignedModuleFileTest.sh b/jdk/test/org/openjdk/jigsaw/cli/SignedModuleFileTest.sh
new file mode 100755
index 0000000..45fecb7
--- /dev/null
+++ b/jdk/test/org/openjdk/jigsaw/cli/SignedModuleFileTest.sh
@@ -0,0 +1,49 @@
+#! /bin/sh
+
+# Copyright (c) 2010, 2011, 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. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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
+# @run shell SignedModuleFileTest.sh
+# @summary Unit test for jpkg command
+
+set -e
+
+SRC=${TESTSRC:-.}
+BIN=${TESTJAVA:-../../../../../build}/bin
+
+rm -rf keystore.jks
+
+# Create the keystore file and import the root CA cert
+$BIN/keytool -import -keystore keystore.jks -file ${TESTSRC}/ca-cert.pem \
+ -noprompt -storepass test123 -alias ca-cert
+
+# Import the signer's private key and cert
+$BIN/javac -source 8 -d . ${TESTSRC}/ImportPrivateKey.java
+$BIN/java -Dtest.src=${TESTSRC} ImportPrivateKey signer \
+ signer-prikey.pem RSA signer-cert.pem
+
+$BIN/javac -source 8 -d . ${TESTSRC}/ModuleFileTest.java
+$BIN/java -Dorg.openjdk.system.security.cacerts=keystore.jks \
+ -Dtest.src=${TESTSRC} ModuleFileTest "test signed module file" \
+ < ${TESTSRC}/keystore.pw
diff --git a/jdk/test/org/openjdk/jigsaw/cli/jmod-basic.sh b/jdk/test/org/openjdk/jigsaw/cli/jmod-basic.sh
index 79c7c68..3e7db45 100644
--- a/jdk/test/org/openjdk/jigsaw/cli/jmod-basic.sh
+++ b/jdk/test/org/openjdk/jigsaw/cli/jmod-basic.sh
@@ -61,7 +61,7 @@ public class Main {
EOF
rm -rf z.modules && mkdir z.modules
-$BIN/javac -source 7 -d z.modules -modulepath z.modules `find z.src -name '*.java'`
+$BIN/javac -source 8 -d z.modules -modulepath z.modules `find z.src -name '*.java'`
rm -rf z.lib
JAVA_MODULES=z.lib
diff --git a/jdk/test/org/openjdk/jigsaw/cli/jmod-signed.sh b/jdk/test/org/openjdk/jigsaw/cli/jmod-signed.sh
index d37d7fa..b4b2e1c 100644
--- a/jdk/test/org/openjdk/jigsaw/cli/jmod-signed.sh
+++ b/jdk/test/org/openjdk/jigsaw/cli/jmod-signed.sh
@@ -64,7 +64,7 @@ $BIN/keytool -import -keystore keystore.jks -file ${TESTSRC}/ca-cert.pem \
-noprompt -storepass test123 -alias ca-cert
# Import the signer's private key and cert
-$BIN/javac -source 7 -d . ${TESTSRC}/ImportPrivateKey.java
+$BIN/javac -source 8 -d . ${TESTSRC}/ImportPrivateKey.java
$BIN/java -Dtest.src=${TESTSRC} ImportPrivateKey signer signer-prikey.pem \
RSA signer-cert.pem
@@ -86,7 +86,7 @@ public class Main {
EOF
rm -rf z.modules && mkdir -p z.modules
-$BIN/javac -source 7 -d z.modules -modulepath z.modules `find z.src -name '*.java'`
+$BIN/javac -source 8 -d z.modules -modulepath z.modules `find z.src -name '*.java'`
JAVA_MODULES=z.lib
export JAVA_MODULES
diff --git a/jdk/test/org/openjdk/jigsaw/cli/signed-module.sh b/jdk/test/org/openjdk/jigsaw/cli/signed-module.sh
index 659ba5b..9e5dcc4 100755
--- a/jdk/test/org/openjdk/jigsaw/cli/signed-module.sh
+++ b/jdk/test/org/openjdk/jigsaw/cli/signed-module.sh
@@ -45,7 +45,7 @@ $BIN/keytool -import -keystore keystore.jks -file ${TESTSRC}/ca-cert.pem \
-noprompt -storepass test123 -alias ca
# Import the signer's private key and cert
-$BIN/javac -source 7 -d . ${TESTSRC}/ImportPrivateKey.java
+$BIN/javac -source 8 -d . ${TESTSRC}/ImportPrivateKey.java
$BIN/java -Dtest.src=${TESTSRC} ImportPrivateKey signer signer-prikey.pem \
RSA signer-cert.pem
@@ -83,7 +83,7 @@ grant signedBy "expired-signer" {
EOF
rm -rf z.modules && mkdir z.modules
-$BIN/javac -source 7 -d z.modules -modulepath z.modules `find z.src -name '*.java'`
+$BIN/javac -source 8 -d z.modules -modulepath z.modules `find z.src -name '*.java'`
rm -f test.security at 0.1.jmod
# Create and sign module file
diff --git a/jdk/test/org/openjdk/jigsaw/cli/timestamp-test.sh b/jdk/test/org/openjdk/jigsaw/cli/timestamp-test.sh
index 607cdd4..b855965 100755
--- a/jdk/test/org/openjdk/jigsaw/cli/timestamp-test.sh
+++ b/jdk/test/org/openjdk/jigsaw/cli/timestamp-test.sh
@@ -54,7 +54,7 @@ importCert ca
importCert tsca
# Import the signer's private key and cert
-$BIN/javac -source 7 -d . ${TESTSRC}/ImportPrivateKey.java
+$BIN/javac -source 8 -d . ${TESTSRC}/ImportPrivateKey.java
importPrivateKey signer RSA
# Import the TSA's private key and cert
importPrivateKey tsa DSA
@@ -84,7 +84,7 @@ public class GetProperty {
EOF
rm -rf z.modules && mkdir z.modules
-$BIN/javac -source 7 -d z.modules -modulepath z.modules `find z.src -name '*.java'`
+$BIN/javac -source 8 -d z.modules -modulepath z.modules `find z.src -name '*.java'`
# Check timestamping support
$BIN/javac -d . ${TESTSRC}/TimestampTest.java
diff --git a/jdk/test/org/openjdk/jigsaw/library.sh b/jdk/test/org/openjdk/jigsaw/library.sh
index ba59cbf..aef604d 100644
--- a/jdk/test/org/openjdk/jigsaw/library.sh
+++ b/jdk/test/org/openjdk/jigsaw/library.sh
@@ -67,7 +67,7 @@ EOF
mkdir z.modules z.classes
-$BIN/javac -source 7 -d z.classes $SRC/_Library.java
+$BIN/javac -source 8 -d z.classes $SRC/_Library.java
$BIN/javac -source 7 -d z.modules -modulepath z.modules \
`find z.src -name '*.java'`
diff --git a/jdk/test/org/openjdk/jigsaw/preinstall.sh b/jdk/test/org/openjdk/jigsaw/preinstall.sh
index 733e58d..eaaf825 100644
--- a/jdk/test/org/openjdk/jigsaw/preinstall.sh
+++ b/jdk/test/org/openjdk/jigsaw/preinstall.sh
@@ -30,11 +30,11 @@ alias jmod=$BIN/jmod
sh ${TESTSRC:-.}/tester.sh $0
-mkdir -p z.res/foo
-echo '<hello/>' >z.res/foo/x.xml
+mkdir -p z.test/modules/x/foo
+echo '<hello/>' >z.test/modules/x/foo/x.xml
$BIN/jmod create -L z.lib
-$BIN/jmod preinstall -L z.lib z.test/modules -r z.res z.pre x y
+$BIN/jmod preinstall -L z.lib z.test/modules z.pre x y
cp -r z.pre/* z.lib
# Need to truncate \r and \n on windows
ms=`$BIN/jmod list -L z.lib | grep -v jdk@ | sort | tr -s '\r' '\n' | tr -s '\n' ' '`
diff --git a/jdk/test/org/openjdk/jigsaw/resource.sh b/jdk/test/org/openjdk/jigsaw/resource.sh
index 6db82d3..dbfbdf3 100644
--- a/jdk/test/org/openjdk/jigsaw/resource.sh
+++ b/jdk/test/org/openjdk/jigsaw/resource.sh
@@ -34,26 +34,26 @@ mk() {
echo "$2" >$1
}
-mk z.res.x/foo/x 'Hello!'
-mk z.res.x/inf/a 'A one,'
+mk z.test/modules/x/foo/x 'Hello!'
+mk z.test/modules/x/inf/a 'A one,'
-mk z.res.y/bar/y 'Bonjour!'
-mk z.res.y/inf/a 'and a two,'
+mk z.test/modules/y/bar/y 'Bonjour!'
+mk z.test/modules/y/inf/a 'and a two,'
-mk z.res.z/baz/z 'Hola!'
-mk z.res.z/inf/a 'and a three!'
+mk z.test/modules/z/baz/z 'Hola!'
+mk z.test/modules/z/inf/a 'and a three!'
echo; echo "Direct install"
$BIN/jmod create -L z.lib
-$BIN/jmod install -L z.lib z.test/modules -r z.res.z z
-$BIN/jmod install -L z.lib z.test/modules -r z.res.y y
-$BIN/jmod install -L z.lib z.test/modules -r z.res.x x
+$BIN/jmod install -L z.lib z.test/modules z
+$BIN/jmod install -L z.lib z.test/modules y
+$BIN/jmod install -L z.lib z.test/modules x
$BIN/java -ea -L z.lib -m x
echo; echo "Module-file install"
-$BIN/jpkg -m z.test/modules/z -r z.res.z jmod z
-$BIN/jpkg -m z.test/modules/y -r z.res.y jmod y
-$BIN/jpkg -m z.test/modules/x -r z.res.x jmod x
+$BIN/jpkg -m z.test/modules/z jmod z
+$BIN/jpkg -m z.test/modules/y jmod y
+$BIN/jpkg -m z.test/modules/x jmod x
rm -rf z.lib
$BIN/jmod create -L z.lib
$BIN/jmod install -L z.lib x at 1.jmod y at 1.jmod z at 1.jmod
diff --git a/jdk/test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java b/jdk/test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java
new file mode 100644
index 0000000..3f37e5c
--- /dev/null
+++ b/jdk/test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2011, 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 6997116
+ * @summary Test verifies that rendering of images with bitmap transparency
+ * to a D3D surface does not cause an ClassCastException.
+ *
+ * @run main/othervm -Dsun.java2d.d3d=True DrawBitmaskToSurfaceTest
+ */
+
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.awt.image.IndexColorModel;
+import java.util.concurrent.CountDownLatch;
+import javax.swing.JFrame;
+
+public class DrawBitmaskToSurfaceTest extends JFrame {
+
+ private final Image src;
+ private static java.util.concurrent.CountDownLatch latch = null;
+ private static Throwable theError = null;
+
+ public DrawBitmaskToSurfaceTest() {
+ src = createTestImage();
+ }
+
+ private static Image createTestImage() {
+ byte[] r = new byte[]{(byte)0x00, (byte)0x80, (byte)0xff, (byte)0xff};
+ byte[] g = new byte[]{(byte)0x00, (byte)0x80, (byte)0xff, (byte)0x00};
+ byte[] b = new byte[]{(byte)0x00, (byte)0x80, (byte)0xff, (byte)0x00};
+
+ IndexColorModel icm = new IndexColorModel(2, 4, r, g, b, 3);
+
+ BufferedImage img = new BufferedImage(100, 100,
+ BufferedImage.TYPE_BYTE_INDEXED,
+ icm);
+ return img;
+ }
+
+ @Override
+ public void paint(final Graphics g) {
+ try {
+ System.err.println("paint frame....");
+ g.drawImage(src, 30, 30, this);
+ } catch (Throwable e) {
+ theError = e;
+ } finally {
+ if (latch != null) {
+ latch.countDown();
+ }
+ }
+ }
+
+ public static void main(final String[] args) throws Exception {
+ final JFrame frame = new DrawBitmaskToSurfaceTest();
+ frame.setBounds(10, 350, 200, 200);
+ frame.setVisible(true);
+
+ Thread.sleep(2000);
+
+ System.err.println("Change frame bounds...");
+ latch = new CountDownLatch(1);
+ frame.setBounds(10, 350, 90, 90);
+ frame.repaint();
+
+ try {
+ if (latch.getCount() > 0) {
+ latch.await();
+ }
+ } catch (InterruptedException e) {
+ }
+
+ frame.dispose();
+
+ if (theError != null) {
+ throw new RuntimeException("Test failed.", theError);
+ }
+
+ System.err.println("Test passed");
+ }
+}
diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java b/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java
index ace09c2..3892054 100644
--- a/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java
+++ b/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java
@@ -154,8 +154,8 @@ public class Basic {
/* run javac <args> */
static void compile(String... args) {
debug("Running: javac " + Arrays.toString(args));
- com.sun.tools.javac.main.Main compiler = new com.sun.tools.javac.main.Main("javac");
- if (compiler.compile(args) != com.sun.tools.javac.main.Main.Result.OK) {
+ com.sun.tools.javac.Main compiler = new com.sun.tools.javac.Main();
+ if (compiler.compile(args) != 0) {
throw new RuntimeException("javac failed: args=" + Arrays.toString(args));
}
}
diff --git a/jdk/test/sun/nio/cs/TestStringCoding.java b/jdk/test/sun/nio/cs/TestStringCoding.java
index c4837e9..09e6144 100644
--- a/jdk/test/sun/nio/cs/TestStringCoding.java
+++ b/jdk/test/sun/nio/cs/TestStringCoding.java
@@ -24,7 +24,7 @@
*/
/* @test
- @bug 6636323 6636319 7040220
+ @bug 6636323 6636319 7040220 7096080
@summary Test if StringCoding and NIO result have the same de/encoding result
* @run main/othervm/timeout=2000 TestStringCoding
*/
@@ -111,7 +111,8 @@ public class TestStringCoding {
//encode unmappable surrogates
if (enc instanceof sun.nio.cs.ArrayEncoder &&
cs.contains(Charset.forName("ASCII"))) {
- if (cs.name().equals("UTF-8")) // utf8 handles surrogates
+ if (cs.name().equals("UTF-8") || // utf8 handles surrogates
+ cs.name().equals("CESU-8")) // utf8 handles surrogates
return;
enc.replaceWith(new byte[] { (byte)'A'});
sun.nio.cs.ArrayEncoder cae = (sun.nio.cs.ArrayEncoder)enc;
@@ -136,7 +137,6 @@ public class TestStringCoding {
cs.name())))
throw new RuntimeException("encode3(surrogates) failed -> "
+ cs.name());
-
ba = new byte[str.length() - 1];
n = cae.encode(str.toCharArray(), 0, str.length(), ba);
if (n != 7 || !"abABABc".equals(new String(ba, 0, n,
diff --git a/jdk/test/sun/nio/cs/TestStringCodingUTF8.java b/jdk/test/sun/nio/cs/TestStringCodingUTF8.java
index fdc2048..d1f6995 100644
--- a/jdk/test/sun/nio/cs/TestStringCodingUTF8.java
+++ b/jdk/test/sun/nio/cs/TestStringCodingUTF8.java
@@ -33,14 +33,16 @@ import java.nio.charset.*;
public class TestStringCodingUTF8 {
public static void main(String[] args) throws Throwable {
- test();
+ test("UTF-8");
+ test("CESU-8");
// security manager on
System.setSecurityManager(new PermissiveSecurityManger());
- test();
+ test("UTF-8");
+ test("CESU-8");
}
- static void test() throws Throwable {
- Charset cs = Charset.forName("UTF-8");
+ static void test(String csn) throws Throwable {
+ Charset cs = Charset.forName(csn);
char[] bmp = new char[0x10000];
for (int i = 0; i < 0x10000; i++) {
bmp[i] = (char)i;
diff --git a/jdk/test/sun/nio/cs/TestUTF8.java b/jdk/test/sun/nio/cs/TestUTF8.java
index f339eae..e83f8fb 100644
--- a/jdk/test/sun/nio/cs/TestUTF8.java
+++ b/jdk/test/sun/nio/cs/TestUTF8.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4486841 7040220
+ * @bug 4486841 7040220 7096080
* @summary Test UTF-8 charset
*/
@@ -156,15 +156,22 @@ public class TestUTF8 {
return 3;
}
+ static int to4ByteUTF8(int uc, byte[] bb, int pos) {
+ bb[pos++] = (byte)(0xf0 | ((uc >> 18)));
+ bb[pos++] = (byte)(0x80 | ((uc >> 12) & 0x3f));
+ bb[pos++] = (byte)(0x80 | ((uc >> 6) & 0x3f));
+ bb[pos++] = (byte)(0x80 | (uc & 0x3f));
+ return 4;
+ }
+
static void checkRoundtrip(String csn) throws Exception {
System.out.printf(" Check roundtrip <%s>...", csn);
char[] cc = getUTFChars();
byte[] bb = encode(cc, csn, false);
char[] ccO = decode(bb, csn, false);
- if (!Arrays.equals(cc, ccO)) {
+ if (!Arrays.equals(cc, ccO))
System.out.printf(" non-direct failed");
- }
bb = encode(cc, csn, true);
ccO = decode(bb, csn, true);
if (!Arrays.equals(cc, ccO)) {
@@ -180,19 +187,24 @@ public class TestUTF8 {
System.out.println();
}
- static void check6ByteSurrs(String csn) throws Exception {
- System.out.printf(" Check 6-byte Surrogates <%s>...%n", csn);
- byte[] bb = new byte[(0x110000 - 0x10000) * 6];
+ static void check4ByteSurrs(String csn) throws Exception {
+ System.out.printf(" Check 4-byte Surrogates <%s>...%n", csn);
+ byte[] bb = new byte[(0x110000 - 0x10000) * 4];
char[] cc = new char[(0x110000 - 0x10000) * 2];
int bpos = 0;
int cpos = 0;
for (int i = 0x10000; i < 0x110000; i++) {
Character.toChars(i, cc, cpos);
- bpos += to3ByteUTF8(cc[cpos], bb, bpos);
- bpos += to3ByteUTF8(cc[cpos + 1], bb, bpos);
+ bpos += to4ByteUTF8(i, bb, bpos);
cpos += 2;
}
+ checkSurrs(csn, bb, cc);
+ }
+
+ static void checkSurrs(String csn, byte[] bb, char[] cc)
+ throws Exception
+ {
char[] ccO = decode(bb, csn, false);
if (!Arrays.equals(cc, ccO)) {
System.out.printf(" decoding failed%n");
@@ -201,14 +213,30 @@ public class TestUTF8 {
if (!Arrays.equals(cc, ccO)) {
System.out.printf(" decoding(direct) failed%n");
}
- // new String(bb, csn).getBytes(csn) will not return
- // the 6 bytes surrogates as in bb, so only test
- // toCharArray() here.
if (!Arrays.equals(cc, new String(bb, csn).toCharArray())) {
System.out.printf(" String.toCharArray() failed");
}
+ if (!Arrays.equals(bb, new String(cc).getBytes(csn))) {
+ System.out.printf(" String.getBytes() failed");
+ }
+ }
+
+ static void check6ByteSurrs(String csn) throws Exception {
+ System.out.printf(" Check 6-byte Surrogates <%s>...%n", csn);
+ byte[] bb = new byte[(0x110000 - 0x10000) * 6];
+ char[] cc = new char[(0x110000 - 0x10000) * 2];
+ int bpos = 0;
+ int cpos = 0;
+ for (int i = 0x10000; i < 0x110000; i++) {
+ Character.toChars(i, cc, cpos);
+ bpos += to3ByteUTF8(cc[cpos], bb, bpos);
+ bpos += to3ByteUTF8(cc[cpos + 1], bb, bpos);
+ cpos += 2;
+ }
+ checkSurrs(csn, bb, cc);
}
+
static void compare(String csn1, String csn2) throws Exception {
System.out.printf(" Diff <%s> <%s>...%n", csn1, csn2);
char[] cc = getUTFChars();
@@ -266,6 +294,10 @@ public class TestUTF8 {
{1, (byte)0xFF, (byte)0xFF, (byte)0xFF }, // all ones
{1, (byte)0xE0, (byte)0xC0, (byte)0x80 }, // invalid second byte
{1, (byte)0xE0, (byte)0x80, (byte)0xC0 }, // invalid first byte
+ {1, (byte)0xE0, (byte)0x41,}, // invalid second byte & 2 bytes
+ {3, (byte)0xED, (byte)0xAE, (byte)0x80 }, // 3 bytes surrogate
+ {3, (byte)0xED, (byte)0xB0, (byte)0x80 }, // 3 bytes surrogate
+
// Four-byte sequences
{1, (byte)0xF0, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
@@ -276,8 +308,13 @@ public class TestUTF8 {
{1, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF }, // all ones
{1, (byte)0xF0, (byte)0x80, (byte)0x80, (byte)0x80}, // invalid second byte
{1, (byte)0xF0, (byte)0xC0, (byte)0x80, (byte)0x80 }, // invalid second byte
+ {1, (byte)0xF0, (byte)41 }, // invalid second byte
+ // & only 2 bytes
+
{2, (byte)0xF0, (byte)0x90, (byte)0xC0, (byte)0x80 }, // invalid third byte
- {3, (byte)0xF0, (byte)0x90, (byte)0x80, (byte)0xC0 }, // invalid third byte
+ {3, (byte)0xF0, (byte)0x90, (byte)0x80, (byte)0xC0 }, // invalid forth byte
+ {2, (byte)0xF0, (byte)0x90, (byte)0x41 }, // invalid third byte
+ // & 3 bytes input
{1, (byte)0xF1, (byte)0xC0, (byte)0x80, (byte)0x80 }, // invalid second byte
{2, (byte)0xF1, (byte)0x80, (byte)0xC0, (byte)0x80 }, // invalid third byte
@@ -287,30 +324,113 @@ public class TestUTF8 {
{1, (byte)0xF5, (byte)0x80, (byte)0x80, (byte)0xC0 }, // out-range 4-byte
// Five-byte sequences
- {5, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80}, // invalid first byte
- {5, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
- {5, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
- {5, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
- {5, (byte)0xF8, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80}, // invalid first byte
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
{1, (byte)0xF8, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80},
- {2, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80 },
- {3, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF },
- {4, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0 },
// Six-byte sequences
- {6, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
- {6, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
- {6, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
- {6, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
{1, (byte)0xF8, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 },
- {2, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80 },
- {3, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF, (byte)0x80 },
- {4, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0, (byte)0x80 },
- {5, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0x80, (byte)0xC0 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0x80, (byte)0xC0 },
};
- static void checkMalformed(String csn) throws Exception {
+ // The first byte is the length of malformed bytes
+ static byte[][] malformed_cesu8 = {
+ // One-byte sequences:
+ {1, (byte)0xFF },
+ {1, (byte)0xC0 },
+ {1, (byte)0x80 },
+
+ {1, (byte)0xFF, (byte)0xFF}, // all ones
+ {1, (byte)0xA0, (byte)0x80}, // 101x first byte first nibble
+
+ // Two-byte sequences:
+ {1, (byte)0xC0, (byte)0x80}, // invalid first byte
+ {1, (byte)0xC1, (byte)0xBF}, // invalid first byte
+ {1, (byte)0xC2, (byte)0x00}, // invalid second byte
+ {1, (byte)0xC2, (byte)0xC0}, // invalid second byte
+ {1, (byte)0xD0, (byte)0x00}, // invalid second byte
+ {1, (byte)0xD0, (byte)0xC0}, // invalid second byte
+ {1, (byte)0xDF, (byte)0x00}, // invalid second byte
+ {1, (byte)0xDF, (byte)0xC0}, // invalid second byte
+
+ // Three-byte sequences
+ {1, (byte)0xE0, (byte)0x80, (byte)0x80}, // 111x first byte first nibble
+ {1, (byte)0xE0, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xE0, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xE0, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
+
+ {1, (byte)0xE0, (byte)0xC0, (byte)0xBF }, // invalid second byte
+ {2, (byte)0xE0, (byte)0xA0, (byte)0x7F }, // invalid third byte
+ {2, (byte)0xE0, (byte)0xA0, (byte)0xC0 }, // invalid third byte
+ {1, (byte)0xFF, (byte)0xFF, (byte)0xFF }, // all ones
+ {1, (byte)0xE0, (byte)0xC0, (byte)0x80 }, // invalid second byte
+ {1, (byte)0xE0, (byte)0x80, (byte)0xC0 }, // invalid first byte
+ {1, (byte)0xE0, (byte)0x41,}, // invalid second byte & 2 bytes
+
+ // CESU-8 does not have 4, 5, 6 bytes sequenc
+ // Four-byte sequences
+ {1, (byte)0xF0, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xF0, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xF0, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xF0, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+07FF zero-padded
+
+ {1, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF }, // all ones
+ {1, (byte)0xF0, (byte)0x80, (byte)0x80, (byte)0x80}, // invalid second byte
+ {1, (byte)0xF0, (byte)0xC0, (byte)0x80, (byte)0x80 }, // invalid second byte
+ {1, (byte)0xF0, (byte)41 }, // invalid second byte
+ // & only 2 bytes
+ {1, (byte)0xF0, (byte)0x90, (byte)0xC0, (byte)0x80 }, // invalid third byte
+ {1, (byte)0xF0, (byte)0x90, (byte)0x80, (byte)0xC0 }, // invalid forth byte
+ {1, (byte)0xF0, (byte)0x90, (byte)0x41 }, // invalid third byte
+ // & 3 bytes input
+
+ {1, (byte)0xF1, (byte)0xC0, (byte)0x80, (byte)0x80 }, // invalid second byte
+ {1, (byte)0xF1, (byte)0x80, (byte)0xC0, (byte)0x80 }, // invalid third byte
+ {1, (byte)0xF1, (byte)0x80, (byte)0x80, (byte)0xC0 }, // invalid forth byte
+ {1, (byte)0xF4, (byte)0x90, (byte)0x80, (byte)0xC0 }, // out-range 4-byte
+ {1, (byte)0xF4, (byte)0xC0, (byte)0x80, (byte)0xC0 }, // out-range 4-byte
+ {1, (byte)0xF5, (byte)0x80, (byte)0x80, (byte)0xC0 }, // out-range 4-byte
+
+ // Five-byte sequences
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80}, // invalid first byte
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
+
+ {1, (byte)0xF8, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80},
+ {1, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0 },
+
+ // Six-byte sequences
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
+ {1, (byte)0xF8, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0x80, (byte)0xC0 },
+ };
+
+
+ static void checkMalformed(String csn, byte[][] malformed) throws Exception {
boolean failed = false;
System.out.printf(" Check malformed <%s>...%n", csn);
Charset cs = Charset.forName(csn);
@@ -430,9 +550,12 @@ public class TestUTF8 {
public static void main(String[] args) throws Exception {
checkRoundtrip("UTF-8");
- check6ByteSurrs("UTF-8");
- //compare("UTF-8", "UTF-8-OLD");
- checkMalformed("UTF-8");
+ check4ByteSurrs("UTF-8");
+ checkMalformed("UTF-8", malformed);
checkUnderOverflow("UTF-8");
+
+ checkRoundtrip("CESU-8");
+ check6ByteSurrs("CESU-8");
+ checkMalformed("CESU-8", malformed_cesu8);
}
}
diff --git a/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java b/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java
new file mode 100644
index 0000000..9aba5e4
--- /dev/null
+++ b/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2011, 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 7077646
+ * @summary gssapi wrap for CFX per-message tokens always set FLAG_ACCEPTOR_SUBKEY
+ * @compile -XDignore.symbol.file AcceptorSubKey.java
+ * @run main/othervm AcceptorSubKey
+ */
+
+import java.util.Arrays;
+import sun.security.jgss.GSSUtil;
+
+// The basic krb5 test skeleton you can copy from
+public class AcceptorSubKey {
+
+ public static void main(String[] args) throws Exception {
+
+ new OneKDC(null).writeJAASConf();
+
+ Context c, s;
+ c = Context.fromJAAS("client");
+ s = Context.fromJAAS("server");
+
+ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_SPNEGO_MECH_OID);
+ s.startAsServer(GSSUtil.GSS_SPNEGO_MECH_OID);
+
+ Context.handshake(c, s);
+
+ byte[] msg = "i say high --".getBytes();
+ byte[] wrapped = s.wrap(msg, false);
+
+ // FLAG_ACCEPTOR_SUBKEY is 4
+ int flagOn = wrapped[2] & 4;
+ if (flagOn != 0) {
+ throw new Exception("Java GSS should not have set acceptor subkey");
+ }
+
+ s.dispose();
+ c.dispose();
+ }
+}
diff --git a/jdk/test/sun/security/krb5/auto/Context.java b/jdk/test/sun/security/krb5/auto/Context.java
index 1739f87..eb2a94a 100644
--- a/jdk/test/sun/security/krb5/auto/Context.java
+++ b/jdk/test/sun/security/krb5/auto/Context.java
@@ -375,44 +375,34 @@ public class Context {
}
}
- /**
- * Transmits a message from one Context to another. The sender wraps the
- * message and sends it to the receiver. The receiver unwraps it, creates
- * a MIC of the clear text and sends it back to the sender. The sender
- * verifies the MIC against the message sent earlier.
- * @param message the message
- * @param s1 the sender
- * @param s2 the receiver
- * @throws java.lang.Exception If anything goes wrong
- */
- static public void transmit(final String message, final Context s1,
- final Context s2) throws Exception {
- final byte[] messageBytes = message.getBytes();
- System.out.printf("-------------------- TRANSMIT from %s to %s------------------------\n",
- s1.name, s2.name);
-
- byte[] t = s1.doAs(new Action() {
+ public byte[] wrap(byte[] t, final boolean privacy)
+ throws Exception {
+ return doAs(new Action() {
@Override
- public byte[] run(Context me, byte[] dummy) throws Exception {
- System.out.println("wrap");
- MessageProp p1 = new MessageProp(0, true);
+ public byte[] run(Context me, byte[] input) throws Exception {
+ System.out.printf("wrap %s privacy from %s: ", privacy?"with":"without", me.name);
+ MessageProp p1 = new MessageProp(0, privacy);
byte[] out;
if (usingStream) {
ByteArrayOutputStream os = new ByteArrayOutputStream();
- me.x.wrap(new ByteArrayInputStream(messageBytes), os, p1);
+ me.x.wrap(new ByteArrayInputStream(input), os, p1);
out = os.toByteArray();
} else {
- out = me.x.wrap(messageBytes, 0, messageBytes.length, p1);
+ out = me.x.wrap(input, 0, input.length, p1);
}
System.out.println(printProp(p1));
return out;
}
- }, null);
+ }, t);
+ }
- t = s2.doAs(new Action() {
+ public byte[] unwrap(byte[] t, final boolean privacy)
+ throws Exception {
+ return doAs(new Action() {
@Override
public byte[] run(Context me, byte[] input) throws Exception {
- MessageProp p1 = new MessageProp(0, true);
+ System.out.printf("unwrap %s privacy from %s: ", privacy?"with":"without", me.name);
+ MessageProp p1 = new MessageProp(0, privacy);
byte[] bytes;
if (usingStream) {
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -421,36 +411,45 @@ public class Context {
} else {
bytes = me.x.unwrap(input, 0, input.length, p1);
}
- if (!Arrays.equals(messageBytes, bytes))
- throw new Exception("wrap/unwrap mismatch");
- System.out.println("unwrap");
System.out.println(printProp(p1));
+ return bytes;
+ }
+ }, t);
+ }
+
+ public byte[] getMic(byte[] t) throws Exception {
+ return doAs(new Action() {
+ @Override
+ public byte[] run(Context me, byte[] input) throws Exception {
+ MessageProp p1 = new MessageProp(0, true);
+ byte[] bytes;
p1 = new MessageProp(0, true);
- System.out.println("getMIC");
+ System.out.printf("getMic from %s: ", me.name);
if (usingStream) {
ByteArrayOutputStream os = new ByteArrayOutputStream();
- me.x.getMIC(new ByteArrayInputStream(messageBytes), os, p1);
+ me.x.getMIC(new ByteArrayInputStream(input), os, p1);
bytes = os.toByteArray();
} else {
- bytes = me.x.getMIC(messageBytes, 0, messageBytes.length, p1);
+ bytes = me.x.getMIC(input, 0, input.length, p1);
}
System.out.println(printProp(p1));
return bytes;
}
}, t);
+ }
- // Re-unwrap should make p2.isDuplicateToken() returns true
- s1.doAs(new Action() {
+ public void verifyMic(byte[] t, final byte[] msg) throws Exception {
+ doAs(new Action() {
@Override
public byte[] run(Context me, byte[] input) throws Exception {
MessageProp p1 = new MessageProp(0, true);
- System.out.println("verifyMIC");
+ System.out.printf("verifyMic from %s: ", me.name);
if (usingStream) {
me.x.verifyMIC(new ByteArrayInputStream(input),
- new ByteArrayInputStream(messageBytes), p1);
+ new ByteArrayInputStream(msg), p1);
} else {
me.x.verifyMIC(input, 0, input.length,
- messageBytes, 0, messageBytes.length,
+ msg, 0, msg.length,
p1);
}
System.out.println(printProp(p1));
@@ -460,6 +459,30 @@ public class Context {
}
/**
+ * Transmits a message from one Context to another. The sender wraps the
+ * message and sends it to the receiver. The receiver unwraps it, creates
+ * a MIC of the clear text and sends it back to the sender. The sender
+ * verifies the MIC against the message sent earlier.
+ * @param message the message
+ * @param s1 the sender
+ * @param s2 the receiver
+ * @throws java.lang.Exception If anything goes wrong
+ */
+ static public void transmit(final String message, final Context s1,
+ final Context s2) throws Exception {
+ final byte[] messageBytes = message.getBytes();
+ System.out.printf("-------------------- TRANSMIT from %s to %s------------------------\n",
+ s1.name, s2.name);
+ byte[] wrapped = s1.wrap(messageBytes, true);
+ byte[] unwrapped = s2.unwrap(wrapped, true);
+ if (!Arrays.equals(messageBytes, unwrapped)) {
+ throw new Exception("wrap/unwrap mismatch");
+ }
+ byte[] mic = s2.getMic(unwrapped);
+ s1.verifyMic(mic, messageBytes);
+ }
+
+ /**
* Returns a string description of a MessageProp object
* @param prop the object
* @return the description
diff --git a/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java b/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java
new file mode 100644
index 0000000..cde2ec6
--- /dev/null
+++ b/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2011, 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 7089889
+ * @summary Krb5LoginModule.login() throws an exception if used without a keytab
+ * @compile -XDignore.symbol.file NoInitNoKeytab.java
+ * @run main/othervm NoInitNoKeytab
+ */
+
+import java.io.FileOutputStream;
+import sun.security.jgss.GSSUtil;
+
+// The basic krb5 test skeleton you can copy from
+public class NoInitNoKeytab {
+
+ public static void main(String[] args) throws Exception {
+
+ new OneKDC(null).writeJAASConf();
+ try (FileOutputStream fos =
+ new FileOutputStream(OneKDC.JAAS_CONF, true)) {
+ fos.write((
+ "noinit {\n" +
+ " com.sun.security.auth.module.Krb5LoginModule required\n" +
+ " principal=\"" + OneKDC.USER + "\"\n" +
+ " useKeyTab=false\n" +
+ " isInitiator=false\n" +
+ " storeKey=true;\n};\n").getBytes());
+ }
+ Context c, s;
+ c = Context.fromJAAS("client");
+ s = Context.fromJAAS("noinit");
+
+ c.startAsClient(OneKDC.USER, GSSUtil.GSS_SPNEGO_MECH_OID);
+ s.startAsServer(GSSUtil.GSS_SPNEGO_MECH_OID);
+
+ Context.handshake(c, s);
+
+ Context.transmit("i say high --", c, s);
+ Context.transmit(" you say low", s, c);
+
+ s.dispose();
+ c.dispose();
+ }
+}
diff --git a/jdk/test/sun/security/krb5/auto/RRC.java b/jdk/test/sun/security/krb5/auto/RRC.java
new file mode 100644
index 0000000..ade12a4
--- /dev/null
+++ b/jdk/test/sun/security/krb5/auto/RRC.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2011, 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 7077640
+ * @summary gss wrap for cfx doesn't handle rrc != 0
+ * @compile -XDignore.symbol.file RRC.java
+ * @run main/othervm RRC
+ */
+
+import java.util.Arrays;
+import sun.security.jgss.GSSUtil;
+
+// The basic krb5 test skeleton you can copy from
+public class RRC {
+
+ public static void main(String[] args) throws Exception {
+
+ new OneKDC(null).writeJAASConf();
+
+ Context c, s;
+ c = Context.fromJAAS("client");
+ s = Context.fromJAAS("server");
+
+ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_SPNEGO_MECH_OID);
+ s.startAsServer(GSSUtil.GSS_SPNEGO_MECH_OID);
+
+ Context.handshake(c, s);
+
+ byte[] msg = "i say high --".getBytes();
+ byte[] wrapped = c.wrap(msg, false);
+
+ // Simulate RRC equals to EC
+ int rrc = wrapped[5];
+ byte[] rotated = new byte[wrapped.length];
+ System.arraycopy(wrapped, 0, rotated, 0, 16);
+ System.arraycopy(wrapped, wrapped.length-rrc, rotated, 16, rrc);
+ System.arraycopy(wrapped, 16, rotated, 16+rrc, wrapped.length-16-rrc);
+ rotated[7] = (byte)rrc;
+
+ byte[] unwrapped = s.unwrap(rotated, false);
+ if (!Arrays.equals(msg, unwrapped)) {
+ throw new Exception("Failure");
+ }
+
+ s.dispose();
+ c.dispose();
+ }
+}
diff --git a/jdk/test/sun/security/pkcs11/Provider/Absolute.java b/jdk/test/sun/security/pkcs11/Provider/Absolute.java
index e35f9c6..fc035dc 100644
--- a/jdk/test/sun/security/pkcs11/Provider/Absolute.java
+++ b/jdk/test/sun/security/pkcs11/Provider/Absolute.java
@@ -27,7 +27,6 @@
*/
import java.security.*;
import java.lang.reflect.*;
-import sun.security.pkcs11.*;
public class Absolute {
diff --git a/jdk/test/sun/security/pkcs11/fips/CipherTest.java b/jdk/test/sun/security/pkcs11/fips/CipherTest.java
index 0d9f8b3..32bc6df 100644
--- a/jdk/test/sun/security/pkcs11/fips/CipherTest.java
+++ b/jdk/test/sun/security/pkcs11/fips/CipherTest.java
@@ -394,52 +394,47 @@ public class CipherTest {
public static void main(PeerFactory peerFactory, KeyStore keyStore,
String[] args) throws Exception {
- SSLContext reservedSSLContext = SSLContext.getDefault();
- try {
- long time = System.currentTimeMillis();
- String relPath;
- if ((args != null) && (args.length > 0) && args[0].equals("sh")) {
- relPath = pathToStoresSH;
- } else {
- relPath = pathToStores;
- }
- PATH = new File(System.getProperty("test.src", "."), relPath);
- CipherTest.peerFactory = peerFactory;
- System.out.print(
- "Initializing test '" + peerFactory.getName() + "'...");
-// secureRandom = new SecureRandom();
-// secureRandom.nextInt();
-// trustStore = readKeyStore(trustStoreFile);
- CipherTest.keyStore = keyStore;
-// keyStore = readKeyStore(keyStoreFile);
- KeyManagerFactory keyFactory =
- KeyManagerFactory.getInstance(
- KeyManagerFactory.getDefaultAlgorithm());
- keyFactory.init(keyStore, "test12".toCharArray());
- keyManager = (X509ExtendedKeyManager)keyFactory.getKeyManagers()[0];
-
- TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- tmf.init(keyStore);
- trustManager = (X509TrustManager)tmf.getTrustManagers()[0];
-
-// trustManager = new AlwaysTrustManager();
- SSLContext context = SSLContext.getInstance("TLS");
- context.init(new KeyManager[] {keyManager},
- new TrustManager[] {trustManager}, null);
- SSLContext.setDefault(context);
-
- CipherTest cipherTest = new CipherTest(peerFactory);
- Thread serverThread = new Thread(peerFactory.newServer(cipherTest),
- "Server");
- serverThread.setDaemon(true);
- serverThread.start();
- System.out.println("Done");
- cipherTest.run();
- time = System.currentTimeMillis() - time;
- System.out.println("Done. (" + time + " ms)");
- } finally {
- SSLContext.setDefault(reservedSSLContext);
+ long time = System.currentTimeMillis();
+ String relPath;
+ if ((args != null) && (args.length > 0) && args[0].equals("sh")) {
+ relPath = pathToStoresSH;
+ } else {
+ relPath = pathToStores;
}
+ PATH = new File(System.getProperty("test.src", "."), relPath);
+ CipherTest.peerFactory = peerFactory;
+ System.out.print(
+ "Initializing test '" + peerFactory.getName() + "'...");
+// secureRandom = new SecureRandom();
+// secureRandom.nextInt();
+// trustStore = readKeyStore(trustStoreFile);
+ CipherTest.keyStore = keyStore;
+// keyStore = readKeyStore(keyStoreFile);
+ KeyManagerFactory keyFactory =
+ KeyManagerFactory.getInstance(
+ KeyManagerFactory.getDefaultAlgorithm());
+ keyFactory.init(keyStore, "test12".toCharArray());
+ keyManager = (X509ExtendedKeyManager)keyFactory.getKeyManagers()[0];
+
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ tmf.init(keyStore);
+ trustManager = (X509TrustManager)tmf.getTrustManagers()[0];
+
+// trustManager = new AlwaysTrustManager();
+ SSLContext context = SSLContext.getInstance("TLS");
+ context.init(new KeyManager[] {keyManager},
+ new TrustManager[] {trustManager}, null);
+ SSLContext.setDefault(context);
+
+ CipherTest cipherTest = new CipherTest(peerFactory);
+ Thread serverThread = new Thread(peerFactory.newServer(cipherTest),
+ "Server");
+ serverThread.setDaemon(true);
+ serverThread.start();
+ System.out.println("Done");
+ cipherTest.run();
+ time = System.currentTimeMillis() - time;
+ System.out.println("Done. (" + time + " ms)");
}
static abstract class PeerFactory {
diff --git a/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java b/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java
index 4cf931d..98dbdee 100644
--- a/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java
+++ b/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java
@@ -26,9 +26,9 @@
* @bug 6313675 6323647
* @summary Verify that all ciphersuites work in FIPS mode
* @library ..
- * @run main/othervm ClientJSSEServerJSSE
* @ignore JSSE supported cipher suites are changed with CR 6916074,
* need to update this test case in JDK 7 soon
+ * @run main/othervm ClientJSSEServerJSSE
* @author Andreas Sterbenz
*/
diff --git a/jdk/test/sun/security/provider/X509Factory/BigCRL.java b/jdk/test/sun/security/provider/X509Factory/BigCRL.java
new file mode 100644
index 0000000..acee51a
--- /dev/null
+++ b/jdk/test/sun/security/provider/X509Factory/BigCRL.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2011, 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 7099399
+ * @summary cannot deal with CRL file larger than 16MB
+ * @run main/othervm -Xmx1024m BigCRL
+ */
+
+import java.io.FileInputStream;
+import java.math.BigInteger;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.PrivateKey;
+import java.security.cert.X509CRLEntry;
+import java.util.Arrays;
+import java.util.Date;
+import sun.security.x509.*;
+import java.security.cert.CertificateFactory;
+import java.io.ByteArrayInputStream;
+
+public class BigCRL {
+
+ public static void main(String[] args) throws Exception {
+ int n = 500000;
+ String ks = System.getProperty("test.src", ".")
+ + "/../../ssl/etc/keystore";
+ String pass = "passphrase";
+ String alias = "dummy";
+
+ KeyStore keyStore = KeyStore.getInstance("JKS");
+ keyStore.load(new FileInputStream(ks), pass.toCharArray());
+ Certificate signerCert = keyStore.getCertificate(alias);
+ byte[] encoded = signerCert.getEncoded();
+ X509CertImpl signerCertImpl = new X509CertImpl(encoded);
+ X509CertInfo signerCertInfo = (X509CertInfo)signerCertImpl.get(
+ X509CertImpl.NAME + "." + X509CertImpl.INFO);
+ X500Name owner = (X500Name)signerCertInfo.get(X509CertInfo.SUBJECT + "."
+ + CertificateSubjectName.DN_NAME);
+
+ Date date = new Date();
+ PrivateKey privateKey = (PrivateKey)
+ keyStore.getKey(alias, pass.toCharArray());
+ String sigAlgName = signerCertImpl.getSigAlgOID();
+
+ X509CRLEntry[] badCerts = new X509CRLEntry[n];
+ CRLExtensions ext = new CRLExtensions();
+ ext.set("Reason", new CRLReasonCodeExtension(1));
+ for (int i = 0; i < n; i++) {
+ badCerts[i] = new X509CRLEntryImpl(
+ BigInteger.valueOf(i), date, ext);
+ }
+ X509CRLImpl crl = new X509CRLImpl(owner, date, date, badCerts);
+ crl.sign(privateKey, sigAlgName);
+ byte[] data = crl.getEncodedInternal();
+
+ // Make sure the CRL is big enough
+ if ((data[1]&0xff) != 0x84) {
+ throw new Exception("The file should be big enough?");
+ }
+
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ cf.generateCRL(new ByteArrayInputStream(data));
+ }
+}
+
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java
index 9a18be3..432aed4 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java
@@ -1,10 +1,7 @@
/*
* @test
* @build TestThread Traffic Handler ServerHandler ServerThread ClientThread
- * @run main/othervm/timeout=140 main
- *
- * SunJSSE does not support dynamic system properties, no way to re-use
- * system properties in samevm/agentvm mode.
+ * @run main/othervm/timeout=140 -Djsse.enableCBCProtection=false main
* @summary Make sure that different configurations of SSL sockets work
*/
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
new file mode 100644
index 0000000..f9cd518
--- /dev/null
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 2011, 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 7031830
+ * @summary bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine
+ * @run main/othervm SSLEngineBadBufferArrayAccess
+ *
+ * SunJSSE does not support dynamic system properties, no way to re-use
+ * system properties in samevm/agentvm mode.
+ */
+
+/**
+ * A SSLSocket/SSLEngine interop test case. This is not the way to
+ * code SSLEngine-based servers, but works for what we need to do here,
+ * which is to make sure that SSLEngine/SSLSockets can talk to each other.
+ * SSLEngines can use direct or indirect buffers, and different code
+ * is used to get at the buffer contents internally, so we test that here.
+ *
+ * The test creates one SSLSocket (client) and one SSLEngine (server).
+ * The SSLSocket talks to a raw ServerSocket, and the server code
+ * does the translation between byte [] and ByteBuffers that the SSLEngine
+ * can use. The "transport" layer consists of a Socket Input/OutputStream
+ * and two byte buffers for the SSLEngines: think of them
+ * as directly connected pipes.
+ *
+ * Again, this is a *very* simple example: real code will be much more
+ * involved. For example, different threading and I/O models could be
+ * used, transport mechanisms could close unexpectedly, and so on.
+ *
+ * When this application runs, notice that several messages
+ * (wrap/unwrap) pass before any application data is consumed or
+ * produced. (For more information, please see the SSL/TLS
+ * specifications.) There may several steps for a successful handshake,
+ * so it's typical to see the following series of operations:
+ *
+ * client server message
+ * ====== ====== =======
+ * write() ... ClientHello
+ * ... unwrap() ClientHello
+ * ... wrap() ServerHello/Certificate
+ * read() ... ServerHello/Certificate
+ * write() ... ClientKeyExchange
+ * write() ... ChangeCipherSpec
+ * write() ... Finished
+ * ... unwrap() ClientKeyExchange
+ * ... unwrap() ChangeCipherSpec
+ * ... unwrap() Finished
+ * ... wrap() ChangeCipherSpec
+ * ... wrap() Finished
+ * read() ... ChangeCipherSpec
+ * read() ... Finished
+ *
+ * This particular bug had a problem where byte buffers backed by an
+ * array didn't offset correctly, and we got bad MAC errors.
+ */
+import javax.net.ssl.*;
+import javax.net.ssl.SSLEngineResult.*;
+import java.io.*;
+import java.net.*;
+import java.security.*;
+import java.nio.*;
+
+public class SSLEngineBadBufferArrayAccess {
+
+ /*
+ * Enables logging of the SSL/TLS operations.
+ */
+ private static boolean logging = true;
+
+ /*
+ * Enables the JSSE system debugging system property:
+ *
+ * -Djavax.net.debug=all
+ *
+ * This gives a lot of low-level information about operations underway,
+ * including specific handshake messages, and might be best examined
+ * after gaining some familiarity with this application.
+ */
+ private static boolean debug = false;
+ private SSLContext sslc;
+ private SSLEngine serverEngine; // server-side SSLEngine
+ private SSLSocket sslSocket; // client-side socket
+ private ServerSocket serverSocket; // server-side Socket, generates the...
+ private Socket socket; // server-side socket that will read
+
+ private final byte[] serverMsg = "Hi there Client, I'm a Server".getBytes();
+ private final byte[] clientMsg = "Hello Server, I'm a Client".getBytes();
+
+ private ByteBuffer serverOut; // write side of serverEngine
+ private ByteBuffer serverIn; // read side of serverEngine
+
+ private volatile Exception clientException;
+ private volatile Exception serverException;
+
+ /*
+ * For data transport, this example uses local ByteBuffers.
+ */
+ private ByteBuffer cTOs; // "reliable" transport client->server
+ private ByteBuffer sTOc; // "reliable" transport server->client
+
+ /*
+ * The following is to set up the keystores/trust material.
+ */
+ private static final String pathToStores = "../../../../../../../etc/";
+ private static final String keyStoreFile = "keystore";
+ private static final String trustStoreFile = "truststore";
+ private static final String passwd = "passphrase";
+ private static String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores
+ + "/" + keyStoreFile;
+ private static String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores
+ + "/" + trustStoreFile;
+
+ /*
+ * Main entry point for this test.
+ */
+ public static void main(String args[]) throws Exception {
+ if (debug) {
+ System.setProperty("javax.net.debug", "all");
+ }
+
+ String [] protocols = new String [] {
+ "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2" };
+
+ for (String protocol : protocols) {
+ log("Testing " + protocol);
+ /*
+ * Run the tests with direct and indirect buffers.
+ */
+ SSLEngineBadBufferArrayAccess test =
+ new SSLEngineBadBufferArrayAccess(protocol);
+ test.runTest(true);
+ test.runTest(false);
+ }
+
+ System.out.println("Test Passed.");
+ }
+
+ /*
+ * Create an initialized SSLContext to use for these tests.
+ */
+ public SSLEngineBadBufferArrayAccess(String protocol) throws Exception {
+
+ KeyStore ks = KeyStore.getInstance("JKS");
+ KeyStore ts = KeyStore.getInstance("JKS");
+
+ char[] passphrase = "passphrase".toCharArray();
+
+ ks.load(new FileInputStream(keyFilename), passphrase);
+ ts.load(new FileInputStream(trustFilename), passphrase);
+
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+ kmf.init(ks, passphrase);
+
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+ tmf.init(ts);
+
+ SSLContext sslCtx = SSLContext.getInstance(protocol);
+
+ sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+ sslc = sslCtx;
+ }
+
+ /*
+ * Run the test.
+ *
+ * Sit in a tight loop, with the server engine calling wrap/unwrap
+ * regardless of whether data is available or not. We do this until
+ * we get the application data. Then we shutdown and go to the next one.
+ *
+ * The main loop handles all of the I/O phases of the SSLEngine's
+ * lifetime:
+ *
+ * initial handshaking
+ * application data transfer
+ * engine closing
+ *
+ * One could easily separate these phases into separate
+ * sections of code.
+ */
+ private void runTest(boolean direct) throws Exception {
+ boolean serverClose = direct;
+
+ serverSocket = new ServerSocket(0);
+ int port = serverSocket.getLocalPort();
+ Thread thread = createClientThread(port, serverClose);
+
+ socket = serverSocket.accept();
+ socket.setSoTimeout(500);
+ serverSocket.close();
+
+ createSSLEngine();
+ createBuffers(direct);
+
+ try {
+ boolean closed = false;
+
+ InputStream is = socket.getInputStream();
+ OutputStream os = socket.getOutputStream();
+
+ SSLEngineResult serverResult; // results from last operation
+
+ /*
+ * Examining the SSLEngineResults could be much more involved,
+ * and may alter the overall flow of the application.
+ *
+ * For example, if we received a BUFFER_OVERFLOW when trying
+ * to write to the output pipe, we could reallocate a larger
+ * pipe, but instead we wait for the peer to drain it.
+ */
+ byte[] inbound = new byte[8192];
+ byte[] outbound = new byte[8192];
+
+ while (!isEngineClosed(serverEngine)) {
+ int len = 0;
+
+ // Inbound data
+ log("================");
+
+ // Read from the Client side.
+ try {
+ len = is.read(inbound);
+ if (len == -1) {
+ throw new Exception("Unexpected EOF");
+ }
+ cTOs.put(inbound, 0, len);
+ } catch (SocketTimeoutException ste) {
+ // swallow. Nothing yet, probably waiting on us.
+ }
+
+ cTOs.flip();
+
+ serverResult = serverEngine.unwrap(cTOs, serverIn);
+ log("server unwrap: ", serverResult);
+ runDelegatedTasks(serverResult, serverEngine);
+ cTOs.compact();
+
+ // Outbound data
+ log("----");
+
+ serverResult = serverEngine.wrap(serverOut, sTOc);
+ log("server wrap: ", serverResult);
+ runDelegatedTasks(serverResult, serverEngine);
+
+ sTOc.flip();
+
+ if ((len = sTOc.remaining()) != 0) {
+ sTOc.get(outbound, 0, len);
+ os.write(outbound, 0, len);
+ // Give the other side a chance to process
+ }
+
+ sTOc.compact();
+
+ if (!closed && (serverOut.remaining() == 0)) {
+ closed = true;
+
+ /*
+ * We'll alternate initiatating the shutdown.
+ * When the server initiates, it will take one more
+ * loop, but tests the orderly shutdown.
+ */
+ if (serverClose) {
+ serverEngine.closeOutbound();
+ }
+ serverIn.flip();
+
+ /*
+ * A sanity check to ensure we got what was sent.
+ */
+ if (serverIn.remaining() != clientMsg.length) {
+ throw new Exception("Client: Data length error");
+ }
+
+ for (int i = 0; i < clientMsg.length; i++) {
+ if (clientMsg[i] != serverIn.get()) {
+ throw new Exception("Client: Data content error");
+ }
+ }
+ serverIn.compact();
+ }
+ }
+ return;
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ socket.close();
+
+ // Wait for the client to join up with us.
+ thread.join();
+ if (serverException != null) {
+ throw serverException;
+ }
+ if (clientException != null) {
+ throw clientException;
+ }
+ }
+ }
+
+ /*
+ * Create a client thread which does simple SSLSocket operations.
+ * We'll write and read one data packet.
+ */
+ private Thread createClientThread(final int port,
+ final boolean serverClose) throws Exception {
+
+ Thread t = new Thread("ClientThread") {
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(1000); // Give server time to finish setup.
+
+ sslSocket = (SSLSocket) sslc.getSocketFactory().
+ createSocket("localhost", port);
+ OutputStream os = sslSocket.getOutputStream();
+ InputStream is = sslSocket.getInputStream();
+
+ // write(byte[]) goes in one shot.
+ os.write(clientMsg);
+
+ byte[] inbound = new byte[2048];
+ int pos = 0;
+
+ int len;
+done:
+ while ((len = is.read(inbound, pos, 2048 - pos)) != -1) {
+ pos += len;
+ // Let the client do the closing.
+ if ((pos == serverMsg.length) && !serverClose) {
+ sslSocket.close();
+ break done;
+ }
+ }
+
+ if (pos != serverMsg.length) {
+ throw new Exception("Client: Data length error");
+ }
+
+ for (int i = 0; i < serverMsg.length; i++) {
+ if (inbound[i] != serverMsg[i]) {
+ throw new Exception("Client: Data content error");
+ }
+ }
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ };
+ t.start();
+ return t;
+ }
+
+ /*
+ * Using the SSLContext created during object creation,
+ * create/configure the SSLEngines we'll use for this test.
+ */
+ private void createSSLEngine() throws Exception {
+ /*
+ * Configure the serverEngine to act as a server in the SSL/TLS
+ * handshake.
+ */
+ serverEngine = sslc.createSSLEngine();
+ serverEngine.setUseClientMode(false);
+ serverEngine.getNeedClientAuth();
+ }
+
+ /*
+ * Create and size the buffers appropriately.
+ */
+ private void createBuffers(boolean direct) {
+
+ SSLSession session = serverEngine.getSession();
+ int appBufferMax = session.getApplicationBufferSize();
+ int netBufferMax = session.getPacketBufferSize();
+
+ /*
+ * We'll make the input buffers a bit bigger than the max needed
+ * size, so that unwrap()s following a successful data transfer
+ * won't generate BUFFER_OVERFLOWS.
+ *
+ * We'll use a mix of direct and indirect ByteBuffers for
+ * tutorial purposes only. In reality, only use direct
+ * ByteBuffers when they give a clear performance enhancement.
+ */
+ if (direct) {
+ serverIn = ByteBuffer.allocateDirect(appBufferMax + 50);
+ cTOs = ByteBuffer.allocateDirect(netBufferMax);
+ sTOc = ByteBuffer.allocateDirect(netBufferMax);
+ } else {
+ serverIn = ByteBuffer.allocate(appBufferMax + 50);
+ cTOs = ByteBuffer.allocate(netBufferMax);
+ sTOc = ByteBuffer.allocate(netBufferMax);
+ }
+
+ serverOut = ByteBuffer.wrap(serverMsg);
+ }
+
+ /*
+ * If the result indicates that we have outstanding tasks to do,
+ * go ahead and run them in this thread.
+ */
+ private static void runDelegatedTasks(SSLEngineResult result,
+ SSLEngine engine) throws Exception {
+
+ if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+ Runnable runnable;
+ while ((runnable = engine.getDelegatedTask()) != null) {
+ log("\trunning delegated task...");
+ runnable.run();
+ }
+ HandshakeStatus hsStatus = engine.getHandshakeStatus();
+ if (hsStatus == HandshakeStatus.NEED_TASK) {
+ throw new Exception(
+ "handshake shouldn't need additional tasks");
+ }
+ log("\tnew HandshakeStatus: " + hsStatus);
+ }
+ }
+
+ private static boolean isEngineClosed(SSLEngine engine) {
+ return (engine.isOutboundDone() && engine.isInboundDone());
+ }
+
+ /*
+ * Logging code
+ */
+ private static boolean resultOnce = true;
+
+ private static void log(String str, SSLEngineResult result) {
+ if (!logging) {
+ return;
+ }
+ if (resultOnce) {
+ resultOnce = false;
+ System.out.println("The format of the SSLEngineResult is: \n"
+ + "\t\"getStatus() / getHandshakeStatus()\" +\n"
+ + "\t\"bytesConsumed() / bytesProduced()\"\n");
+ }
+ HandshakeStatus hsStatus = result.getHandshakeStatus();
+ log(str
+ + result.getStatus() + "/" + hsStatus + ", "
+ + result.bytesConsumed() + "/" + result.bytesProduced()
+ + " bytes");
+ if (hsStatus == HandshakeStatus.FINISHED) {
+ log("\t...ready for application data");
+ }
+ }
+
+ private static void log(String str) {
+ if (logging) {
+ System.out.println(str);
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java
index c29f55a..dfdefa9 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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
@@ -29,6 +29,8 @@
* This is a simple hack to test a bunch of conditions and check
* their return codes.
*
+ * @run main/othervm -Djsse.enableCBCProtection=false CheckStatus
+ *
* @author Brad Wetmore
*/
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java
index 849e739..5960ea6 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2011, 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,8 @@
* This is to test larger buffer arrays, and make sure the maximum
* is being passed.
*
+ * @run main/othervm -Djsse.enableCBCProtection=false LargeBufs
+ *
* @author Brad R. Wetmore
*/
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java
index 9740b67..498df71 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2011, 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
@@ -27,10 +27,7 @@
* @bug 6388456
* @summary Need adjustable TLS max record size for interoperability
* with non-compliant
- * @run main/othervm LargePacket
- *
- * SunJSSE does not support dynamic system properties, no way to re-use
- * system properties in samevm/agentvm mode.
+ * @run main/othervm -Djsse.enableCBCProtection=false LargePacket
*
* @author Xuelei Fan
*/
diff --git a/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java b/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java
new file mode 100644
index 0000000..e31409a
--- /dev/null
+++ b/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 2011, 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 7105780
+ * @summary Add SSLSocket client/SSLEngine server to templates directory.
+ *
+ * SunJSSE does not support dynamic system properties, no way to re-use
+ * system properties in samevm/agentvm mode.
+ *
+ * @run main/othervm SSLSocketSSLEngineTemplate
+ */
+
+/**
+ * A SSLSocket/SSLEngine interop test case. This is not the way to
+ * code SSLEngine-based servers, but works for what we need to do here,
+ * which is to make sure that SSLEngine/SSLSockets can talk to each other.
+ * SSLEngines can use direct or indirect buffers, and different code
+ * is used to get at the buffer contents internally, so we test that here.
+ *
+ * The test creates one SSLSocket (client) and one SSLEngine (server).
+ * The SSLSocket talks to a raw ServerSocket, and the server code
+ * does the translation between byte [] and ByteBuffers that the SSLEngine
+ * can use. The "transport" layer consists of a Socket Input/OutputStream
+ * and two byte buffers for the SSLEngines: think of them
+ * as directly connected pipes.
+ *
+ * Again, this is a *very* simple example: real code will be much more
+ * involved. For example, different threading and I/O models could be
+ * used, transport mechanisms could close unexpectedly, and so on.
+ *
+ * When this application runs, notice that several messages
+ * (wrap/unwrap) pass before any application data is consumed or
+ * produced. (For more information, please see the SSL/TLS
+ * specifications.) There may several steps for a successful handshake,
+ * so it's typical to see the following series of operations:
+ *
+ * client server message
+ * ====== ====== =======
+ * write() ... ClientHello
+ * ... unwrap() ClientHello
+ * ... wrap() ServerHello/Certificate
+ * read() ... ServerHello/Certificate
+ * write() ... ClientKeyExchange
+ * write() ... ChangeCipherSpec
+ * write() ... Finished
+ * ... unwrap() ClientKeyExchange
+ * ... unwrap() ChangeCipherSpec
+ * ... unwrap() Finished
+ * ... wrap() ChangeCipherSpec
+ * ... wrap() Finished
+ * read() ... ChangeCipherSpec
+ * read() ... Finished
+ */
+import javax.net.ssl.*;
+import javax.net.ssl.SSLEngineResult.*;
+import java.io.*;
+import java.net.*;
+import java.security.*;
+import java.nio.*;
+
+public class SSLSocketSSLEngineTemplate {
+
+ /*
+ * Enables logging of the SSL/TLS operations.
+ */
+ private static boolean logging = true;
+
+ /*
+ * Enables the JSSE system debugging system property:
+ *
+ * -Djavax.net.debug=all
+ *
+ * This gives a lot of low-level information about operations underway,
+ * including specific handshake messages, and might be best examined
+ * after gaining some familiarity with this application.
+ */
+ private static boolean debug = false;
+ private SSLContext sslc;
+ private SSLEngine serverEngine; // server-side SSLEngine
+ private SSLSocket sslSocket; // client-side socket
+ private ServerSocket serverSocket; // server-side Socket, generates the...
+ private Socket socket; // server-side socket that will read
+
+ private final byte[] serverMsg =
+ "Hi there Client, I'm a Server.".getBytes();
+ private final byte[] clientMsg =
+ "Hello Server, I'm a Client! Pleased to meet you!".getBytes();
+
+ private ByteBuffer serverOut; // write side of serverEngine
+ private ByteBuffer serverIn; // read side of serverEngine
+
+ private volatile Exception clientException;
+ private volatile Exception serverException;
+
+ /*
+ * For data transport, this example uses local ByteBuffers.
+ */
+ private ByteBuffer cTOs; // "reliable" transport client->server
+ private ByteBuffer sTOc; // "reliable" transport server->client
+
+ /*
+ * The following is to set up the keystores/trust material.
+ */
+ private static final String pathToStores = "../etc/";
+ private static final String keyStoreFile = "keystore";
+ private static final String trustStoreFile = "truststore";
+ private static final String passwd = "passphrase";
+ private static String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores
+ + "/" + keyStoreFile;
+ private static String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores
+ + "/" + trustStoreFile;
+
+ /*
+ * Main entry point for this test.
+ */
+ public static void main(String args[]) throws Exception {
+ if (debug) {
+ System.setProperty("javax.net.debug", "all");
+ }
+
+ String [] protocols = new String [] {
+ "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2" };
+
+ for (String protocol : protocols) {
+ log("Testing " + protocol);
+ /*
+ * Run the tests with direct and indirect buffers.
+ */
+ SSLSocketSSLEngineTemplate test =
+ new SSLSocketSSLEngineTemplate(protocol);
+ test.runTest(true);
+ test.runTest(false);
+ }
+
+ System.out.println("Test Passed.");
+ }
+
+ /*
+ * Create an initialized SSLContext to use for these tests.
+ */
+ public SSLSocketSSLEngineTemplate(String protocol) throws Exception {
+
+ KeyStore ks = KeyStore.getInstance("JKS");
+ KeyStore ts = KeyStore.getInstance("JKS");
+
+ char[] passphrase = "passphrase".toCharArray();
+
+ ks.load(new FileInputStream(keyFilename), passphrase);
+ ts.load(new FileInputStream(trustFilename), passphrase);
+
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+ kmf.init(ks, passphrase);
+
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+ tmf.init(ts);
+
+ SSLContext sslCtx = SSLContext.getInstance(protocol);
+
+ sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+ sslc = sslCtx;
+ }
+
+ /*
+ * Run the test.
+ *
+ * Sit in a tight loop, with the server engine calling wrap/unwrap
+ * regardless of whether data is available or not. We do this until
+ * we get the application data. Then we shutdown and go to the next one.
+ *
+ * The main loop handles all of the I/O phases of the SSLEngine's
+ * lifetime:
+ *
+ * initial handshaking
+ * application data transfer
+ * engine closing
+ *
+ * One could easily separate these phases into separate
+ * sections of code.
+ */
+ private void runTest(boolean direct) throws Exception {
+ boolean serverClose = direct;
+
+ serverSocket = new ServerSocket(0);
+ int port = serverSocket.getLocalPort();
+ Thread thread = createClientThread(port, serverClose);
+
+ socket = serverSocket.accept();
+ socket.setSoTimeout(500);
+ serverSocket.close();
+
+ createSSLEngine();
+ createBuffers(direct);
+
+ try {
+ boolean closed = false;
+
+ InputStream is = socket.getInputStream();
+ OutputStream os = socket.getOutputStream();
+
+ SSLEngineResult serverResult; // results from last operation
+
+ /*
+ * Examining the SSLEngineResults could be much more involved,
+ * and may alter the overall flow of the application.
+ *
+ * For example, if we received a BUFFER_OVERFLOW when trying
+ * to write to the output pipe, we could reallocate a larger
+ * pipe, but instead we wait for the peer to drain it.
+ */
+ byte[] inbound = new byte[8192];
+ byte[] outbound = new byte[8192];
+
+ while (!isEngineClosed(serverEngine)) {
+ int len = 0;
+
+ // Inbound data
+ log("================");
+
+ // Read from the Client side.
+ try {
+ len = is.read(inbound);
+ if (len == -1) {
+ throw new Exception("Unexpected EOF");
+ }
+ cTOs.put(inbound, 0, len);
+ } catch (SocketTimeoutException ste) {
+ // swallow. Nothing yet, probably waiting on us.
+ }
+
+ cTOs.flip();
+
+ serverResult = serverEngine.unwrap(cTOs, serverIn);
+ log("server unwrap: ", serverResult);
+ runDelegatedTasks(serverResult, serverEngine);
+ cTOs.compact();
+
+ // Outbound data
+ log("----");
+
+ serverResult = serverEngine.wrap(serverOut, sTOc);
+ log("server wrap: ", serverResult);
+ runDelegatedTasks(serverResult, serverEngine);
+
+ sTOc.flip();
+
+ if ((len = sTOc.remaining()) != 0) {
+ sTOc.get(outbound, 0, len);
+ os.write(outbound, 0, len);
+ // Give the other side a chance to process
+ }
+
+ sTOc.compact();
+
+ if (!closed && (serverOut.remaining() == 0)) {
+ closed = true;
+
+ /*
+ * We'll alternate initiatating the shutdown.
+ * When the server initiates, it will take one more
+ * loop, but tests the orderly shutdown.
+ */
+ if (serverClose) {
+ serverEngine.closeOutbound();
+ }
+ serverIn.flip();
+
+ /*
+ * A sanity check to ensure we got what was sent.
+ */
+ if (serverIn.remaining() != clientMsg.length) {
+ throw new Exception("Client: Data length error");
+ }
+
+ for (int i = 0; i < clientMsg.length; i++) {
+ if (clientMsg[i] != serverIn.get()) {
+ throw new Exception("Client: Data content error");
+ }
+ }
+ serverIn.compact();
+ }
+ }
+ return;
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ socket.close();
+
+ // Wait for the client to join up with us.
+ thread.join();
+ if (serverException != null) {
+ throw serverException;
+ }
+ if (clientException != null) {
+ throw clientException;
+ }
+ }
+ }
+
+ /*
+ * Create a client thread which does simple SSLSocket operations.
+ * We'll write and read one data packet.
+ */
+ private Thread createClientThread(final int port,
+ final boolean serverClose) throws Exception {
+
+ Thread t = new Thread("ClientThread") {
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(1000); // Give server time to finish setup.
+
+ sslSocket = (SSLSocket) sslc.getSocketFactory().
+ createSocket("localhost", port);
+ OutputStream os = sslSocket.getOutputStream();
+ InputStream is = sslSocket.getInputStream();
+
+ // write(byte[]) goes in one shot.
+ os.write(clientMsg);
+
+ byte[] inbound = new byte[2048];
+ int pos = 0;
+
+ int len;
+done:
+ while ((len = is.read(inbound, pos, 2048 - pos)) != -1) {
+ pos += len;
+ // Let the client do the closing.
+ if ((pos == serverMsg.length) && !serverClose) {
+ sslSocket.close();
+ break done;
+ }
+ }
+
+ if (pos != serverMsg.length) {
+ throw new Exception("Client: Data length error");
+ }
+
+ for (int i = 0; i < serverMsg.length; i++) {
+ if (inbound[i] != serverMsg[i]) {
+ throw new Exception("Client: Data content error");
+ }
+ }
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ };
+ t.start();
+ return t;
+ }
+
+ /*
+ * Using the SSLContext created during object creation,
+ * create/configure the SSLEngines we'll use for this test.
+ */
+ private void createSSLEngine() throws Exception {
+ /*
+ * Configure the serverEngine to act as a server in the SSL/TLS
+ * handshake.
+ */
+ serverEngine = sslc.createSSLEngine();
+ serverEngine.setUseClientMode(false);
+ serverEngine.getNeedClientAuth();
+ }
+
+ /*
+ * Create and size the buffers appropriately.
+ */
+ private void createBuffers(boolean direct) {
+
+ SSLSession session = serverEngine.getSession();
+ int appBufferMax = session.getApplicationBufferSize();
+ int netBufferMax = session.getPacketBufferSize();
+
+ /*
+ * We'll make the input buffers a bit bigger than the max needed
+ * size, so that unwrap()s following a successful data transfer
+ * won't generate BUFFER_OVERFLOWS.
+ *
+ * We'll use a mix of direct and indirect ByteBuffers for
+ * tutorial purposes only. In reality, only use direct
+ * ByteBuffers when they give a clear performance enhancement.
+ */
+ if (direct) {
+ serverIn = ByteBuffer.allocateDirect(appBufferMax + 50);
+ cTOs = ByteBuffer.allocateDirect(netBufferMax);
+ sTOc = ByteBuffer.allocateDirect(netBufferMax);
+ } else {
+ serverIn = ByteBuffer.allocate(appBufferMax + 50);
+ cTOs = ByteBuffer.allocate(netBufferMax);
+ sTOc = ByteBuffer.allocate(netBufferMax);
+ }
+
+ serverOut = ByteBuffer.wrap(serverMsg);
+ }
+
+ /*
+ * If the result indicates that we have outstanding tasks to do,
+ * go ahead and run them in this thread.
+ */
+ private static void runDelegatedTasks(SSLEngineResult result,
+ SSLEngine engine) throws Exception {
+
+ if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+ Runnable runnable;
+ while ((runnable = engine.getDelegatedTask()) != null) {
+ log("\trunning delegated task...");
+ runnable.run();
+ }
+ HandshakeStatus hsStatus = engine.getHandshakeStatus();
+ if (hsStatus == HandshakeStatus.NEED_TASK) {
+ throw new Exception(
+ "handshake shouldn't need additional tasks");
+ }
+ log("\tnew HandshakeStatus: " + hsStatus);
+ }
+ }
+
+ private static boolean isEngineClosed(SSLEngine engine) {
+ return (engine.isOutboundDone() && engine.isInboundDone());
+ }
+
+ /*
+ * Logging code
+ */
+ private static boolean resultOnce = true;
+
+ private static void log(String str, SSLEngineResult result) {
+ if (!logging) {
+ return;
+ }
+ if (resultOnce) {
+ resultOnce = false;
+ System.out.println("The format of the SSLEngineResult is: \n"
+ + "\t\"getStatus() / getHandshakeStatus()\" +\n"
+ + "\t\"bytesConsumed() / bytesProduced()\"\n");
+ }
+ HandshakeStatus hsStatus = result.getHandshakeStatus();
+ log(str
+ + result.getStatus() + "/" + hsStatus + ", "
+ + result.bytesConsumed() + "/" + result.bytesProduced()
+ + " bytes");
+ if (hsStatus == HandshakeStatus.FINISHED) {
+ log("\t...ready for application data");
+ }
+ }
+
+ private static void log(String str) {
+ if (logging) {
+ System.out.println(str);
+ }
+ }
+}
diff --git a/jdk/test/sun/text/resources/Collator/Bug6755060.java b/jdk/test/sun/text/resources/Collator/Bug6755060.java
new file mode 100644
index 0000000..ee23487
--- /dev/null
+++ b/jdk/test/sun/text/resources/Collator/Bug6755060.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2011, 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 6755060
+ * @summary updating collation tables for thai to make it consistent with CLDR 1.9
+ */
+
+import java.text.*;
+import java.util.*;
+
+public class Bug6755060 {
+
+ /********************************************************
+ *********************************************************/
+ public static void main (String[] args) {
+
+ Locale reservedLocale = Locale.getDefault();
+
+ try{
+
+ int errors=0;
+
+ Locale loc = new Locale ("th", "TH"); // Thai
+
+ Locale.setDefault (loc);
+ Collator col = Collator.getInstance ();
+
+ /*
+ * The original data "data" are the data to be sorted provided by the submitter of the CR.
+ * It's in correct order in accord with thai collation in CLDR 1.9. If we use old Java without this fix,
+ * the output order will be incorrect. Correct order will be turned into incorrect order.
+
+ * If fix is there, "data" after sorting will be unchanged, same as "sortedData". If fix is lost (regression),
+ * "data" after sorting will be changed, not as "sortedData".(not correct anymore)
+
+ * The submitter of the CR also gives a expected "sortedData" in the CR, but it's in accord with collation in CLDR 1.4.
+ * His data to be sorted are actually well sorted in accord with CLDR 1.9.
+ */
+
+ String[] data = {"\u0e01", "\u0e01\u0e2f", "\u0e01\u0e46", "\u0e01\u0e4f", "\u0e01\u0e5a", "\u0e01\u0e5b", "\u0e01\u0e4e", "\u0e01\u0e4c", "\u0e01\u0e48", "\u0e01\u0e01", "\u0e01\u0e4b\u0e01", "\u0e01\u0e4d", "\u0e01\u0e30", "\u0e01\u0e31\u0e01", "\u0e01\u0e32", "\u0e01\u0e33", "\u0e01\u0e34", "\u0e01\u0e35", "\u0e01\u0e36", "\u0e01\u0e37", "\u0e01\u0e38", "\u0e01\u0e39", "\u0e40\u0e01", "\u0e40\u0e01\u0e48", "\u0e40\u0e01\u0e49", "\u0e40\u0e01\u0e4b", "\u0e41\u0e01", "\u0e42\u0e01", "\u0e43\u0e01", "\u0e44\u0e01", "\u0e01\u0e3a", "\u0e24\u0e32", "\u0e24\u0e45", "\u0e40\u0e25", "\u0e44\u0e26"};
+
+ String[] sortedData = {"\u0e01", "\u0e01\u0e2f", "\u0e01\u0e46", "\u0e01\u0e4f", "\u0e01\u0e5a", "\u0e01\u0e5b", "\u0e01\u0e4e", "\u0e01\u0e4c", "\u0e01\u0e48", "\u0e01\u0e01", "\u0e01\u0e4b\u0e01", "\u0e01\u0e4d", "\u0e01\u0e30", "\u0e01\u0e31\u0e01", "\u0e01\u0e32", "\u0e01\u0e33", "\u0e01\u0e34", "\u0e01\u0e35", "\u0e01\u0e36", "\u0e01\u0e37", "\u0e01\u0e38", "\u0e01\u0e39", "\u0e40\u0e01", "\u0e40\u0e01\u0e48", "\u0e40\u0e01\u0e49", "\u0e40\u0e01\u0e4b", "\u0e41\u0e01", "\u0e42\u0e01", "\u0e43\u0e01", "\u0e44\u0e01", "\u0e01\u0e3a", "\u0e24\u0e32", "\u0e24\u0e45", "\u0e40\u0e25", "\u0e44\u0e26"};
+
+ Arrays.sort (data, col);
+
+ System.out.println ("Using " + loc.getDisplayName());
+ for (int i = 0; i < data.length; i++) {
+ System.out.println(data[i] + " : " + sortedData[i]);
+ if (sortedData[i].compareTo(data[i]) != 0) {
+ errors++;
+ }
+ }//end for
+
+ if (errors > 0){
+ StringBuffer expected = new StringBuffer(), actual = new StringBuffer();
+ expected.append(sortedData[0]);
+ actual.append(data[0]);
+
+ for (int i=1; i<data.length; i++) {
+ expected.append(",");
+ expected.append(sortedData[i]);
+
+ actual.append(",");
+ actual.append(data[i]);
+ }
+
+ String errmsg = "Error is found in collation testing in Thai\n" + "exepected order is: " + expected.toString() + "\n" + "actual order is: " + actual.toString() + "\n";
+
+ throw new RuntimeException(errmsg);
+ }
+ }finally{
+ // restore the reserved locale
+ Locale.setDefault(reservedLocale);
+ }
+
+ }//end main
+
+}//end class CollatorTest
diff --git a/jdk/test/sun/text/resources/LocaleData b/jdk/test/sun/text/resources/LocaleData
index 0096007..2c66a97 100644
--- a/jdk/test/sun/text/resources/LocaleData
+++ b/jdk/test/sun/text/resources/LocaleData
@@ -7006,3 +7006,7 @@ CurrencyNames/zh_CN/zwl=\u6d25\u5df4\u5e03\u97e6\u5143 (2009)
CurrencyNames/zh_TW/cuc=\u53e4\u5df4\u53ef\u8f49\u63db\u62ab\u7d22
CurrencyNames/zh_TW/tmt=\u571f\u5eab\u66fc\u65b0\u99ac\u7d0d\u7279
CurrencyNames/zh_TW/zwl=\u8f9b\u5df4\u5a01\u5143 (2009)
+
+# bug 7101495
+CalendarData/lv/firstDayOfWeek=2
+CalendarData/lv/minimalDaysInFirstWeek=4
diff --git a/jdk/test/sun/text/resources/LocaleDataTest.java b/jdk/test/sun/text/resources/LocaleDataTest.java
index 6ec4236..836b1b2 100644
--- a/jdk/test/sun/text/resources/LocaleDataTest.java
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java
@@ -33,7 +33,7 @@
* 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259
* 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
* 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
- * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203
+ * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
* @summary Verify locale data
*
*/
diff --git a/jdk/test/sun/tools/jinfo/Basic.sh b/jdk/test/sun/tools/jinfo/Basic.sh
index 9d5cb46..432dd62 100644
--- a/jdk/test/sun/tools/jinfo/Basic.sh
+++ b/jdk/test/sun/tools/jinfo/Basic.sh
@@ -44,7 +44,19 @@ set +e
failed=0
-if [ $isWindows = false ]; then
+runSA=true
+
+if [ $isLinux = true ]; then
+ # Some Linux systems disable non-child ptrace (see 7050524)
+ ptrace_scope=`/sbin/sysctl -n kernel.yama.ptrace_scope`
+ if [ $? = 0 ]; then
+ if [ $ptrace_scope = 1 ]; then
+ runSA=false
+ fi
+ fi
+fi
+
+if [ $runSA = true ]; then
# -sysprops option
${JINFO} -J-XX:+UsePerfData -sysprops $appJavaPid
if [ $? != 0 ]; then failed=1; fi
diff --git a/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh b/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh
index 8e7d220..c4d09b5 100644
--- a/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh
+++ b/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh
@@ -22,7 +22,7 @@
#
# @test
-# @bug 4990825
+# @bug 4990825 7092186
# @run shell/timeout=90 jstatdExternalRegistry.sh
# @summary Test functionality of 'jstatd -p<port>&' with an external RMI registry
diff --git a/langtools/.hg/cache/branchheads b/langtools/.hg/cache/branchheads
index 8a5ea67..a961040 100644
--- a/langtools/.hg/cache/branchheads
+++ b/langtools/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-9d81e6a48f1bc1fcbf777e191d402078d46e46dd 1167
-9d81e6a48f1bc1fcbf777e191d402078d46e46dd default
+1e829edfb3409f02c21227bce696a0610d91bf38 1168
+1e829edfb3409f02c21227bce696a0610d91bf38 default
diff --git a/langtools/.hg/dirstate b/langtools/.hg/dirstate
index cbf2265..749c1bd 100644
Binary files a/langtools/.hg/dirstate and b/langtools/.hg/dirstate differ
diff --git a/langtools/.hg/store/00changelog.d b/langtools/.hg/store/00changelog.d
index 2e457f2..be51023 100644
Binary files a/langtools/.hg/store/00changelog.d and b/langtools/.hg/store/00changelog.d differ
diff --git a/langtools/.hg/store/00changelog.i b/langtools/.hg/store/00changelog.i
index cabb8c5..a8d0db1 100644
Binary files a/langtools/.hg/store/00changelog.i and b/langtools/.hg/store/00changelog.i differ
diff --git a/langtools/.hg/store/00manifest.d b/langtools/.hg/store/00manifest.d
index 081b92b..536559f 100644
Binary files a/langtools/.hg/store/00manifest.d and b/langtools/.hg/store/00manifest.d differ
diff --git a/langtools/.hg/store/00manifest.i b/langtools/.hg/store/00manifest.i
index 9efc035..c1811f1 100644
Binary files a/langtools/.hg/store/00manifest.i and b/langtools/.hg/store/00manifest.i differ
diff --git a/langtools/.hg/store/data/make/tools/_jigsaw/_fpkg_task.java.i b/langtools/.hg/store/data/make/tools/_jigsaw/_fpkg_task.java.i
index 84b8bb2..a7beea2 100644
Binary files a/langtools/.hg/store/data/make/tools/_jigsaw/_fpkg_task.java.i and b/langtools/.hg/store/data/make/tools/_jigsaw/_fpkg_task.java.i differ
diff --git a/langtools/.hg/store/undo b/langtools/.hg/store/undo
index 3241ed8..68018e1 100644
Binary files a/langtools/.hg/store/undo and b/langtools/.hg/store/undo differ
diff --git a/langtools/.hg/undo.desc b/langtools/.hg/undo.desc
index 58f0c15..5d85ed1 100644
--- a/langtools/.hg/undo.desc
+++ b/langtools/.hg/undo.desc
@@ -1,3 +1,3 @@
-1115
+1168
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/langtools
diff --git a/langtools/.hg/undo.dirstate b/langtools/.hg/undo.dirstate
index 06631af..cbf2265 100644
Binary files a/langtools/.hg/undo.dirstate and b/langtools/.hg/undo.dirstate differ
diff --git a/langtools/make/tools/Jigsaw/FpkgTask.java b/langtools/make/tools/Jigsaw/FpkgTask.java
index 40c47a8..eaf0c13 100644
--- a/langtools/make/tools/Jigsaw/FpkgTask.java
+++ b/langtools/make/tools/Jigsaw/FpkgTask.java
@@ -156,18 +156,15 @@ public class FpkgTask extends MatchingTask {
try {
File tmpModuleDir = new File(tmpDir, name);
File tmpClassesDir = new File(tmpModuleDir, "classes");
- File tmpResourcesDir = new File(tmpModuleDir, "resources");
tmpClassesDir.mkdirs();
- tmpResourcesDir.mkdirs();
destDir.mkdirs();
FileUtils fu = FileUtils.getFileUtils();
fu.copyFile(importModuleInfo, new File(tmpClassesDir, "module-info.class"));
- copyFiles(tmpClassesDir, tmpResourcesDir);
+ copyFiles(tmpClassesDir);
List<String> opts = new ArrayList<String>();
add(opts, "--module-dir", tmpClassesDir.getPath());
- add(opts, "--resources", tmpResourcesDir.getPath());
add(opts, "--dest-dir", destDir.getPath());
add(opts, type);
add(opts, name);
@@ -222,11 +219,11 @@ public class FpkgTask extends MatchingTask {
return true;
}
- void copyFiles(File classesDir, File resourcesDir) throws IOException {
+ void copyFiles(File classesDir) throws IOException {
FileUtils fu = FileUtils.getFileUtils();
DirectoryScanner s = getDirectoryScanner(dir);
for (String path: s.getIncludedFiles()) {
- File toDir = (path.endsWith(".class") ? classesDir : resourcesDir);
+ File toDir = classesDir;
fu.copyFile(new File(dir, path), new File(toDir, path));
}
}
--
jigsaw packaging
More information about the pkg-java-commits
mailing list