ISIS-1477: add null checking in case there are no parameters in the D…

…TO (as appears to be the case for 0-arg commands).
apache · Aug 26, 2016 · 37684f7 · 37684f7
1 parent b8e6eb5
commit 37684f7
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/...ain/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java b/...ain/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
@@ -16,6 +16,7 @@
  */
 package org.apache.isis.core.runtime.services.background;
 
+import java.util.Collections;
 import java.util.List;
 
 import com.google.common.base.Function;
@@ -51,6 +52,7 @@
 import org.apache.isis.schema.cmd.v1.CommandDto;
 import org.apache.isis.schema.cmd.v1.MemberDto;
 import org.apache.isis.schema.cmd.v1.ParamDto;
+import org.apache.isis.schema.cmd.v1.ParamsDto;
 import org.apache.isis.schema.cmd.v1.PropertyDto;
 import org.apache.isis.schema.common.v1.InteractionType;
 import org.apache.isis.schema.common.v1.OidDto;
@@ -107,13 +109,6 @@ private void execute(
             final IsisTransactionManager transactionManager,
             final Command backgroundCommand) {
 
-
-        //
-        // TODO: need to generalize so that can invoke property modifications also.
-        //
-
-
-
         transactionManager.executeWithinTransaction(
                 backgroundCommand,
                 new TransactionalClosure() {
@@ -332,7 +327,7 @@ private ObjectAdapter argAdapterFor(final ActionInvocationMemento aim, int num)
     }
 
     private ObjectAdapter[] argAdaptersFor(final ActionDto actionDto) {
-        final List<ParamDto> params = actionDto.getParameters().getParameter();
+        final List<ParamDto> params = paramDtosFrom(actionDto);
         final List<ObjectAdapter> args = Lists.newArrayList(
                 Iterables.transform(params, new Function<ParamDto, ObjectAdapter>() {
                     @Override
@@ -345,6 +340,17 @@ public ObjectAdapter apply(final ParamDto paramDto) {
         return args.toArray(new ObjectAdapter[]{});
     }
 
+    private static List<ParamDto> paramDtosFrom(final ActionDto actionDto) {
+        final ParamsDto parameters = actionDto.getParameters();
+        if (parameters != null) {
+            final List<ParamDto> parameterList = parameters.getParameter();
+            if (parameterList != null) {
+                return parameterList;
+            }
+        }
+        return Collections.emptyList();
+    }
+
     // //////////////////////////////////////
 
     @javax.inject.Inject