eckehard 2005/02/02 06:53:32
Modified: proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl
Tag: TWS421_BRANCH URMUserAdministratorImpl.java
Log:
fixed Nullpointer during metadata access
Revision Changes Path
No revision
No revision
1.1.4.1 +24 -5
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/URMUserAdministratorImpl.java
Index: URMUserAdministratorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/authenticator/impl/URMUserAdministratorImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- URMUserAdministratorImpl.java 25 Mar 2004 16:18:08 -0000 1.1
+++ URMUserAdministratorImpl.java 2 Feb 2005 14:53:32 -0000 1.1.4.1
@@ -63,7 +63,6 @@
super (adminConf, owner);
// Create the UserDBManagerSpi (SSX)
-
URMConfigurator conf =
(URMConfigurator)adminConf.getSubConfigurators().get("UserDatabase");
Properties props = conf.getProperties();
String class_name = props != null ? (String)props.get(
@@ -96,7 +95,7 @@
}
public URMUserAdministratorImpl(URMAdministrator inAdmin, Object owner)
throws URMConnectionException {
- super(inAdmin, owner);
+ super(inAdmin, owner);
mUserDBManagerSpi = inAdmin.getUserDBManager();
URMMetadataPropsSpi mp_spi = inAdmin.getMetaDataprop();
if (mp_spi != null)
@@ -112,6 +111,26 @@
public URMUserAdministratorImpl(URMConfigurator adminConf,
URMUserDBManagerSpi userDbSpi, Object owner) throws URMConfigurationException {
super (adminConf, owner);
mUserDBManagerSpi = userDbSpi;
+ try {
+ URMConfigurator root_conf = adminConf.getRootConfigurator();
+ URMConfigurator conf =
root_conf.getSubConfigurator("Authenticator/Administrator/UserDatabase/MetadataProperties");
+ if (conf != null) {
+ Properties props = conf.getProperties();
+ String class_name = props != null ? (String)props.get(
+
URMConstants.FACTORY_CLASS_ATTRIBUTE_NAME) : null;
+ if (class_name == null)
+ throw new URMConfigurationException(
+ MessageLogger.getAndLogMessage(msLogger,
"URMCOC0002",
+ URMConstants.FACTORY_CLASS_ATTRIBUTE_NAME,
"Administrator/UserDatabase/MetadataProperties"));
+ Object mprops_params[] = { conf, owner };
+ mMetadataPropsSpi =
(URMMetadataPropsSpi)URMClassInstantiator.newInstance(class_name,
mprops_params);
+ }
+ else {
+ MessageLogger.logMessage(msLogger, "URMCOW0028");
+ }
+ } catch (URMException e) {
+ throw new
URMConfigurationException(MessageLogger.getAndLogMessage(msLogger, "F", e));
+ }
}
/******************* UserDB Manager ***************************/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
