------------------------------------------------------------
revno: 8671
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Tue 2012-10-23 16:24:38 +0200
message:
Null check
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java 2012-10-22 18:48:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java 2012-10-23 14:24:38 +0000
@@ -83,7 +83,12 @@
public String execute()
{
- UserAuthorityGroup group = userService.getUserAuthorityGroup( selfRegistrationRole );
+ UserAuthorityGroup group = null;
+
+ if ( selfRegistrationRole != null )
+ {
+ group = userService.getUserAuthorityGroup( selfRegistrationRole );
+ }
Configuration config = configurationService.getConfiguration();
config.setSelfRegistrationRole( group );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
