Author: reto
Date: Sat Aug 11 10:27:52 2012
New Revision: 1371904
URL: http://svn.apache.org/viewvc?rev=1371904&view=rev
Log:
CLEREZZA-619: only creating console shell when console is in fact available
(makes -NCS argument obsolete in many circumstances)
Modified:
incubator/clerezza/trunk/shell/src/main/scala/org/apache/clerezza/shell/ConsoleShell.scala
Modified:
incubator/clerezza/trunk/shell/src/main/scala/org/apache/clerezza/shell/ConsoleShell.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/shell/src/main/scala/org/apache/clerezza/shell/ConsoleShell.scala?rev=1371904&r1=1371903&r2=1371904&view=diff
==============================================================================
---
incubator/clerezza/trunk/shell/src/main/scala/org/apache/clerezza/shell/ConsoleShell.scala
(original)
+++
incubator/clerezza/trunk/shell/src/main/scala/org/apache/clerezza/shell/ConsoleShell.scala
Sat Aug 11 10:27:52 2012
@@ -45,7 +45,8 @@ class ConsoleShell() {
def activate(componentContext: ComponentContext)= {
bundleContext = componentContext.getBundleContext
- if ("true" !=
bundleContext.getProperty("clerezza.shell.disable")) {
+ if (("true" !=
bundleContext.getProperty("clerezza.shell.disable")) &&
+ (System.console != null)) {
for (bundle <- bundleContext.getBundles;
if (bundle.getSymbolicName ==
"org.apache.felix.shell.tui");
if (bundle.getState == Bundle.ACTIVE)) {
