You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by je...@apache.org on 2003/05/03 13:22:56 UTC
cvs commit: cocoon-2.1/src/blocks/linkrewriter/java/org/apache/cocoon/transformation LinkRewriterTransformer.java
jefft 2003/05/03 04:22:56
Modified: src/blocks/linkrewriter/java/org/apache/cocoon/transformation
LinkRewriterTransformer.java
Log:
Improve error messages. Configuration errors are now re-thrown, and all other
inputmodule errors are logged.
Revision Changes Path
1.5 +9 -5 cocoon-2.1/src/blocks/linkrewriter/java/org/apache/cocoon/transformation/LinkRewriterTransformer.java
Index: LinkRewriterTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/linkrewriter/java/org/apache/cocoon/transformation/LinkRewriterTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LinkRewriterTransformer.java 26 Mar 2003 10:36:57 -0000 1.4
+++ LinkRewriterTransformer.java 3 May 2003 11:22:55 -0000 1.5
@@ -341,10 +341,14 @@
try {
String modValue = (String)modHelper.getAttribute(this.objectModel, getConf(scheme), scheme, addr, (badLinkStr!=null?badLinkStr:scheme+":"+addr));
newAttrs.setValue(linkIndex, modValue);
- } catch (Exception e) {
- // Swallow IM errors, usually prefixes like 'http' that aren't
- // bound to an InputModule.
- getLogger().warn("## IM error: "+e, e);
+ } catch (org.apache.avalon.framework.CascadingRuntimeException e) {
+ // Rethrow Configuration errors
+ if (e.getCause() instanceof ConfigurationException) throw e;
+
+ // Swallow IM errors, usually prefixes like 'telnet' that aren't
+ // bound to an InputModule. These should really be declared in
+ // 'exclude-schemes', hence the 'error' classification of this log.
+ getLogger().error("Error rewriting link '"+scheme+":"+addr+"': "+e.getMessage());
}
return newAttrs;
}