Author: julien(a)jboss.com Date: 2007-01-10 11:23:58 -0500 (Wed, 10 Jan 2007) New Revision: 5980 Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java Log: don't try to return UserModule if identity service controller is null in JCRCMS Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2007-01-10 16:03:11 UTC (rev 5979) +++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2007-01-10 16:23:58 UTC (rev 5980) @@ -229,14 +229,18 @@ public UserModule getUserModule() { - try + if (identityServiceController != null) { - return (UserModule)identityServiceController.getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); + try + { + + return (UserModule)identityServiceController.getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); + } + catch (IdentityException e) + { + return null; + } } - catch (IdentityException e) - { - return null; - } } public IdentityServiceController getIdentityServiceController()