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 2014/07/15 10:27:01 UTC
[1/2] git commit: [KARAF-2878] The thread reading the system input
stream should exit automatically when the console bundle stops
Repository: karaf
Updated Branches:
refs/heads/karaf-2.3.x aa0c11748 -> b8e7cf2e4
[KARAF-2878] The thread reading the system input stream should exit automatically when the console bundle stops
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/99615115
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/99615115
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/99615115
Branch: refs/heads/karaf-2.3.x
Commit: 996151154affa932a450957b37c5e25813aa479c
Parents: aa0c117
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Jul 15 09:59:30 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Jul 15 10:23:04 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/shell/console/jline/Console.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/99615115/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
index 99f1b3b..527060e 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
@@ -464,6 +464,12 @@ public class Console implements Runnable
{
try
{
+ while (in.available() == 0) {
+ if (!running) {
+ return;
+ }
+ Thread.sleep(50);
+ }
int c = in.read();
if (c == -1)
{
[2/2] git commit: [KARAF-3117] The console welcome message is garbled
when the console is restarted
Posted by gn...@apache.org.
[KARAF-3117] The console welcome message is garbled when the console is restarted
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b8e7cf2e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b8e7cf2e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b8e7cf2e
Branch: refs/heads/karaf-2.3.x
Commit: b8e7cf2e4e3023ba95867e04d6b384049e6c9f66
Parents: 9961511
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Jul 15 10:01:07 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Jul 15 10:23:09 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/shell/console/jline/Console.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/b8e7cf2e/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
index 527060e..5c179b0 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
@@ -148,6 +148,7 @@ public class Console implements Runnable
if (!running) {
return;
}
+ out.println();
if (reader.getHistory() instanceof PersistentHistory) {
try {
((PersistentHistory) reader.getHistory()).flush();