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/04/06 19:38:31 UTC
[plc4x] branch develop updated: - Some changes I missed.
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
The following commit(s) were added to refs/heads/develop by this push:
new 847710d - Some changes I missed.
847710d is described below
commit 847710dc4ae68fdab5f50812c35c6921dd001ab7
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Apr 6 21:38:24 2020 +0200
- Some changes I missed.
---
.../src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java | 2 +-
.../src/test/java/org/apache/plc4x/protocol/df1/EndToEndTest.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java
index 844f7d0..c9596d0 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java
@@ -56,7 +56,7 @@ public class RequirePcapNgCondition implements ExecutionCondition {
return ConditionEvaluationResult.disabled("Test disabled due to too old libpcap version. Please install at least version 1.1.0 to support all features.");
}
}
- } catch(Exception e) {
+ } catch(Throwable e) {
logger.info("Error detecting libpcap version.", e);
}
if(SystemUtils.IS_OS_WINDOWS) {
diff --git a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/EndToEndTest.java b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/EndToEndTest.java
index 55d1a52..55581ab 100644
--- a/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/EndToEndTest.java
+++ b/sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/EndToEndTest.java
@@ -21,7 +21,6 @@ package org.apache.plc4x.protocol.df1;
import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.junit.jupiter.api.Disabled;