Merge pull request #263 from cdjackson/bug_465079-thing_item

Move update of thing to after update of item to ensure information is correctly presented
eclipse-archived · Apr 21, 2015 · cee40aa · cee40aa
2 parents cff3beb + e473d95
commit cee40aa
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...c/main/java/org/eclipse/smarthome/io/rest/core/thing/setup/ThingSetupManagerResource.java b/...c/main/java/org/eclipse/smarthome/io/rest/core/thing/setup/ThingSetupManagerResource.java
@@ -86,13 +86,6 @@ public Response updateThing(ThingBean thingBean) throws IOException {
         Configuration configuration = getConfiguration(thingBean);
 
         Thing thing = thingSetupManager.getThing(thingUID);
-        if (thing != null) {
-            if (bridgeUID != null) {
-                thing.setBridgeUID(bridgeUID);
-            }
-            updateConfiguration(thing, configuration);
-            thingSetupManager.updateThing(thing);
-        }
 
         String label = thingBean.item.label;
         List<String> groupNames = thingBean.item.groupNames;
@@ -111,6 +104,14 @@ public Response updateThing(ThingBean thingBean) throws IOException {
                 }
             }
         }
+
+        if (thing != null) {
+            if (bridgeUID != null) {
+                thing.setBridgeUID(bridgeUID);
+            }
+            updateConfiguration(thing, configuration);
+            thingSetupManager.updateThing(thing);
+        }
 
         return Response.ok().build();
     }