You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by mp...@apache.org on 2006/08/10 15:35:11 UTC

svn commit: r430378 - in /cocoon: branches/BRANCH_2_1_X/status.xml trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java

Author: mpo
Date: Thu Aug 10 06:35:08 2006
New Revision: 430378

URL: http://svn.apache.org/viewvc?rev=430378&view=rev
Log:
Reverting inappropriate fix.
- facts to undo: http://svn.apache.org/viewvc?view=rev&revision=369507
- discussion: http://marc.theaimsgroup.com/?t=115502476800003&r=1&w=2
- original patch-issue: https://issues.apache.org/jira/browse/COCOON-1687

Modified:
    cocoon/branches/BRANCH_2_1_X/status.xml
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=430378&r1=430377&r2=430378&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Aug 10 06:35:08 2006
@@ -182,6 +182,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.10" date="TBD">
+    <action dev="MPO" type="fix" fixes-bug="COCOON-1687" >
+      CForms: Reverting inapropriate fix.
+    </action>
     <action dev="AG" type="fix" fixes-bug="COCOON-1889" due-to="Jeroen Goubert" due-to-email="jgou@schaubroeck.be">
       CForms: Tiny typo in JavaScriptJXPathBinding.
     </action>

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java?rev=430378&r1=430377&r2=430378&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java Thu Aug 10 06:35:08 2006
@@ -129,11 +129,7 @@
 
         if ((value == null && oldValue != null) || value != null && !value.equals(oldValue)) {
             // first update the value itself
-            if(value != null) {
-                jxpc.createPathAndSetValue(this.xpath, value);
-            } else {
-                jxpc.removePath(this.xpath);
-            }
+            jxpc.createPathAndSetValue(this.xpath, value);
 
             // now perform any other bindings that need to be performed when the value is updated
             JXPathContext subContext = null;