Project

General

Profile

« Previous | Next » 

Revision c7f13f26

Added by Andreas Müller almost 2 years ago

handle errors not as json for commands with expected json result

View differences:

src/main/java/eu/etaxonomy/drush/DrushExecuter.java
193 193 
            String out, error;
194 194 
            if(cmd.jsonResult) {
195 195 
                out = readExecutionResponse(matches, process.getInputStream());
196 
                error = readExecutionResponse(matches, process.getErrorStream());
196 
                //Note AM: this originally also called the json version (with no 3rd param), but do we expect the error response to be json, too?
197 
                error = readExecutionResponse(matches, process.getErrorStream(), null);
197 198 
            } else {
198 199 
                out = readExecutionResponse(matches, process.getInputStream(), cmd.outRegex);
199 200 
                error = readExecutionResponse(matches, process.getErrorStream(), cmd.errRegex);

Also available in: Unified diff