Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Reverted Asset version mapping. Added 409 CONFLICT exception to let the client know it should update the asset from the server before updating it.

Michael Rademaker93a197e7ec56
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
index 7460ac85c..71763f1c5 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
@@ -37,6 +37,7 @@ import org.openremote.model.value.Value;
import org.openremote.model.value.ValueException;
import org.openremote.model.value.Values;
+import javax.persistence.OptimisticLockException;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.HttpHeaders;
import java.io.IOException;
@@ -344,6 +345,8 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
} catch (IllegalStateException ex) {
throw new WebApplicationException(ex, BAD_REQUEST);
+ } catch (OptimisticLockException opEx) {
+ throw new WebApplicationException("Refresh the asset from the server and try to update the changes again", opEx, CONFLICT);
}
}
diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.java
index 1858cb4eb..2fafee1ae 100644
--- a/model/src/main/java/org/openremote/model/asset/Asset.java
+++ b/model/src/main/java/org/openremote/model/asset/Asset.java
@@ -702,11 +702,7 @@ public class Asset implements IdentifiableEntity {
String overrideType,
Boolean overrideAccessPublicRead,
ObjectValue overrideAttributes) {
-
- if (asset.getVersion() < assetToMap.getVersion()) {
- asset.setVersion(assetToMap.getVersion());
- }
-
+ asset.setVersion(assetToMap.getVersion());
asset.setName(overrideName != null ? overrideName : assetToMap.getName());
if (overrideType != null) {
asset.setType(overrideType);