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 2020/12/26 14:10:13 UTC
[plc4x] 02/04: - Fixed some empty-string escaping issues in the
java code generation
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/plc4x.git
commit 118f0e82322b575a84ebdb350439250131249e96
Author: cdutz <ch...@c-ware.de>
AuthorDate: Sat Dec 26 14:51:14 2020 +0100
- Fixed some empty-string escaping issues in the java code generation
---
.../java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java | 2 +-
.../codegenerator/language/mspec/parser/MessageFormatListener.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java b/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
index e2906ca..820bce2 100644
--- a/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
+++ b/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
@@ -577,7 +577,7 @@ public class JavaLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHe
}
// Get the class and method name
String methodName = ((StringLiteral) vl.getArgs().get(0)).getValue();
- // Cut off the double-quptes
+ // Cut off the double-quotes
methodName = methodName.substring(1, methodName.length() - 1);
sb.append(methodName).append("(");
for(int i = 1; i < vl.getArgs().size(); i++) {
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
index be06317..135fd4f 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
@@ -508,7 +508,7 @@ public class MessageFormatListener extends MSpecBaseListener {
}
private String unquoteString(String quotedString) {
- if (quotedString != null && quotedString.length() > 2) {
+ if (quotedString != null && quotedString.length() >= 2) {
return quotedString.substring(1, quotedString.length() - 1);
}
return quotedString;