You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/04/14 00:21:09 UTC
[15/28] git commit: Revert "fix for bug USERGRID-22,
ICLA - Malaka Mahanama"
Revert "fix for bug USERGRID-22, ICLA - Malaka Mahanama"
This reverts commit dbfd345b9ba68040a6728e794d3742cfd90d3175.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c562a182
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c562a182
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c562a182
Branch: refs/pull/106/merge
Commit: c562a182e49b4b2bbd7314b0a93170415e656dcd
Parents: 86d4537
Author: Malaka <ma...@gmail.com>
Authored: Mon Apr 14 02:10:36 2014 +0530
Committer: Malaka <ma...@gmail.com>
Committed: Mon Apr 14 02:10:36 2014 +0530
----------------------------------------------------------------------
.../java/org/apache/usergrid/persistence/Query.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c562a182/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java b/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java
index 23970f0..6cc8249 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java
@@ -371,11 +371,6 @@ public class Query {
return false;
}
for ( Identifier identifier : identifiers ) {
-
- //part of fix for the bug USERGRID-22 (to prevent a null pointer exception).
- if (identifier == null)
- { return false; }
-
if ( !identifier.isEmail() && !identifier.isName() ) {
return false;
}
@@ -418,10 +413,6 @@ public class Query {
}
for ( Identifier identifier : identifiers ) {
-
- //part of fix for the bug USERGRID-22 (to prevent a null pointer exception).
- if (identifier == null){ return true; }
-
if ( !identifier.isUUID() ) {
return false;
}
@@ -451,10 +442,6 @@ public class Query {
if ( !containsSingleUuidIdentifier() ) {
return null;
}
- //part of fix for the bug USERGRID-22 (to prevent a null pointer exception).
- if(identifiers.get( 0 )==null)
- { return null; }
-
return ( identifiers.get( 0 ).getUUID() );
}