You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/12/10 15:11:29 UTC
[incubator-plc4x] branch develop updated: PLC4X-78 - Write
operations seem to fail - And another ... - Intentionally breaking the API
module to get faster results ...
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 4dcffa2 PLC4X-78 - Write operations seem to fail - And another ... - Intentionally breaking the API module to get faster results ...
4dcffa2 is described below
commit 4dcffa23550e86f28f1760b1354d064a8a48e31e
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Dec 10 16:11:11 2018 +0100
PLC4X-78 - Write operations seem to fail
- And another ...
- Intentionally breaking the API module to get faster results ...
---
.../api/src/main/java/org/apache/plc4x/java/PlcDriverManager.java | 8 ++++----
tools/jenkins/helper.groovy | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/PlcDriverManager.java b/plc4j/api/src/main/java/org/apache/plc4x/java/PlcDriverManager.java
index 1a433c7..46b9aea 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/PlcDriverManager.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/PlcDriverManager.java
@@ -39,10 +39,10 @@ public class PlcDriverManager {
this(Thread.currentThread().getContextClassLoader());
}
- public PlcDriverManager(ClassLoader classLoader) {
- this.classLoader = classLoader;
- driverMap = new HashMap<>();
- ServiceLoader<PlcDriver> plcDriverLoader = ServiceLoader.load(PlcDriver.class, classLoader);
+ public PlcDriverManager(ClassLoader classLoader)
+ this.classLoader = classLoader
+ driverMap = new HashMap<>()
+ ServiceLoader<PlcDriver> plcDriverLoader = ServiceLoader.load(PlcDriver.class, classLoader);
for (PlcDriver driver : plcDriverLoader) {
if (driverMap.containsKey(driver.getProtocolCode())) {
throw new IllegalStateException(
diff --git a/tools/jenkins/helper.groovy b/tools/jenkins/helper.groovy
index 2367a64..bd21e48 100644
--- a/tools/jenkins/helper.groovy
+++ b/tools/jenkins/helper.groovy
@@ -19,7 +19,7 @@
import groovy.text.StreamingTemplateEngine
-def renderEmail(emailTemplate, variables) {
+def renderEmail(String emailTemplate, Map variables) {
StreamingTemplateEngine engine = new StreamingTemplateEngine()
return engine.createTemplate(emailTemplate).make(variables).toString()
}