1 files changed, 14 insertions, 0 deletions
diff --git a/base/server/tomcat8/src/com/netscape/cms/tomcat/ProxyRealm.java b/base/server/tomcat8/src/com/netscape/cms/tomcat/ProxyRealm.java
index bcedd52dc..72876a4ed 100644
--- a/base/server/tomcat8/src/com/netscape/cms/tomcat/ProxyRealm.java
+++ b/base/server/tomcat8/src/com/netscape/cms/tomcat/ProxyRealm.java
@@ -62,16 +62,19 @@ public class ProxyRealm implements Realm {
 
     @Override
     public Principal authenticate(String username) {
+        if (realm == null) return null;
         return realm.authenticate(username);
     }
 
     @Override
     public Principal authenticate(String username, String password) {
+        if (realm == null) return null;
         return realm.authenticate(username, password);
     }
 
     @Override
     public Principal authenticate(X509Certificate certs[]) {
+        if (realm == null) return null;
         return realm.authenticate(certs);
     }
 
@@ -86,11 +89,13 @@ public class ProxyRealm implements Realm {
             String realmName,
             String md5a2
     ) {
+        if (realm == null) return null;
         return realm.authenticate(username, digest, nonce, nc, cnonce, qop, realmName, md5a2);
     }
 
     @Override
     public Principal authenticate(GSSContext gssContext, boolean storeCreds) {
+        if (realm == null) return null;
         return realm.authenticate(gssContext, storeCreds);
     }
 
@@ -101,21 +106,25 @@ public class ProxyRealm implements Realm {
             SecurityConstraint[] constraints,
             Context context
     ) throws IOException {
+        if (realm == null) return false;
         return realm.hasResourcePermission(request, response, constraints, context);
     }
 
     @Override
     public void backgroundProcess() {
+        if (realm == null) return;
         realm.backgroundProcess();
     }
 
     @Override
     public SecurityConstraint[] findSecurityConstraints(Request request, Context context) {
+        if (realm == null) return null;
         return realm.findSecurityConstraints(request, context);
     }
 
     @Override
     public boolean hasRole(Wrapper wrapper, Principal principal, String role) {
+        if (realm == null) return false;
         return realm.hasRole(wrapper, principal, role);
     }
 
@@ -125,26 +134,31 @@ public class ProxyRealm implements Realm {
             Response response,
             SecurityConstraint[] constraint
     ) throws IOException {
+        if (realm == null) return false;
         return realm.hasUserDataPermission(request,  response, constraint);
     }
 
     @Override
     public void addPropertyChangeListener(PropertyChangeListener listener) {
+        if (realm == null) return;
         realm.addPropertyChangeListener(listener);
     }
 
     @Override
     public void removePropertyChangeListener(PropertyChangeListener listener) {
+        if (realm == null) return;
         realm.removePropertyChangeListener(listener);
     }
 
     @Override
     public CredentialHandler getCredentialHandler() {
+        if (realm == null) return null;
         return realm.getCredentialHandler();
     }
 
     @Override
     public void setCredentialHandler(CredentialHandler handler) {
+        if (realm == null) return;
         realm.setCredentialHandler(handler);
     }
 }