You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/12/18 10:51:41 UTC
svn commit: r488185 -
/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
Author: andreas
Date: Mon Dec 18 01:51:41 2006
New Revision: 488185
URL: http://svn.apache.org/viewvc?view=rev&rev=488185
Log:
Avoid NPE in FallbackSourceFactory when resolved source is null. Thanks to Richard Frovarp for the patch (although I altered it a bit)
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java?view=diff&rev=488185&r1=488184&r2=488185
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/FallbackSourceFactory.java Mon Dec 18 01:51:41 2006
@@ -126,10 +126,6 @@
source = resolver.getSource();
}
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("Resolved URI: [" + source.getURI() + "]");
- }
-
if (source == null) {
if (path.startsWith("lenya/modules/")) {
ModuleManager moduleMgr = null;
@@ -148,6 +144,10 @@
String contextUri = "context://" + path;
source = sourceResolver.resolveURI(contextUri);
}
+ }
+
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Resolved source: [" + source.getURI() + "]");
}
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org