Commit 8e2da200 authored by Dave Cridland's avatar Dave Cridland Committed by GitHub

Merge pull request #711 from akrherz/of1128

OF-1228 Prevent NPE on first boot
parents 9248a822 b5b07fd9
...@@ -138,7 +138,12 @@ public class AdminConsolePlugin implements Plugin { ...@@ -138,7 +138,12 @@ public class AdminConsolePlugin implements Plugin {
// Create a connector for https traffic if it's enabled. // Create a connector for https traffic if it's enabled.
sslEnabled = false; sslEnabled = false;
try { try {
final IdentityStore identityStore = XMPPServer.getInstance().getCertificateStoreManager().getIdentityStore( ConnectionType.WEBADMIN ); IdentityStore identityStore = null;
if (XMPPServer.getInstance().getCertificateStoreManager() == null){
Log.warn( "Admin console: CertifcateStoreManager has not been initialized yet. HTTPS will be unavailable." );
} else {
identityStore = XMPPServer.getInstance().getCertificateStoreManager().getIdentityStore( ConnectionType.WEBADMIN );
}
if (identityStore != null && adminSecurePort > 0 ) if (identityStore != null && adminSecurePort > 0 )
{ {
if ( identityStore.getAllCertificates().isEmpty() ) if ( identityStore.getAllCertificates().isEmpty() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment