[jboss-cvs] JBossAS SVN: r112657 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2012-02-16 13:54:16 -0500 (Thu, 16 Feb 2012)
New Revision: 112657

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java
Log:
Use getBeanValidation() method

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2012-02-16 15:28:19 UTC (rev 112656)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2012-02-16 18:54:16 UTC (rev 112657)
@@ -2120,7 +2120,7 @@
 
                if (beanValidationObjects.size() > 0)
                {
-                  BeanValidation beanValidator = new BeanValidation();
+                  BeanValidation beanValidator = getBeanValidation();
                   for (Object o : beanValidationObjects)
                   {
                      beanValidator.validate(o, groupsClasses);
@@ -2286,6 +2286,15 @@
    }
 
    /**
+    * Get the bean validation module
+    * @return The module
+    */
+   protected BeanValidation getBeanValidation()
+   {
+      return new BeanValidation();
+   }
+
+   /**
     * Get the cached connection manager
     * @return The handle
     */

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java	2012-02-16 15:28:19 UTC (rev 112656)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java	2012-02-16 18:54:16 UTC (rev 112657)
@@ -52,18 +52,28 @@
 
    private static boolean trace = log.isTraceEnabled();
 
-   private static ValidatorFactory factory;
-
    private static String factoryName = "java:/ValidatorFactory";
 
+   private ValidatorFactory factory;
+
    /**
     * Constructor
     */
    public BeanValidation()
    {
+      this(null);
    }
 
    /**
+    * Constructor
+    * @param vf The validator factory
+    */
+   public BeanValidation(ValidatorFactory vf)
+   {
+      this.factory = vf;
+   }
+
+   /**
     * Validate the object against the Bean Validation specification (JSR-303).
     * The object must be fully initialized
     * @param object The object that should be validated
@@ -108,15 +118,6 @@
    }
 
    /**
-    * Set the validator factory
-    * @param f The factory
-    */
-   public synchronized static void setValidatorFactory(ValidatorFactory f)
-   {
-      factory = f;
-   }
-
-   /**
     * Set the validator factory name
     * @param name The factory name
     */
@@ -128,7 +129,7 @@
    /**
     * Init the validator factory
     */
-   private synchronized static void initValidatorFactory()
+   private synchronized void initValidatorFactory()
    {
       Context context = null;
       try