From 06c846a1d3ae96ca36e37b1968790a9f6bc00fbe Mon Sep 17 00:00:00 2001 From: vpj-cd Date: Sat, 23 Jan 2010 21:14:49 +0000 Subject: [PATCH] merge from 11334 * See identifiers columns when delete records - Fix NPE problem reported in forums https://sourceforge.net/projects/adempiere/forums/forum/610548/topic/3525006 Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2877111 --- client/src/org/compiere/apps/APanel.java | 3 ++- .../src/org/adempiere/webui/panel/AbstractADWindowPanel.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/org/compiere/apps/APanel.java b/client/src/org/compiere/apps/APanel.java index 4bb118e072..3363265c0f 100644 --- a/client/src/org/compiere/apps/APanel.java +++ b/client/src/org/compiere/apps/APanel.java @@ -1868,7 +1868,8 @@ public final class APanel extends CPanel } else { final int id = m_curTab.getKeyID(i); String value = DB.getSQLValueStringEx(null, sql, id); - value = value.replace(" - ", " | "); + if (value != null) + value = value.replace(" - ", " | "); displayValue.append(value); // Append ID if (displayValue.length() == 0 || CLogMgt.isLevelFine()) diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java index a3ca491147..c2eaf05207 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java @@ -1448,7 +1448,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To } else { final int id = curTab.getKeyID(i); String value = DB.getSQLValueStringEx(null, sql, id); - value = value.replace(" - ", " | "); + if (value != null) + value = value.replace(" - ", " | "); displayValue.append(value); // Append ID if (displayValue.length() == 0 || CLogMgt.isLevelFine())