[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: corrected URI warning bug

[Kaffe CVS]

PatchSet 5564 
Date: 2005/03/15 02:00:24
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: corrected URI warning bug

2005-03-13  Dalibor Topic  <robilad at kaffe.org>

Resynced with GNU Classpath.

2005-03-11  Chris Burdess  <dog at gnu.org>

* gnu/xml/aelfred2/SAXDriver.java: Corrected bug handling URI
warnings.

Members: 
	ChangeLog:1.3738->1.3739 
	libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.19->1.20 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3738 kaffe/ChangeLog:1.3739
--- kaffe/ChangeLog:1.3738	Tue Mar 15 01:57:18 2005
+++ kaffe/ChangeLog	Tue Mar 15 02:00:24 2005
@@ -1,8 +1,17 @@
 2005-03-13  Dalibor Topic  <robilad at kaffe.org>
 
 	Resynced with GNU Classpath.
+	
+	2005-03-11  Chris Burdess  <dog at gnu.org>
 
-2005-03-14  Chris Burdess  <dog at gnu.org>
+	* gnu/xml/aelfred2/SAXDriver.java: Corrected bug handling URI
+	warnings.
+
+2005-03-13  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-03-14  Chris Burdess  <dog at gnu.org>
 
 	* gnu/xml/dom/DomImpl.java,
 	gnu/xml/dom/html2/DomHTMLAnchorElement.java,
Index: kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java
diff -u kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.19 kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.20
--- kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.19	Wed Mar  2 22:32:17 2005
+++ kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java	Tue Mar 15 02:00:28 2005
@@ -740,10 +740,13 @@
     
     try
       {
-        if (baseURI == null && XmlParser.uriWarnings)
+        if (baseURI == null)
           {
-            warn ("No base URI; hope this SYSTEM id is absolute: "
-                  + systemId);
+            if (XmlParser.uriWarnings)
+              {
+                warn ("No base URI; hope this SYSTEM id is absolute: "
+                      + systemId);
+              }
             return new URL(systemId).toString();
           }
         else