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 2011/05/09 10:58:03 UTC
svn commit: r1100923 -
/karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java
Author: jbonofre
Date: Mon May 9 08:58:02 2011
New Revision: 1100923
URL: http://svn.apache.org/viewvc?rev=1100923&view=rev
Log:
[KARAF-537] admin.bat prints stack trace to standard output.
Modified:
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java
Modified: karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java?rev=1100923&r1=1100922&r2=1100923&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java (original)
+++ karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java Mon May 9 08:58:02 2011
@@ -63,10 +63,10 @@ public class Execute {
listCommands();
exit(0);
}
-
- Class<?> cls = COMMANDS.get(args[0]);
+ String commandName = args[0];
+ Class<?> cls = COMMANDS.get(commandName);
if (cls == null) {
- System.err.println("Command not found: " + args[0]);
+ System.err.println("Command not found: " + commandName);
exit(-1);
}
@@ -81,9 +81,16 @@ public class Execute {
Object command = cls.newInstance();
if (command instanceof AdminCommandSupport) {
- execute((AdminCommandSupport) command, storageFile, args);
+ try {
+ execute((AdminCommandSupport) command, storageFile, args);
+ } catch (Exception e) {
+ System.err.println("Error execution command '" + commandName + "': " + e.getMessage());
+ if (System.getProperty("karaf.showStackTrace") != null) {
+ throw e;
+ }
+ }
} else {
- System.err.println("Not an admin command: " + args[0]);
+ System.err.println("Not an admin command: " + commandName);
exit(-1);
}
}