From 2783582c7d845016ea0e14beca88da9ee85213af Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Sun, 27 Apr 2008 14:12:09 +0000
Subject: [PATCH] SWS-342

---
 .../mapping/AbstractAnnotationMethodEndpointMapping.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java b/core-tiger/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java
index 81dee340..b98d20f7 100644
--- a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java
+++ b/core-tiger/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java
@@ -44,7 +44,8 @@ public abstract class AbstractAnnotationMethodEndpointMapping extends AbstractMe
     }
 
     public final Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-        if (getEndpointClass(bean).getAnnotation(getEndpointAnnotationType()) != null) {
+        Class endpointClass = getEndpointClass(bean);
+        if (endpointClass != null && endpointClass.getAnnotation(getEndpointAnnotationType()) != null) {
             registerMethods(bean);
         }
         return bean;