svn commit: r577679 - /ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java

Author: jleroux
Date: Thu Sep 20 03:55:32 2007
New Revision: 577679

URL: http://svn.apache.org/viewvc?rev=577679&view=rev
Log:
Applied fix from trunk for revision: 577496

Modified:
    ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java

Modified: ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=577679&r1=577678&r2=577679&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java (original)
+++ ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java Thu Sep 20 03:55:32 2007
@@ -350,7 +350,7 @@
                 String addAvs = (String) parameters.get("AVSADDR");
                 String zipAvs = (String) parameters.get("AVSZIP");
                 avsCode = addAvs + zipAvs;
-                if ("N".equals(addAvs) || "N".equals(zipAvs)) {
+                if (addAvs == null || "N".equals(addAvs) || zipAvs == null || "N".equals(zipAvs)) {
                     avsCheckOkay = false;
                 }
             }
@@ -363,7 +363,7 @@
             boolean checkCvv2 = UtilProperties.propertyValueEqualsIgnoreCase(resource, "payment.verisign.checkAvs", "Y");
             if (checkCvv2 && !isSale) {
                 cvvCode = (String) parameters.get("CVV2MATCH");
-                if ("N".equals(cvvCode)) {
+                if (cvvCode == null || "N".equals(cvvCode)) {
                     cvv2CheckOkay = false;
                 }
             }