svn commit: r967099 - in /ofbiz/branches/release10.04: ./ applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java

Author: jleroux
Date: Fri Jul 23 14:05:26 2010
New Revision: 967099

URL: http://svn.apache.org/viewvc?rev=967099&view=rev
Log:
"Applied fix from trunk for revision: 967098"
------------------------------------------------------------------------
r967098 | jleroux | 2010-07-23 15:59:16 +0200 (ven. 23 juil. 2010) | 4 lignes

A patch from Sascha Rodekamp "NPE in Financial Account Services" (https://issues.apache.org/jira/browse/OFBIZ-3873) - OFBIZ-3873

NPE in the financial account services when creating a financial account for a store. The error occurred when the accountValidDays is empty. The thru date can not be set.
This patch covers this issue by checking if accountValidDays is empty or not.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 23 14:05:26 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610,964558,965470,965916,966525,966785
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610,964558,965470,965916,966525,966785,967098

Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java?rev=967099&r1=967098&r2=967099&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java (original)
+++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java Fri Jul 23 14:05:26 2010
@@ -208,7 +208,9 @@ public class FinAccountServices {
             }
 
             // set the dates/userlogin
-            inContext.put("thruDate", UtilDateTime.getDayEnd(now, accountValidDays));
+            if (UtilValidate.isNotEmpty(accountValidDays)){
+                inContext.put("thruDate", UtilDateTime.getDayEnd(now, accountValidDays));
+            }
             inContext.put("fromDate", now);
             inContext.put("userLogin", userLogin);