Author: echatellier Date: 2012-07-02 17:36:34 +0200 (Mon, 02 Jul 2012) New Revision: 3483 Url: http://chorem.org/repositories/revision/lima/3483 Log: Fix NPE with VAT and BCR plans Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java 2012-06-27 12:09:05 UTC (rev 3482) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java 2012-07-02 15:36:34 UTC (rev 3483) @@ -56,10 +56,21 @@ * @throws TopiaException */ public List<FinancialStatement> findChildrenFinancialStatement(FinancialStatement financialStatement) throws TopiaException { - String query = "FROM " + FinancialStatement.class.getName() + - " WHERE masterFinancialStatement = :masterFinancialStatement" + - " ORDER BY " + FinancialStatement.TOPIA_CREATE_DATE; - List<FinancialStatement> result = context.findAll(query, "masterFinancialStatement", financialStatement); + String query = "FROM " + FinancialStatement.class.getName(); + + if (financialStatement == null) { + query += " WHERE masterFinancialStatement = null"; + } else { + query += " WHERE masterFinancialStatement = :masterFinancialStatement"; + } + query += " ORDER BY " + FinancialStatement.TOPIA_CREATE_DATE; + + List<FinancialStatement> result; + if (financialStatement == null) { + result = context.findAll(query); + } else { + result = context.findAll(query, "masterFinancialStatement", financialStatement); + } return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java 2012-06-27 12:09:05 UTC (rev 3482) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java 2012-07-02 15:36:34 UTC (rev 3483) @@ -60,10 +60,21 @@ * @throws TopiaException */ public List<VatStatement> getChildrenVatStatement(VatStatement masterVatStatement) throws TopiaException { - String query = "FROM " + VatStatement.class.getName() + - " WHERE masterVatStatement = :masterVatStatement" + - " ORDER BY " + VatStatement.TOPIA_CREATE_DATE; - List<VatStatement> result = context.findAll(query, "masterVatStatement", masterVatStatement); + String query = "FROM " + VatStatement.class.getName(); + + if (masterVatStatement == null) { + query += " WHERE masterVatStatement = null"; + } else { + query += "WHERE masterVatStatement = :masterVatStatement"; + } + + query += " ORDER BY " + VatStatement.TOPIA_CREATE_DATE; + List<VatStatement> result; + if (masterVatStatement == null) { + result = context.findAll(query); + } else { + result = context.findAll(query, "masterVatStatement", masterVatStatement); + } return result; }