aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csie...@apache.org
Subject svn commit: r1784902 - /aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Phase_Publish.java
Date Wed, 01 Mar 2017 10:07:33 GMT
Author: csierra
Date: Wed Mar  1 10:07:32 2017
New Revision: 1784902

URL: http://svn.apache.org/viewvc?rev=1784902&view=rev
Log:
[ARIES-CDI] Not needed

Modified:
    aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Phase_Publish.java

Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Phase_Publish.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Phase_Publish.java?rev=1784902&r1=1784901&r2=1784902&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Phase_Publish.java
(original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/Phase_Publish.java
Wed Mar  1 10:07:32 2017
@@ -27,7 +27,6 @@ import java.util.concurrent.CopyOnWriteA
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
-import javax.naming.spi.ObjectFactory;
 
 import org.apache.aries.cdi.container.internal.bean.ReferenceBean;
 import org.apache.aries.cdi.container.internal.literal.AnyLiteral;
@@ -78,18 +77,8 @@ public class Phase_Publish implements Ph
 			}
 			catch (Exception e) {
 				if (_log.isTraceEnabled()) {
-					_log.trace("Service already unregistered {}", _beanManagerRegistration);
-				}
-			}
-		}
-
-		if (_objectFactoryRegistration != null) {
-			try {
-				_objectFactoryRegistration.unregister();
-			}
-			catch (Exception e) {
-				if (_log.isTraceEnabled()) {
-					_log.trace("Service already unregistered {}", _objectFactoryRegistration);
+					_log.trace(
+						"Service already unregistered {}", _beanManagerRegistration);
 				}
 			}
 		}
@@ -236,6 +225,5 @@ public class Phase_Publish implements Ph
 	private final List<ServiceDeclaration> _services;
 
 	private ServiceRegistration<BeanManager> _beanManagerRegistration;
-	private ServiceRegistration<ObjectFactory> _objectFactoryRegistration;
 
 }
\ No newline at end of file



Mime
View raw message