RED-9472:
solving merge conflicts
This commit is contained in:
parent
1991cfb8e5
commit
a02e48c17a
@ -83,7 +83,7 @@ public class RulesController implements RulesResource {
|
|||||||
mergedRulesString = ((RulesUploadResponse) mergedRules.getBody()).getRules();
|
mergedRulesString = ((RulesUploadResponse) mergedRules.getBody()).getRules();
|
||||||
} catch (FeignException e) {
|
} catch (FeignException e) {
|
||||||
if (e.status() == HttpStatus.BAD_REQUEST.value()) {
|
if (e.status() == HttpStatus.BAD_REQUEST.value()) {
|
||||||
throw new BadRequestException("The provided rule string is not a valid drools rule file!");
|
throw new BadRequestException("The provided rule file is not a valid drools rule file!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user