Commit c053b609 authored by chiaming2000's avatar chiaming2000
Browse files

Error handling improvement for simulator:

Fixed error status code assignment in the error response message such
that INVALID_REQUEST is set only if a finer grained error status code
was not already set.
parent 21aec45a
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -557,9 +557,15 @@ public class SimulatorEngine implements MessageService {
            commandBuilder.getHeaderBuilder().setMessageType(
                    MessageType.valueOf(number));

            if (commandBuilder.getStatusBuilder().hasCode() == false) {
                commandBuilder.getStatusBuilder().setCode(
                    StatusCode.INVALID_REQUEST);
            commandBuilder.getStatusBuilder().setStatusMessage(e.getMessage());
            }

            if (commandBuilder.getStatusBuilder().hasStatusMessage() == false) {
                commandBuilder.getStatusBuilder().setStatusMessage(
                        e.getMessage());
            }

            logger.log(Level.WARNING, e.getMessage(), e);
        } finally {