thingsboard-aplcache

Merge branch 'is_public'

10/4/2017 4:44:50 PM

Details

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
index 12ff629..a82c235 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty.Access;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -60,12 +61,13 @@ public class Customer extends ContactBased<CustomerId> implements HasName {
     public void setTitle(String title) {
         this.title = title;
     }
-    
+
+    @JsonIgnore
     public boolean isPublic() {
         if (getAdditionalInfo() != null && getAdditionalInfo().has("isPublic")) {
-            return getAdditionalInfo().get("isPublic").asBoolean();
+            return additionalInfo.get("isPublic").asBoolean();
         }
-        
+
         return false;
     }