From 8c67ec7a88047289f5318c2bb03338899b8a3bd5 Mon Sep 17 00:00:00 2001
From: Gary Benson <gbenson@redhat.com>
Date: Thu, 8 Mar 2007 16:33:40 +0000
Subject: [PATCH] re PR xml/30983 (DocumentBuilder.parse throws exception)

2007-03-08  Gary Benson  <gbenson@redhat.com>

	PR classpath/30983:
	* gnu/xml/dom/ls/DomLSParser.java (getInputSource):
	Do not use the entity resolver to resolve the top-level document.

From-SVN: r122700
---
 libjava/classpath/ChangeLog.gcj               |   7 +++++++
 .../classpath/gnu/xml/dom/ls/DomLSParser.java |  16 ----------------
 .../lib/gnu/xml/dom/ls/DomLSParser.class      | Bin 10963 -> 10699 bytes
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index e5af87991a5..315ac4d009b 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,5 +1,12 @@
+2007-03-08  Gary Benson  <gbenson@redhat.com>
+
+	PR classpath/30983:
+	* gnu/xml/dom/ls/DomLSParser.java (getInputSource):
+	Do not use the entity resolver to resolve the top-level document.
+
 2007-03-07  Gary Benson  <gbenson@redhat.com>
 
+	PR classpath/30906:
 	* resource/META-INF/services/org.w3c.dom.DOMImplementationSourceList:
 	New file.
 
diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java b/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java
index 7ac4cc749fc..6bc069d3201 100644
--- a/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java
+++ b/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java
@@ -363,22 +363,6 @@ public class DomLSParser
         source = new InputSource(in);
         source.setSystemId(systemId);
       }
