You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/10/19 16:26:05 UTC

svn commit: r1400115 - in /karaf/branches/karaf-2.3.x/shell: console/src/main/java/org/apache/karaf/shell/console/jline/Console.java osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java

Author: jbonofre
Date: Fri Oct 19 14:26:04 2012
New Revision: 1400115

URL: http://svn.apache.org/viewvc?rev=1400115&view=rev
Log:
[KARAF-1949] Fix shutdown command

Modified:
    karaf/branches/karaf-2.3.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
    karaf/branches/karaf-2.3.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java

Modified: karaf/branches/karaf-2.3.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java?rev=1400115&r1=1400114&r2=1400115&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java (original)
+++ karaf/branches/karaf-2.3.x/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java Fri Oct 19 14:26:04 2012
@@ -146,7 +146,6 @@ public class Console implements Runnable
                 // ignore
             }
         }
-        reader.shutdown();
         running = false;
         CommandSessionHolder.unset();
         pipe.interrupt();

Modified: karaf/branches/karaf-2.3.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java?rev=1400115&r1=1400114&r2=1400115&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java (original)
+++ karaf/branches/karaf-2.3.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java Fri Oct 19 14:26:04 2012
@@ -107,11 +107,10 @@ public class Shutdown extends OsgiComman
             public void run() {
                 try {
                     if (sleep > 0) {
-                        System.err.println("Shutdown in " + sleep/1000/60 + " minute(s).");
+                        System.err.println("Shutdown in " + sleep/1000/60 + " minute(s)");
                     }
                     Thread.sleep(sleep);
-                    Bundle bundle = getBundleContext().getBundle(0);
-                    bundle.stop();
+                    getBundleContext().getBundle(0).stop();
                 } catch (Exception e) {
                     log.error("Error when shutting down", e);
                 }