haul 2002/12/16 01:43:18
Modified: src/java/org/apache/cocoon/components/modules/input
AbstractMetaModule.java
Log:
<action dev="CH" type="fix">
"meta" input modules: configuring a different module locally did not
override the default one in all circumstances.
</action>
Revision Changes Path
1.5 +8 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
Index: AbstractMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractMetaModule.java 5 Dec 2002 10:01:04 -0000 1.4
+++ AbstractMetaModule.java 16 Dec 2002 09:43:18 -0000 1.5
@@ -303,10 +303,12 @@
try {
+ if (getLogger().isDebugEnabled())
+ getLogger().debug("parameters "+op+": "+modA+", "+modAName+",
"+modAConf+" || "+modB+", "+modBName+", "+modBConf);
if (cs == null)
cs = (ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR);
- if (modB == null) {
+ if (modB == null && modBName == null) {
input = modA;
name = modAName;
conf = modAConf;
@@ -325,7 +327,7 @@
getLogger().warn("No such InputModule: "+name);
}
}
-
+
switch (op) {
case OP_GET:
value = input.getAttribute(attr, conf, objectModel);
@@ -338,6 +340,9 @@
break;
};
+ if (getLogger().isDebugEnabled())
+ getLogger().debug("using "+name+" as "+input+" for "+op+"
("+attr+") and "+conf+" gives "+value);
+
} catch (Exception e) {
if (getLogger().isWarnEnabled())
getLogger().warn("A problem obtaining a value from "+name+"
occurred : "+e.getMessage());
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
