[exo-jcr-commits] exo-jcr SVN: r4373 - in jcr/trunk/exo.jcr.component.ext/src: test/java/org/exoplatform/services/jcr/ext/metadata and 1 other directory.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2011-05-11 10:10:09 -0400 (Wed, 11 May 2011)
New Revision: 4373

Modified:
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java
   jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java
Log:
EXOJCR-1334 : Problem with catching DocumentReaderException in AddMetadataAction was fixed.

Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java	2011-05-11 14:08:32 UTC (rev 4372)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java	2011-05-11 14:10:09 UTC (rev 4373)
@@ -22,6 +22,7 @@
 import org.exoplatform.commons.utils.QName;
 import org.exoplatform.container.ExoContainer;
 import org.exoplatform.services.command.action.Action;
+import org.exoplatform.services.document.DocumentReadException;
 import org.exoplatform.services.document.DocumentReaderService;
 import org.exoplatform.services.document.HandlerNotFoundException;
 import org.exoplatform.services.jcr.core.nodetype.PropertyDefinitionDatas;
@@ -124,6 +125,10 @@
          {
             log.debug(e.getMessage());
          }
+         catch (DocumentReadException e)
+         {
+            log.warn(e.getMessage(), e);
+         }
 
          Iterator entries = props.entrySet().iterator();
          while (entries.hasNext())

Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java	2011-05-11 14:08:32 UTC (rev 4372)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java	2011-05-11 14:10:09 UTC (rev 4373)
@@ -22,6 +22,7 @@
 
 import java.io.InputStream;
 import java.util.Calendar;
+import java.util.GregorianCalendar;
 
 import javax.jcr.Node;
 
@@ -161,4 +162,19 @@
       assertFalse(testNode.hasProperty("dc:title"));
       assertFalse(testNode.hasProperty("dc:creator"));
    }
+
+   public void testJcrSetPropertyTestCase() throws Exception
+   {
+      Node rootNode = session.getRootNode().addNode("MetaDataActionTest");
+      Node contentNode = rootNode.addNode("testAddContent", "nt:resource");
+      contentNode.setProperty("jcr:mimeType", "");
+      contentNode.setProperty("jcr:data", "");
+      contentNode.setProperty("jcr:lastModified", new GregorianCalendar());
+      session.save();
+
+      //try set property
+      contentNode.setProperty("jcr:mimeType", "image/jpeg");
+      session.save();
+   }
+
 }