You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/07/16 21:48:04 UTC

svn commit: r556709 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundle.java

Author: felixk
Date: Mon Jul 16 12:48:01 2007
New Revision: 556709

URL: http://svn.apache.org/viewvc?view=rev&rev=556709
Log:
COCOON-2089: ServletService throws an exception when a specific language catalogue in a connected block is not found, even when a general catalogue exists. 

Reader in sitemap-pipline used to get resource via servlet-services throws CascadingIOException when Resource not found.

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundle.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundle.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundle.java?view=diff&rev=556709&r1=556708&r2=556709
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundle.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundle.java Mon Jul 16 12:48:01 2007
@@ -23,6 +23,7 @@
 import org.apache.excalibur.source.SourceValidity;
 import org.apache.excalibur.source.impl.validity.ExpiresValidity;
 
+import org.apache.cocoon.CascadingIOException;
 import org.apache.cocoon.ResourceNotFoundException;
 import org.apache.cocoon.components.source.SourceUtil;
 import org.apache.cocoon.components.source.impl.validity.DelayedValidity;
@@ -294,6 +295,13 @@
             newValues = Collections.EMPTY_MAP;
 
         } catch (SourceNotFoundException e) {
+            // Nominal case where a bundle doesn't exist
+            if (getLogger().isDebugEnabled()) {
+                getLogger().debug("Bundle <" + sourceURI + "> not loaded: Source URI not found");
+            }
+            newValues = Collections.EMPTY_MAP;
+
+        } catch (CascadingIOException e) {
             // Nominal case where a bundle doesn't exist
             if (getLogger().isDebugEnabled()) {
                 getLogger().debug("Bundle <" + sourceURI + "> not loaded: Source URI not found");