------------------------------------------------------------
revno: 21608
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Tue 2016-01-05 20:38:32 +0100
message:
Test fix
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.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-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java 2016-01-05 19:38:32 +0000
@@ -210,7 +210,7 @@
if ( userCredentials == null )
{
- return Optional.empty();
+ return Optional.ofNullable( key.getDefaultValue() );
}
UserSetting setting = userSettingStore.getUserSetting( userCredentials.getUserInfo(), key.getName() );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
