From 91b908c9675b061ea82a40913e9cf636112ac335 Mon Sep 17 00:00:00 2001 From: gary Date: Fri, 9 Mar 2007 09:31:18 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122743 138bc75d-0d04-0410-961f-82ee72b054a4 --- 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 315ac4d009b1..122f83f39888 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 285540060d95..364c576d1969 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 zc-kG4eN5DK9LL|EAKU|ZfJec2@OZrA4!Gk%kd#1+cyR7O!~|VAW`XoTplLOUaa0pU zp46`v=vau^&BjPM9%f0R6lrNit*zzOY-_EMTK{O~OnV=@{qFPh`n^A&&-cD}w{~yc znHGJ35&P61`n>246AoanAY@nF?#(YZ6gNKCRQp0>y#Zayqqi74(PKg{4yyO{DS?Mg zP-;#e?#nYQh#d6UgFL}B-iRyupw|(=4=}FwSXKqhVv`!N&!Jo3_S0z-ICK_)s6ahl#F0hYhj_DrIgE@`Ag3H73{PQT*affh5~$zb(q6ue8*9L#A~>& z3gdUn4K*3RGyFHc^E;L2@h}#s`X^WY%U6)#l(Jha-Ddh9HoV1SxPxT;i&ePC>F;AB z9$+i|dJ*i9KvHMkHaDMGN6AXZ9Mq3vC> z8zEALL@7tMxUoXkt9e_Sc@q_?sj!6#Pa{IMsyC9G&CfDh%j|Y$>k%!_E4{r&8q{`s zmF!Ye_E(~sNwkn?g;_j^kv1gAn@E{FADW^*^0UNVO`$6=}{RhV*nTOYIi z%pT*G$MJ{^AWjB3(+O@mgw=8qYvdG4d9vX=+f1>|r&uNzV3BFqg_l8QkSU*`Kt9JdnMI>~fmh`+ zTI334ui}7Qwtjvel8y8QV%$^H|MiwSd*tNYvJFj>nOu72+}NNfc|vswL}0)H;%GlI0}VldPc5 M26n1cxyy_G2TC{_+5i9m delta 1263 zc-l3ReN5G56vw~kCoh+Gu84tffeT#jy?EjBB4c1g6r>2(3K}3=BZ51!@h%z=g?n+hgc>kF+t+wVN*oX`25=RCh>mvgcD zWQT{v6T1Z=4b3(7*1B5zw#rt!v$e%u*icp3($JjZgD&jxMK|`UzdWqr`+U)hU4p=E z&X)Z8#_cV6^;HekTkC6d*snT0G6UZ5g<1mq36#~88XzgAw_vdcssiW5fVRzk{NVO<28YU&Su*w^w1Wq?3+f1h8gVqKm582x>6V1 zNhR&R2vL9s_WYt@&IE?3T3~d6q?-CS_|foj?2ix zm)L|W?D-9z#}C+ntI848BG=SxR8#QJtoen?*AavpRQ(Mm{64wSXcNaxrfxBOn+9NvA?5X$X*Xgh&QVlDT}Z@o-a5 z7_I77tivxGzLEn!c@z$=s+D22l&h|| zc6|k-m5f#~T8%a0RC;rTY*kI>5@}SI%*~-MkZ2?EBJ|RMFnI|^c^PrisfsQ2@~WD( zwClUc^pNT0Ir^xwUpcG`l?NC-$Y?(&9>6L&gh(0UnGSR6BX~%TB3p*>n2exEMo}v7 zaB>%FX&dETw9ET=MaIx2>Rq~GWN+={7+xws9eDaeV2TT3He^xZ4K@} z!dh3o2dCJyWM3BA{9*P0a78P!V#-Q zz@$YXK{Fy%i&l5+eW4ao@uX~|5=bRd%MQDiq>dzAFr_h@&TIy=nar+7wDuruS{9PE kY^>KFMxOSF+MRqXbOXtJk_99SNjj*rnVlY2IVrjS0@`jQW&i*H -- 2.47.3