[jboss-cvs] JBossAS SVN: r109536 - projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard.

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

Author: smarlow at redhat.com
Date: 2010-11-29 09:09:27 -0500 (Mon, 29 Nov 2010)
New Revision: 109536

Modified:
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceUnitRefResource.java
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceUnitResourceProvider.java
Log:
JBJPA-33 PURP should not keep reference to PUD

Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceUnitRefResource.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceUnitRefResource.java	2010-11-29 13:29:13 UTC (rev 109535)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceUnitRefResource.java	2010-11-29 14:09:27 UTC (rev 109536)
@@ -36,12 +36,10 @@
 public class PersistenceUnitRefResource implements Resource
 {
 
-   private final String name;
    private final String persistenceUnitDeploymentMCBeanName;
 
-   public PersistenceUnitRefResource(String persistenceUnitDeploymentMCBeanName, String name)
+   public PersistenceUnitRefResource(String persistenceUnitDeploymentMCBeanName)
    {
-      this.name = name;
       this.persistenceUnitDeploymentMCBeanName = persistenceUnitDeploymentMCBeanName;
    }
 
@@ -54,6 +52,6 @@
 
    public Object getTarget()
    {
-      return ((PersistenceUnitDeployment)PersistenceUnitRegistry.getPersistenceUnit(name)).getManagedFactory();
+      return ((PersistenceUnitDeployment)PersistenceUnitRegistry.getPersistenceUnit(persistenceUnitDeploymentMCBeanName)).getManagedFactory();
    }
 }

Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceUnitResourceProvider.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceUnitResourceProvider.java	2010-11-29 13:29:13 UTC (rev 109535)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceUnitResourceProvider.java	2010-11-29 14:09:27 UTC (rev 109536)
@@ -41,15 +41,12 @@
 {
    private static final Logger log = Logger.getLogger(PersistenceUnitResourceProvider.class);
    private PersistenceUnitDependencyResolver persistenceUnitDependencyResolver;
-   private final String persistenceUnitDeploymentMCBeanName;
    /**
     *
-    * @param persistenceUnitDeploymentMCBeanName The name of PersistenceUnitDeployment MC bean
-    * @param resolver For resolve the PU bean name   
+    * @param resolver For resolving the PU bean name
     */
-   public PersistenceUnitResourceProvider(String persistenceUnitDeploymentMCBeanName, PersistenceUnitDependencyResolver resolver)
+   public PersistenceUnitResourceProvider(PersistenceUnitDependencyResolver resolver)
    {
-      this.persistenceUnitDeploymentMCBeanName = persistenceUnitDeploymentMCBeanName;
       this.persistenceUnitDependencyResolver = resolver;
    }
 
@@ -58,9 +55,10 @@
    public Resource provide(DeploymentUnit deploymentUnit, PersistenceUnitRefType persistenceUnitRefType)
    {
       String lookupName = persistenceUnitRefType.getLookupName();
-      log.trace("PersistenceUnitResourceProvider.provide: " + deploymentUnit.getName() + " " + lookupName);
       String persistenceUnitName = persistenceUnitDependencyResolver.createBeanName(deploymentUnit,deploymentUnit.getName());
-      return new PersistenceUnitRefResource(persistenceUnitDeploymentMCBeanName, persistenceUnitName);
+      if (log.isTraceEnabled())
+         log.trace("PersistenceUnitResourceProvider.provide: " + deploymentUnit.getName() + ", " + lookupName + ", " + persistenceUnitName);
+      return new PersistenceUnitRefResource(persistenceUnitName);
    }
 
    public Class<PersistenceUnitRefType> getEnvironmentEntryType()