You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jm...@apache.org on 2018/01/12 00:28:13 UTC
[incubator-plc4x] 01/10: see
https://www.ibm.com/developerworks/java/library/j-jtp05236/index.html?ca=drs-#2.1
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 4a2d2575127bd69617d62bc68f83c26b8e589254
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Fri Jan 12 10:39:02 2018 +1100
see https://www.ibm.com/developerworks/java/library/j-jtp05236/index.html?ca=drs-#2.1
---
.../java/org/apache/plc4x/java/api/messages/items/RequestItem.java | 1 +
.../java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/RequestItem.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/RequestItem.java
index 56d20df..d193f79 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/RequestItem.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/RequestItem.java
@@ -61,6 +61,7 @@ public abstract class RequestItem<DATA_TYPE, RESPONSE_ITEM extends ResponseItem>
responseSet.await();
}
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new CompletionException(e);
} finally {
lock.unlock();
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 7091281..477993f 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -146,7 +146,11 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader,
sessionSetupCompleteFuture.get();
} catch (UnknownHostException e) {
throw new PlcConnectionException("Unknown Host " + hostName, e);
- } catch (InterruptedException | ExecutionException e) {
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new PlcConnectionException(e);
+ }
+ catch (ExecutionException e) {
throw new PlcConnectionException(e);
}
}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.