Merged in PAYARA-1997 (pull request payara#80)

PAYARA-1997 NPE on asadmin list-batch-job-executions (payara#1899)
michaelranaldo · Sep 4, 2017 · 9b22996 · 9b22996
2 parents 02fc412 + 30eb9f8
commit 9b22996
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.../glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java b/.../glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java
@@ -131,7 +131,8 @@ public final void execute(AdminCommandContext context) {
             if (subReport.getExtraProperties() != null && subReport.getExtraProperties().size() > 0)
                 postInvoke(context, subReport);
             else {
-                if (subReport.getSubActionsReport() != null && subReport.getSubActionsReport().size() > 0) {
+                if (subReport.getSubActionsReport() != null && subReport.getSubActionsReport().size() > 0
+                        && subReport.getSubActionsReport().get(0).getExtraProperties() != null) {
                     postInvoke(context, subReport.getSubActionsReport().get(0));
                 } else {
                     actionReport.setMessage(subReport.getMessage());