svn commit: r559035 - /lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java

Author: andreas
Date: Tue Jul 24 06:01:19 2007
New Revision: 559035

URL: http://svn.apache.org/viewvc?view=rev&rev=559035
Log:
Paste usecase: Don't lock nodes if clipboard is empty. See bug 42960.

Modified:
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java?view=diff&rev=559035&r1=559034&r2=559035
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java Tue Jul 24 06:01:19 2007
@@ -117,21 +117,25 @@
         List nodes = new ArrayList();
 
         try {
-            Node siteNode = getArea().getSite().getRepositoryNode();
-            nodes.add(siteNode);
 
             Clipboard clipboard = new ClipboardHelper().getClipboard(getContext());
-            DocumentFactory map = getDocumentFactory();
-            Publication pub = getPublication();
-            Document clippedDocument = clipboard.getDocument(map, pub);
+            if (clipboard != null) {
+                
+                Node siteNode = getArea().getSite().getRepositoryNode();
+                nodes.add(siteNode);
 
-            NodeSet subsite = SiteUtil
-                    .getSubSite(this.manager, clippedDocument.getLink().getNode());
-            Document[] subsiteDocs = subsite.getDocuments();
-
-            for (int i = 0; i < subsiteDocs.length; i++) {
-                if (clipboard.getMethod() == Clipboard.METHOD_CUT) {
-                    nodes.add(subsiteDocs[i].getRepositoryNode());
+                DocumentFactory map = getDocumentFactory();
+                Publication pub = getPublication();
+                Document clippedDocument = clipboard.getDocument(map, pub);
+    
+                NodeSet subsite = SiteUtil
+                        .getSubSite(this.manager, clippedDocument.getLink().getNode());
+                Document[] subsiteDocs = subsite.getDocuments();
+    
+                for (int i = 0; i < subsiteDocs.length; i++) {
+                    if (clipboard.getMethod() == Clipboard.METHOD_CUT) {
+                        nodes.add(subsiteDocs[i].getRepositoryNode());
+                    }
                 }
             }