svn commit: r562418 - in /lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms: FormsEditor.java OneFormEditor.java

Author: andreas
Date: Fri Aug  3 04:42:36 2007
New Revision: 562418

URL: http://svn.apache.org/viewvc?view=rev&rev=562418
Log:
Form editors: add check if source document is null (more robust when running web tests)

Modified:
    lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java
    lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/OneFormEditor.java

Modified: lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java?view=diff&rev=562418&r1=562417&r2=562418
==============================================================================
--- lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java (original)
+++ lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java Fri Aug  3 04:42:36 2007
@@ -24,8 +24,10 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.MalformedURLException;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -107,8 +109,13 @@
      * @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
      */
     protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
-        org.apache.lenya.cms.repository.Node[] objects = { getSourceDocument().getRepositoryNode() };
-        return objects;
+        org.apache.lenya.cms.publication.Document doc = getSourceDocument();
+        Set nodes = new HashSet();
+        if (doc != null) {
+            nodes.add(doc.getRepositoryNode());
+        }
+        return (org.apache.lenya.cms.repository.Node[])
+            nodes.toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
     }
 
     /**

Modified: lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/OneFormEditor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/OneFormEditor.java?view=diff&rev=562418&r1=562417&r2=562418
==============================================================================
--- lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/OneFormEditor.java (original)
+++ lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/OneFormEditor.java Fri Aug  3 04:42:36 2007
@@ -22,6 +22,8 @@
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -51,8 +53,13 @@
      * @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
      */
     protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
-        org.apache.lenya.cms.repository.Node[] objects = { getSourceDocument().getRepositoryNode() };
-        return objects;
+        org.apache.lenya.cms.publication.Document doc = getSourceDocument();
+        Set nodes = new HashSet();
+        if (doc != null) {
+            nodes.add(doc.getRepositoryNode());
+        }
+        return (org.apache.lenya.cms.repository.Node[])
+            nodes.toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
     }
 
     /**