[jboss-cvs] JBossAS SVN: r109742 - trunk/webservices/src/main/java/org/jboss/webservices/integration/weld.

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

Author: richard.opalka at jboss.com
Date: 2010-12-07 03:05:29 -0500 (Tue, 07 Dec 2010)
New Revision: 109742

Modified:
   trunk/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java
   trunk/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java
Log:
[JBWS-3177] final cleanup - no need to propagate DU

Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java	2010-12-07 06:49:49 UTC (rev 109741)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java	2010-12-07 08:05:29 UTC (rev 109742)
@@ -56,7 +56,7 @@
       {
          for (final Endpoint endpoint : dep.getService().getEndpoints())
          {
-            endpoint.setInvocationHandler(new WeldInvocationHandler(deploymentUnit, endpoint.getInvocationHandler()));
+            endpoint.setInvocationHandler(new WeldInvocationHandler(endpoint.getInvocationHandler()));
          }
       }
    }

Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java	2010-12-07 06:49:49 UTC (rev 109741)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java	2010-12-07 08:05:29 UTC (rev 109742)
@@ -24,7 +24,6 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.weld.integration.injection.NonContextualObjectInjectionHelper;
 import org.jboss.weld.manager.api.WeldManager;
 import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE;
@@ -43,13 +42,10 @@
 
    private static final String BEAN_MANAGER_JNDI_NAME = "java:comp/BeanManager";
 
-   private final DeploymentUnit deploymentUnit;
-
    private final InvocationHandler delegate;
 
-   public WeldInvocationHandler(final DeploymentUnit unit, final InvocationHandler delegate)
+   public WeldInvocationHandler(final InvocationHandler delegate)
    {
-      this.deploymentUnit = unit;
       this.delegate = delegate;
    }
 
@@ -58,7 +54,7 @@
    {
       // handle Weld injections first
       this.handleWeldInjection(invocation.getInvocationContext().getTargetBean());
-      // handle JBossWS injections last and call @PostConstruct & @PreDestroy annotated lifecycle methods
+      // handle JBossWS injections last and call @PostConstruct annotated methods
       this.delegate.onEndpointInstantiated(endpoint, invocation);
    }