Author: jim.ma Date: 2015-03-13 04:11:47 -0400 (Fri, 13 Mar 2015) New Revision: 19558 Modified: common/branches/management/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java Log: [JBWS-3880]:Add NPE guard Modified: common/branches/management/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java =================================================================== --- common/branches/management/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java 2015-03-12 14:06:19 UTC (rev 19557) +++ common/branches/management/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java 2015-03-13 08:11:47 UTC (rev 19558) @@ -320,7 +320,10 @@ public void setSecurityDomainContext(SecurityDomainContext securityDomainContext) { this.securityDomainContext = securityDomainContext; - this.configsMap.put(Endpoint.SECURITY_DOMAIN, securityDomainContext.getSecurityDomain()); + if (securityDomainContext != null) + { + this.configsMap.put(Endpoint.SECURITY_DOMAIN, securityDomainContext.getSecurityDomain()); + } } public InstanceProvider getInstanceProvider()