From 948b55f86a4a7981ca576f6304820c644f418e61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Wed, 6 Jun 2012 08:12:01 +0000 Subject: [PATCH] Avoid potential NPE discovered in review (#8914) svn changeset:23889/svn branch:6.8 --- .../terminal/gwt/server/AbstractCommunicationManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index fe848e50f2..ae2cacdd38 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -1561,9 +1561,11 @@ public abstract class AbstractCommunicationManager implements } catch (Exception e) { String pid = variable[VAR_PID]; VariableOwner variableOwner = getVariableOwner(pid); + String targetType = variableOwner == null ? "unknown VariableOwner" + : variableOwner.getClass().getName(); throw new RuntimeException("Could not convert variable \"" - + variable[VAR_NAME] + "\" for " - + variableOwner.getClass().getName() + " (" + pid + ")", e); + + variable[VAR_NAME] + "\" for " + targetType + " (" + pid + + ")", e); } } -- 2.39.5