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:07 UTC
[13/28] git commit: Revert "added review comments for the fix for bug
USERGRID-22, ICLA - Malaka Mahanama"
Revert "added review comments for the fix for bug USERGRID-22, ICLA - Malaka Mahanama"
This reverts commit e186568e0f32a78fee53b2006691337def1729e3.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/86d45377
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/86d45377
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/86d45377
Branch: refs/pull/106/merge
Commit: 86d4537767e0fbeaa44080d6d5b3b9031f28e5b7
Parents: 55dfcca
Author: Malaka <ma...@gmail.com>
Authored: Mon Apr 14 02:10:17 2014 +0530
Committer: Malaka <ma...@gmail.com>
Committed: Mon Apr 14 02:10:17 2014 +0530
----------------------------------------------------------------------
.../java/org/apache/usergrid/persistence/Query.java | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/86d45377/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 a2c97a6..23970f0 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
@@ -373,9 +373,8 @@ 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 false;
- }
+ if (identifier == null)
+ { return false; }
if ( !identifier.isEmail() && !identifier.isName() ) {
return false;
@@ -421,9 +420,7 @@ 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 == null){ return true; }
if ( !identifier.isUUID() ) {
return false;
@@ -455,9 +452,8 @@ public class Query {
return null;
}
//part of fix for the bug USERGRID-22 (to prevent a null pointer exception).
- if( identifiers.get( 0 ) == null ){
- return null;
- }
+ if(identifiers.get( 0 )==null)
+ { return null; }
return ( identifiers.get( 0 ).getUUID() );
}