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 2014/11/11 00:28:51 UTC

[03/26] incubator-usergrid git commit: Revert "remove unregister devices"

Revert "remove unregister devices"

This reverts commit d68967c2fada77ce765c3a0d77431d444308d5cf.


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

Branch: refs/heads/es-type-updates-ryan-external
Commit: 2d08b25224fea6d344d009d9c312c1ffceddf417
Parents: 81f56f6
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Nov 6 15:01:24 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Nov 6 15:01:24 2014 -0700

----------------------------------------------------------------------
 .../apache/usergrid/services/users/devices/DevicesService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2d08b252/stack/services/src/main/java/org/apache/usergrid/services/users/devices/DevicesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/users/devices/DevicesService.java b/stack/services/src/main/java/org/apache/usergrid/services/users/devices/DevicesService.java
index 1d6fd14..4556eaa 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/users/devices/DevicesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/users/devices/DevicesService.java
@@ -40,7 +40,7 @@ public class DevicesService extends org.apache.usergrid.services.devices.Devices
     @Override
     public ServiceResults putItemById( ServiceContext context, UUID id ) throws Exception {
         logger.debug("Registering device {}", id);
-//        unregisterDeviceToUsers(id,context.getOwner());
+        unregisterDeviceToUsers(id,context.getOwner());
         ServiceResults results = super.putItemById( context, id );
         return results;
     }
@@ -49,7 +49,7 @@ public class DevicesService extends org.apache.usergrid.services.devices.Devices
     @Override
     public ServiceResults postItemById( ServiceContext context, UUID id ) throws Exception {
         logger.info( "Attempting to connect an entity to device {}", id );
-//        unregisterDeviceToUsers(id,context.getOwner());
+        unregisterDeviceToUsers(id,context.getOwner());
         ServiceResults results = super.postItemById( context, id );
         return results;
     }