You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/06/24 17:53:00 UTC
[12/18] usergrid git commit: Fix some comments.
Fix some comments.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e24ea20d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e24ea20d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e24ea20d
Branch: refs/heads/master
Commit: e24ea20d7bd0a83b34577470e28327dccd174f66
Parents: 70f50c2
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jun 22 22:42:43 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jun 22 22:42:43 2016 -0700
----------------------------------------------------------------------
.../serialization/impl/UniqueValueSerializationStrategyImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/e24ea20d/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 2a53194..8a41bff 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
@@ -338,12 +338,14 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey>
candidate.getEntityId().getUuid(), candidate.getEntityVersion() );
delete(appScope, candidate ).execute();
+
} catch (ConnectionException e) {
// do nothing for now
}
});
+ // clear the transient candidates list
candidates.clear();
if(logger.isTraceEnabled()) {
@@ -355,8 +357,6 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey>
// add our new candidate to the list
candidates.add(uniqueValue);
- // add our new candidate to the result set
- //uniqueValueSet.addValue(candidate);
}else{