Skip to content

Commit a39ccd3

Browse files
author
Gabriel Einsdorf
committed
Return empty set instead of null when no superclasses or interfaces are found during input adapter search
1 parent f73a85f commit a39ccd3

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

org.knime.scijava.commands/src/org/knime/scijava/commands/DefaultInputAdapterService.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package org.knime.scijava.commands;
22

33
import java.util.Collection;
4+
import java.util.Collections;
45
import java.util.Comparator;
56
import java.util.HashSet;
67
import java.util.Set;
78
import java.util.TreeSet;
89
import java.util.WeakHashMap;
910

1011
import org.knime.core.data.DataValue;
12+
import org.knime.core.data.StringValue;
1113
import org.knime.scijava.commands.adapter.InputAdapter;
1214
import org.knime.scijava.commands.adapter.InputAdapterService;
1315
import org.scijava.plugin.AbstractSingletonService;
@@ -122,13 +124,13 @@ public Set<InputAdapter> getMatchingInputAdapters(
122124
if (set != null) {
123125
// save result for dataValueClass
124126
m_pluginsByDataValue.put(dataValueClass, set);
125-
126127
break;
127128
}
128129
}
129-
130+
if (set == null) { // datatype is unknown
131+
set = Collections.emptySet();
132+
}
130133
}
131-
132134
return set;
133135
}
134136

@@ -151,7 +153,6 @@ private void processInstances() {
151153
// priority
152154
m_pluginsByDataValue.put(type, set);
153155
}
154-
155156
set.add(p);
156157
}
157158
}

0 commit comments

Comments
 (0)