Mercurial > hg > release > icedtea7-2.0
view patches/boot/revert-6941137.patch @ 2445:7ca2cb0df928
Bump to b143.
2011-06-24 Andrew John Hughes <ahughes@redhat.com>
* patches/rmi_amd64.patch:
Removed, upsteam (OpenJDK).
* patches/testenv.patch:
Removed, upstream (IcedTea forest).
* Makefile.am:
(OPENJDK_VERSION): Bumped to b143.
(CORBA_CHANGESET): Updated.
(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.
(JAXWS_DROP_ZIP): Likewise.
(JAXWS_DROP_SHA256SUM): Likewise.
(JAXP_DROP_ZIP): Likewise.
(JAXP_DROP_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Drop rmi_amd64 and testenv patch.
* generated/sun/nio/ch/SocketOptionRegistry.java:
Use version from latest build.
* patches/boot/ecj-autoboxing.patch,
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-multicatch.patch,
* patches/boot/ecj-trywithresources.patch:
Extended with new cases introduced since b136.
* patches/boot/jar.patch:
Recreated against b143.
* patches/boot/revert-6941137.patch:
Updated for b143.
* patches/boot/symbols.patch: Likewise.
* patches/libraries.patch: Likewise.
* patches/linker-libs-order.patch: Likewise.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 24 Jun 2011 19:07:40 +0100 |
| parents | ca86748424fa |
| children |
line wrap: on
line source
diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java openjdk-boot/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java --- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2011-06-11 00:38:11.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2011-06-14 01:44:11.082438342 +0100 @@ -486,7 +486,7 @@ String otherDir = getZoneInfoDir(homeDir); if (otherDir != null) zi = otherDir; - zi = FileSystems.getDefault().getPath(zi).toRealPath().toString(); + zi = new File(zi).getCanonicalPath(); } catch(Exception e) { } return zi;