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 09:45:45 UTC
[1/2] karaf git commit: [KARAF-5317] UnsupportedOperationException in
thread "SIGWINCH handler"
Repository: karaf
Updated Branches:
refs/heads/karaf-4.1.x 55b7830b0 -> 26418a67d
[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/1644d435
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1644d435
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1644d435
Branch: refs/heads/karaf-4.1.x
Commit: 1644d435f70bda6be889af0c7ebfebef9b0698ed
Parents: 55b7830
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 11:27:10 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/1644d435/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) {
[2/2] karaf git commit: [KARAF-5320] Karaf Command Arguments escapes
backslash characters
Posted by gn...@apache.org.
[KARAF-5320] Karaf Command Arguments escapes backslash characters
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/26418a67
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/26418a67
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/26418a67
Branch: refs/heads/karaf-4.1.x
Commit: 26418a67d3a6d529bd5ebd95f7f60a308f44ffd2
Parents: 1644d43
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Sep 1 10:53:10 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Sep 1 11:30:19 2017 +0200
----------------------------------------------------------------------
.../karaf/shell/impl/console/ConsoleSessionImpl.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/26418a67/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
index 6ab8ea8..1253967 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
@@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.felix.gogo.jline.ParsedLineImpl;
import org.apache.felix.gogo.jline.Shell;
import org.apache.felix.gogo.runtime.CommandSessionImpl;
import org.apache.felix.service.command.CommandProcessor;
@@ -341,10 +342,16 @@ public class ConsoleSessionImpl implements Session {
String scriptFileName = System.getProperty(SHELL_INIT_SCRIPT);
executeScript(scriptFileName);
while (running) {
- String command = null;
+ CharSequence command = null;
reading.set(true);
try {
- command = reader.readLine(getPrompt(), getRPrompt(), null, null);
+ reader.readLine(getPrompt(), getRPrompt(), null, null);
+ ParsedLine pl = reader.getParsedLine();
+ if (pl instanceof ParsedLineImpl) {
+ command = ((ParsedLineImpl) pl).program();
+ } else {
+ command = pl.line();
+ }
} catch (EndOfFileException e) {
break;
} catch (UserInterruptException e) {