Merge pull request #49 from CyberSource/future

gauravmokhasi · web-flow · commit 9532913a28d3 · 2018-06-12T09:43:15.000-07:00
Merged Dileep's PR for null pointer issue fix
diff --git a/CyberSource/Base/Properties/AssemblyInfo.cs b/CyberSource/Base/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.1")]
-[assembly: AssemblyFileVersion("1.4.1")]
+[assembly: AssemblyVersion("1.4.2")]
+[assembly: AssemblyFileVersion("1.4.2")]
diff --git a/CyberSource/Client/BaseClient.cs b/CyberSource/Client/BaseClient.cs
@@ -16,7 +16,7 @@ public abstract class BaseClient
         /// <summary>
         /// Version of this client.
         /// </summary>
-        public const string CLIENT_LIBRARY_VERSION = "1.4.1";
+        public const string CLIENT_LIBRARY_VERSION = "1.4.2";
 
         /// <summary>
         /// Proxy object that is initialized during start-up, if needed.
@@ -46,6 +46,7 @@ public abstract class BaseClient
 
 		static BaseClient()
 		{
+			ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072 | (SecurityProtocolType)768;
 			SetupProxy();
 		}
 
diff --git a/CyberSource/Client/FaultException.cs b/CyberSource/Client/FaultException.cs
@@ -74,9 +74,11 @@ private void ExtractFields( string nspace )
 				mMessage = GetTextValue( "faultstring", String.Empty );
 
 				// requestID goes into mRequestID
-				mRequestID = GetTextValue(
+				if(nspace != null)
+				{
+					mRequestID = GetTextValue(
 								"requestID", nspace );
-
+				}
 				// faultcode goes into mCode.  If it has a prefix, look up
 				// the namespace for that prefix.
 				XmlNode faultCodeText = GetText( "faultcode", String.Empty );
diff --git a/CyberSource/Client/NVPClient.cs b/CyberSource/Client/NVPClient.cs
@@ -222,7 +222,7 @@ private static void SetVersionInformation(Hashtable request)
             request["clientLibrary"] = ".NET NVP";
             request["clientLibraryVersion"] = CLIENT_LIBRARY_VERSION;
             request["clientEnvironment"] = mEnvironmentInfo;
-            request["clientSecurityLibraryVersion"] =".Net 1.4.1";
+            request["clientSecurityLibraryVersion"] =".Net 1.4.2";
         }
     }
 }
diff --git a/CyberSource/Client/Properties/AssemblyInfo.cs b/CyberSource/Client/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.1")]
-[assembly: AssemblyFileVersion("1.4.1")]
+[assembly: AssemblyVersion("1.4.2")]
+[assembly: AssemblyFileVersion("1.4.2")]
diff --git a/CyberSource/Client/SoapClient.cs b/CyberSource/Client/SoapClient.cs
@@ -222,7 +222,7 @@ private static void SetVersionInformation(
 			requestMessage.clientLibrary = ".NET Soap";
 			requestMessage.clientLibraryVersion = CLIENT_LIBRARY_VERSION;
 			requestMessage.clientEnvironment = mEnvironmentInfo;
-			requestMessage.clientSecurityLibraryVersion =".Net 1.4.1";
+			requestMessage.clientSecurityLibraryVersion =".Net 1.4.2";
 		}
 	}
 }
diff --git a/CyberSource/Client/XmlClient.cs b/CyberSource/Client/XmlClient.cs
@@ -472,7 +472,7 @@ XmlNode previousSibling
 
             SetField(requestMessageNode, ref previousSibling,
                 "clientSecurityLibraryVersion",
-                ".Net 1.4.1", nspace);
+                ".Net 1.4.2", nspace);
         }
 
         private static void SetField(
diff --git a/CyberSourceTests/BaseTest/Properties/AssemblyInfo.cs b/CyberSourceTests/BaseTest/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.4.1.0")]
-[assembly: AssemblyFileVersion("1.4.1.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
diff --git a/CyberSourceTests/MTTest/Properties/AssemblyInfo.cs b/CyberSourceTests/MTTest/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.4.1.0")]
-[assembly: AssemblyFileVersion("1.4.1.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public abstract class BaseClient`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// Version of this client.`
`18`	`18`	`/// </summary>`
`19`		`- public const string CLIENT_LIBRARY_VERSION = "1.4.1";`
	`19`	`+ public const string CLIENT_LIBRARY_VERSION = "1.4.2";`
`20`	`20`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// Proxy object that is initialized during start-up, if needed.`
`@@ -46,6 +46,7 @@ public abstract class BaseClient`
`46`	`46`
`47`	`47`	`static BaseClient()`
`48`	`48`	`{`
	`49`	`+ ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072 \| (SecurityProtocolType)768;`
`49`	`50`	`SetupProxy();`
`50`	`51`	`}`
`51`	`52`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ private static void SetVersionInformation(Hashtable request)`
`222`	`222`	`request["clientLibrary"] = ".NET NVP";`
`223`	`223`	`request["clientLibraryVersion"] = CLIENT_LIBRARY_VERSION;`
`224`	`224`	`request["clientEnvironment"] = mEnvironmentInfo;`
`225`		`- request["clientSecurityLibraryVersion"] =".Net 1.4.1";`
	`225`	`+ request["clientSecurityLibraryVersion"] =".Net 1.4.2";`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ XmlNode previousSibling`
`472`	`472`
`473`	`473`	`SetField(requestMessageNode, ref previousSibling,`
`474`	`474`	`"clientSecurityLibraryVersion",`
`475`		`- ".Net 1.4.1", nspace);`
	`475`	`+ ".Net 1.4.2", nspace);`
`476`	`476`	`}`
`477`	`477`
`478`	`478`	`private static void SetField(`