[plc4x] branch rel/0.6 updated: PLC4X-158 Add Warning if Scraper is not used with Pooled Driver Manager.

[jf...@apache.org]

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

jfeinauer pushed a commit to branch rel/0.6
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/rel/0.6 by this push:
     new e583003  PLC4X-158 Add Warning if Scraper is not used with Pooled Driver Manager.
e583003 is described below

commit e583003ac7957001dec4174a3581a84750847742
Author: julian <j....@pragmaticminds.de>
AuthorDate: Wed Feb 5 16:25:57 2020 +0100

    PLC4X-158 Add Warning if Scraper is not used with Pooled Driver Manager.
---
 .../plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java     | 3 +++
 .../triggerhandler/collector/TriggerCollectorImpl.java                | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
index 7120369..d21a409 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
@@ -137,6 +137,9 @@ public class TriggeredScraperImpl implements Scraper, TriggeredScraperMBean {
     public TriggeredScraperImpl(ResultHandler resultHandler, PlcDriverManager plcDriverManager, List<ScrapeJob> jobs,TriggerCollector triggerCollector, long futureTimeOut, int poolSizeScheduler, int poolSizeExecutor) {
         this.resultHandler = resultHandler;
         Validate.notEmpty(jobs);
+        if (!(plcDriverManager instanceof PooledPlcDriverManager)) {
+            LOGGER.warn("The Triggered Scraper is intended to be used with a Pooled Connection. In other situations leaks could occur!");
+        }
         this.driverManager = plcDriverManager;
         this.jobs = jobs;
         this.triggerCollector = triggerCollector;
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
index a87cc73..b372331 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
@@ -25,6 +25,7 @@ import org.apache.plc4x.java.api.messages.PlcReadRequest;
 import org.apache.plc4x.java.api.messages.PlcReadResponse;
 import org.apache.plc4x.java.scraper.exception.ScraperException;
 import org.apache.plc4x.java.scraper.triggeredscraper.TriggeredScraperImpl;
+import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,6 +53,9 @@ public class TriggerCollectorImpl implements TriggerCollector {
     private final ExecutorService executorService;
 
     public TriggerCollectorImpl(PlcDriverManager plcDriverManager, long schedulerInterval, long futureTimeout, int poolSizeScheduler, int poolSizeExecutor) {
+        if (!(plcDriverManager instanceof PooledPlcDriverManager)) {
+            logger.warn("The Triggered Scraper is intended to be used with a Pooled Connection. In other situations leaks could occur!");
+        }
         this.plcDriverManager = plcDriverManager;
         this.currentRequestElements = new ConcurrentHashMap<>();
         this.schedulerInterval = schedulerInterval;