Mercurial > hg > icedtea7
changeset 2589:5944287b9f40
Regenerate conditional patches.
2012-08-29 Andrew John Hughes <gnu_andrew@member.fsf.org>
* patches/boot/jaxws-getdtdtype.patch,
* patches/boot/pr40188.patch:
Regenerate conditional patches.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 29 Aug 2012 16:34:52 +0100 |
| parents | 77fba95d574a |
| children | 8eaeadfd2bdd |
| files | ChangeLog patches/boot/jaxws-getdtdtype.patch patches/boot/pr40188.patch |
| diffstat | 3 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Aug 29 14:48:01 2012 +0100 +++ b/ChangeLog Wed Aug 29 16:34:52 2012 +0100 @@ -1,3 +1,9 @@ +2012-08-29 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * patches/boot/jaxws-getdtdtype.patch, + * patches/boot/pr40188.patch: + Regenerate conditional patches. + 2012-08-29 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/7192804-jvisualvm.patch,
--- a/patches/boot/jaxws-getdtdtype.patch Wed Aug 29 14:48:01 2012 +0100 +++ b/patches/boot/jaxws-getdtdtype.patch Wed Aug 29 16:34:52 2012 +0100 @@ -1,5 +1,5 @@ ---- openjdk-boot.orig/jaxws/sources/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000 -+++ openjdk-boot/jaxws/sources/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:38:00.000000000 +0000 +--- openjdk-boot.orig/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000 ++++ openjdk-boot/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:38:00.000000000 +0000 @@ -276,7 +276,7 @@ qName = localName; else @@ -9,8 +9,8 @@ String value = staxAttr.getValue(); attrs.addAttribute(uri, localName, qName, type, value); ---- openjdk-boot.orig/jaxws/sources/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old 2009-11-17 19:46:11.000000000 +0000 -+++ openjdk-boot/jaxws/sources/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2009-11-17 19:46:35.000000000 +0000 +--- openjdk-boot.orig/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old 2009-11-17 19:46:11.000000000 +0000 ++++ openjdk-boot/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2009-11-17 19:46:35.000000000 +0000 @@ -108,11 +108,10 @@ * the String "CDATA" * @return the type as a String, default is "CDATA"
--- a/patches/boot/pr40188.patch Wed Aug 29 14:48:01 2012 +0100 +++ b/patches/boot/pr40188.patch Wed Aug 29 16:34:52 2012 +0100 @@ -1,10 +1,10 @@ diff -Nru openjdk-boot.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c openjdk-boot/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c ---- openjdk-boot.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-03-30 17:23:08.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-05-18 19:58:36.000000000 +0100 -@@ -192,9 +192,9 @@ +--- openjdk-boot.orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2012-08-29 16:19:35.860554102 +0100 ++++ openjdk-boot/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2012-08-29 16:23:37.688539537 +0100 +@@ -209,9 +209,9 @@ lockResult = fcntl(fd, cmd, &fl); if (lockResult < 0) { - if ((cmd == F_SETLK64) && (errno == EAGAIN)) + if ((cmd == F_SETLK64) && (errno == EAGAIN || errno == EACCES)) - return sun_nio_ch_FileDispatcherImpl_NO_LOCK; + return sun_nio_ch_FileDispatcher_NO_LOCK; if (errno == EINTR)