From 5602a15f0433017ce6dcd160bc2b121a64ebdb75 Mon Sep 17 00:00:00 2001 From: Diego Ruiz <12065321+d-ruiz@users.noreply.github.com> Date: Wed, 7 Jun 2023 00:32:03 +0200 Subject: [PATCH] IDEMPIERE-5759 - Fixed potential NPE when sending a null orderclause (#1880) --- org.adempiere.base/src/org/compiere/model/MOrder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java index fd0afa7ddd..0301f82d98 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrder.java +++ b/org.adempiere.base/src/org/compiere/model/MOrder.java @@ -695,7 +695,7 @@ public class MOrder extends X_C_Order implements DocAction /************************************************************************** * Get Lines of Order * @param whereClause where clause or null (starting with AND) - * @param orderClause order clause + * @param orderClause order clause or null * @return lines */ public MOrderLine[] getLines (String whereClause, String orderClause) @@ -704,7 +704,7 @@ public class MOrder extends X_C_Order implements DocAction StringBuilder whereClauseFinal = new StringBuilder(MOrderLine.COLUMNNAME_C_Order_ID+"=? "); if (!Util.isEmpty(whereClause, true)) whereClauseFinal.append(whereClause); - if (orderClause.length() == 0) + if (Util.isEmpty(orderClause, true)) orderClause = MOrderLine.COLUMNNAME_Line; // List list = new Query(getCtx(), I_C_OrderLine.Table_Name, whereClauseFinal.toString(), get_TrxName())