- Now that config save is no longer bound to infinispan cache type
contraint of ConcurrentMap, need to assure old configuration still
serialized as concurrent maps can be still be read.
Change-Id: I6b4404b2280fa923391aeee02cf56ed9a8847552
Signed-off-by: Alessandro Boch <aboch@cisco.com>
package org.opendaylight.controller.configuration.internal;
package org.opendaylight.controller.configuration.internal;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
}
String source = String.format("%s%s", ROOT, fileName);
Object obj = objReader.read(reader, source);
}
String source = String.format("%s%s", ROOT, fileName);
Object obj = objReader.read(reader, source);
- return (obj == null || !(obj instanceof List)) ? Collections.<ConfigurationObject> emptyList()
- : (List<ConfigurationObject>) obj;
+ if (obj == null) {
+ return Collections.<ConfigurationObject> emptyList();
+ }
+ if (obj instanceof ConcurrentMap) {
+ return new ArrayList<ConfigurationObject>(((ConcurrentMap)obj).values());
+ }
+ return (List<ConfigurationObject>) obj;
package org.opendaylight.controller.configuration.internal;
import java.io.File;
package org.opendaylight.controller.configuration.internal;
import java.io.File;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Dictionary;
import java.util.EnumSet;
import java.util.Collections;
import java.util.Dictionary;
import java.util.EnumSet;
}
String source = String.format("%s%s", root, fileName);
Object obj = objReader.read(reader, source);
}
String source = String.format("%s%s", root, fileName);
Object obj = objReader.read(reader, source);
- return (obj == null || !(obj instanceof List)) ? Collections.<ConfigurationObject> emptyList()
- : (List<ConfigurationObject>) obj;
+ if (obj == null) {
+ return Collections.<ConfigurationObject> emptyList();
+ }
+ if (obj instanceof ConcurrentMap) {
+ return new ArrayList<ConfigurationObject>(((ConcurrentMap)obj).values());
+ }
+ return (List<ConfigurationObject>) obj;