Author: iocanel
Date: Tue Sep 27 13:04:39 2011
New Revision: 1176368
URL: http://svn.apache.org/viewvc?rev=1176368&view=rev
Log:
Merging changes from trunk: [KARAF-900] Shutdown command now uses the system
property karaf.name to display instance name. Also its now visible what the
user is typing on the confirmation prompt.
Modified:
karaf/branches/karaf-2.2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java
Modified:
karaf/branches/karaf-2.2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java?rev=1176368&r1=1176367&r2=1176368&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java
(original)
+++
karaf/branches/karaf-2.2.x/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Shutdown.java
Tue Sep 27 13:04:39 2011
@@ -79,11 +79,8 @@ public class Shutdown extends OsgiComman
for (; ; ) {
StringBuffer sb = new StringBuffer();
String karafName = System.getProperty("karaf.name");
-<<<<<<< HEAD
System.err.println(String.format("Confirm: shutdown instance %s
(yes/no): ", karafName));
-=======
- System.err.println(String.format("Confirm: shutdown instance %s
(yes/no): ",karafName));
->>>>>>> 5ae4e9a... [KARAF-900] Shutdown command now uses the system property
karaf.name to display instance name. Also its now visible what the user is
typing on the confirmation prompt.
+
System.err.flush();
for (; ; ) {
int c = session.getKeyboard().read();
