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 11:36:53 UTC

[plc4x] 02/04: - Fixed an issue not correctly detecting the absence of libpcap (UnsattisfiedLinkError is not an Exception, but an Error ... throwable is the common denominator)

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 eb726f609e1eb0dd8943d0ece39c00ca5cbf3e89
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Apr 6 10:46:45 2020 +0200

    - Fixed an issue not correctly detecting the absence of libpcap (UnsattisfiedLinkError is not an Exception, but an Error ... throwable is the common denominator)
---
 .../src/main/java/org/apache/plc4x/test/RequirePcapCondition.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java
index e76606f..990bf61 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java
@@ -44,11 +44,11 @@ public class RequirePcapCondition implements ExecutionCondition {
                 String versionString = matcher.group("version");
                 return ConditionEvaluationResult.enabled("Found libpcap version " + versionString);
             }
-        } catch(Exception e) {
+        } catch(Throwable e) {
             logger.info("Error detecting libpcap version.", e);
         }
         if(SystemUtils.IS_OS_WINDOWS) {
-            return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid WinPcap version. Please install from here: https://sourceforge.net/projects/winpcap413-176/ as this version supports all needed freatures.");
+            return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid WinPcap version. Please install from here: https://sourceforge.net/projects/winpcap413-176/ as this version supports all needed features.");
         } else {
             return ConditionEvaluationResult.disabled("Test disabled due to missing or invalid libpcap version. Please install at least version 1.1.0 to support all features.");
         }