Author: mes
Date: 2012-03-20 16:23:42 -0700 (Tue, 20 Mar 2012)
New Revision: 28599
Modified:
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTunableInterceptorTest.java
Log:
fixed a possible npe
Modified:
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
===================================================================
---
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
2012-03-20 22:06:51 UTC (rev 28598)
+++
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
2012-03-20 23:23:42 UTC (rev 28599)
@@ -32,6 +32,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.Type;
+import java.util.Collections;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -209,7 +210,7 @@
*/
public final List<T> getHandlers(final Object o) {
if (o == null)
- return null;
+ return Collections.emptyList();
return loadTunables(o);
}
Modified:
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTunableInterceptorTest.java
===================================================================
---
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTunableInterceptorTest.java
2012-03-20 22:06:51 UTC (rev 28598)
+++
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTunableInterceptorTest.java
2012-03-20 23:23:42 UTC (rev 28599)
@@ -33,6 +33,7 @@
import java.lang.reflect.Method;
import javax.swing.JPanel;
+import java.util.List;
import static org.junit.Assert.*;
import org.junit.Before;
@@ -138,6 +139,12 @@
interceptor.getHandlers(o);
}
+ @Test
+ public final void testNullTaskObject() {
+ List l = interceptor.getHandlers(null);
+ assertTrue(l.isEmpty());
+ }
+
}
class FakeTunableHandler extends AbstractTunableHandler {
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
