/hg/icedtea7: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jun 11 16:06:17 PDT 2012
changeset a0cb6640401e in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a0cb6640401e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 31 02:25:52 2012 +0100
Fix ChangeLog e-mail address for changes not done for Red Hat.
changeset 7ceb431c104f in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7ceb431c104f
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jun 12 00:05:49 2012 +0100
Update to 7u6b13.
2012-06-11 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(OPENJDK_VERSION): Bump to b13.
* patches/boot/demos.patch,
* patches/boot/ecj-diamond.patch:
Regenerated. Update Hashtable changes
to use <K,V> not <Object,Object>.
* patches/boot/ecj-multicatch.patch:
Add additional cases in Hashtable and HashMap.
* patches/boot/ecj-trywithresources.patch,
* patches/boot/jaxws-jdk-dependency.patch:
Regenerated.
diffstat:
ChangeLog | 20 +-
Makefile.am | 30 +-
patches/boot/demos.patch | 16 +-
patches/boot/ecj-diamond.patch | 879 +++++++++++++++----------------
patches/boot/ecj-multicatch.patch | 28 +
patches/boot/ecj-trywithresources.patch | 184 +++---
patches/boot/jaxws-jdk-dependency.patch | 30 +-
7 files changed, 612 insertions(+), 575 deletions(-)
diffs (truncated from 3071 to 500 lines):
diff -r ff055500a78c -r 7ceb431c104f ChangeLog
--- a/ChangeLog Thu May 31 02:17:58 2012 +0100
+++ b/ChangeLog Tue Jun 12 00:05:49 2012 +0100
@@ -1,8 +1,22 @@
-2012-05-30 Andrew John Hughes <ahughes at redhat.com>
+2012-06-11 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to b13.
+ * patches/boot/demos.patch,
+ * patches/boot/ecj-diamond.patch:
+ Regenerated. Update Hashtable changes
+ to use <K,V> not <Object,Object>.
+ * patches/boot/ecj-multicatch.patch:
+ Add additional cases in Hashtable and HashMap.
+ * patches/boot/ecj-trywithresources.patch,
+ * patches/boot/jaxws-jdk-dependency.patch:
+ Regenerated.
+
+2012-05-30 Andrew John Hughes <gnu_andrew at member.fsf.org>
* NEWS: Add 2.2 release notes.
-2012-05-30 Andrew John Hughes <ahughes at redhat.com>
+2012-05-30 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(EXTRA_DIST): Add test/tapset.
@@ -10,7 +24,7 @@
(clean-local): Remove clean-jtreg-reports.
(clean-jtreg): Remove test/jtreg if empty.
-2012-05-25 Andrew John Hughes <ahughes at redhat.com>
+2012-05-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(versioning): Don't add a suffix if building
diff -r ff055500a78c -r 7ceb431c104f Makefile.am
--- a/Makefile.am Thu May 31 02:17:58 2012 +0100
+++ b/Makefile.am Tue Jun 12 00:05:49 2012 +0100
@@ -1,24 +1,24 @@
# Dependencies
-OPENJDK_VERSION = b10
+OPENJDK_VERSION = b13
JDK_UPDATE_VERSION = 06
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = f60db5e849b2
-HOTSPOT_CHANGESET = 09d95d97bb19
-JAXP_CHANGESET = ac8bf0b8bd4a
-JAXWS_CHANGESET = 2d41be955e9b
-JDK_CHANGESET = 3f748460de83
-LANGTOOLS_CHANGESET = 93e9eae30c44
-OPENJDK_CHANGESET = f51ab5aecdc8
+CORBA_CHANGESET = fdff99b68633
+HOTSPOT_CHANGESET = 25544370b08a
+JAXP_CHANGESET = d058831728ea
+JAXWS_CHANGESET = 9527a5961398
+JDK_CHANGESET = dcfc6cbe78fc
+LANGTOOLS_CHANGESET = ce88d36be582
+OPENJDK_CHANGESET = 4ad80e78b55b
-CORBA_SHA256SUM = b850b59422c9b73bc99df5f3457bdff71358b9ff7064adb84f13f2f3ee2df708
-HOTSPOT_SHA256SUM = e4fe84a920df0971babfbab338faaa0db447d173099f4333c24f92f4a65410f0
-JAXP_SHA256SUM = 4c0b3377556674b52fa6e9ddbd20e60426bf8e65806b8bbce5104f90a445b8e6
-JAXWS_SHA256SUM = c013e3311af9858016f348e38e84d727222b0097fe9737320f57d1ea7269331a
-JDK_SHA256SUM = 67f7f4042e7008753acf4dd5f482b84ef0b5b8f0538aff3fe5670da47e49b32b
-LANGTOOLS_SHA256SUM = fc7d8adf15de321622153732a81d2e37fd89d3aa0b44986898e8fcdceac85b85
-OPENJDK_SHA256SUM = e53301a75d5ce44dbb7a3e3202c797f155755f6d688d0dde4ed6e9d8e87855c8
+CORBA_SHA256SUM = 80afdada85c2a2c1d3754120764a37e68ff002c1a3dd3e43a8b09972e046bba1
+HOTSPOT_SHA256SUM = 656f27e952e31780cc3621e2dfee92892098a313d84738c4a150855b36586159
+JAXP_SHA256SUM = b48fba30c4ce97beb31c1cae2edee0f0e6b68a00da1da0405c1cedb2a6277dd5
+JAXWS_SHA256SUM = d1ceb2f1182766d199a9118603669a35d1b1f62cb42f92af4cf14c554840b006
+JDK_SHA256SUM = b3e69c1ba90ab23c2a4b8d2fc5723a15bb40e9515e21e4296f4a86017305c7a1
+LANGTOOLS_SHA256SUM = ba6f16e69d18686935f25aefaee36f0a39bda4f6f8f7260513f5c53e777340a6
+OPENJDK_SHA256SUM = 65e54962cf9b77b6967a814515a58d7660624be0464af599229e6ad55647eb7e
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff -r ff055500a78c -r 7ceb431c104f patches/boot/demos.patch
--- a/patches/boot/demos.patch Thu May 31 02:17:58 2012 +0100
+++ b/patches/boot/demos.patch Tue Jun 12 00:05:49 2012 +0100
@@ -1,6 +1,6 @@
-diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
---- openjdk-boot.orig/jdk/make/common/Release.gmk 2012-03-18 22:39:44.298585468 +0000
-+++ openjdk-boot/jdk/make/common/Release.gmk 2012-03-19 00:50:02.224588936 +0000
+diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
+--- openjdk-boot.orig/jdk/make/common/Release.gmk 2012-06-11 14:24:46.531375308 +0100
++++ openjdk-boot/jdk/make/common/Release.gmk 2012-06-11 14:28:47.215136389 +0100
@@ -1104,16 +1104,6 @@
$(CP) $(FILES_launcher) $(JDK_IMAGE_DIR)/src/launcher
$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
@@ -18,11 +18,11 @@
ifneq ($(PLATFORM), windows)
$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
endif # !windows
-diff -Nru openjdk-boot.orig/jdk/make/Makefile openjdk-boot/jdk/make/Makefile
---- openjdk-boot.orig/jdk/make/Makefile 2012-03-12 17:25:51.000000000 +0000
-+++ openjdk-boot/jdk/make/Makefile 2012-03-19 00:50:02.224588936 +0000
-@@ -237,7 +237,7 @@
- SUBDIRS += apple
+diff -Nru openjdk.orig/jdk/make/Makefile openjdk/jdk/make/Makefile
+--- openjdk-boot.orig/jdk/make/Makefile 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/make/Makefile 2012-06-11 14:28:47.223136515 +0100
+@@ -240,7 +240,7 @@
+ SUBDIRS += bridge
endif
SUBDIRS_tools = launchers
-SUBDIRS_misc = org sunw jpda mkdemo mksample
diff -r ff055500a78c -r 7ceb431c104f patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Thu May 31 02:17:58 2012 +0100
+++ b/patches/boot/ecj-diamond.patch Tue Jun 12 00:05:49 2012 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-05-23 22:43:01.731314647 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-06-11 14:50:15.507289929 +0100
@@ -103,9 +103,9 @@
return this.def.compareTo(that.def);
}
@@ -72,8 +72,8 @@
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-05-23 22:28:08.716575342 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-05-23 22:43:01.743314841 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-06-11 14:49:32.914613624 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-06-11 14:50:15.527290247 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -142,8 +142,8 @@
return true;
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-05-23 22:28:08.596573363 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-05-23 22:43:01.743314841 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-06-11 14:49:32.798611784 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-06-11 14:50:15.527290247 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -154,8 +154,8 @@
InnerClass ic =
new InnerClass(readClassRef(),
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-06-11 14:50:15.527290247 +0100
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -192,8 +192,8 @@
if (popset.add(values[i])) popvals.add(values[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-06-11 14:50:15.527290247 +0100
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -204,8 +204,8 @@
Coding x1 = codeMap.get(x0);
if (x1 == null) codeMap.put(x0, x1 = x0);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-06-11 14:50:15.527290247 +0100
@@ -915,7 +915,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -234,8 +234,8 @@
Entry e = work.previous();
work.remove(); // pop stack
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-05-23 22:28:08.716575342 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-06-11 14:49:32.914613624 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-06-11 14:50:15.527290247 +0100
@@ -59,7 +59,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -273,8 +273,8 @@
for (String optline : options.split("\n")) {
String[] words = optline.split("\\p{Space}+");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-06-11 14:50:15.527290247 +0100
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -285,8 +285,8 @@
for (int i = 0 ; i < capacity ; i++) {
flist.add(null);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-06-11 14:50:15.527290247 +0100
@@ -126,11 +126,11 @@
public void setBytes(byte[] newBytes) {
if (bytes == newBytes) return;
@@ -311,8 +311,8 @@
static final int LOC_SHIFT = 1;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-05-23 22:28:08.600573429 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-06-11 14:49:32.798611784 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-06-11 14:50:15.527290247 +0100
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -477,8 +477,8 @@
// Add to the end of ths list:
if (!fileSet.contains(cls.file))
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-05-23 22:28:08.716575342 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-06-11 14:49:32.918613688 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-06-11 14:50:15.527290247 +0100
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -592,8 +592,8 @@
ClassEntry thisClass = curClass.thisClass;
ClassEntry superClass = curClass.superClass;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-05-23 22:28:08.724575474 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-06-11 14:49:32.918613688 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-06-11 14:50:15.527290247 +0100
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -649,8 +649,8 @@
for (Class cls : pkg.classes) {
if (!cls.hasInnerClasses()) continue;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-06-11 14:50:15.527290247 +0100
@@ -181,8 +181,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -681,8 +681,8 @@
for (JarEntry je : Collections.list(jf.entries())) {
InFile inFile = new InFile(jf, je);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-06-11 14:50:15.527290247 +0100
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -693,8 +693,8 @@
maxForDebug += fillp;
int min = Integer.MIN_VALUE; // farthest from the center
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-05-23 22:28:08.724575474 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-06-11 14:49:32.918613688 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-06-11 14:50:15.531290310 +0100
@@ -47,8 +47,8 @@
*/
@@ -716,8 +716,8 @@
while (res.remove(null));
return res;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-06-11 14:50:15.531290310 +0100
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -738,8 +738,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-05-23 22:28:08.724575474 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-06-11 14:49:32.918613688 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-06-11 14:50:15.531290310 +0100
@@ -232,7 +232,7 @@
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
@@ -750,8 +750,8 @@
String name = file.nameString;
JarEntry je = new JarEntry(Utils.getJarEntryName(name));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-05-23 22:28:08.724575474 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-05-23 22:43:01.747314905 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-06-11 14:49:32.918613688 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-06-11 14:50:15.531290310 +0100
@@ -132,7 +132,7 @@
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
@@ -762,8 +762,8 @@
// convenience methods to access the TL globals
static TLGlobals getTLGlobals() {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-05-23 22:43:01.751314972 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-06-11 14:50:15.531290310 +0100
@@ -1284,7 +1284,7 @@
*/
public Collection<?> toCollection() throws SQLException {
@@ -783,8 +783,8 @@
// create a copy
CachedRowSetImpl crsTemp;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-05-23 22:43:01.751314972 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-06-11 14:50:15.531290310 +0100
@@ -222,7 +222,7 @@
// either of the setter methods have been set.
if(boolColId){
@@ -795,8 +795,8 @@
if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) {
iMatchKey = cRowset.findColumn(strMatchKey);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-05-23 22:43:01.751314972 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-06-11 14:50:15.531290310 +0100
@@ -99,10 +99,10 @@
throws UnsupportedCallbackException
{
@@ -811,8 +811,8 @@
ConfirmationInfo confirmation = new ConfirmationInfo();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-05-23 22:43:01.751314972 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-06-11 14:50:15.531290310 +0100
@@ -152,7 +152,7 @@
// new configuration
@@ -841,8 +841,8 @@
String value;
while (peek(";") == false) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-05-23 22:43:01.751314972 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-06-11 14:50:15.531290310 +0100
@@ -184,7 +184,7 @@
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
@@ -853,8 +853,8 @@
// initial state
private Subject subject;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-05-23 22:43:01.751314972 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-06-11 14:50:15.535290373 +0100
@@ -658,7 +658,7 @@
throw new FailedLoginException(
"Unable to find X.509 certificate chain in keystore");
@@ -865,8 +865,8 @@
certList.add(fromKeyStore[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-05-23 22:43:01.751314972 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-06-11 14:50:15.535290373 +0100
@@ -76,7 +76,7 @@
private SolarisNumericUserPrincipal UIDPrincipal;
private SolarisNumericGroupPrincipal GIDPrincipal;
@@ -877,8 +877,8 @@
/**
* Initialize this <code>LoginModule</code>.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-05-23 22:43:01.751314972 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-06-11 14:50:15.535290373 +0100
@@ -70,7 +70,7 @@
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
@@ -889,8 +889,8 @@
/**
* Initialize this <code>LoginModule</code>.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-05-23 22:43:01.751314972 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-06-11 14:50:15.535290373 +0100
@@ -1180,7 +1180,7 @@
// Done
return certs;
@@ -901,8 +901,8 @@
while (i < certs.length) {
userCertList.add(certs[i]);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-05-23 22:43:01.755315042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-06-11 14:50:15.535290373 +0100
@@ -59,7 +59,7 @@
// Maps ThreadReference to ThreadTrace instances
@@ -913,8 +913,8 @@
EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) {
super("event-handler");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java
---- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2012-05-23 22:43:01.755315042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2012-06-11 14:50:15.535290373 +0100
@@ -95,7 +95,7 @@
public final static int IGNORE_ALL_BEANINFO = 3;
@@ -925,8 +925,8 @@
private Class beanClass;
private BeanInfo explicitBeanInfo;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java
---- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-05-23 22:43:01.755315042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-06-11 14:50:15.535290373 +0100
@@ -42,7 +42,7 @@
*/
final class ThreadGroupContext {
@@ -946,8 +946,8 @@
return this.beanInfoCache.put(type, info);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-05-23 22:43:01.755315042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-06-11 14:50:15.535290373 +0100
@@ -34,7 +34,7 @@
*/
@@ -967,8 +967,8 @@
// reverse the list to maintain previous jdk deletion order.
// Last in first deleted.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/File.java openjdk-boot/jdk/src/share/classes/java/io/File.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2012-05-23 22:43:01.755315042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2012-06-11 14:50:15.535290373 +0100
@@ -1082,7 +1082,7 @@
if ((names == null) || (filter == null)) {
return names;
@@ -997,8 +997,8 @@
File f = new File(s, this);
if ((filter == null) || filter.accept(f))
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2012-05-23 22:43:01.755315042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2012-06-11 14:50:15.535290373 +0100
@@ -725,7 +725,7 @@
*/
@@ -1027,8 +1027,8 @@
}
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-05-23 22:43:01.755315042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-06-11 14:50:15.535290373 +0100
@@ -213,7 +213,7 @@
/** table mapping primitive type names to corresponding class objects */
@@ -1053,8 +1053,8 @@
/** filter stream for handling block data conversion */
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-05-23 20:38:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-05-23 22:43:01.755315042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-06-08 17:12:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-06-11 14:50:15.535290373 +0100
@@ -165,11 +165,11 @@
private static class Caches {
/** cache of subclass security audit results */
@@ -1079,8 +1079,8 @@
/**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java
More information about the distro-pkg-dev
mailing list