Author: justin
Date: Fri Jul 30 20:56:57 2010
New Revision: 980958
URL: http://svn.apache.org/viewvc?rev=980958&view=rev
Log:
SLING-1619 - adding try/catch block
Modified:
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingPropertyValueHandler.java
Modified:
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingPropertyValueHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingPropertyValueHandler.java?rev=980958&r1=980957&r2=980958&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingPropertyValueHandler.java
(original)
+++
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingPropertyValueHandler.java
Fri Jul 30 20:56:57 2010
@@ -28,6 +28,7 @@ import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.ValueFactory;
+import javax.jcr.nodetype.ConstraintViolationException;
import org.apache.sling.servlets.post.Modification;
@@ -107,23 +108,26 @@ public class SlingPropertyValueHandler {
} else if (AUTO_PROPS.containsKey(name)) {
// avoid collision with protected properties
- switch (AUTO_PROPS.get(name)) {
- case CREATED:
- if (parent.isNew()) {
+ try {
+ switch (AUTO_PROPS.get(name)) {
+ case CREATED:
+ if (parent.isNew()) {
+ setCurrentDate(parent, name);
+ }
+ break;
+ case CREATED_BY:
+ if (parent.isNew()) {
+ setCurrentUser(parent, name);
+ }
+ break;
+ case MODIFIED:
setCurrentDate(parent, name);
- }
- break;
- case CREATED_BY:
- if (parent.isNew()) {
+ break;
+ case MODIFIED_BY:
setCurrentUser(parent, name);
- }
- break;
- case MODIFIED:
- setCurrentDate(parent, name);
- break;
- case MODIFIED_BY:
- setCurrentUser(parent, name);
- break;
+ break;
+ }
+ } catch (ConstraintViolationException e) {
}
} else {
// no magic field, set value as provided