svn commit: r1296699 - in /ofbiz/branches/release11.04: ./ applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java

Author: jleroux
Date: Sat Mar  3 20:48:09 2012
New Revision: 1296699

URL: http://svn.apache.org/viewvc?rev=1296699&view=rev
Log:
"Applied fix from trunk for revision: 1296697"
------------------------------------------------------------------------
r1296697 | jleroux | 2012-03-03 21:46:47 +0100 (sam., 03 mars 2012) | 5 lines

Fixes https://issues.apache.org/jira/browse/OFBIZ-4719 "Error "org.ofbiz.webapp.event.EventHandlerException: Service invocation error (null)"

Took me a moment to decide to commit this changes. But after many researches and tries I could not find a better solution.

So simply avoid possible NPE there if a wrong paymentId is entered in createPaymentApplication screen.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 20:48:09 2012
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4:951708-952957
 /ofbiz/branches/jquery:952958-1044489
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1139860,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193,1210211,1212147,1214124,1220298,1221889,1221913,1222105,1222478,1226055,1226065,1226223,1226231,1226378,1227965,1229304,1229952,1231004,1231444,1232053,1232539,1244139,1291472,1292331,1292506,1293376,1293557,1294090,1296597
+/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1139860,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193,1210211,1212147,1214124,1220298,1221889,1221913,1222105,1222478,1226055,1226065,1226223,1226231,1226378,1227965,1229304,1229952,1231004,1231444,1232053,1232539,1244139,1291472,1292331,1292506,1293376,1293557,1294090,1296597,1296697

Modified: ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=1296699&r1=1296698&r2=1296699&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java (original)
+++ ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java Sat Mar  3 20:48:09 2012
@@ -262,7 +262,7 @@ public class PaymentWorker {
     }
 
     /**
-     * Method to return the total amount of an payment which is applied to a payment
+     * Method to return the total amount of a payment which is applied to a payment
      * @param payment GenericValue object of the Payment
      * @param false for currency of the payment, true for the actual currency
      * @return the applied total as BigDecimal in the currency of the payment
@@ -297,7 +297,10 @@ public class PaymentWorker {
     }
 
     public static BigDecimal getPaymentNotApplied(GenericValue payment) {
-        return payment.getBigDecimal("amount").subtract(getPaymentApplied(payment)).setScale(decimals,rounding);
+        if (payment != null) {
+            return payment.getBigDecimal("amount").subtract(getPaymentApplied(payment)).setScale(decimals,rounding);
+        }
+        return BigDecimal.ZERO;
     }
 
     public static BigDecimal getPaymentNotApplied(GenericValue payment, Boolean actual) {