[Openutils-svn] SF.net SVN: openutils:[4555] magnoliamodules/branches/magnolia44/ openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media /dialog/LayerDialogMVC.java

[<die...@us...>]

Revision: 4555
          http://openutils.svn.sourceforge.net/openutils/?rev=4555&view=rev
Author:   diego_schivo
Date:     2014-01-28 15:40:36 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
MEDIA-311 Duplicate media nodes when MediaTypeHandler.onPostSave returns false

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java	2014-01-02 10:33:20 UTC (rev 4554)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java	2014-01-28 15:40:36 UTC (rev 4555)
@@ -57,6 +57,8 @@
      */
     private Logger log = LoggerFactory.getLogger(LayerDialogMVC.class);
 
+    private boolean newNode;
+
     /**
      * @param name
      * @param request
@@ -149,7 +151,22 @@
 
         // TODO rename dei nodi in base al filename?
 
-        return MediaConfigurationManager.getInstance().getTypes().get(type).getHandler().onPostSave(node);
+        boolean result = MediaConfigurationManager.getInstance().getTypes().get(type).getHandler().onPostSave(node);
+        // MEDIA-311
+        if (!result && newNode)
+        {
+            try
+            {
+                Content parent = node.getParent();
+                node.delete();
+                parent.save();
+            }
+            catch (RepositoryException e)
+            {
+                log.error(e.getMessage(), e);
+            }
+        }
+        return result;
     }
 
     /**
@@ -160,7 +177,8 @@
     {
         String type = this.request.getParameter("type");
 
-        if (control.getNodeName().equals("mgnlNew"))
+        newNode = control.getNodeName().equals("mgnlNew");
+        if (newNode)
         {
             HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
             Content c = null;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.