You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by mb...@apache.org on 2011/02/22 22:14:25 UTC

svn commit: r1073507 - /incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/jsr303/dynamic/DynamicModelManager.java

Author: mbenson
Date: Tue Feb 22 21:14:25 2011
New Revision: 1073507

URL: http://svn.apache.org/viewvc?rev=1073507&view=rev
Log:
correct unintended String.contains() call to equals(); omit cached BEAN_DESCRIPTOR feature for any features merge

Modified:
    incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/jsr303/dynamic/DynamicModelManager.java

Modified: incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/jsr303/dynamic/DynamicModelManager.java
URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/jsr303/dynamic/DynamicModelManager.java?rev=1073507&r1=1073506&r2=1073507&view=diff
==============================================================================
--- incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/jsr303/dynamic/DynamicModelManager.java (original)
+++ incubator/bval/sandbox/lang3-work/bval-jsr303d/src/main/java/org/apache/bval/jsr303/dynamic/DynamicModelManager.java Tue Feb 22 21:14:25 2011
@@ -37,6 +37,7 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.apache.bval.jsr303.ConstraintValidation;
+import org.apache.bval.jsr303.Jsr303Features;
 import org.apache.bval.model.FeaturesCapable;
 import org.apache.bval.model.MetaBean;
 import org.apache.bval.model.MetaProperty;
@@ -234,7 +235,9 @@ public class DynamicModelManager {
         for (Map.Entry<String, Object> e : source.getFeatures().entrySet()) {
             if (DYNAMIC_CONSTRAINT_COLLECTION.equals(e.getKey())) {
                 mergeConstraints(target, source);
-            } else if (META_CONTAINER.contains(e.getKey())) {
+            } else if (META_CONTAINER.equals(e.getKey())) {
+                continue;
+            } else if (Jsr303Features.Bean.BEAN_DESCRIPTOR.equals(e.getKey())) {
                 continue;
             } else {
                 Object targetValue = target.getFeature(e.getKey());