[Yanel-commits] rev 23097 - public/yanel/trunk/src/core/java/org/wyona/yanel/core

[josias at wyona.com]

Author: josias
Date: 2007-03-02 18:01:50 +0100 (Fri, 02 Mar 2007)
New Revision: 23097

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceConfigurationMap.java
Log:
map not found error fixed. see bug #5192, thanks to simon

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceConfigurationMap.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceConfigurationMap.java	2007-03-02 16:17:27 UTC (rev 23096)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceConfigurationMap.java	2007-03-02 17:01:50 UTC (rev 23097)
@@ -20,6 +20,7 @@
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
+import org.apache.log4j.Category;
 import org.wyona.yanel.core.map.Realm;
 import org.wyona.yanel.core.util.WildcardMatcherHelper;
 
@@ -29,10 +30,12 @@
  */
 public class ResourceConfigurationMap {
 
+    private static Category log = Category.getInstance(ResourceConfigurationMap.class);
+
     public static String getRCPath(Realm realm, String path) {
         XMLInputFactory factory = XMLInputFactory.newInstance();
         try {
-            XMLStreamReader parser = factory.createXMLStreamReader(getRCMap(realm, path));
+            XMLStreamReader parser = factory.createXMLStreamReader(getRCMap(realm));
             while (true) {
                 int event = parser.next();
                 if (event == XMLStreamConstants.END_DOCUMENT) {
@@ -68,7 +71,16 @@
     /**
      * 
      */
-    private static InputStream getRCMap(Realm realm, String path) throws Exception {
-        return realm.getRTIRepository().getInputStream(new Path(getRCMapPath("/map")));
+    private static InputStream getRCMap(Realm realm) {
+        try {
+            if (realm.getRTIRepository().existsNode(getRCMapPath("/map"))) {
+                return realm.getRTIRepository().getInputStream(new Path(getRCMapPath("/map")));
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            log.error(e);
+            return null;
+        }
     }
 }