usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [5/9] incubator-usergrid git commit: Remove commented out code.
Date Mon, 06 Apr 2015 20:50:53 GMT
Remove commented out code.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/122e9aee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/122e9aee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/122e9aee

Branch: refs/heads/USERGRID-533-create-app-test
Commit: 122e9aeee190ee4bb2dea89d65856f894196a9ad
Parents: 3a1ee57
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Fri Apr 3 16:12:48 2015 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Fri Apr 3 16:12:48 2015 -0400

----------------------------------------------------------------------
 .../usergrid/corepersistence/CpEntityManager.java      | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/122e9aee/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 6013d54..c94fe5e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -2243,14 +2243,11 @@ public class CpEntityManager implements EntityManager {
     private Id getIdForUniqueEntityField( final String collectionName, final String propertyName,
                                           final Object propertyValue ) {
 
-        //convert to a string, that's what we store
-        final Id results = ecm.getIdField( Inflector.getInstance().singularize( collectionName
), new StringField(
-                propertyName, propertyValue.toString() ) ).toBlocking() .lastOrDefault( null
);
-
-//        final Id results = ecm.getIdField(
-//            Inflector.getInstance().singularize( collectionName ),
-//            new StringField( propertyName, propertyValue.toString() )
-//        ).toBlocking() .lastOrDefault( null );
+        // convert to a string, that's what we store
+        final Id results = ecm.getIdField(
+            Inflector.getInstance().singularize( collectionName ),
+            new StringField( propertyName, propertyValue.toString() )
+        ).toBlocking() .lastOrDefault( null );
 
         return results;
     }


Mime
View raw message