Fix merge conflicts with origin/master

siddhi-io · Jul 6, 2020 · 53f0155 · 53f0155
1 parent ca6886d
commit 53f0155
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/component/src/main/java/io/siddhi/extension/map/csv/sourcemapper/CSVSourceMapper.java b/component/src/main/java/io/siddhi/extension/map/csv/sourcemapper/CSVSourceMapper.java
@@ -210,7 +210,9 @@ public Class[] getSupportedInputEventClasses() {
      * @throws InterruptedException if it does not throw the exception immediately due to streaming
      */
     @Override
-    protected void mapAndProcess(Object eventObject, InputEventHandler inputEventHandler) throws InterruptedException {
+    protected void mapAndProcess(Object eventObject, InputEventHandler inputEventHandler)
+            throws InterruptedException, MappingFailedException {
+        List<ErroneousEvent> failedEvents = new ArrayList<>(0);
         Event[] result = new io.siddhi.core.event.Event[0];
         try {
             if (eventObject == null) {
@@ -225,7 +227,7 @@ protected void mapAndProcess(Object eventObject, InputEventHandler inputEventHan
                         + eventObject.getClass().getCanonicalName());
             } else {
                 if (pointer != 0) {
-                    result = convertToEvents(eventObject);
+                    result = convertToEvents(eventObject, failedEvents);
                 }
                 pointer++;
             }