TANGOARCH-596

snapmanager/src/main/java/SnapManager/SnapManager.java

@@ -116,6 +116,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -674,7 +675,7 @@ public class SnapManager extends DeviceImpl/* WithShutdownRunnable */ implements
 
     public String getSnapComment(int snapID) throws DevFailed {
         try {
-            return SnapManagerApi.getSnapComment(snapID);
+            return Objects.toString(SnapManagerApi.getSnapComment(snapID));
         } catch (SnapshotingException e) {
             throw e.toTangoException();
         }

snapmanager/src/main/java/org/tango/server/snap/manager/SnapManager.java

 package org.tango.server.snap.manager;
 
-import fr.esrf.Tango.DevError;
-import fr.esrf.Tango.DevFailed;
-import fr.esrf.Tango.DevVarLongStringArray;
-import fr.esrf.TangoDs.Except;
-import fr.soleil.archiving.snap.api.manager.ISnapManager;
-import fr.soleil.archiving.snap.api.manager.SnapManagerApi;
-import fr.soleil.archiving.snap.api.manager.SnapManagerImpl;
-import fr.soleil.archiving.snap.api.tools.SnapAttributeExtract;
-import fr.soleil.archiving.snap.api.tools.SnapConst;
-import fr.soleil.archiving.snap.api.tools.SnapContext;
-import fr.soleil.archiving.snap.api.tools.Snapshot;
-import fr.soleil.archiving.snap.api.tools.SnapshotingException;
-import fr.soleil.tango.clientapi.TangoCommand;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.ResourceBundle;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tango.DeviceState;
@@ -27,17 +27,19 @@ import org.tango.server.annotation.StateMachine;
 import org.tango.server.annotation.Status;
 import org.tango.utils.DevFailedUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
+import fr.esrf.Tango.DevError;
+import fr.esrf.Tango.DevFailed;
+import fr.esrf.Tango.DevVarLongStringArray;
+import fr.esrf.TangoDs.Except;
+import fr.soleil.archiving.snap.api.manager.ISnapManager;
+import fr.soleil.archiving.snap.api.manager.SnapManagerApi;
+import fr.soleil.archiving.snap.api.manager.SnapManagerImpl;
+import fr.soleil.archiving.snap.api.tools.SnapAttributeExtract;
+import fr.soleil.archiving.snap.api.tools.SnapConst;
+import fr.soleil.archiving.snap.api.tools.SnapContext;
+import fr.soleil.archiving.snap.api.tools.Snapshot;
+import fr.soleil.archiving.snap.api.tools.SnapshotingException;
+import fr.soleil.tango.clientapi.TangoCommand;
 
 /**
  * Class Description: This DServer provides the connections points and methods
@@ -473,7 +475,7 @@ public class SnapManager {
     @Command(name = "getSnapComment", inTypeDesc = "snap id")
     public String getSnapComment(int snapID) throws DevFailed {
         try {
-            return SnapManagerApi.getSnapComment(snapID);
+			return Objects.toString(SnapManagerApi.getSnapComment(snapID));
         } catch (SnapshotingException e) {
             throw e.toTangoException();
         }