Merge branch 'master' of https://github.com/AuthorizeNet/sdk-java

srathod · srathod · commit ff35fd714fe2 · 2016-10-03T21:26:41.000+05:30
# Conflicts:
#	src/main/java/net/authorize/util/XmlUtility.java
diff --git a/src/main/java/net/authorize/util/XmlUtility.java b/src/main/java/net/authorize/util/XmlUtility.java
@@ -28,6 +28,7 @@ public final class XmlUtility {
     private static JAXBContext response_ctx = null;
     private static HashMap<String, JAXBContext> jaxbContext = new HashMap<String, JAXBContext>();
 
+
 	/**
     * Default C'tor, cannot be instantiated
     */
@@ -93,7 +94,11 @@ public static synchronized <T extends Serializable> T create(String xml, Class<T
         	{
         		response_ctx = jaxbContext.get(classType.toString());
         	}
+<<<<<<< .mine
         	
+=======
+			
+>>>>>>> .theirs
 	        Unmarshaller um = response_ctx.createUnmarshaller();
 	        try {
 		        Object unmarshaled = um.unmarshal(new StringReader(xml));
