From b2fa3d851877a7284dda345c2fa794910118add1 Mon Sep 17 00:00:00 2001 From: Aleksey Kozyaikin Date: Wed, 29 May 2013 07:38:20 +0000 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20NPE=20=D0=B2=D0=BE=D0=B7=D0=BD=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=D1=8E=D1=89=D0=B0=D1=8F=20=D0=BF=D1=80=D0=B8=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D1=83=D1=8E=D1=89=D0=B5=D0=B9=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BC=D0=B5=D0=BD=D0=B5=20=20#PL-2175?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/src/com/haulmont/cuba/web/gui/components/WebFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/web/src/com/haulmont/cuba/web/gui/components/WebFilter.java b/modules/web/src/com/haulmont/cuba/web/gui/components/WebFilter.java index f7ca867f23..fbb63e3527 100644 --- a/modules/web/src/com/haulmont/cuba/web/gui/components/WebFilter.java +++ b/modules/web/src/com/haulmont/cuba/web/gui/components/WebFilter.java @@ -913,7 +913,7 @@ public class WebFilter extends WebAbstractComponent i public void editorCancelled() { filterEntity = filterEntityBeforeCopy; filterEntityBeforeCopy = null; - if (filterEntity.getXml() == null) + if (filterEntity != null && filterEntity.getXml() == null) filterEntity = null; switchToUse();