usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdun...@apache.org
Subject usergrid git commit: Added app id to the other duplicate unique value log.
Date Tue, 28 Jun 2016 00:05:25 GMT
Repository: usergrid
Updated Branches:
  refs/heads/release-2.1.1 0c965ae22 -> 09280b1fe


Added app id to the other duplicate unique value log.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/09280b1f
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/09280b1f
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/09280b1f

Branch: refs/heads/release-2.1.1
Commit: 09280b1fea81938576e8143cdc4047b41aae4350
Parents: 0c965ae
Author: Mike Dunker <mdunker@apigee.com>
Authored: Mon Jun 27 17:04:27 2016 -0700
Committer: Mike Dunker <mdunker@apigee.com>
Committed: Mon Jun 27 17:04:27 2016 -0700

----------------------------------------------------------------------
 .../impl/UniqueValueSerializationStrategyImpl.java             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/09280b1f/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
index 28e28aa..aec2e58 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
@@ -361,9 +361,9 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey,
EntityKey>
 
                 }else{
 
-                    logger.warn("Duplicate unique value [{}={}] found, removing newer entry
" +
-                            "with entity id [{}] and entity version [{}]", field.getName(),
field.getValue().toString(),
-                        uniqueValue.getEntityId().getUuid(), uniqueValue.getEntityVersion()
);
+                    logger.warn("Duplicate unique value [{}={}] found for application [{}],
removing newer entry " +
+                            "with entity id [{}] and entity version [{}].", field.getName(),
field.getValue().toString(),
+                        applicationId.getUuid(), uniqueValue.getEntityId().getUuid(), uniqueValue.getEntityVersion()
);
 
                     // delete the duplicate from the unique value index
                     delete(appScope, uniqueValue ).execute();


Mime
View raw message