From 629cfba2133db8872d80d2e253db49ee1df5518d Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 9 Feb 2009 19:27:06 +0000 Subject: [PATCH] Fixed #2564 - NPE in ICustomLayout and added a sensible error message if this happens again for some reason. svn changeset:6772/svn branch:trunk --- .../toolkit/terminal/gwt/client/ApplicationConnection.java | 5 +++++ .../itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java index ca195e7384..cb3fe85951 100755 --- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java @@ -812,6 +812,11 @@ public class ApplicationConnection { }-*/; public void unregisterPaintable(Paintable p) { + if (p == null) { + ApplicationConnection.getConsole().error( + "WARN: Trying to unregister null paintable"); + return; + } String id = getPid(p); idToPaintableDetail.remove(id); if (p instanceof HasWidgets) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java index 6918a5cbfc..452621dbc1 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java @@ -116,7 +116,10 @@ public class ICustomLayout extends ComplexPanel implements Paintable, if (previous == widget) { return; } - remove(previous); + + if (previous != null) { + remove(previous); + } // if template is missing add element in order if (!hasTemplate()) { -- 2.39.5