You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2014/06/04 21:10:19 UTC
[1/4] git commit: KARAF-3021 - Keyboard still read after log:tail
cancelled
Repository: karaf
Updated Branches:
refs/heads/karaf-2.3.x 00e4d3433 -> 728cd0ee7
refs/heads/karaf-2.x f3a6a72cf -> 530924560
refs/heads/karaf-3.0.x b9cecabf4 -> 8c60f0e6a
refs/heads/master 5532278ab -> 8a3090b5c
KARAF-3021 - Keyboard still read after log:tail cancelled
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/53092456
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/53092456
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/53092456
Branch: refs/heads/karaf-2.x
Commit: 530924560890e70f87f86e4eb5bc786f5a608c63
Parents: f3a6a72
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Jun 4 16:23:42 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Jun 4 16:28:14 2014 -0230
----------------------------------------------------------------------
.../main/java/org/apache/karaf/shell/log/LogTail.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/53092456/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
----------------------------------------------------------------------
diff --git a/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java b/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
index 1f25ecd..173b0bd 100644
--- a/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
+++ b/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
@@ -36,8 +36,10 @@ public class LogTail extends DisplayLog {
protected Object doExecute() throws Exception {
PrintEventThread printThread = new PrintEventThread();
+ ReadKeyBoardThread readKeyboardThread = new ReadKeyBoardThread(this, Thread.currentThread());
executorService.execute(printThread);
- new Thread(new ReadKeyBoardThread(this, Thread.currentThread())).start();
+ executorService.execute(readKeyboardThread);
+
while (!Thread.currentThread().isInterrupted()) {
try {
Thread.sleep(200);
@@ -46,6 +48,7 @@ public class LogTail extends DisplayLog {
}
}
printThread.abort();
+ readKeyboardThread.abort();
executorService.shutdownNow();
return null;
}
@@ -53,12 +56,19 @@ public class LogTail extends DisplayLog {
class ReadKeyBoardThread implements Runnable {
private LogTail logTail;
private Thread sessionThread;
+ boolean readKeyboard = true;
+
public ReadKeyBoardThread(LogTail logtail, Thread thread) {
this.logTail = logtail;
this.sessionThread = thread;
}
+
+ public void abort() {
+ readKeyboard = false;
+ }
+
public void run() {
- for (;;) {
+ while (readKeyboard) {
try {
int c = this.logTail.session.getKeyboard().read();
if (c < 0) {
[4/4] git commit: KARAF-3021 - Keyboard still read after log:tail
cancelled
Posted by ja...@apache.org.
KARAF-3021 - Keyboard still read after log:tail cancelled
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8a3090b5
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8a3090b5
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8a3090b5
Branch: refs/heads/master
Commit: 8a3090b5cf2fa3a82b44e3f9681e8964504b146f
Parents: 5532278
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Jun 4 16:39:56 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Jun 4 16:39:56 2014 -0230
----------------------------------------------------------------------
.../main/java/org/apache/karaf/log/command/LogTail.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8a3090b5/log/src/main/java/org/apache/karaf/log/command/LogTail.java
----------------------------------------------------------------------
diff --git a/log/src/main/java/org/apache/karaf/log/command/LogTail.java b/log/src/main/java/org/apache/karaf/log/command/LogTail.java
index bf2801e..d433c48 100644
--- a/log/src/main/java/org/apache/karaf/log/command/LogTail.java
+++ b/log/src/main/java/org/apache/karaf/log/command/LogTail.java
@@ -46,8 +46,9 @@ public class LogTail extends DisplayLog {
@Override
public Object execute() throws Exception {
PrintEventThread printThread = new PrintEventThread();
+ ReadKeyBoardThread readKeyboardThread = new ReadKeyBoardThread(this, Thread.currentThread());
executorService.execute(printThread);
- new Thread(new ReadKeyBoardThread(this, Thread.currentThread())).start();
+ executorService.execute(readKeyboardThread);
while (!Thread.currentThread().isInterrupted()) {
try {
Thread.sleep(200);
@@ -56,6 +57,7 @@ public class LogTail extends DisplayLog {
}
}
printThread.abort();
+ readKeyboardThread.abort();
executorService.shutdownNow();
return null;
}
@@ -63,12 +65,18 @@ public class LogTail extends DisplayLog {
class ReadKeyBoardThread implements Runnable {
private LogTail logTail;
private Thread sessionThread;
+ boolean readKeyboard = true;
public ReadKeyBoardThread(LogTail logtail, Thread thread) {
this.logTail = logtail;
this.sessionThread = thread;
}
+
+ public void abort() {
+ readKeyboard = false;
+ }
+
public void run() {
- for (;;) {
+ while (readKeyboard) {
try {
int c = this.logTail.session.getKeyboard().read();
if (c < 0) {
[3/4] git commit: KARAF-3021 - Keyboard still read after log:tail
cancelled
Posted by ja...@apache.org.
KARAF-3021 - Keyboard still read after log:tail cancelled
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8c60f0e6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8c60f0e6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8c60f0e6
Branch: refs/heads/karaf-3.0.x
Commit: 8c60f0e6ad9fdeeb89fd26db2de4e032621ab9fa
Parents: b9cecab
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Jun 4 16:34:21 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Jun 4 16:34:21 2014 -0230
----------------------------------------------------------------------
.../java/org/apache/karaf/log/command/LogTail.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8c60f0e6/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java
----------------------------------------------------------------------
diff --git a/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java b/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java
index 93ae14a..25ccfd6 100644
--- a/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java
+++ b/log/command/src/main/java/org/apache/karaf/log/command/LogTail.java
@@ -31,8 +31,11 @@ public class LogTail extends DisplayLog {
protected Object doExecute() throws Exception {
PrintEventThread printThread = new PrintEventThread();
+ ReadKeyBoardThread readKeyboardThread = new ReadKeyBoardThread(this, Thread.currentThread());
+
executorService.execute(printThread);
- new Thread(new ReadKeyBoardThread(this, Thread.currentThread())).start();
+ executorService.execute(readKeyboardThread);
+
while (!Thread.currentThread().isInterrupted()) {
try {
Thread.sleep(200);
@@ -41,6 +44,7 @@ public class LogTail extends DisplayLog {
}
}
printThread.abort();
+ readKeyboardThread.abort();
executorService.shutdownNow();
return null;
}
@@ -48,12 +52,18 @@ public class LogTail extends DisplayLog {
class ReadKeyBoardThread implements Runnable {
private LogTail logTail;
private Thread sessionThread;
+ boolean readKeyboard = true;
public ReadKeyBoardThread(LogTail logtail, Thread thread) {
this.logTail = logtail;
this.sessionThread = thread;
}
+
+ public void abort() {
+ readKeyboard = false;
+ }
+
public void run() {
- for (;;) {
+ while (readKeyboard) {
try {
int c = this.logTail.session.getKeyboard().read();
if (c < 0) {
[2/4] git commit: KARAF-3021 - Keyboard still read after log:tail
cancelled
Posted by ja...@apache.org.
KARAF-3021 - Keyboard still read after log:tail cancelled
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/728cd0ee
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/728cd0ee
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/728cd0ee
Branch: refs/heads/karaf-2.3.x
Commit: 728cd0ee78319bdffbb5d40dd4ba3a3bb3a11c57
Parents: 00e4d34
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Jun 4 16:23:42 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Jun 4 16:28:51 2014 -0230
----------------------------------------------------------------------
.../main/java/org/apache/karaf/shell/log/LogTail.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/728cd0ee/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
----------------------------------------------------------------------
diff --git a/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java b/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
index 1f25ecd..173b0bd 100644
--- a/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
+++ b/shell/log/src/main/java/org/apache/karaf/shell/log/LogTail.java
@@ -36,8 +36,10 @@ public class LogTail extends DisplayLog {
protected Object doExecute() throws Exception {
PrintEventThread printThread = new PrintEventThread();
+ ReadKeyBoardThread readKeyboardThread = new ReadKeyBoardThread(this, Thread.currentThread());
executorService.execute(printThread);
- new Thread(new ReadKeyBoardThread(this, Thread.currentThread())).start();
+ executorService.execute(readKeyboardThread);
+
while (!Thread.currentThread().isInterrupted()) {
try {
Thread.sleep(200);
@@ -46,6 +48,7 @@ public class LogTail extends DisplayLog {
}
}
printThread.abort();
+ readKeyboardThread.abort();
executorService.shutdownNow();
return null;
}
@@ -53,12 +56,19 @@ public class LogTail extends DisplayLog {
class ReadKeyBoardThread implements Runnable {
private LogTail logTail;
private Thread sessionThread;
+ boolean readKeyboard = true;
+
public ReadKeyBoardThread(LogTail logtail, Thread thread) {
this.logTail = logtail;
this.sessionThread = thread;
}
+
+ public void abort() {
+ readKeyboard = false;
+ }
+
public void run() {
- for (;;) {
+ while (readKeyboard) {
try {
int c = this.logTail.session.getKeyboard().read();
if (c < 0) {