cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: rev 43632 - in cocoon/branches/BRANCH_2_1_X: . src/java/org/apache/cocoon/components/modules/input
Date Thu, 09 Sep 2004 22:01:54 GMT
Author: antonio
Date: Thu Sep  9 15:01:52 2004
New Revision: 43632

Modified:
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
   cocoon/branches/BRANCH_2_1_X/status.xml
Log:
Fix bug 31134, thanks to Ralph Goers

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
Thu Sep  9 15:01:52 2004
@@ -66,7 +66,7 @@
  *
  * @author <a href="mailto:kpiroumian@apache.org">Konstantin Piroumian</a>
  * @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id: JXPathMetaModule.java,v 1.7 2004/03/05 13:02:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class JXPathMetaModule extends AbstractMetaModule implements Configurable, ThreadSafe
{
 
@@ -114,7 +114,7 @@
 
         Object contextObj = getContextObject(modeConf, objectModel);
         if (modeConf != null) { 
-            name = modeConf.getChild("parameter").getValue(this.parameter != null ? this.parameter
: name); 
+            name = modeConf.getChild("parameter").getValue(!this.parameter.equals("") ? this.parameter
: name); 
         }
         return JXPathHelper.getAttribute(name, modeConf, this.configuration, contextObj);
     }
@@ -133,7 +133,7 @@
 
         Object contextObj = getContextObject(modeConf, objectModel);
         if (modeConf != null) { 
-            name = modeConf.getChild("parameter").getValue(this.parameter != null ? this.parameter
: name); 
+            name = modeConf.getChild("parameter").getValue(!this.parameter.equals("") ? this.parameter
: name);
         }
         return JXPathHelper.getAttributeValues(name, modeConf, this.configuration, contextObj);
     }

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml	Thu Sep  9 15:01:52 2004
@@ -204,6 +204,9 @@
 
   <changes>
  <release version="@version@" date="@date@">
+   <action dev="AG" type="fix" fixes-bug="31134" due-to="Ralph Goers" due-to-email="Ralph_Goers@dslextreme.com">
+     JXPathMetaModule incorrectly checks for null parameter (can't happen) instead of empty
string.
+   </action>
    <action dev="VG" type="fix">
      Cron block: Fixed memory leak, QuartzJobExecutor was not releasing pipelines.
    </action>

Mime
View raw message