Skip to content

[#956] FIX NPE ConfigurationObserver.globalConfigChanged #958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vharseko wants to merge 1 commit into from
Closed

[#956] FIX NPE ConfigurationObserver.globalConfigChanged #958

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions openam-core/src/main/java/com/sun/identity/common/configuration/ConfigurationObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* "Portions Copyrighted [year] [name of copyright owner]"
*
* Portions Copyrighted 2012-2016 ForgeRock AS.
* Portions Copyrighted 2017-2026 3A Systemc, LLC
*/

package com.sun.identity.common.configuration;
Expand Down Expand Up @@ -145,8 +146,10 @@ public void globalConfigChanged(String serviceName, String version, String group
SSOToken adminToken = AccessController.doPrivileged(AdminTokenAction.getInstance());
try {
Properties newProp = ServerConfiguration.getServerInstance(adminToken, serverName);
SystemProperties.initializeProperties(newProp, true, true);
notifies(Constants.SVC_NAME_PLATFORM);
if (newProp!=null) {
SystemProperties.initializeProperties(newProp, true, true);
notifies(Constants.SVC_NAME_PLATFORM);
}
} catch (SSOException | IOException | SMSException ex) {
// ignored
}
Expand Down