aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2011-01-20 11:04:54 +0000
committerArtur Signell <artur.signell@itmill.com>2011-01-20 11:04:54 +0000
commitcc994a65700c1ac988af6561cf6aeb1447ce61b9 (patch)
treea3e7de9e669c08dbc8440875cb1f36e59a7dd464
parent59364e03aae6a773cc35e8bda068820f58b433b6 (diff)
downloadvaadin-framework-cc994a65700c1ac988af6561cf6aeb1447ce61b9.tar.gz
vaadin-framework-cc994a65700c1ac988af6561cf6aeb1447ce61b9.zip
#6308 NPE in VFormLayout.replaceComponent
svn changeset:16963/svn branch:6.5
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
index 4fce0938ad..c1d9f56a4f 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
@@ -326,8 +326,10 @@ public class VFormLayout extends SimplePanel implements Container {
owner = component;
String style = CLASSNAME;
- for (int i = 0; i < styles.length; i++) {
- style += " " + CLASSNAME + "-" + styles[i];
+ if (styles != null) {
+ for (int i = 0; i < styles.length; i++) {
+ style += " " + CLASSNAME + "-" + styles[i];
+ }
}
setStyleName(style);