You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by rf...@apache.org on 2007/07/24 16:04:41 UTC
svn commit: r559054 -
/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
Author: rfrovarp
Date: Tue Jul 24 07:04:40 2007
New Revision: 559054
URL: http://svn.apache.org/viewvc?view=rev&rev=559054
Log:
Fixes NPE problem when trying to select the authoring node.
Modified:
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java?view=diff&rev=559054&r1=559053&r2=559054
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java Tue Jul 24 07:04:40 2007
@@ -17,6 +17,9 @@
*/
package org.apache.lenya.cms.site.usecases;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.util.DocumentHelper;
@@ -57,10 +60,14 @@
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
protected Node[] getNodesToLock() throws UsecaseException {
- Node docNode = getSourceDocument().getRepositoryNode();
- Node siteNode = getSourceDocument().area().getSite().getRepositoryNode();
- Node[] nodes = { docNode, siteNode };
- return nodes;
+ List nodes = new ArrayList();
+ if(getSourceDocument() != null) {
+ Node docNode = getSourceDocument().getRepositoryNode();
+ Node siteNode = getSourceDocument().area().getSite().getRepositoryNode();
+ nodes.add(docNode);
+ nodes.add(siteNode);
+ }
+ return (Node[]) nodes.toArray(new Node[nodes.size()]);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org