You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ld...@apache.org on 2020/04/20 11:14:31 UTC
[plc4x] branch rel/0.6 updated: PLC4X-194 Make sure that array
indexes are at least one digit long.
This is an automated email from the ASF dual-hosted git repository.
ldywicki 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 8702ba0 PLC4X-194 Make sure that array indexes are at least one digit long.
8702ba0 is described below
commit 8702ba04360e813d4279849701578043090b1d92
Author: Łukasz Dywicki <lu...@code-house.org>
AuthorDate: Mon Apr 20 13:06:22 2020 +0200
PLC4X-194 Make sure that array indexes are at least one digit long.
---
.../src/main/java/org/apache/plc4x/java/ads/model/DirectAdsField.java | 2 +-
.../src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsField.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/DirectAdsField.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/DirectAdsField.java
index 27bc45f..dc29a24 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/DirectAdsField.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/DirectAdsField.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
*/
public class DirectAdsField implements AdsField {
- private static final Pattern RESOURCE_ADDRESS_PATTERN = Pattern.compile("^((0[xX](?<indexGroupHex>[0-9a-fA-F]+))|(?<indexGroup>\\d+))/((0[xX](?<indexOffsetHex>[0-9a-fA-F]+))|(?<indexOffset>\\d+)):(?<adsDataType>\\w+)(\\[(?<numberOfElements>\\d)])?");
+ private static final Pattern RESOURCE_ADDRESS_PATTERN = Pattern.compile("^((0[xX](?<indexGroupHex>[0-9a-fA-F]+))|(?<indexGroup>\\d+))/((0[xX](?<indexOffsetHex>[0-9a-fA-F]+))|(?<indexOffset>\\d+)):(?<adsDataType>\\w+)(\\[(?<numberOfElements>\\d+)])?");
private final long indexGroup;
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsField.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsField.java
index 52f9720..528ff9e 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsField.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/SymbolicAdsField.java
@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
*/
public class SymbolicAdsField implements AdsField {
- private static final Pattern SYMBOLIC_ADDRESS_PATTERN = Pattern.compile("^(?<symbolicAddress>.+):(?<adsDataType>\\w+)(\\[(?<numberOfElements>\\d)])?");
+ private static final Pattern SYMBOLIC_ADDRESS_PATTERN = Pattern.compile("^(?<symbolicAddress>.+):(?<adsDataType>\\w+)(\\[(?<numberOfElements>\\d+)])?");
private final String symbolicAddress;