MIFOSX-329 updated

add Both Integer and Double condition to adapt different Gson version.