brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject git commit: fix NPE in SensorResource
Date Tue, 07 Oct 2014 04:44:42 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 96ff6f769 -> b11274a45


fix NPE in SensorResource


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

Branch: refs/heads/master
Commit: b11274a450a09ec9b540cc9b8a9340b7c597e4c2
Parents: 96ff6f7
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Mon Oct 6 21:43:51 2014 -0700
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Mon Oct 6 21:44:33 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/brooklyn/rest/resources/SensorResource.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b11274a4/usage/rest-server/src/main/java/brooklyn/rest/resources/SensorResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/SensorResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/SensorResource.java
index 3981b95..fedd60d 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/SensorResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/SensorResource.java
@@ -124,7 +124,7 @@ public class SensorResource extends AbstractBrooklynRestResource implements
Sens
         final EntityLocal entity = brooklyn().getEntity(application, entityToken);
         AttributeSensor<?> sensor = findSensor(entity, sensorName);
         if (log.isDebugEnabled())
-            log.debug("REST user "+Entitlements.getEntitlementContext().user()+" deleting
sensor "+sensorName);
+            log.debug("REST user "+Entitlements.getEntitlementContext()+" deleting sensor
"+sensorName);
         ((EntityInternal)entity).removeAttribute(sensor);
     }
     


Mime
View raw message