Commits

Anonymous committed 15c62c4

Use fullFieldName when checking for errors.

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@318e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits 5a54e3f

Comments (0)

Files changed (1)

File src/java/com/opensymphony/xwork/validator/ActionValidatorManager.java

             }
 
             FieldValidator fValidator = null;
+            String fullFieldName = null;
 
             if (validator instanceof FieldValidator) {
                 fValidator = (FieldValidator) validator;
-
-                if ((shortcircuitedFields != null) && shortcircuitedFields.contains(fValidator.getFieldName())) {
+                fullFieldName = fValidator.getValidatorContext().getFullFieldName(fValidator.getFieldName());
+                if ((shortcircuitedFields != null) && shortcircuitedFields.contains(fullFieldName)) {
                     if (LOG.isDebugEnabled()) {
                         LOG.debug("Short-circuited, skipping");
                     }
 
                 if (fValidator != null) {
                     if (validatorContext.hasFieldErrors()) {
-                        Collection fieldErrors = (Collection) validatorContext.getFieldErrors().get(fValidator.getFieldName());
+                        Collection fieldErrors = (Collection) validatorContext.getFieldErrors().get(fullFieldName);
 
                         if (fieldErrors != null) {
                             errs = new ArrayList(fieldErrors);
 
                 if (fValidator != null) {
                     if (validatorContext.hasFieldErrors()) {
-                        Collection errCol = (Collection) validatorContext.getFieldErrors().get(fValidator.getFieldName());
+                        Collection errCol = (Collection) validatorContext.getFieldErrors().get(fullFieldName);
 
                         if ((errCol != null) && !errCol.equals(errs)) {
                             if (LOG.isDebugEnabled()) {
                                 shortcircuitedFields = new TreeSet();
                             }
 
-                            shortcircuitedFields.add(fValidator.getFieldName());
+                            shortcircuitedFields.add(fullFieldName);
                         }
                     }
                 } else if (validatorContext.hasActionErrors()) {