From 5111a2c640f6429cbb3481f24040cc33d0facc1b Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@intalio.com>
Date: Thu, 8 Mar 2012 10:26:34 +1100
Subject: [PATCH] 373603 NullPointer in WebServletAnnotation

---
 .../org/eclipse/jetty/annotations/WebServletAnnotation.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
index 66861553f01..b3cd7acd4dc 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
@@ -100,7 +100,7 @@ public class WebServletAnnotation extends DiscoveredAnnotation
         {
             for (ServletHolder h : holders)
             {
-                if (h.getClassName().equals(clazz.getName()) && h.getName().equals(servletName))
+                if (h.getClassName().equals(clazz.getName()) && h.getName() != null && servletName.equals(h.getName()))
                 {
                     holder = h;
                     isNew = false;