Author: cschneider
Date: Thu Jul 30 15:54:48 2015
New Revision: 1693446
URL: http://svn.apache.org/r1693446
Log:
Using equinox coordinator until felix coordinator is fixed
Modified:
aries/trunk/jpa/itests/jpa-container-itest/pom.xml
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java
aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
Modified: aries/trunk/jpa/itests/jpa-container-itest/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/pom.xml?rev=1693446&r1=1693445&r2=1693446&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-itest/pom.xml Thu Jul 30 15:54:48 2015
@@ -49,9 +49,9 @@
<version>5.0.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.coordinator</artifactId>
- <version>1.0.0</version>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.coordinator</artifactId>
+ <version>1.1.0.v20120522-1841</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java?rev=1693446&r1=1693445&r2=1693446&view=diff
==============================================================================
---
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
(original)
+++
aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
Thu Jul 30 15:54:48 2015
@@ -186,7 +186,7 @@ public abstract class AbstractJPAItest {
mvnBundle("org.ow2.asm", "asm-all"),
mvnBundle("org.apache.felix",
"org.apache.felix.configadmin"),
- mvnBundle("org.apache.felix",
"org.apache.felix.coordinator"),
+ mvnBundle("org.eclipse.equinox",
"org.eclipse.equinox.coordinator"),
mvnBundle("org.apache.aries.proxy",
"org.apache.aries.proxy.api"),
mvnBundle("org.apache.aries.proxy",
"org.apache.aries.proxy.impl"),
Modified:
aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java?rev=1693446&r1=1693445&r2=1693446&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java
(original)
+++
aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java
Thu Jul 30 15:54:48 2015
@@ -57,7 +57,6 @@ public class EMSupplierImpl implements E
private CountDownLatch emsToShutDown;
private Coordinator coordinator;
private String unitName;
- private ThreadLocal<Coordination> localCoordination = new ThreadLocal<>();
public EMSupplierImpl(String unitName, final EntityManagerFactory emf,
Coordinator coordinator) {
this.unitName = unitName;
@@ -142,7 +141,7 @@ public class EMSupplierImpl implements E
@Override
public void preCall() {
- localCoordination.set(coordinator.begin("jpa." + unitName, 0));
+ coordinator.begin("jpa." + unitName, 0);
}
@Override
@@ -150,7 +149,6 @@ public class EMSupplierImpl implements E
try {
Coordination coord = coordinator.pop();
coord.end();
- localCoordination.set(null);
} catch (Throwable t) {
LOG.warn("Error ending coord", t);
}
Modified:
aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java?rev=1693446&r1=1693445&r2=1693446&view=diff
==============================================================================
---
aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
(original)
+++
aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
Thu Jul 30 15:54:48 2015
@@ -27,7 +27,6 @@ import org.apache.aries.blueprint.Interc
import org.apache.aries.transaction.annotations.TransactionPropagationType;
import org.apache.aries.transaction.exception.TransactionRollbackException;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
-import org.osgi.service.coordinator.Coordination;
import org.osgi.service.coordinator.Coordinator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,9 +38,6 @@ public class TxInterceptorImpl implement
private Coordinator coordinator;
private TxComponentMetaDataHelper metaDataHelper;
- // Workaround for bug in coordinator 1.0.0 where coordinations are
considered orhpaned sometimes
- private ThreadLocal<Coordination> localCoordination = new
ThreadLocal<Coordination>();
-
public int getRank() {
return 1; // Higher rank than jpa interceptor to make sure transaction
is started first
}
@@ -58,7 +54,7 @@ public class TxInterceptorImpl implement
LOGGER.debug("PreCall for bean {}, method {} with tx strategy {}.",
getCmId(cm), m.getName(), txAttribute);
TransactionToken token = txAttribute.begin(tm);
- localCoordination.set(coordinator.begin("txInterceptor." +
m.getDeclaringClass().getName() + "." + m.getName() , 0));
+ coordinator.begin("txInterceptor." + m.getDeclaringClass().getName() +
"." + m.getName() , 0);
return token;
}
@@ -109,9 +105,7 @@ public class TxInterceptorImpl implement
private void endCoordination() {
try {
- Coordination coord = coordinator.pop();
- coord.end();
- localCoordination.set(null);
+ coordinator.pop().end();
} catch (Exception e) {
LOGGER.warn("Error ending coordination ", e);
}
