[jbosstools-commits] JBoss Tools SVN: r17659 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2009-09-18 08:29:24 -0400 (Fri, 18 Sep 2009)
New Revision: 17659

Modified:
   trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4909

Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java	2009-09-18 11:59:51 UTC (rev 17658)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java	2009-09-18 12:29:24 UTC (rev 17659)
@@ -79,14 +79,16 @@
     public InputSource resolveEntity(String publicId, String systemId) 
     	throws SAXException, java.io.IOException {
 		InputSource source = null;
-
+		boolean ok = false;
     	if (publicId != null) {
 			String url = publicEntities.getProperty(publicId);
 			if (url != null) {
 				source = new InputSource(url);
 				source.setPublicId(publicId);
+				ok = true;
 			}
-    	} else if (systemId != null) {
+    	}
+    	if (!ok && systemId != null) {
 			String url = systemEntities.getProperty(systemId);
 			if (url != null) {
 				source = new InputSource(url);