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/01/01 17:05:17 UTC
[plc4x] branch next-gen-core updated (3838e0d -> af91066)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch next-gen-core
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 3838e0d - Made the RequestTransactionManager handle changes of the numberOfConcurrentRequests.
add 1c20067 PLC4X-164: Fix wrong NOT FOUND exception in OPC-UA driver
add 1e3b63f Merge pull request #112 from acs/PLC4X-164-OPCUA_Not_found
add b52443c Fix ADS tcp protocol fragmented and multiple messages
add e31a7b6 Fix bytebuf release
add c44f4d4 Merge pull request #103 from amrod-/develop
add 9653deb - Minor adjustements to get develop working again
new af91066 Merge branches 'develop' and 'next-gen-core' of https://gitbox.apache.org/repos/asf/plc4x into next-gen-core
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../opcua/connection/OpcuaTcpPlcConnection.java | 4 +-
.../java/ads/protocol/Ads2PayloadProtocol.java | 107 +++++++++++----------
.../java/ads/protocol/Payload2TcpProtocol.java | 30 +++---
.../java/ads/protocol/Payload2TcpProtocolTest.java | 20 ++++
4 files changed, 97 insertions(+), 64 deletions(-)
[plc4x] 01/01: Merge branches 'develop' and 'next-gen-core' of
https://gitbox.apache.org/repos/asf/plc4x into next-gen-core
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch next-gen-core
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit af91066f3cf77a763ca78bc4d7c0d4d844a186e2
Merge: 3838e0d 9653deb
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Jan 1 17:55:36 2020 +0100
Merge branches 'develop' and 'next-gen-core' of https://gitbox.apache.org/repos/asf/plc4x into next-gen-core
Conflicts:
build-utils/language-java/src/main/resources/templates/java/io-template.ftlh
build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java
build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java
plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
.../opcua/connection/OpcuaTcpPlcConnection.java | 4 +-
.../java/ads/protocol/Ads2PayloadProtocol.java | 107 +++++++++++----------
.../java/ads/protocol/Payload2TcpProtocol.java | 30 +++---
.../java/ads/protocol/Payload2TcpProtocolTest.java | 20 ++++
4 files changed, 97 insertions(+), 64 deletions(-)
diff --cc plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
index de67394,6fce8ea..ada500c
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
@@@ -396,15 -396,15 +396,15 @@@ public class OpcuaTcpPlcConnection exte
}
for (int counter = 0; counter < readValueIds.size(); counter++) {
PlcResponseCode resultCode = PlcResponseCode.OK;
- BaseDefaultFieldItem stringItem = null;
+ PlcValue stringItem = null;
- if (readValues == null || readValues.size() <= counter || readValues.get(counter).getStatusCode()
- != StatusCode.GOOD) {
+ if (readValues == null || readValues.size() <= counter ||
+ !readValues.get(counter).getStatusCode().equals(StatusCode.GOOD)) {
resultCode = PlcResponseCode.NOT_FOUND;
} else {
- stringItem = encodeFieldItem(readValues.get(counter));
+ stringItem = encodePlcValue(readValues.get(counter));
}
- Pair<PlcResponseCode, BaseDefaultFieldItem> newPair = new ImmutablePair<>(resultCode, stringItem);
+ Pair<PlcResponseCode, PlcValue> newPair = new ImmutablePair<>(resultCode, stringItem);
fields.put((String) readRequest.getFieldNames().toArray()[counter], newPair);