You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/06/22 08:02:52 UTC

svn commit: r549725 - /geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java

Author: gawor
Date: Thu Jun 21 23:02:50 2007
New Revision: 549725

URL: http://svn.apache.org/viewvc?view=rev&rev=549725
Log:
check for null

Modified:
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java

Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java?view=diff&rev=549725&r1=549724&r2=549725
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java Thu Jun 21 23:02:50 2007
@@ -144,7 +144,7 @@
         try {
             // JACC v1.0 secion B.19
             String servletName = InternalJettyServletHolder.getCurrentServletName();
-            if (servletName.equals("jsp")) {
+            if (servletName == null || servletName.equals("jsp")) {
                 servletName = "";
             }
             acc.checkPermission(new WebRoleRefPermission(servletName, role));