You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2017/01/18 10:14:42 UTC

svn commit: r1779308 - /felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/BaseConverters.java

Author: gnodet
Date: Wed Jan 18 10:14:42 2017
New Revision: 1779308

URL: http://svn.apache.org/viewvc?rev=1779308&view=rev
Log:
[FELIX-5463] [gogo][jline] Fix possible NPE in converter

Modified:
    felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/BaseConverters.java

Modified: felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/BaseConverters.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/BaseConverters.java?rev=1779308&r1=1779307&r2=1779308&view=diff
==============================================================================
--- felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/BaseConverters.java (original)
+++ felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/BaseConverters.java Wed Jan 18 10:14:42 2017
@@ -29,6 +29,7 @@ import java.lang.reflect.InvocationHandl
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
+import java.util.Collections;
 
 public class BaseConverters implements Converter {
 
@@ -63,7 +64,8 @@ public class BaseConverters implements C
                                         .bindTo(proxy)
                                         .invokeWithArguments(args);
                             } else {
-                                return command.execute(null, Arrays.asList(args));
+                                return command.execute(null,
+                                        args != null ? Arrays.asList(args) : Collections.emptyList());
                             }
                         }
                     });