You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/10/14 23:28:10 UTC

svn commit: r1022726 - /geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java

Author: djencks
Date: Thu Oct 14 21:28:10 2010
New Revision: 1022726

URL: http://svn.apache.org/viewvc?rev=1022726&view=rev
Log:
GERONIMO-5647 avoid an NPE in jetty if no security realm is specified anywhere

Modified:
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java?rev=1022726&r1=1022725&r2=1022726&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java Thu Oct 14 21:28:10 2010
@@ -692,8 +692,8 @@ public class JettyModuleBuilder extends 
         if (jettyWebApp.isSetSecurityRealmName()) {
             securityRealmName = jettyWebApp.getSecurityRealmName().trim();
         } else {
-            if (loginConfigInfo == null) return;
-            securityRealmName = loginConfigInfo.realmName.trim();
+            if (loginConfigInfo == null ||loginConfigInfo.realmName == null) return;
+            securityRealmName = loginConfigInfo.realmName;
         }
         AbstractNameQuery configurationFactoryName = new AbstractNameQuery(null, Collections.singletonMap("name", securityRealmName), ConfigurationFactory.class.getName());
         securityFactoryData.setReferencePattern("ConfigurationFactory", configurationFactoryName);