From 2697d938a157eb03171826f047743f39dc4b63e6 Mon Sep 17 00:00:00 2001
From: Eric Long <elong@jumpmind.com>
Date: Mon, 11 May 2020 12:25:34 -0400
Subject: [PATCH] 0004393: Regression NPE in Postgres bulk loader factory

---
 .../symmetric/ext/PostgresBulkDataLoaderFactory.java      | 2 +-
 .../jumpmind/symmetric/load/DefaultDataLoaderFactory.java | 8 ++++----
 .../symmetric/service/impl/DataLoaderService.java         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/PostgresBulkDataLoaderFactory.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/PostgresBulkDataLoaderFactory.java
index aba277c349..9e0594e1ec 100644
--- a/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/PostgresBulkDataLoaderFactory.java
+++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/PostgresBulkDataLoaderFactory.java
@@ -38,7 +38,7 @@
 public class PostgresBulkDataLoaderFactory extends DefaultDataLoaderFactory {
 
     public PostgresBulkDataLoaderFactory(ISymmetricEngine engine) {
-        super(engine.getParameterService());
+        super(engine);
     }
 
     public String getTypeName() {
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DefaultDataLoaderFactory.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DefaultDataLoaderFactory.java
index dca4043522..2ce747f2d3 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DefaultDataLoaderFactory.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DefaultDataLoaderFactory.java
@@ -48,7 +48,6 @@
 import org.jumpmind.symmetric.io.data.writer.KafkaWriter;
 import org.jumpmind.symmetric.io.data.writer.ResolvedData;
 import org.jumpmind.symmetric.io.data.writer.TransformWriter;
-import org.jumpmind.symmetric.service.IParameterService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,8 +60,9 @@ public class DefaultDataLoaderFactory extends AbstractDataLoaderFactory implemen
     public DefaultDataLoaderFactory() {
     }
 
-    public DefaultDataLoaderFactory(IParameterService parameterService) {
-        this.parameterService = parameterService;
+    public DefaultDataLoaderFactory(ISymmetricEngine engine) {
+        this.engine = engine;
+        this.parameterService = engine.getParameterService();
     }
 
     public String getTypeName() {
@@ -216,7 +216,7 @@ protected DatabaseWriterSettings buildDatabaseWriterSettings(List<IDatabaseWrite
     @Override
     public void setSymmetricEngine(ISymmetricEngine engine) {
         this.engine = engine;
+        this.parameterService = engine.getParameterService();
     }
     
-    
 }
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
index 5cb4effe08..9d7590f849 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
@@ -189,7 +189,7 @@ public DataLoaderService(ISymmetricEngine engine) {
         this.stagingManager = engine.getStagingManager();
         this.setSqlMap(new DataLoaderServiceSqlMap(platform, createSqlReplacementTokens()));
         extensionService = engine.getExtensionService();
-        extensionService.addExtensionPoint(new DefaultDataLoaderFactory(parameterService));
+        extensionService.addExtensionPoint(new DefaultDataLoaderFactory(engine));
         extensionService.addExtensionPoint(new ConfigurationChangedDatabaseWriterFilter(engine));
         this.nodeCommunicationService = engine.getNodeCommunicationService();
         this.engine = engine;