Skip to content

Commit bd62e54

Browse files
committed
SWS-702 - sws:annotation-driven does not pick up @endpoint annotations on classes that are JDK proxies
1 parent 6b27590 commit bd62e54

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ private void loggedMethod() {
4040
}
4141

4242
@Around("loggedMethod()")
43-
public void log(ProceedingJoinPoint joinPoint) throws Throwable {
43+
public Object log(ProceedingJoinPoint joinPoint) throws Throwable {
4444
logInvoked = true;
4545
logger.info("Before: " + joinPoint.getSignature());
4646
try {
47-
joinPoint.proceed();
47+
return joinPoint.proceed();
4848
}
4949
finally {
5050
logger.info("After: " + joinPoint.getSignature());

core/src/test/resources/org/springframework/ws/server/endpoint/mapping/applicationContext.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:aop="http://www.springframework.org/schema/aop"
5+
xmlns:sws="http://www.springframework.org/schema/web-services"
56
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
6-
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
7-
8-
<aop:aspectj-autoproxy/>
9-
10-
<bean id="mapping"
11-
class="org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping"/>
7+
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
8+
http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd">
129

1310
<bean id="endpoint" class="org.springframework.ws.server.endpoint.mapping.PayloadRootEndpoint"/>
1411

12+
<aop:aspectj-autoproxy/>
13+
1514
<bean id="other" class="org.springframework.ws.server.endpoint.mapping.OtherBean"/>
1615

1716
<bean id="logAspect" class="org.springframework.ws.server.endpoint.mapping.LogAspect"/>
1817

18+
<sws:annotation-driven/>
19+
1920
</beans>

0 commit comments

Comments
 (0)