Author: richard.opalka(a)jboss.com Date: 2008-10-07 11:41:49 -0400 (Tue, 07 Oct 2008) New Revision: 8376 Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java Log: [JBWS-2246][JBWS-2264][JBAS-5732] reorder template method call to prevent NPE Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java 2008-10-07 15:29:52 UTC (rev 8375) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractEndpointServlet.java 2008-10-07 15:41:49 UTC (rev 8376) @@ -69,7 +69,6 @@ { super.init(servletConfig); this.initRegistry(); - this.initAspectManager(); this.initServiceEndpoint(servletConfig.getServletContext().getContextPath()); this.postInit(servletConfig); } @@ -154,6 +153,7 @@ private void initServiceEndpoint(String contextPath) { this.initEndpoint(contextPath, getServletName()); + this.initAspectManager(); this.setRuntimeLoader(); this.startAspectManager(); }