Author: asoldano Date: 2014-05-13 16:42:40 -0400 (Tue, 13 May 2014) New Revision: 18640 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java Log: [JBWS-3793] Fix Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java 2014-05-13 20:21:06 UTC (rev 18639) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java 2014-05-13 20:42:40 UTC (rev 18640) @@ -115,7 +115,7 @@ public EJBArchiveMetaData(List<EJBMetaData> beans, String configName, String configFile, String webServiceContextRoot, String securityDomain, PublishLocationAdapter publishLocationAdapter) { - if (beans != null) { + if (beans != null && !beans.isEmpty()) { this.beans = Collections.unmodifiableList(beans); } else { this.beans = Collections.emptyList(); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java 2014-05-13 20:21:06 UTC (rev 18639) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java 2014-05-13 20:42:40 UTC (rev 18640) @@ -139,12 +139,12 @@ PublishLocationAdapter publishLocationAdapter, List<JSESecurityMetaData> securityMetaData) { this.contextRoot = contextRoot; - if (servletMappings != null) { + if (servletMappings != null && !servletMappings.isEmpty()) { this.servletMappings = Collections.unmodifiableMap(servletMappings); } else { this.servletMappings = Collections.emptyMap(); } - if (servletClassNames != null) { + if (servletClassNames != null && !servletClassNames.isEmpty()) { this.servletClassNames = Collections.unmodifiableMap(servletClassNames); } else { this.servletClassNames = Collections.emptyMap(); @@ -153,7 +153,7 @@ this.configFile = configFile; this.securityDomain = securityDomain; this.publishLocationAdapter = publishLocationAdapter; - if (securityMetaData != null) { + if (securityMetaData != null && !securityMetaData.isEmpty()) { this.securityMetaData = Collections.unmodifiableList(securityMetaData); } else { this.securityMetaData = Collections.emptyList(); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java 2014-05-13 20:21:06 UTC (rev 18639) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java 2014-05-13 20:42:40 UTC (rev 18640) @@ -87,7 +87,7 @@ public JSEResourceCollection(final String name, Collection<String> urlPatterns) { this.name = name; - if (urlPatterns != null) { + if (urlPatterns != null && !urlPatterns.isEmpty()) { this.urlPatterns = Collections.unmodifiableSet(new HashSet<String>(urlPatterns)); } else { this.urlPatterns = Collections.emptySet();