Author: tjwatson
Date: Tue Feb 5 15:55:10 2019
New Revision: 1853016
URL: http://svn.apache.org/viewvc?rev=1853016&view=rev
Log:
FELIX-6046 - fix gogo shell thread interrupt.
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java?rev=1853016&r1=1853015&r2=1853016&view=diff
==============================================================================
---
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
(original)
+++
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
Tue Feb 5 15:55:10 2019
@@ -185,6 +185,8 @@ public class Activator implements Bundle
private final BundleContext context;
private final CommandProcessor processor;
private volatile CommandSession session;
+ private volatile Thread shellThread;
+
public StartShellJob(BundleContext context, CommandProcessor processor)
{
@@ -195,6 +197,7 @@ public class Activator implements Bundle
public void run()
{
+ shellThread = Thread.currentThread();
session = processor.createSession(new
FileInputStream(FileDescriptor.in),
new
FileOutputStream(FileDescriptor.out),
new
FileOutputStream(FileDescriptor.err));
@@ -239,7 +242,9 @@ public class Activator implements Bundle
session.close();
session = null;
}
- Thread.currentThread().interrupt();
+ if (shellThread != null) {
+ shellThread.interrupt();
+ }
}
}
}
\ No newline at end of file
