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 99eb15b42217905d5a7fab58e258f74d6979b3c8..8fa01affba1305515046a527b4d6b9fa8ced7143 100644 (file)
--- 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