From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 30 Oct 2009 14:06:42 +0000 (+0000)
Subject: merged [9521] from 6.1
X-Git-Tag: 6.7.0.beta1~2354
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d82c827f7bc3ba89be2d8c0ce09ead40bb48148;p=vaadin-framework.git

merged [9521] from 6.1

svn changeset:9522/svn branch:6.2
---

diff --git a/src/com/vaadin/data/validator/CompositeValidator.java b/src/com/vaadin/data/validator/CompositeValidator.java
index 99eb15b422..8fa01affba 100644
--- a/src/com/vaadin/data/validator/CompositeValidator.java
+++ b/src/com/vaadin/data/validator/CompositeValidator.java
@@ -191,8 +191,8 @@ public class CompositeValidator extends AbstractValidator {
      */
     @Override
     public String getErrorMessage() {
-        if (getErrorMessage() != null) {
-            return getErrorMessage();
+        if (super.getErrorMessage() != null) {
+            return super.getErrorMessage();
         }
 
         // TODO Return composite error message