/hg/icedtea7: Bump to b16.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 29 12:37:33 PDT 2012
changeset 7a7d8d40ae38 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7a7d8d40ae38
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 29 20:37:24 2012 +0100
Bump to b16.
2012-06-29 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am,
(OPENJDK_VERSION): Bump to b16.
(CORBA_CHANGESET): Update to IcedTea7 forest head.
(HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* patches/boot/ecj-diamond.patch:
Regenerated. Add additional class in DevPollArrayWrapper.
* patches/boot/xbootclasspath.patch:
Regenerated.
diffstat:
ChangeLog | 23 +
Makefile.am | 30 +-
patches/boot/ecj-diamond.patch | 1098 ++++++++++++++++++------------------
patches/boot/xbootclasspath.patch | 32 +-
4 files changed, 609 insertions(+), 574 deletions(-)
diffs (truncated from 2775 to 500 lines):
diff -r 748c609a6a14 -r 7a7d8d40ae38 ChangeLog
--- a/ChangeLog Thu Jun 28 19:54:43 2012 -0400
+++ b/ChangeLog Fri Jun 29 20:37:24 2012 +0100
@@ -1,3 +1,26 @@
+2012-06-29 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am,
+ (OPENJDK_VERSION): Bump to b16.
+ (CORBA_CHANGESET): Update to IcedTea7 forest head.
+ (HOTSPOT_CHANGESET): Likewise.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated. Add additional class in DevPollArrayWrapper.
+ * patches/boot/xbootclasspath.patch:
+ Regenerated.
+
2012-06-28 Omair Majid <omajid at redhat.com>
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
diff -r 748c609a6a14 -r 7a7d8d40ae38 Makefile.am
--- a/Makefile.am Thu Jun 28 19:54:43 2012 -0400
+++ b/Makefile.am Fri Jun 29 20:37:24 2012 +0100
@@ -1,24 +1,24 @@
# Dependencies
-OPENJDK_VERSION = b14
+OPENJDK_VERSION = b16
JDK_UPDATE_VERSION = 06
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = a4f33c9cfe7a
-HOTSPOT_CHANGESET = 0ca5b2700768
-JAXP_CHANGESET = 0dd012bd32dd
-JAXWS_CHANGESET = 403d2af913f8
-JDK_CHANGESET = 5ed9d9f10873
-LANGTOOLS_CHANGESET = e899fe9f5be5
-OPENJDK_CHANGESET = d85c6b19aed5
+CORBA_CHANGESET = a7ae26981729
+HOTSPOT_CHANGESET = 3359eef69d1e
+JAXP_CHANGESET = 411912b74c9c
+JAXWS_CHANGESET = d5997e503698
+JDK_CHANGESET = 0f03c3a0bf94
+LANGTOOLS_CHANGESET = 480d4eb554fc
+OPENJDK_CHANGESET = 7f5ea73378df
-CORBA_SHA256SUM = f01d45a1a783c0c571064c0b3cdfa73f498bdfb645a9b9cdbdc398b6cc5e28ad
-HOTSPOT_SHA256SUM = e3b3141be8ddae0d10bfb9f169910aeffc4dc4ce5ad8941454004290f7cd09b2
-JAXP_SHA256SUM = 89ada256ef3befda5909be87b5e5e04074dc25c7f7278394dcc9e92cf9959d0f
-JAXWS_SHA256SUM = 7ef28892b1d91ef3b5aef5d8505dcec17744469401a7329aad39d51432ab4f1e
-JDK_SHA256SUM = 6f249b2ebc21ca0247b767a25d59ef310e99a2783957dbd62a3101040e0bf537
-LANGTOOLS_SHA256SUM = a0b6b362397dbae173ee9c3dbd040170891591044829ca03a72a307186764dc7
-OPENJDK_SHA256SUM = 07bc36f9ab45609e053904ad7d66ca2ae7c79748c3173149bf03886bf949058f
+CORBA_SHA256SUM = d1e6246b72f4efcc2834ce22fa6d7e9540af77803b4450e3c7b8beebc553b24c
+HOTSPOT_SHA256SUM = c10b4208b76c1012e91774bc8a29f561fbb4747fb5bbebe3267f3cbaa24b8c5a
+JAXP_SHA256SUM = 77de1a8c4ab40652d0cf9c862c543376a877eb9399ad20e653c7103c599640e4
+JAXWS_SHA256SUM = 4fdb7a02b9d42fef84a7fb0f2de2b4c15a737a14be93b5de1c5f6d658072cdea
+JDK_SHA256SUM = 9c5790b4e35f52c351900b9e71ce0c81479961a6146cbf6b74ef2a2d3c802fd5
+LANGTOOLS_SHA256SUM = 6a3995facdaae90fd7c68faa6c8a566825317136a0064892d71a76f5d5f09efe
+OPENJDK_SHA256SUM = a426ab622e51d5ca40a7da4af4b42c2c216f7c27b56190df36e3bf7fea8529ca
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff -r 748c609a6a14 -r 7a7d8d40ae38 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Thu Jun 28 19:54:43 2012 -0400
+++ b/patches/boot/ecj-diamond.patch Fri Jun 29 20:37:24 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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-06-29 19:24:33.034867658 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-06-29 18:56:07.047976181 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-06-29 19:24:33.050867912 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-06-29 18:56:06.371965522 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-06-29 19:24:33.050867912 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-06-29 19:24:33.050867912 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-06-29 19:24:33.050867912 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-06-29 19:24:33.050867912 +0100
@@ -915,7 +915,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -234,9 +234,9 @@
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-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 @@
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-06-29 18:56:07.047976181 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-06-29 19:24:33.050867912 +0100
+@@ -60,7 +60,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
public static void main(String[] ava) throws IOException {
@@ -245,7 +245,7 @@
boolean doPack = true;
boolean doUnpack = false;
-@@ -82,7 +82,7 @@
+@@ -83,7 +83,7 @@
}
// Collect engine properties here:
@@ -254,7 +254,7 @@
engProps.put(verboseProp, System.getProperty(verboseProp));
String optionMap;
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@
}
// Collect argument properties here:
@@ -263,7 +263,7 @@
try {
for (;;) {
String state = parseCommandOptions(av, optionMap, avProps);
-@@ -530,7 +530,7 @@
+@@ -529,7 +529,7 @@
String resultString = null;
// Convert options string into optLines dictionary.
@@ -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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-06-29 19:24:33.050867912 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-06-29 19:24:33.050867912 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-06-29 18:56:06.375965584 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-06-29 19:24:33.054867976 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-06-29 18:56:07.047976181 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-06-29 19:24:33.054867976 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-06-29 18:56:07.051976244 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-06-29 19:24:33.054867976 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-06-29 19:24:33.054867976 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-06-29 19:24:33.054867976 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-06-29 18:56:07.051976244 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-06-29 19:24:33.054867976 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-06-29 19:24:33.054867976 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-06-29 18:56:07.051976244 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-06-29 19:24:33.054867976 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-06-29 18:56:07.051976244 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-06-29 19:24:33.054867976 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-06-29 19:24:33.058868039 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-06-29 19:24:33.070868229 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-06-29 19:24:33.070868229 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2012-06-29 19:24:33.074868292 +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-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
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2012-06-29 19:24:33.074868292 +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
---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2012-06-08 17:12:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2012-06-11 14:50:15.535290373 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2012-06-29 15:21:00.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2012-06-29 19:24:33.078868354 +0100
@@ -84,18 +84,18 @@
private static class Caches {
/** cache mapping local classes -> descriptors */
@@ -1161,8 +1161,8 @@
More information about the distro-pkg-dev
mailing list