Author: alessio.soldano(a)jboss.com
Date: 2010-06-25 11:00:33 -0400 (Fri, 25 Jun 2010)
New Revision: 12522
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-3002] pojo endpoint shared
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
---
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-25
14:12:09 UTC (rev 12521)
+++
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-25
15:00:33 UTC (rev 12522)
@@ -143,8 +143,9 @@
Invocation inv = invHandler.createInvocation();
InvocationContext invContext = inv.getInvocationContext();
- inv.getInvocationContext().addAttachment(WebServiceContext.class,
getWebServiceContext(ctx));
+ invContext.addAttachment(WebServiceContext.class, getWebServiceContext(ctx));
invContext.addAttachment(MessageContext.class, ctx);
+ invContext.setTargetBean(ep.getAttachment(Object.class)); //JBWS-2486 - JBWS-3002
inv.setJavaMethod(m);
inv.setArgs(params);
@@ -179,6 +180,14 @@
exchange.getInMessage().put(FaultMode.class,
FaultMode.UNCHECKED_APPLICATION_FAULT);
throw createFault(e, m, paramList, false);
}
+ finally
+ {
+ // JBWS-2486
+ if (ep.getAttachment(Object.class) == null)
+ {
+ ep.addAttachment(Object.class, inv.getInvocationContext().getTargetBean());
+ }
+ }
return retObj;
}
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-25 14:12:09 UTC
(rev 12521)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-25 15:00:33 UTC
(rev 12522)
@@ -53,9 +53,6 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available
# on AS 5.x
org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-25 14:12:09 UTC
(rev 12521)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-25 15:00:33 UTC
(rev 12522)
@@ -53,9 +53,6 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available
# on AS 5.x
org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-25 14:12:09 UTC
(rev 12521)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-25 15:00:33 UTC
(rev 12522)
@@ -47,8 +47,5 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-25 14:12:09 UTC
(rev 12521)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-25 15:00:33 UTC
(rev 12522)
@@ -47,8 +47,5 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
Show replies by date