commit 6cb3093068bab8f70cdeb4d370f7318c817fffcf
author Matt Benson <mbenson@apache.org> Wed Oct 17 16:35:47 2018 -0500
committer Matt Benson <mbenson@apache.org> Wed Oct 17 16:35:47 2018 -0500
tree e0aacb43d2913fe29fbb7e0fc374971750aa83a5
parent 796a2ca4474e29f28e6e047cafe4d4485ee8880d

efficiency

bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java

diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java
index f25514c..caa9bb3 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java
@@ -76,16 +76,19 @@
         if (beanDescriptors.containsKey(beanClass)) {
             return beanDescriptors.get(beanClass);
         }
-        final MetadataBuilder.ForBean<T> builder =
-            knownUnconstrainedTypes.contains(beanClass) ? EmptyBuilder.instance().forBean() : builder(beanClass);
+        final boolean constrained = !knownUnconstrainedTypes.contains(beanClass);
+        final MetadataBuilder.ForBean<T> builder = constrained ? builder(beanClass) : EmptyBuilder.instance().forBean();
         final BeanD<T> beanD = new BeanD<>(new MetadataReader(validatorFactory, beanClass).forBean(builder));
 
-        if (beanD.isBeanConstrained() || !(beanD.getConstrainedConstructors().isEmpty()
-            && beanD.getConstrainedMethods(MethodType.GETTER, MethodType.NON_GETTER).isEmpty())) {
-            @SuppressWarnings("unchecked")
-            final BeanD<T> result =
+        if (constrained) {
+            // if not previously known to be unconstrained, check:
+            if (beanD.isBeanConstrained() || !(beanD.getConstrainedConstructors().isEmpty()
+                    && beanD.getConstrainedMethods(MethodType.GETTER, MethodType.NON_GETTER).isEmpty())) {
+                @SuppressWarnings("unchecked")
+                final BeanD<T> result =
                 Optional.ofNullable((BeanD<T>) beanDescriptors.putIfAbsent(beanClass, beanD)).orElse(beanD);
-            return result;
+                return result;
+            }
         }
         knownUnconstrainedTypes.add(beanClass);
         return beanD;