details: /erp/devel/pi/rev/f066af093112
changeset: 10675:f066af093112
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Tue Feb 15 19:36:02 2011 +0100
summary: [APRM] Prevent potential NPE
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
| 16 ++++++---
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
| 11 ++++--
2 files changed, 18 insertions(+), 9 deletions(-)
diffs (55 lines):
diff -r 5dbb31365d77 -r f066af093112
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Tue Feb 15 19:33:55 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Tue Feb 15 19:36:02 2011 +0100
@@ -469,8 +469,11 @@
finTrans.setAccount(account);
finTrans.setLineNo(line);
finTrans.setFinPayment(payment);
- String truncateDescription = (description.length() > 255) ?
description.substring(0, 252)
- .concat("...").toString() : description.toString();
+ String truncateDescription = null;
+ if (description != null) {
+ truncateDescription = (description.length() > 255) ?
description.substring(0, 252).concat(
+ "...").toString() : description.toString();
+ }
finTrans.setDescription(truncateDescription);
finTrans.setDateAcct(accountingDate);
finTrans.setGLItem(glItem);
@@ -843,10 +846,13 @@
// Truncate description
String description = FIN_Payments[i].getDescription();
- String truncateDescription = (description.length() > 57) ?
description.substring(0, 54)
- .concat("...").toString() : description;
+ String truncateDescription = "";
+ if (description != null) {
+ truncateDescription = (description.length() > 57) ?
description.substring(0, 54).concat(
+ "...").toString() : description;
+ }
FieldProviderFactory.setField(data[i], "paymentDescription",
- (description.length() > 57) ? description : "");
+ (description != null && description.length() > 57) ? description :
"");
FieldProviderFactory.setField(data[i], "paymentDescriptionTrunc",
truncateDescription);
FieldProviderFactory.setField(data[i], "paymentDate",
dateFormater.format(
diff -r 5dbb31365d77 -r f066af093112
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
Tue Feb 15 19:33:55 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
Tue Feb 15 19:36:02 2011 +0100
@@ -340,10 +340,13 @@
// Truncate description
String description = FIN_Transactions[i].getDescription();
- String truncateDescription = (description.length() > 42) ?
description.substring(0, 39)
- .concat("...").toString() : description;
- FieldProviderFactory.setField(data[i], "description",
- (description.length() > 42) ? description : "");
+ String truncateDescription = "";
+ if (description != null) {
+ truncateDescription = (description.length() > 42) ?
description.substring(0, 39).concat(
+ "...").toString() : description;
+ }
+ FieldProviderFactory.setField(data[i], "description", (description !=
null && description
+ .length() > 42) ? description : "");
FieldProviderFactory.setField(data[i], "descriptionTrunc",
truncateDescription);
FieldProviderFactory.setField(data[i], "paymentAmount",
FIN_Transactions[i]
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