-    if (source == null && entityResolver != null)
-      {
-        String publicId = input.getPublicId();
-        try
-          {
-            source = entityResolver.resolveEntity(publicId, systemId);
-          }
-        catch (SAXException e)
-          {
-            throw new DomLSException(LSException.PARSE_ERR, e);
-          } 
-        catch (IOException e)
-          {
-            throw new DomLSException(LSException.PARSE_ERR, e);
-          } 
-      }
     if (source == null)
       {
         URL url = null;
diff --git a/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class b/libjava/classpath/lib/gnu/xml/dom/ls/DomLSParser.class
index 616257deb3452b22bdc2e20d60fdd2337087e30f..1740fbbe53f04beb0b4c77123cc8e77661cff092 100644
GIT binary patch
delta 2056
zcmZ`)YiyHc6n>s=ZMW{*+`0=XB91XacXKY|l68p+jB6T<EK^Jjrh{&jl@_)#U=GVg
zM48Iv6KA<Pan^CsZLr}OFi>RCg@_?UjVKC1L%byT#~%pse7%f~#Xo)D_dMr0=X~cm
z@7v221LdZ#?wvdXposk)rbXr=Q?=7K-BIVPSTNVf#e}lVQST`9IDLf`3+yIV(y3rJ
zHfy_T*>R~_kZLVk7Ik!a3un39P7_@W{VZ4Lp_kD6yuv4vtvU9g5lc1Cm0F-$HIQm8
zsH9KfDlQ~U-W5(yxv$pgSgs{ot#A!?6LCJT7+s!fBOBDeQlC;w(kjMoR`{w0CiuK|
z?`mi54EX>Pa`>9U*SS?ak~W@isF%_*MmO;-h1=kfax1-Fx6|Qy*5O{|G;)X9XnsV!
zo3`ljCcdjMK#8WGHO*c=lSmC$>~?sn3#W%!rSWXyUWNO(TWw08ZD>*WJ`bwjrLP&&
z#=}M)B9cO%xyt8q7usEQ@>NH8RCQ<AENwid@Hjh&*g98(Gl6aF*63T+zKjw>ufk8+
zqu$GSEUQo9Y4%7bsvJItduDB|w>AL@{7m6l_LxAPKQ@0<ae|5G5Q{j`@S@t3W%akx
zrqAo)i-gT!G4#X8Ae3HKK5sFc;1ZkBV(dqfb}o=(5Q!nkD2FPWJ_y@$LpZJwrzXrv
z>7`5K)O6DwM6!0WXtWh_w&^YUZr0giE&7;l)~mkp*?t`+VF{|aR@Rd^&0^><Q>v_j
z1z;6)tVTSSB84twum+iQV*))Q+Y01!B_^>RbGRA{MR?I)A~j$s8_~#h*v6N!SJwSp
zk5+ELVQxehH%XSw=;Ia)aH}7)Ldi^8W8grgtlDlZ8bB#!fRi~z)_9y}Dbf&w6rAEq
zk{}lOIKXw1LNBE^(=Vt2bMPqFi_M5eWO0KeG@=g*r_v@nO7goBZLZ{qmH6|Z{+yls
z%qw<tUS2o11YpU{Kg*_Wz8QcqCWzSBF5C>_S98Jt!q<c7Hy1tttJ5Z=`XyXSG+Y<v
z2eHFk9QGSxz7|A-dGZLeBwcKt@}QZfAnfL;Bg|z%Og5K<%}H9y?OjZc4`Q6TR5Pkq
zClvU1LQfS*+=Xm5qksX-;2zkyPgFaA8n$394`L%*v0WxHz%~SV80|cYGyDYo?7$Ts
z!%ytOEuO&N?7>}`d!r1wB9pC&m?`3biBS=m$ekhyH5*kw-<H0UyZFwq{#ym!Bt)GA
zxFf~hmm)3qIBo_I-^u1644vH59#ug@t`A2d0%*w9;Yd-qEq)D}AA<IT!Zo)?)zFY@
z!;y#}8WJvHkQ32F5SoT_BC=>m*>FTt<{_DeIDwMeBbw}*IL?1TG?81*FJ)*4VC6-W
z@M}!xHz?<2yud41&TmoA@3DnHh%P^(h1YP1zo3^l<U-sOO@0$iZs7)h#~=I?w|P6H
zMMk)xQ7v#Mq6N8M)F!0uD4QovA{h+1Qs8?>WEZ~rhLC9g+!s~uRrF>WqN2h;HKOSU
zY*qc%OdbDKTde7$Ka}|iXP71dHDMDwG2`JLexzQqrrTqN6gW66NaV*dW|RqOmr)DT
zi?y@R<AvVCPU3+Qb#ZD@PWsdGq(=x(MDm%0Aa84zZUiH7NOIHQN10@zwMk{@QNNR8
z9dlBLj=_E;X<gE#!>AjD6rDwVGS?D+D&#H?zpA;P8R<S&+%v^JYlyr2A*haAYxX%E
ka=ZEY{S0P#ji8$-lpLYtAzhcR9?i8RhO>O3Rl*DZ0Xtglo&W#<

delta 2195
zcmZ`)X>e0j6#l-nN!sMKL(?=6Sz0y;g;J1#(%^!u(y5HXu+&kU6ha9N38pEfpcD{9
zQ4n|_6c>aFVU-qWu~ar$Dj*=^sN=B7>Yy?XF5@r=<9SJ13JibVz2|=CJNLWioO|E#
z5#Nn89lN`GFMu9ARb?7$v6>6q!5512y`FJH$D28hZX?I5E^F%+3Ma6DNC>!#{NAbV
zLB60TSV}yjI#SvgMg#*MUx9kj)bc4aX49i^5>^o=3D)0L<Q_SEsF7YmndF-4%JjK|
znInhinpjAmf+3iv&8EnVuc_r0M`}@nqsN~)*yDAZ7@$x4OjTIIY3k3G)^Pz&*9bFI
zeX=8?kZ&lQ$uY8_e~Q~DV%)CDTF_YvXKOm*g8qm?Bi~eCO70gQHzj&Rb!GDCHt#E3
ztht$k{#<{FJ1{^bo6wm{6{=jOCRp3^1GR_M)_gfvDlCUj1m^qwUbo9P%H=I~t23=*
z<CgPNg=@H0y<$xh<1>Zp#86U(7&a>0#La46%CuHh++pN)A~BqZ;-JTynd>PED%{Cx
z^+t-*Ud1|vU$T~nE%Hovn_0!Z8hx4C&z5aCsBk|IsAaZp?dlaC<^ehJ1Xs}I9TW)o
z17?_cOySo&U;_Egj#IXtW|J-lv4{hxs7gCW+0*Ge+3X0iy43Pj!l~CxyFR0q`7wAt
zgjA=Yj;VRgUbGu_vF*P5t*-T0N2gw>6NPH98|q<X2ud9b^ECg-PNUsek3`MR5Ho~?
zFk}?N@6?Cj9NoVODG(+FBc!A{1~gKzhQ%Q?(=5BjD;3+Rx9e;8x-(WA%G8>69m-<S
z2ZQh&dxXbP?1>^&U_Ix^cnklDtrHxWgETq%1n5|RcuqtTJ+QG5Y4oBaedx|9=))q3
zRE!*!U=&L+hBGjpGcl2~P$>OV#J4b?^Ra?&V~vdKxu6UozK1$4#7Qo~85z$>2VLP3
z{K}>Ho2p1yj=Nkz6IWrd2$_ontp;!*Uo34_is_&TGqD$Yi`;m|urI8LK@x6rF6T+z
z`k<?9ZiOB>P?*JR7%)a=eY5D4X(3i~zNpg6saNnFaWr5)Qn^6ZjHp99zAG|~xEm%r
zWkxPkkG4-OTa;_*(xrw=%3)9Mx}VEyxS|}!m=I!Pt8q1iYnF^h!k0p*w`4vNJ{!UY
zOOFVg)DXNH!$MeM=^0%vySIKJgz1)E54nqmahBc>F4Gi3t|jZC<$)pevSde=6Sdgm
zs@W`rwwAv4)?lutO>0RE&r`2;X!*)o=vje8u0sdu;tX!Y0B%Muw<4e0r1DiL<qphY
zH5PLh%2_K#uR|sGU@!Nfo(J$f58^xz<2vi{Cy(L|PteG3sqnNqwqx^@RZ<a3u@m?q
zKavuYAM+D+LC4lj@^4MwiL2#^-_F$`7`C&bvLW>va_N2~nsp61dp{CQxP}Z1BNgFj
zt1BCFt|1p1kOJ9AplI4PC?cVe6wSOKG&PVSoM`ejWZ?ZsH2-nhlTsPUyt?r5wq-v^
zo_~})|0JDx1`eJ>HZPz*FJc5Q<7HmOWd4Gwye_xwH_7!4xn+M~6K~1|`wNHokL3AZ
z$@48-=574WJGiN1_)^&<r@-xoOC{GPl5ujqRFrTCIxt6^Vq{`SmtNSgMP`ww!Jw5!
zXAB2Qi+D5!GDHIjtFd%jxK%Cbl=hfT2~!k}E}<e9n*5yG)T&Ol=9N0^N9W21wn<jc
zcWQ2~kv^hy!56Gu>PYFjn|M%8izcz-8)IvKk7pgW-g|Tp5n6`{kwlmp^_!$Ywbo<!
zcd^jnX!Vs2RgIbwwd3kK!l>(nBwc6qw8I{MDC{o36jgIS^00e1aqlkfPc(6tUyYjA
s*^zTphx8gAzqf-$9xv#!gpw_kzDUtM*+i(VQK(HGwaCsVG<7`rKcZ3_9RL6T

-- 
2.30.2