From 3608ffaa74650e4669d997cfd08c315082bf310f Mon Sep 17 00:00:00 2001
From: Denis Anisimov <denis@vaadin.com>
Date: Tue, 21 Oct 2014 20:41:05 +0300
Subject: FieldGroup should not throw NPE when data source is not set (#14901).

Change-Id: I74bea857306fac5123aa86cdabc70d81c2a72094
---
 server/src/com/vaadin/data/fieldgroup/FieldGroup.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'server/src/com/vaadin/data')

diff --git a/server/src/com/vaadin/data/fieldgroup/FieldGroup.java b/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
index c5aab5a053..6f3a67a92a 100644
--- a/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
+++ b/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
@@ -211,7 +211,8 @@ public class FieldGroup implements Serializable {
     public void setReadOnly(boolean fieldsReadOnly) {
         readOnly = fieldsReadOnly;
         for (Field<?> field : getFields()) {
-            if (!field.getPropertyDataSource().isReadOnly()) {
+            if (field.getPropertyDataSource() == null
+                    || !field.getPropertyDataSource().isReadOnly()) {
                 field.setReadOnly(fieldsReadOnly);
             } else {
                 field.setReadOnly(true);
-- 
cgit v1.2.3