COMMIT mode not returned when commitMode is true

[pajikos]

Key issues:

1. When commitMode is true, the function always skips the block that should return 'COMMIT'.
2. The function only considers the mode parameter when commitMode is true, which is counterintuitive.
3. As a result, setting commitMode to true never guarantees a 'COMMIT' return value as it should.

Proposed changes:

1. Restructure the function logic to prioritize the commitMode parameter.
2. Ensure that when commitMode is true, the function always returns 'COMMIT', regardless of the mode value.
3. Maintain the existing logic for handling different mode values when commitMode is false.