cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r371545 - in /cocoon: branches/BRANCH_2_1_X/status.xml trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/transformation/EffectPipe.java
Date Mon, 23 Jan 2006 14:39:43 GMT
Author: jbq
Date: Mon Jan 23 06:39:28 2006
New Revision: 371545

URL: http://svn.apache.org/viewcvs?rev=371545&view=rev
Log:
Fix COCOON-1651: Null locator in EffectPipe triggers NPE

Modified:
    cocoon/branches/BRANCH_2_1_X/status.xml
    cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/transformation/EffectPipe.java

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=371545&r1=371544&r2=371545&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Jan 23 06:39:28 2006
@@ -180,6 +180,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.9" date="TBD">
+    <action dev="JBQ" type="fix" fixes-bug="COCOON-1651" due-to="Tom Green" due-to-email="tom@slaxicon.org">
+       Fix a bug in CForms: Null locator in EffectPipe triggers NPE
+    </action>
     <action dev="JBQ" type="add" fixes-bug="COCOON-1170" due-to="Simon Mieth" due-to-email="simon.mieth@t-online.de">
       Added a "precompile" target for the cocoon startup script.  It precompiles
       all XSPs found in the webapp.

Modified: cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/transformation/EffectPipe.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/transformation/EffectPipe.java?rev=371545&r1=371544&r2=371545&view=diff
==============================================================================
--- cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/transformation/EffectPipe.java
(original)
+++ cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/transformation/EffectPipe.java
Mon Jan 23 06:39:28 2006
@@ -484,8 +484,10 @@
             }
             this.buffers.addFirst(this.buffer);
         }
-        locators.addFirst(locator);
-        locator = new LocatorImpl(locator);
+        if (locator != null) {
+            locators.addFirst(locator);
+            locator = new LocatorImpl(locator);
+        }
         this.buffer = new SaxBuffer();
     }
 
@@ -496,7 +498,9 @@
         } else {
             this.buffer = null;
         }
-        locator = (Locator)locators.removeFirst();
+        if (locator != null) {
+            locator = (Locator)locators.removeFirst();
+        }
         return buffer;
     }
 



Mime
View raw message