merged [9521] from 6.1

svn changeset:9522/svn branch:6.2

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