From 8d82c827f7bc3ba89be2d8c0ce09ead40bb48148 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 30 Oct 2009 14:06:42 +0000
Subject: [PATCH] merged [9521] from 6.1

svn changeset:9522/svn branch:6.2
---
 src/com/vaadin/data/validator/CompositeValidator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
-- 
2.39.5