svn commit: r292886 - /forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java

[rg...@apache.org]

Author: rgardler
Date: Fri Sep 30 18:01:00 2005
New Revision: 292886

URL: http://svn.apache.org/viewcvs?rev=292886&view=rev
Log:
if a mounted locationmap is not present then ignore the config error

Modified:
    forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java?rev=292886&r1=292885&r2=292886&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/SelectNode.java Fri Sep 30 18:01:00 2005
@@ -104,13 +104,20 @@
     public String locate(Map om, InvokeContext context) throws Exception {
         
         Parameters parameters = resolveParameters(context,om);
+        String location;
         for (int i = 0; i < m_nodes.length; i++) {
-            String location = m_nodes[i].locate(om,context);
-            if (m_selector.select(location,om,parameters)) {
+            try {
+              location = m_nodes[i].locate(om,context);
+              if (m_selector.select(location,om,parameters)) {
+                  if (getLogger().isDebugEnabled()) {
+                      getLogger().debug("selected: " + location);
+                  }
+                  return location;
+              }
+            } catch (ConfigurationException e) {
                 if (getLogger().isDebugEnabled()) {
-                    getLogger().debug("selected: " + location);
+                    getLogger().debug("Ignoring locatoinmap config exception: " + e.getMessage());
                 }
-                return location;
             }
         }
         return null;