fix bug that could cause errors "org.omg.CORBA.MARSHAL: Cannot marsha…

…ll null string."
tango-controls · Aug 24, 2020 · bcb9a7d · bourtemb · Aug 25, 2020 · gwen-soleil
1 parent d903bf9
commit bcb9a7d
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/server/src/main/java/org/tango/server/attribute/AttributePropertiesImpl.java b/server/src/main/java/org/tango/server/attribute/AttributePropertiesImpl.java
@@ -666,7 +666,9 @@ void load(final String deviceName, final String attributeName) throws DevFailed
         // use a second map for attribute props that have one value
         final Map<String, String> propValuesSingle = new CaseInsensitiveMap<>(propValues.size());
         for (final Entry<String, String[]> entry : propValues.entrySet()) {
+            System.out.println(attributeName + "- "+ entry.getKey() + " = "+ Arrays.toString(entry.getValue()));
             final String[] value = entry.getValue();
+            System.out.println(value.length);
             if (value.length == 1 && !value[0].equalsIgnoreCase(Constants.NOT_SPECIFIED)) {
                 propValuesSingle.put(entry.getKey(), value[0]);
             }
@@ -677,25 +679,27 @@ void load(final String deviceName, final String attributeName) throws DevFailed
         if (propValues.containsKey(Constants.LABEL)) {
             setLabel(propValuesSingle.get(Constants.LABEL));
         }
+        System.out.println(attributeName + "load " + propValues);
+        System.out.println(attributeName + "load propValuesSingle " + propValuesSingle);
         if (!isFwdAttribute) {
-            if (propValues.containsKey(Constants.FORMAT)) {
+            if (propValuesSingle.containsKey(Constants.FORMAT)) {
                 setFormat(propValuesSingle.get(Constants.FORMAT));
             }
-            if (propValues.containsKey(Constants.UNIT)) {
+            if (propValuesSingle.containsKey(Constants.UNIT)) {
                 setUnit(propValuesSingle.get(Constants.UNIT));
             }
-            if (propValues.containsKey(Constants.DISPLAY_UNIT)) {
+            if (propValuesSingle.containsKey(Constants.DISPLAY_UNIT)) {
                 setDisplayUnit(propValuesSingle.get(Constants.DISPLAY_UNIT));
             }
-            if (propValues.containsKey(Constants.STANDARD_UNIT)) {
+            if (propValuesSingle.containsKey(Constants.STANDARD_UNIT)) {
                 setStandardUnit(propValuesSingle.get(Constants.STANDARD_UNIT));
             }
             setMinMax(propValuesSingle);
-            if (propValues.containsKey(Constants.DESC)) {
+            if (propValuesSingle.containsKey(Constants.DESC)) {
                 setDescription(propValuesSingle.get(Constants.DESC));
             }
             setEventProperties(propValuesSingle);
-            if (propValues.containsKey(Constants.ENUM_LABELS)) {
+            if (propValuesSingle.containsKey(Constants.ENUM_LABELS)) {
                 setEnumLabels(propValues.get(Constants.ENUM_LABELS));
             }
         }