Merge pull request AuthorizeNet#104 from sunnyrajrathod/master

Sunny Raj Rathod · web-flow · commit 32e5b6be9a87 · 2016-10-04T12:08:29.000+05:30
Fix for multithreading issue
diff --git a/src/main/java/net/authorize/util/Constants.java b/src/main/java/net/authorize/util/Constants.java
@@ -33,5 +33,5 @@ public final class Constants {
 	public static final String HTTP_READ_TIME_OUT = "http.ReadTimeout";
 	public static final int HTTP_READ_TIME_OUT_DEFAULT_VALUE = 30000;
 	
-	public static final String CLIENT_ID = "sdk-java-1.9.0";
+	public static final String CLIENT_ID = "sdk-java-1.9.1";
 }
diff --git a/src/main/java/net/authorize/util/XmlUtility.java b/src/main/java/net/authorize/util/XmlUtility.java
@@ -34,7 +34,7 @@ public final class XmlUtility {
     */
 	private XmlUtility() {
 	}
-	
+
 	/**
 	 * Helper method to serialize an object to XML. Requires object to be Serializable
 	 * @param entity Object to serialize
@@ -49,7 +49,6 @@ public static synchronized <T extends Serializable> String getXml(T entity) thro
 
         if ( null != entity)
 		{
-    	
         	if(!jaxbContext.containsKey(entity.getClass().toString()))
         	{
         		request_ctx = JAXBContext.newInstance(entity.getClass());
@@ -59,11 +58,14 @@ public static synchronized <T extends Serializable> String getXml(T entity) thro
         	{
         		request_ctx = jaxbContext.get(entity.getClass().toString());
         	}
-        			
-	        Marshaller m = request_ctx.createMarshaller();
-	        m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
 	
-	        m.marshal(entity, sw);
+        	if(request_ctx != null)
+        	{
+    	        Marshaller m = request_ctx.createMarshaller();
+    	        m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+    	
+    	        m.marshal(entity, sw);
+        	}
 		}
         sw.flush();
         sw.close();
@@ -95,29 +97,32 @@ public static synchronized <T extends Serializable> T create(String xml, Class<T
         	{
         		response_ctx = jaxbContext.get(classType.toString());
         	}
-			
-	        Unmarshaller um = response_ctx.createUnmarshaller();
-	        try {
-		        Object unmarshaled = um.unmarshal(new StringReader(xml));
-		        if ( null != unmarshaled)
-		        {
-		        	try {
-		        		entity = classType.cast(unmarshaled);
-		        	} catch (ClassCastException cce) {
-		        		if (unmarshaled instanceof JAXBElement) {
-		        			@SuppressWarnings("rawtypes")
-							JAXBElement element = (JAXBElement) unmarshaled;
-		        			if ( null != element.getValue() && element.getValue().getClass()==classType) {
-		        				entity = (T) element.getValue();
-		        			}
-		        		}
-		        	}
-		        }
-	        } catch (JAXBException jaxbe) {
-	        	LogHelper.info(logger, "Exception - while deserializing text:'%s' ", xml);
-	        	LogHelper.warn(logger, "Exception Details-> Code:'%s', Message:'%s'", jaxbe.getErrorCode(), jaxbe.getMessage());
-	        	throw jaxbe;
-	        }
+        	
+        	if(response_ctx != null)
+        	{
+    	        Unmarshaller um = response_ctx.createUnmarshaller();
+    	        try {
+    		        Object unmarshaled = um.unmarshal(new StringReader(xml));
+    		        if ( null != unmarshaled)
+    		        {
+    		        	try {
+    		        		entity = classType.cast(unmarshaled);
+    		        	} catch (ClassCastException cce) {
+    		        		if (unmarshaled instanceof JAXBElement) {
+    		        			@SuppressWarnings("rawtypes")
+    							JAXBElement element = (JAXBElement) unmarshaled;
+    		        			if ( null != element.getValue() && element.getValue().getClass()==classType) {
+    		        				entity = (T) element.getValue();
+    		        			}
+    		        		}
+    		        	}
+    		        }
+    	        } catch (JAXBException jaxbe) {
+    	        	LogHelper.info(logger, "Exception - while deserializing text:'%s' ", xml);
+    	        	LogHelper.warn(logger, "Exception Details-> Code:'%s', Message:'%s'", jaxbe.getErrorCode(), jaxbe.getMessage());
+    	        	throw jaxbe;
+    	        }
+        	}
 		}
 
         return entity;

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ public final class Constants {`
`33`	`33`	`public static final String HTTP_READ_TIME_OUT = "http.ReadTimeout";`
`34`	`34`	`public static final int HTTP_READ_TIME_OUT_DEFAULT_VALUE = 30000;`
`35`	`35`
`36`		`- public static final String CLIENT_ID = "sdk-java-1.9.0";`
	`36`	`+ public static final String CLIENT_ID = "sdk-java-1.9.1";`
`37`	`37`	`}`