svn commit: r1804845 - in /ofbiz/branches/release16.11: ./ applications/accounting/config/AccountingErrorUiLabels.xml applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java

Author: jleroux
Date: Fri Aug 11 19:22:31 2017
New Revision: 1804845

URL: http://svn.apache.org/viewvc?rev=1804845&view=rev
Log:
"Applied fix from trunk framework for revision: 1804843"
------------------------------------------------------------------------
r1804843 | jleroux | 2017-08-11 21:14:21 +0200 (ven. 11 août 2017) | 12 lignes

Fixed: Missing action in empty if-statement in accounting.PaymentGatewayServices
(OFBIZ-9530)

In the method processAuthResult() line 1889 there is an empty if-statement for
the case that authResult is null. It seems like somebody was planning to cover
the case but forgot to add code.

I would suggest to return a service error when the authResult is null since
otherwise it cannot be determined if the payment is authorized or not.


Thanks: Kyra Pritzel-Hentley
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/accounting/config/AccountingErrorUiLabels.xml
    ofbiz/branches/release16.11/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 11 19:22:31 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804319,1804656
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804319,1804656,1804843
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/accounting/config/AccountingErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/accounting/config/AccountingErrorUiLabels.xml?rev=1804845&r1=1804844&r2=1804845&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/accounting/config/AccountingErrorUiLabels.xml (original)
+++ ofbiz/branches/release16.11/applications/accounting/config/AccountingErrorUiLabels.xml Fri Aug 11 19:22:31 2017
@@ -769,6 +769,10 @@
     <property key="AccountingValidationFailedInvalidValues">
         <value xml:lang="en">Validation Failed - invalid values</value>
     </property>
+    <property key="AccountingProcessingAuthResultEmpty">
+        <value xml:lang="en">No authentification result available. Payment preference can't be checked.</value>
+        <value xml:lang="de">Es ist kein Authentifizierungsergebnis vorhanden. Die Zahlungsmethode kann nicht überprüft werden.</value>
+    </property>
     <property key="idealEvents.failedToExecuteServiceCreatePaymentFromPreference">
         <value xml:lang="ar">فشل في تنفيذ خدمة CreatePaymentFromPreference</value>
         <value xml:lang="de">Ausführen des Service CreatePaymentFromPreference fehlgeschlagen</value>

Modified: ofbiz/branches/release16.11/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1804845&r1=1804844&r2=1804845&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/branches/release16.11/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java Fri Aug 11 19:22:31 2017
@@ -1885,6 +1885,12 @@ public class PaymentGatewayServices {
         String currencyUomId = (String) context.get("currencyUomId");
         Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
         Locale locale = (Locale) context.get("locale");
+        
+        if(authResult == null) {
+            Debug.logError("No authentification result available. Payment preference can't be checked.", module);
+            return ServiceUtil
+                    .returnError(UtilProperties.getMessage(resource, "AccountingProcessingAuthResultEmpty", locale));
+        }
 
         // refresh the payment preference
         try {