check for existing datasetversion id when updating with parsed json (#…

…1554)
IQSS · Mar 5, 2015 · 9c25094 · 9c25094
1 parent 3eb3c8d
commit 9c25094
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
@@ -172,8 +172,12 @@ public DatasetVersion parseDatasetVersion(JsonObject obj, DatasetVersion dsv) th
             dsv.setDeaccessionLink(obj.getString("deaccessionLink", null));
             dsv.setVersionNumber((long) obj.getInt("versionNumber", -1));
             dsv.setMinorVersionNumber(parseLong(obj.getString("minorVersionNumber", null)));
-            dsv.setId(parseLong(obj.getString("id", null)));
-
+            // if the existing datasetversion doesn not have an id
+            // use the id from the json object.
+            if (dsv.getId()==null) {
+                 dsv.setId(parseLong(obj.getString("id", null)));
+            }
+
             String versionStateStr = obj.getString("versionState", null);
             if (versionStateStr != null) {
                 dsv.setVersionState(DatasetVersion.VersionState.valueOf(versionStateStr));