Fix Bug TDI-30041 : Change the order of if expression
https://jira.talendforge.org/browse/TDI-30041