svn commit: r1737376 - in /aries/trunk/transaction/transaction-manager: pom.xml src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java

[cschneider]

Author: cschneider
Date: Fri Apr  1 13:24:05 2016
New Revision: 1737376

URL: http://svn.apache.org/viewvc?rev=1737376&view=rev
Log:
[ARIES-1516] Embed needed util classes

Modified:
    aries/trunk/transaction/transaction-manager/pom.xml
    
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java

Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1737376&r1=1737375&r2=1737376&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Fri Apr  1 13:24:05 2016
@@ -55,7 +55,8 @@
         </aries.osgi.import>
         <aries.osgi.private.pkg>
             org.objectweb.howl.log*,
-            org.apache.aries.transaction.internal
+            org.apache.aries.transaction.internal,
+            org.apache.aries.util*
         </aries.osgi.private.pkg>
         <aries.osgi.activator>
             org.apache.aries.transaction.internal.Activator

Modified: 
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java?rev=1737376&r1=1737375&r2=1737376&view=diff
==============================================================================
--- 
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java
 (original)
+++ 
aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java
 Fri Apr  1 13:24:05 2016
@@ -27,7 +27,6 @@ import javax.transaction.UserTransaction
 import javax.transaction.xa.XAException;
 
 import org.apache.aries.transaction.AriesTransactionManager;
-import org.apache.aries.util.AriesFrameworkUtil;
 import org.apache.geronimo.transaction.log.HOWLLog;
 import org.apache.geronimo.transaction.log.UnrecoverableLog;
 import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
@@ -168,7 +167,13 @@ public class TransactionManagerService {
     }
 
     public void close() throws Exception {
-        AriesFrameworkUtil.safeUnregisterService(serviceRegistration);
+        if(serviceRegistration != null) {
+          try {
+            serviceRegistration.unregister();
+          } catch (IllegalStateException e) {
+            //This can be safely ignored
+          }
+        }
       
         if (transactionLog instanceof HOWLLog) {
             ((HOWLLog) transactionLog).doStop();