From c38527a8319fbe29012be2c6d3c9f82a31216d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Mantelet?= <gregory.mantelet@astro.unistra.fr> Date: Fri, 18 May 2018 13:22:16 +0200 Subject: [PATCH] [UWS] Fix the backup restoration of custom keys. When a custom key was encountered, the library tried to fetch its value as a String...but it is not always a String. Instead, now it is fetch as an Object (possibly a JSONObject or JSONArray). --- src/uws/service/backup/DefaultUWSBackupManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/uws/service/backup/DefaultUWSBackupManager.java b/src/uws/service/backup/DefaultUWSBackupManager.java index 6b52b3c..5e18db3 100644 --- a/src/uws/service/backup/DefaultUWSBackupManager.java +++ b/src/uws/service/backup/DefaultUWSBackupManager.java @@ -87,7 +87,7 @@ import uws.service.request.UploadFile; * <p>Another positive value will be considered as the frequency (in milliseconds) of the automatic backup (= {@link #saveAll()}).</p> * * @author Grégory Mantelet (CDS;ARI) - * @version 4.3 (03/2018) + * @version 4.3 (05/2018) */ public class DefaultUWSBackupManager implements UWSBackupManager { @@ -882,7 +882,7 @@ public class DefaultUWSBackupManager implements UWSBackupManager { else if (key.equalsIgnoreCase("pseudo")) pseudo = json.getString(key); else - userData.put(key, json.getString(key)); + userData.put(key, json.get(key)); }catch(JSONException je){ getLogger().logUWS(LogLevel.WARNING, null, "RESTORATION", "Incorrect JSON format for the serialization of the user \"" + ID + "\"! The restoration of this job may be incomplete.", je); } -- GitLab