[camel] branch master updated: Revert DataSetEndpoint changes which cause NPE in tests

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new fad6cd6  Revert DataSetEndpoint changes which cause NPE in tests
fad6cd6 is described below

commit fad6cd6e33b28059e539fb6ea3be85b48e5de124
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu May 28 15:54:48 2020 +0200

    Revert DataSetEndpoint changes which cause NPE in tests
---
 .../java/org/apache/camel/component/dataset/DataSetConsumer.java  | 8 ++++----
 .../java/org/apache/camel/component/dataset/DataSetEndpoint.java  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
 
b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
index ca5aa1e..43fbb4b 100644
--- 
a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
+++ 
b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
@@ -44,16 +44,16 @@ public class DataSetConsumer extends DefaultConsumer {
     @Override
     protected void doInit() throws Exception {
         super.doInit();
-
-        if (reporter == null) {
-            reporter = createReporter();
-        }
     }
 
     @Override
     protected void doStart() throws Exception {
         super.doStart();
 
+        if (reporter == null) {
+            reporter = createReporter();
+        }
+
         final DataSet dataSet = endpoint.getDataSet();
         final long preloadSize = endpoint.getPreloadSize();
 
diff --git 
a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
 
b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
index 574ebc7..fc6188e 100644
--- 
a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
+++ 
b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
@@ -291,8 +291,8 @@ public class DataSetEndpoint extends MockEndpoint 
implements Service {
     }
 
     @Override
-    protected void doInit() {
-        super.doInit();
+    protected void doStart() throws Exception {
+        super.doStart();
 
         if (reporter == null) {
             reporter = createReporter();