You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2006/12/14 22:46:27 UTC
svn commit: r487361 -
/incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java
Author: meerajk
Date: Thu Dec 14 13:46:26 2006
New Revision: 487361
URL: http://svn.apache.org/viewvc?view=rev&rev=487361
Log:
Intermediate.
Modified:
incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java
Modified: incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java?view=diff&rev=487361&r1=487360&r2=487361
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java (original)
+++ incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java Thu Dec 14 13:46:26 2006
@@ -24,6 +24,7 @@
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.SystemAtomicComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.AbstractPropertyProcessor;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
@@ -62,12 +63,16 @@
protected <T> void initProperty(JavaMappedProperty<T> property, PersistenceUnit annotation, CompositeComponent parent, DeploymentContext context) {
String unitName = annotation.unitName();
- EntityManagerFactory emf = (EntityManagerFactory) parent.getSystemChild(unitName);
-
- if (emf == null) {
- emf = builder.newEntityManagerFactory(unitName, context.getClassLoader());
- parent.registerJavaObject(unitName, EntityManagerFactory.class, emf);
+
+ SystemAtomicComponent component = (SystemAtomicComponent) parent.getSystemChild(unitName);
+ EntityManagerFactory emf;
+ if (component == null) {
+ emf = builder.newEntityManagerFactory(unitName, context.getClassLoader());
+ parent.registerJavaObject(unitName, EntityManagerFactory.class, emf);
+ } else {
+ emf = (EntityManagerFactory) component.getTargetInstance();
}
+
ObjectFactory factory = new EmfObjectFactory(emf);
property.setDefaultValueFactory(factory);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org