Mercurial > hg > release > icedtea6-1.8
view patches/ecj/icedtea-jaxws-getdtdtype.patch @ 2154:ed75c53af605
PR744: Fix jaxws patch broken by latest security update.
2011-07-11 Andrew John Hughes <ahughes@redhat.com>
PR744: Patching error
* NEWS: Updated.
* patches/ecj/icedtea-jaxws-getdtdtype.patch:
Update patch to apply after security patch.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 19 Jul 2011 22:00:36 +0100 |
| parents | 278ade392786 |
| children |
line wrap: on
line source
diff -Nru openjdk-ecj.orig/jaxws/build.properties openjdk-ecj/jaxws/build.properties --- openjdk-ecj.orig/jaxws/build.properties 2011-07-11 21:56:16.000000000 +0100 +++ openjdk-ecj/jaxws/build.properties 2011-07-11 21:58:15.168357598 +0100 @@ -78,7 +78,7 @@ patches.dir=patches # Patches to apply -jaxws_src.patch.list=7013971.patch xjc.patch +jaxws_src.patch.list=7013971.patch xjc.patch getdtdtype.patch # Sanity information sanity.info= Sanity Settings:${line.separator}\ diff -Nru openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch --- openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch 1970-01-01 01:00:00.000000000 +0100 +++ openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch 2011-07-11 21:57:55.656033418 +0100 @@ -0,0 +1,27 @@ +--- src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000 ++++ src/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 + qName = prefix + ':' + localName; +- String type = staxAttr.getDTDType(); ++ String type = staxAttr.getDTDType().toString(); + String value = staxAttr.getValue(); + + attrs.addAttribute(uri, localName, qName, type, value); +--- src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old 2009-11-17 19:46:11.000000000 +0000 ++++ src/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" + */ +- public String getDTDType() { +- return _attributeType; ++ public QName getDTDType() { ++ return new QName(_attributeType); + } + +- + /** + * A flag indicating whether this attribute was actually + * specified in the start-tag of its element, or was defaulted from the schema.