You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/09/01 08:00:07 UTC
karaf git commit: [KARAF-5317] UnsupportedOperationException in
thread "SIGWINCH handler"
Repository: karaf
Updated Branches:
refs/heads/master 447f36e29 -> cf6671014
[KARAF-5317] UnsupportedOperationException in thread "SIGWINCH handler"
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cf667101
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cf667101
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cf667101
Branch: refs/heads/master
Commit: cf66710143026a383849b985040600e5b5cafc8f
Parents: 447f36e
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Sep 1 10:00:01 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Sep 1 10:00:01 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/shell/impl/console/JLineTerminal.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/cf667101/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
index 652efa0..ef6fba2 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.EnumSet;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -184,6 +185,8 @@ public class JLineTerminal implements Terminal, org.jline.terminal.Terminal {
@Override
public SignalHandler handle(Signal signal, SignalHandler handler) {
+ Objects.requireNonNull(signal);
+ Objects.requireNonNull(handler);
return handlers.put(signal, handler);
}
@@ -280,7 +283,7 @@ public class JLineTerminal implements Terminal, org.jline.terminal.Terminal {
protected void handle(Signal signal) {
SignalHandler handler = handlers.get(signal);
- if (handler != null) {
+ if (handler != SignalHandler.SIG_DFL && handler != SignalHandler.SIG_IGN) {
try {
handler.handle(signal);
} catch (UnsupportedOperationException uoe) {