| Displaying differences for changeset |
| @@ -212,34 +212,36 @@ |
| WQM5_input = this.createWQM5Request(); |
| } |
| - // Send this input to the WQM5 service... |
| - result = wqmService.getResult( this.WQM5Service, WQM5_input ); |
| + if ( ret_val == true ){ |
| + // Send this input to the WQM5 service... |
| + result = wqmService.getResult( this.WQM5Service, WQM5_input ); |
| - if ( null != result ){ |
| - // Got a return from WQM-05 |
| - //Store result |
| - if ( this.parseWQM5Result( result ) ){ |
| - //Call WQM-06 |
| - // NOTE: WQM-06 uses the same input as WQM-05...no need to change here. |
| - result = wqmService.getResult( this.WQM6Service, WQM5_input ); |
| + if ( null != result ){ |
| + // Got a return from WQM-05 |
| + //Store result |
| + if ( this.parseWQM5Result( result ) ){ |
| + //Call WQM-06 |
| + // NOTE: WQM-06 uses the same input as WQM-05...no need to change here. |
| + result = wqmService.getResult( this.WQM6Service, WQM5_input ); |
| - //Store result |
| - if ( this.parseWQM6Result( result, this.WQM_5.getFinalComponentMap())){ |
| - this.aoa_nslp = this.WQM_5.getAoaNSLP(); |
| - this.aoa_srp = this.WQM_6.getAoaSRP(); |
| - } |
| - else{ |
| - ret_val = false; |
| - } |
| - } |
| - else{ |
| - ret_val = false; |
| - } |
| - } |
| - else{ |
| - ret_val = false; |
| - this.error_msg += " " + wqmService.getErrorMsg(); |
| - } |
| + //Store result |
| + if ( this.parseWQM6Result( result, this.WQM_5.getFinalComponentMap())){ |
| + this.aoa_nslp = this.WQM_5.getAoaNSLP(); |
| + this.aoa_srp = this.WQM_6.getAoaSRP(); |
| + } |
| + else{ |
| + ret_val = false; |
| + } |
| + } |
| + else{ |
| + ret_val = false; |
| + } |
| + } |
| + else{ |
| + ret_val = false; |
| + this.error_msg += " " + wqmService.getErrorMsg(); |
| + } |
| + } |
| } // End try block |
| catch(JSONException ex){ |
| this.error_msg += " " + ex.getMessage(); |