You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2010/11/25 10:56:45 UTC
svn commit: r1038974 -
/lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java
Author: andreas
Date: Thu Nov 25 09:56:44 2010
New Revision: 1038974
URL: http://svn.apache.org/viewvc?rev=1038974&view=rev
Log:
Avoid NPE in ChangeLabel.getNodesToLock().
Modified:
lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java
Modified: lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java?rev=1038974&r1=1038973&r2=1038974&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ChangeLabel.java Thu Nov 25 09:56:44 2010
@@ -24,7 +24,6 @@ import org.apache.lenya.cms.publication.
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.repository.Node;
-import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.workflow.WorkflowUtil;
@@ -66,8 +65,11 @@ public class ChangeLabel extends Documen
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
protected Node[] getNodesToLock() throws UsecaseException {
- List nodes = new ArrayList();
- nodes.add(getSourceDocument().getRepositoryNode());
+ List<Node> nodes = new ArrayList<Node>();
+ final Document doc = getSourceDocument();
+ if (doc != null) {
+ nodes.add(doc.getRepositoryNode());
+ }
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