Author: alexsmirnov
Date: 2010-01-11 15:36:57 -0500 (Mon, 11 Jan 2010)
New Revision: 16259
Modified:
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateValidator.java
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectValidator.java
Log:
https://jira.jboss.org/jira/browse/RF-8213
Modified:
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java
===================================================================
---
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java 2010-01-11
14:07:55 UTC (rev 16258)
+++
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java 2010-01-11
20:36:57 UTC (rev 16259)
@@ -73,8 +73,10 @@
Collection<String> messages = extractMessages(violations);
if(null != parent){
Collection<String> parentMessages = parent.validateGraph(context, value,
profiles);
- if(null != messages){
- messages.addAll(parentMessages);
+ if (null != messages) {
+ if (null != parentMessages) {
+ messages.addAll(parentMessages);
+ }
} else {
messages = parentMessages;
}
Modified:
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateValidator.java
===================================================================
---
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateValidator.java 2010-01-11
14:07:55 UTC (rev 16258)
+++
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateValidator.java 2010-01-11
20:36:57 UTC (rev 16259)
@@ -96,7 +96,9 @@
if(null != parent){
Collection<String> parentMessages = parent.validateGraph(context, value,
profiles);
if(null != validationMessages){
- validationMessages.addAll(parentMessages);
+ if (null != parentMessages) {
+ validationMessages.addAll(parentMessages);
+ }
} else {
validationMessages = parentMessages;
}
Modified:
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectValidator.java
===================================================================
---
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectValidator.java 2010-01-11
14:07:55 UTC (rev 16258)
+++
branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectValidator.java 2010-01-11
20:36:57 UTC (rev 16259)
@@ -141,8 +141,10 @@
}
if(null != parent){
Collection<String> parentMessages = parent.validate(context, target, value,
profiles);
- if(null != validationMessages){
- validationMessages.addAll(parentMessages);
+ if (null != validationMessages) {
+ if (null != parentMessages) {
+ validationMessages.addAll(parentMessages);
+ }
} else {
validationMessages = parentMessages;
}