[jboss-cvs] JBossAS SVN: r90699 - projects/jboss-deployers/branches/2.0.5.SP1/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer.

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

Author: thomas.diesler at jboss.com
Date: 2009-06-30 12:02:41 -0400 (Tue, 30 Jun 2009)
New Revision: 90699

Modified:
   projects/jboss-deployers/branches/2.0.5.SP1/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployer.java
Log:
[JBDEPLOY-202] BeansDeployer cannot be recycled - subclasses of the JBossXBDeployer may overwrite getHelper()


Modified: projects/jboss-deployers/branches/2.0.5.SP1/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployer.java
===================================================================
--- projects/jboss-deployers/branches/2.0.5.SP1/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployer.java	2009-06-30 15:02:10 UTC (rev 90698)
+++ projects/jboss-deployers/branches/2.0.5.SP1/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployer.java	2009-06-30 16:02:41 UTC (rev 90699)
@@ -41,7 +41,6 @@
    public JBossXBDeployer(Class<T> output)
    {
       super(output);
-      this.helper = new JBossXBDeployerHelper<T>(output);
    }
 
    /**
@@ -51,6 +50,9 @@
     */
    protected JBossXBDeployerHelper<T> getHelper()
    {
+	  if (helper == null)
+		  helper = new JBossXBDeployerHelper<T>(getOutput());
+	  
       return helper;
    }
 
@@ -71,7 +73,7 @@
     */
    public boolean isUseSchemaValidation()
    {
-      return helper.isUseSchemaValidation();
+      return getHelper().isUseSchemaValidation();
    }
 
    /**
@@ -81,7 +83,7 @@
     */
    public void setUseSchemaValidation(boolean useSchemaValidation)
    {
-      helper.setUseSchemaValidation(useSchemaValidation);
+      getHelper().setUseSchemaValidation(useSchemaValidation);
    }
 
    /**
@@ -91,7 +93,7 @@
     */
    public boolean isUseValidation()
    {
-      return helper.isUseValidation();
+      return getHelper().isUseValidation();
    }
 
    /**
@@ -101,6 +103,6 @@
     */
    public void setUseValidation(boolean useValidation)
    {
-      helper.setUseValidation(useValidation);
+      getHelper().setUseValidation(useValidation);
    }
 }
\ No newline at end of file