Repository: usergrid
Updated Branches:
refs/heads/release-2.1.1 e982ba4ed -> 0c965ae22
Add application id to log for duplicate unique values.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0c965ae2
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0c965ae2
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0c965ae2
Branch: refs/heads/release-2.1.1
Commit: 0c965ae221f9761f30e5c3fc5562b8e455a347bf
Parents: e982ba4
Author: Mike Dunker <mdunker@apigee.com>
Authored: Mon Jun 27 09:28:26 2016 -0700
Committer: Mike Dunker <mdunker@apigee.com>
Committed: Mon Jun 27 09:28:26 2016 -0700
----------------------------------------------------------------------
.../impl/UniqueValueSerializationStrategyImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0c965ae2/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 1c5b08f..28e28aa 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
@@ -333,8 +333,9 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey,
EntityKey>
try {
- logger.warn("Duplicate unique value [{}={}] found, removing newer
entry " +
- "with entity id [{}] and entity version [{}]", field.getName(),
field.getValue().toString(),
+ logger.warn("Duplicate unique value [{}={}] found for application
[{}], removing newer " +
+ "entry with entity id [{}] and entity version [{}]",
field.getName(),
+ field.getValue().toString(), applicationId.getUuid(),
candidate.getEntityId().getUuid(), candidate.getEntityVersion()
);
delete(appScope, candidate ).execute();
|