Skip to content

Fix for AESH-391 #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2016
Merged

Fix for AESH-391 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/org/jboss/aesh/console/command/container/CommandContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/
package org.jboss.aesh.console.command.container;

import org.jboss.aesh.cl.CommandLine;
import org.jboss.aesh.cl.parser.CommandLineParserException;
import org.jboss.aesh.cl.parser.CommandLineParser;
import org.jboss.aesh.cl.validator.CommandValidatorException;
Expand Down Expand Up @@ -68,4 +69,9 @@ CommandContainerResult executeCommand(AeshLine line, InvocationProviders invocat
CommandInvocation commandInvocation)
throws CommandLineParserException, OptionValidatorException,
CommandValidatorException, CommandException, InterruptedException;

CommandContainerResult executeCommand(CommandLine commandLine, InvocationProviders invocationProviders,
AeshContext aeshContext,
CommandInvocation commandInvocation)
throws CommandLineParserException, OptionValidatorException, CommandValidatorException, CommandException, InterruptedException;
}
14 changes: 12 additions & 2 deletions src/main/java/org/jboss/aesh/console/command/container/DefaultCommandContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,20 @@ public CommandContainerResult executeCommand(AeshLine line, InvocationProviders
throws CommandLineParserException, OptionValidatorException, CommandValidatorException, CommandException, InterruptedException {

CommandLine commandLine = getParser().parse(line, false);
return executeCommand(commandLine, invocationProviders, aeshContext, commandInvocation);
}

@Override
public CommandContainerResult executeCommand(CommandLine commandLine, InvocationProviders invocationProviders,
AeshContext aeshContext,
CommandInvocation commandInvocation)
throws CommandLineParserException, OptionValidatorException, CommandValidatorException, CommandException, InterruptedException {

commandLine.getParser().getCommandPopulator().populateObject(commandLine, invocationProviders, aeshContext, true);
if(commandLine.getParser().getProcessedCommand().getValidator() != null &&
!commandLine.hasOptionWithOverrideRequired())
if (commandLine.getParser().getProcessedCommand().getValidator() != null
&& !commandLine.hasOptionWithOverrideRequired()) {
commandLine.getParser().getProcessedCommand().getValidator().validate(commandLine.getParser().getCommand());
}

CommandResult result = commandLine.getParser().getCommand().execute(commandInvocation);

Expand Down