correct confusing changelog timestamps

aegif · Jul 6, 2018 · d23df51 · d23df51
1 parent c06d2c4
commit d23df51
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/core/src/main/java/jp/aegif/nemaki/businesslogic/impl/ContentServiceImpl.java b/core/src/main/java/jp/aegif/nemaki/businesslogic/impl/ContentServiceImpl.java
@@ -477,9 +477,6 @@ public String writeChangeEvent(CallContext callContext, String repositoryId, Con
 		case UPDATED:
 			change.setTime(content.getModified());
 			break;
-		case DELETED:
-			change.setTime(content.getCreated());
-			break;
 		case SECURITY:
 			change.setTime(content.getModified());
 			break;

diff --git a/core/src/main/java/jp/aegif/nemaki/model/couch/CouchChange.java b/core/src/main/java/jp/aegif/nemaki/model/couch/CouchChange.java
@@ -61,11 +61,12 @@ public CouchChange(){
 
 	public CouchChange(Change c){
 		super(c);
+		GregorianCalendar time = c.getTime();
 		setObjectId(c.getObjectId());
 		Long token = convertChangeToken(c.getToken());
 		setToken(token);
 		setChangeType(c.getChangeType());
-		setTime(c.getCreated());
+		setTime(time != null ? time : c.getCreated());
 		setType(c.getType());
 		setName(c.getName());
 		setBaseType(c.getBaseType());