Delegate exception during notifyListener()

And fix a screw-up of mine for row push.

Signed-off-by: Squareys <squareys@googlemail.com>

Author: Squareys

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

@@ -10,6 +10,7 @@ public interface MultiOutputListener {
 
     /**
      * Notify this listener that a new output row has been pushed.
+     * @throws Exception
      */
-    public void notifyListener();
+    public void notifyListener() throws Exception;
 }

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

@@ -28,9 +28,13 @@ public class SciJavaTestCommand implements Command {
 
     @Override
     public void run() {
-        for (int i = 0; i < fromInt; i++) {
-            outInt = i;
-            rowOutput.notifyListener();
+        try {
+            for (int i = 0; i < fromInt; i++) {
+                outInt = i;
+                rowOutput.notifyListener();
+            }
+        } catch (final Exception e) {
+            throw new RuntimeException(e);
         }
     }
 }

org.knime.scijava.commands/src/org/knime/scijava/commands/module/DefaultNodeModule.java

@@ -172,26 +172,21 @@ public NodeModuleOutputChangedListener(final boolean manualPush) {
         }
 
         @Override
-        public void notifyListener() {
-            try {
-                // output can be null if sink node
-                if (output != null) {
-                    final List<DataCell> cells = new ArrayList<DataCell>();
-
-                    final ModuleItem<?> result = module.getInfo()
-                            .getOutput("result");
-                    if (result != null) {
-                        // FIXME hack because e.g. python script contains
-                        // result log
+        public void notifyListener() throws Exception {
+            // output can be null if sink node
+            if (output != null) {
+                final List<DataCell> cells = new ArrayList<DataCell>();
+                for (final ModuleItem<?> entry : module.getInfo().outputs()) {
+                    // FIXME hack because e.g. python script contains
+                    // result log
+                    if (!entry.getName().equals("result")) {
                         cells.add(cs.convertToKnime(
-                                module.getOutput(result.getName()),
-                                result.getType(), outputMapping.get(result),
+                                module.getOutput(entry.getName()),
+                                entry.getType(), outputMapping.get(entry),
                                 ctx));
                     }
-                    output.push(cells.toArray(new DataCell[cells.size()]));
                 }
-            } catch (final Exception e) {
-                logService.error("Unable to push output row.", e);
+                output.push(cells.toArray(new DataCell[cells.size()]));
             }
         }
 
@@ -218,8 +213,9 @@ public void setCellOutput(final CellOutput output) {
         /**
          * Final flush. Will push a row in case module does not handle pushing
          * output rows.
+         * @throws Exception
          */
-        public void flush() {
+        public void flush() throws Exception {
             if (!manualPush) {
                 notifyListener();
             }