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

Author: andreas
Date: Thu Apr 26 01:04:08 2007
New Revision: 532646

URL: http://svn.apache.org/viewvc?view=rev&rev=532646
Log:
Removing clipboard from session after pasting. See bug 34988.

Modified:
    
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ClipboardHelper.java
    
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/ClipboardHelper.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ClipboardHelper.java?view=diff&rev=532646&r1=532645&r2=532646
==============================================================================
--- 
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ClipboardHelper.java
 (original)
+++ 
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ClipboardHelper.java
 Thu Apr 26 01:04:08 2007
@@ -72,4 +72,13 @@
         session.setAttribute(getSessionAttributeName(), clipboard);
     }
     
+    /**
+     * Removes the clipboard from the session.
+     * @param context The context.
+     */
+    public void removeClipboard(Context context) {
+        Session session = getSession(context);
+        session.removeAttribute(getSessionAttributeName());
+    }
+    
 }

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=532646&r1=532645&r2=532646
==============================================================================
--- 
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
 Thu Apr 26 01:04:08 2007
@@ -122,7 +122,9 @@
         super.doExecute();
 
         DocumentFactory identityMap = getDocumentFactory();
-        Clipboard clipboard = new ClipboardHelper().getClipboard(getContext());
+        ClipboardHelper helper = new ClipboardHelper();
+        
+        Clipboard clipboard = helper.getClipboard(getContext());
         Publication pub = getSourceDocument().getPublication();
         Document clippedDocument = clipboard.getDocument(identityMap, pub);
 
@@ -144,6 +146,8 @@
                 this.manager.release(documentManager);
             }
         }
+        
+        helper.removeClipboard(getContext());
     }
 
     protected String getTargetPath() throws SiteException, 
DocumentBuildException,