Code clean up in JSONMessageHandler classes

Author: robertlazarski

modules/json/src/org/apache/axis2/json/gson/JSONMessageHandler.java

@@ -75,8 +75,7 @@ public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
             } else {
                 log.debug("JSON MessageReceiver found, proceeding with the JSON request");
                 Object tempObj = msgContext.getProperty(JsonConstant.IS_JSON_STREAM);
-                if (tempObj != null) {
-                    boolean isJSON = Boolean.valueOf(tempObj.toString());
+                if (tempObj != null && Boolean.valueOf(tempObj.toString()) {
                     Object o = msgContext.getProperty(JsonConstant.GSON_XML_STREAM_READER);
                     if (o != null) {
                         GsonXMLStreamReader gsonXMLStreamReader = (GsonXMLStreamReader) o;

modules/json/src/org/apache/axis2/json/moshi/JSONMessageHandler.java

@@ -76,7 +76,6 @@ public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
                 log.debug("JSON MessageReceiver found, proceeding with the JSON request");
                 Object tempObj = msgContext.getProperty(JsonConstant.IS_JSON_STREAM);
                 if (tempObj != null) {
-                    boolean isJSON = Boolean.valueOf(tempObj.toString());
                     Object o = msgContext.getProperty(JsonConstant.MOSHI_XML_STREAM_READER);
                     if (o != null) {
                         MoshiXMLStreamReader moshiXMLStreamReader = (MoshiXMLStreamReader) o;
@@ -100,8 +99,7 @@ public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
                 log.debug("On enableJSONOnly=true Axis operation is null on JSON request, message hasn't been dispatched to an operation, proceeding on JSON message name discovery and AxisOperation mapping");
                 try{
                     Object tempObj = msgContext.getProperty(JsonConstant.IS_JSON_STREAM);
-                    if (tempObj != null) {
-                        boolean isJSON = Boolean.valueOf(tempObj.toString());
+                    if (tempObj != null && Boolean.valueOf(tempObj.toString()) {
                         Object o = msgContext.getProperty(JsonConstant.MOSHI_XML_STREAM_READER);
                         if (o != null) {
                             MoshiXMLStreamReader moshiXMLStreamReader = (MoshiXMLStreamReader) o;