From 8e4425d798eb4970eac12bd1a66011ed94b2509b Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Fri, 9 Mar 2007 09:31:18 +0000 Subject: [PATCH] re PR xml/30831 (Writing (transforming) XML fails) 2007-03-09 Gary Benson Chris Burdess PR classpath/30831 * gnu/xml/dom/ls/SAXEventSink.java: Only set extended document properties when reader is available. Co-Authored-By: Chris Burdess From-SVN: r122743 --- libjava/classpath/ChangeLog.gcj | 7 +++ .../gnu/xml/dom/ls/SAXEventSink.java | 51 +++++++++--------- .../lib/gnu/xml/dom/ls/SAXEventSink.class | Bin 12922 -> 12933 bytes 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 315ac4d009b..122f83f3988 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,10 @@ +2007-03-09 Gary Benson + Chris Burdess + + PR classpath/30831 + * gnu/xml/dom/ls/SAXEventSink.java: Only set extended document + properties when reader is available. + 2007-03-08 Gary Benson PR classpath/30983: diff --git a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java index 285540060d9..364c576d196 100644 --- a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java +++ b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java @@ -144,37 +144,40 @@ public class SAXEventSink final String PROPERTIES = "http://xml.org/sax/properties/"; final String GNU_PROPERTIES = "http://gnu.org/sax/properties/"; - boolean standalone = reader.getFeature(FEATURES + "is-standalone"); - doc.setXmlStandalone(standalone); - try - { - String version = (String) reader.getProperty(PROPERTIES + - "document-xml-version"); - doc.setXmlVersion(version); - } - catch (SAXNotRecognizedException e) - { - } - catch (SAXNotSupportedException e) + if (reader != null) { + boolean standalone = reader.getFeature(FEATURES + "is-standalone"); + doc.setXmlStandalone(standalone); + try + { + String version = (String) reader.getProperty(PROPERTIES + + "document-xml-version"); + doc.setXmlVersion(version); + } + catch (SAXNotRecognizedException e) + { + } + catch (SAXNotSupportedException e) + { + } + try + { + String encoding = (String) reader.getProperty(GNU_PROPERTIES + + "document-xml-encoding"); + doc.setXmlEncoding(encoding); + } + catch (SAXNotRecognizedException e) + { + } + catch (SAXNotSupportedException e) + { + } } if (locator != null && locator instanceof Locator2) { String encoding = ((Locator2) locator).getEncoding(); doc.setInputEncoding(encoding); } - try - { - String encoding = (String) reader.getProperty(GNU_PROPERTIES + - "document-xml-encoding"); - doc.setXmlEncoding(encoding); - } - catch (SAXNotRecognizedException e) - { - } - catch (SAXNotSupportedException e) - { - } } public void endDocument() diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/SAXEventSink.class b/libjava/classpath/lib/gnu/xml/dom/ls/SAXEventSink.class index d0caa3bd423f74a038d4eccc90e9160d3ba23ddc..5ba9dfac935839f0c88afa0b18be4802e64534c4 100644 GIT binary patch delta 1236 zcmW-geN5DK9LL|EA8;IbfJebN@OZrA4!Gk%kn{pA;=wsU!~|VAW`XoTho;q}8%H%! zGGsr8R$&a^k|_Pfv1>-YYAKHvM^-MYQ? zXFR$9J@%L3LU(^*{$mFlnUTef?h;JsI!D>VH}}_-myh*2>L}&pni^f#{4nE zPp}l{5sOL0;{uX#5q4bSVAHB5{!;2?&io~3{t7l)JFenUTtflA#yZSmGrr@fKjJl9 zSA_|?<%XI_*ctg7-}#-&b9fl@RQ;2y{^c)7bV&IvmTois4;$X%G2B54{>3WXd96|+Lj5-WSzTK;4Iv}V>?n+hgc>kF+t+wVN*oX`25=RCh>SM_4m z$qo;zCw2=$8k%byt#!4IZ56GK>ed!VK|^IlOG9(A4_w&ei!SU{e|gx#_W7a*y99yT zs$25v8@IRQ)>k%EZLP1-VZZA1$Ow4D7itOcCs0~fJDKcxTV(H~#jDegW_0zOhgU6D zZ~^10&6uvHjmgS8+`HN}fRMN;6wkmljn@QDI-BjM&`n#ovUeIC8fLKb|M2Uh(3OnB zt>i5^pZs8XV*i-^OwJOLmODh8*@Q#41%5ZtTonCi_r|0am?*8XU%RIEFS1 zbJ!799mgQv<9Cef1U|q7a#_C)?n|e}25h9wMjiSQ0-=r%mHgSo1sx78?*! z&)gQ)xREYXi{bgk(}C7dNyL#b`hTV0xNL|7FsLjkcP|1 z#FyBFEA06Vp2rW^fvd_H*&^4}Y-CgL&#d`{%GVKu8&v%bX8b<6(PS6rO{Q)!e47n# z!iagqVgc#6%W>|Z2>0r2L@xlS|!H@)CjPX+vG#DXniL$$0`3(=>INu*PtlT-vq8bTx;X31E-*EqPT zCrmbVE5_-U1z*XApFE0i$x%*opFR)%vI$X=j}*y6suZYs^GH?AXHw0NnS>*bgCk2y}YVs zt?l|QGTmf)c#dAG>{m|PLd5|_4>H=viTkli4k1DYd8Wgh`UoD9qsWpWJSM{^lo6E3 zJDhwJwX}`$F52aNydq<8$vArD1P0_J2I&vU1jc0&Q!+I<5|<%QPP5Hfw)qHQat=oM z7#88fkQpS(d1T5gD&zv{5rZJn&YzDLI5v4r{yOxP0 kEeq?lhmos2qIM@8Gi)H4M>3ye0ZAuyHnY>?DmyvnU)pXYW&i*H