From 7d23e49cbe09e8d50801534b3d2ef8a06fe87692 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Tue, 19 Jan 2021 14:09:38 +0100
Subject: [PATCH] Fix duplicate variable declaration for two active protocols.
---
.../src/main/resources/receiveDefinition.mustache | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/ragconnect.base/src/main/resources/receiveDefinition.mustache b/ragconnect.base/src/main/resources/receiveDefinition.mustache
index 4f2aafe..96333bd 100644
--- a/ragconnect.base/src/main/resources/receiveDefinition.mustache
+++ b/ragconnect.base/src/main/resources/receiveDefinition.mustache
@@ -7,33 +7,32 @@ public boolean {{parentTypeName}}.{{connectMethod}}(String {{connectParameterNam
{{/loggingEnabledForReads}}
set{{tokenName}}({{lastResult}});
};
+ ConnectToken connectToken;
switch (scheme) {
{{#usesMqtt}}
case "mqtt":
- ConnectToken connectToken = {{mqttHandlerAttribute}}().newConnection(uri, consumer);
+ connectToken = {{mqttHandlerAttribute}}().newConnection(uri, consumer);
if (connectToken == null) {
return false;
}
- connectTokens.computeIfAbsent(this, astNode -> new java.util.HashMap<java.net.URI, ConnectToken>())
- .put(uri, connectToken);
break;
{{/usesMqtt}}
{{#usesRest}}
case "rest":
- ConnectToken connectToken = {{restHandlerAttribute}}().newPUTConnection(uri, input -> {
+ connectToken = {{restHandlerAttribute}}().newPUTConnection(uri, input -> {
consumer.accept(input.getBytes());
});
if (connectToken == null) {
return false;
}
- connectTokens.computeIfAbsent(this, astNode -> new java.util.HashMap<java.net.URI, ConnectToken>())
- .put(uri, connectToken);
break;
{{/usesRest}}
default:
System.err.println("Unknown protocol '" + scheme + "'.");
return false;
}
+ connectTokens.computeIfAbsent(this, astNode -> new java.util.HashMap<java.net.URI, ConnectToken>())
+ .put(uri, connectToken);
return true;
}
--
GitLab