From f8a1d6adfd09db89465471a7086a93159d74a1ab Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 2 Jul 2014 13:45:09 -0500 Subject: [PATCH] IDEMPIERE-1979 / fix NPE on initial query --- .../WEB-INF/src/org/adempiere/webui/info/InfoWindow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index 11ff6f85f0..d20f83a99b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -713,7 +713,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL * when query not by click requery button, reuse prev where clause * IDEMPIERE-1979 */ - if (!isQueryByUser){ + if (!isQueryByUser && prevWhereClause != null){ return prevWhereClause; } @@ -828,7 +828,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL protected void setParameters(PreparedStatement pstmt, boolean forCount) throws SQLException { // when query not by click requery button, reuse parameter value - if (!isQueryByUser){ + if (!isQueryByUser && prevParameterValues != null){ for (int parameterIndex = 0; parameterIndex < prevParameterValues.size(); parameterIndex++){ setParameter (pstmt, parameterIndex + 1, prevParameterValues.get(parameterIndex), prevQueryOperators.get(parameterIndex)); }