Allow creationDate and lastChanged to be set explicitly

zanata · Jul 15, 2013 · 08e23c3 · 08e23c3
1 parent 452292d
commit 08e23c3
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java b/zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
@@ -102,18 +102,24 @@ public void setLastChanged(Date lastChanged)
    @PrePersist
    private void onPersist()
    {
-      creationDate = new Date();
-      lastChanged = creationDate;
+      if (creationDate != null)
+      {
+         creationDate = new Date();
+      }
+      if (lastChanged != null)
+      {
+         lastChanged = creationDate;
+      }
    }
-   
+
    @SuppressWarnings("unused")
-   @PreRemove
-   private void onRemove()
+   @PostPersist
+   private void postPersist()
    {
       if (logPersistence())
       {
          Logger log = LoggerFactory.getLogger(getClass());
-         log.info("remove entity: {}", this);
+         log.info("persist entity: {}", this);
       }
    }
 
@@ -125,13 +131,13 @@ private void onUpdate()
    }
 
    @SuppressWarnings("unused")
-   @PostPersist
-   private void postPersist()
+   @PreRemove
+   private void onRemove()
    {
       if (logPersistence())
       {
          Logger log = LoggerFactory.getLogger(getClass());
-         log.info("persist entity: {}", this);
+         log.info("remove entity: {}", this);
       }
    }