Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change how JLineShellComponent is access in Bootstrap class

Browse Source
This commit is contained in:
mpollack
2012-12-20 05:49:37 +08:00
parent 730e33d6ff
commit c22bad1e6a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/springframework/shell/Bootstrap.java
View File

@@ -39,7 +39,6 @@ import org.springframework.util.StopWatch;
public class Bootstrap {
private static Bootstrap bootstrap;
private JLineShellComponent shell;
private AnnotationConfigApplicationContext parentApplicationContext;
private static StopWatch sw = new StopWatch("Spring Shell");
private static CommandLine commandLine;
@@ -49,7 +48,7 @@ public class Bootstrap {
sw.start();
ExitShellRequest exitShellRequest;
try {
bootstrap = new Bootstrap(args);
bootstrap = new Bootstrap(args);
exitShellRequest = bootstrap.run();
} catch (RuntimeException t) {
throw t;
@@ -152,6 +151,8 @@ public class Bootstrap {
protected ExitShellRequest run() {
String[] commandsToExecuteAndThenQuit = commandLine.getShellCommandsToExecute();
// The shell is used
JLineShellComponent shell = parentApplicationContext.getBean("shell", JLineShellComponent.class);
ExitShellRequest exitShellRequest;
if (null != commandsToExecuteAndThenQuit) {
@@ -189,6 +190,6 @@ public class Bootstrap {
}
JLineShellComponent getJLineShellComponent() {
return shell;
return parentApplicationContext.getBean("shell", JLineShellComponent.class);
}
}