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 2005/09/10 03:24:13 UTC
svn commit: r279928 - in
/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security:
jaas/ServerRealmConfigurationEntry.java realm/GenericSecurityRealm.java
Author: djencks
Date: Fri Sep 9 18:24:10 2005
New Revision: 279928
URL: http://svn.apache.org/viewcvs?rev=279928&view=rev
Log:
GERONIMO-1000 avoid NPE on client where there is no loginService reference
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ServerRealmConfigurationEntry.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ServerRealmConfigurationEntry.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ServerRealmConfigurationEntry.java?rev=279928&r1=279927&r2=279928&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ServerRealmConfigurationEntry.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ServerRealmConfigurationEntry.java Fri Sep 9 18:24:10 2005
@@ -66,7 +66,9 @@
Properties options = new Properties();
options.put(JaasLoginCoordinator.OPTION_REALM, realmName);
options.put(JaasLoginCoordinator.OPTION_KERNEL, kernel.getKernelName());
- options.put(JaasLoginCoordinator.OPTION_SERVICENAME, loginService.getObjectName());
+ if (loginService != null) {
+ options.put(JaasLoginCoordinator.OPTION_SERVICENAME, loginService.getObjectName());
+ }
options.put("realm", realmName);
options.put("kernel", kernel.getKernelName());
Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java?rev=279928&r1=279927&r2=279928&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java Fri Sep 9 18:24:10 2005
@@ -156,7 +156,9 @@
Map options = new HashMap();
options.put(JaasLoginCoordinator.OPTION_REALM, realmName);
options.put(JaasLoginCoordinator.OPTION_KERNEL, kernel.getKernelName());
- options.put(JaasLoginCoordinator.OPTION_SERVICENAME, loginService.getObjectName());
+ if (loginService != null) {
+ options.put(JaasLoginCoordinator.OPTION_SERVICENAME, loginService.getObjectName());
+ }
return new JaasLoginModuleConfiguration(JaasLoginCoordinator.class.getName(), LoginModuleControlFlag.REQUIRED, options, true, realmName);
}