You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/11/02 23:56:12 UTC
[21/50] [abbrv] usergrid git commit: USERGRID-1044: don't log UUID
mismatch if UUID was never retrieved during load
USERGRID-1044: don't log UUID mismatch if UUID was never retrieved during load
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0fc18041
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0fc18041
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0fc18041
Branch: refs/heads/USERGRID-909
Commit: 0fc18041e32df049040f26a0faaef1f46dbe6d9f
Parents: 2a09bf1
Author: Mike Dunker <md...@apigee.com>
Authored: Wed Oct 28 08:09:19 2015 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Wed Oct 28 08:09:19 2015 -0700
----------------------------------------------------------------------
.../scala/org/apache/usergrid/scenarios/AuditScenarios.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0fc18041/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
index d1e2c4b..cc59e0a 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
@@ -183,7 +183,7 @@ object AuditScenarios {
errorString += "|NoUuidReturned"
Settings.incAuditPayloadUuidError()
println(s"PAYLOAD UUID MISSING (DIRECT): requestedUuid=$uuid")
- } else if (!uuid.equalsIgnoreCase(entityUuid)) {
+ } else if (!uuid.isEmpty && !uuid.equalsIgnoreCase(entityUuid)) {
errorString += "|ReturnedUuidMismatch"
Settings.incAuditPayloadUuidError()
println(s"PAYLOAD UUID MISMATCH (DIRECT): requestedUuid=$uuid returnedUuid=$entityUuid")
@@ -247,7 +247,7 @@ object AuditScenarios {
errorString += "|NoUuidReturned"
Settings.incAuditPayloadUuidError()
println(s"PAYLOAD UUID MISSING (QUERY): requestedUuid=$uuid")
- } else if (!uuid.equalsIgnoreCase(entityUuid)) {
+ } else if (!uuid.isEmpty && !uuid.equalsIgnoreCase(entityUuid)) {
errorString += "|ReturnedUuidMismatch"
Settings.incAuditPayloadUuidError()
println(s"PAYLOAD UUID MISMATCH (QUERY): requestedUuid=$uuid returnedUuid=$entityUuid")