diff --git a/main/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java b/main/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java index c81ae4e..8c91a64 100644 --- a/main/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java +++ b/main/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java @@ -44,10 +44,10 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.config.serverbeans.VirtualServer; import com.sun.enterprise.deploy.shared.AbstractArchiveHandler; -import com.sun.enterprise.security.perms.SMGlobalPolicyUtil; import com.sun.enterprise.security.perms.PermsArchiveDelegate; -import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.security.perms.SMGlobalPolicyUtil; import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.StringUtils; import org.apache.naming.resources.WebDirContext; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.deployment.DeployCommandParameters; @@ -55,23 +55,28 @@ import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.api.deployment.archive.ArchiveDetector; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.deployment.common.DeploymentProperties; +import org.glassfish.loader.util.ASClassLoaderUtil; import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.web.loader.WebappClassLoader; import org.glassfish.web.sniffer.WarDetector; -import org.glassfish.loader.util.ASClassLoaderUtil; -import javax.inject.Inject; -import javax.inject.Named; -import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.types.Property; +import javax.inject.Inject; +import javax.inject.Named; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import java.io.*; +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; -import java.net.URL; import java.net.URI; +import java.net.URL; import java.security.AccessController; import java.security.PrivilegedAction; +import java.security.PrivilegedActionException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -79,8 +84,6 @@ import java.util.ResourceBundle; import java.util.jar.JarFile; import java.util.logging.Level; import java.util.logging.Logger; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; import static javax.xml.stream.XMLStreamConstants.*; @@ -163,9 +166,7 @@ public class WarHandler extends AbstractArchiveHandler { try { WebXmlParser webXmlParser = getWebXmlParser(archive); versionIdentifierValue = webXmlParser.getVersionIdentifier(); - } catch (XMLStreamException e) { - logger.log(Level.SEVERE, e.getMessage()); - } catch (IOException e) { + } catch (XMLStreamException | IOException e) { logger.log(Level.SEVERE, e.getMessage()); } return versionIdentifierValue; @@ -220,18 +221,12 @@ public class WarHandler extends AbstractArchiveHandler { throw new SecurityException(e.getException()); } - } catch(XMLStreamException xse) { - logger.log(Level.SEVERE, xse.getMessage()); - if (logger.isLoggable(Level.FINE)) { - logger.log(Level.FINE, xse.getMessage(), xse); - } - xse.printStackTrace(); - } catch(IOException ioe) { - logger.log(Level.SEVERE, ioe.getMessage()); + } catch(XMLStreamException | IOException e) { + logger.log(Level.SEVERE, e.getMessage()); if (logger.isLoggable(Level.FINE)) { - logger.log(Level.FINE, ioe.getMessage(), ioe); + logger.log(Level.FINE, e.getMessage(), e); } - ioe.printStackTrace(); + e.printStackTrace(); } cloader.start(); @@ -242,7 +237,7 @@ public class WarHandler extends AbstractArchiveHandler { protected WebXmlParser getWebXmlParser(ReadableArchive archive) throws XMLStreamException, IOException { - WebXmlParser webXmlParser = null; + WebXmlParser webXmlParser; boolean hasWSLDD = archive.exists(WEBLOGIC_XML); File runtimeAltDDFile = archive.getArchiveMetaData( DeploymentProperties.RUNTIME_ALT_DD, File.class); @@ -280,10 +275,9 @@ public class WarHandler extends AbstractArchiveHandler { String extraClassPath = webXmlParser.getExtraClassPath(); if (extraClassPath != null) { - // Parse the extra classpath into its ':' and ';' separated - // components. Ignore ':' as a separator if it is preceded by - // '\' - String[] pathElements = extraClassPath.split(";|((? csrs = new ArrayList(); + List csrs = new ArrayList<>(); HttpService httpService = serverConfig.getHttpService(); DeployCommandParameters params = dc.getCommandParameters(DeployCommandParameters.class); String vsIDs = params.virtualservers; @@ -464,7 +451,7 @@ public class WarHandler extends AbstractArchiveHandler { String localName = parser.getLocalName(); if (!name.equals(localName)) { String msg = rb.getString(UNEXPECTED_XML_ELEMENT); - msg = MessageFormat.format(msg, new Object[] { name, localName }); + msg = MessageFormat.format(msg, name, localName); throw new XMLStreamException(msg); } return; @@ -559,7 +546,7 @@ public class WarHandler extends AbstractArchiveHandler { protected void read(InputStream input) throws XMLStreamException { parser = getXMLInputFactory().createXMLStreamReader(input); - int event = 0; + int event; boolean inClassLoader = false; skipRoot(getRootElementName()); @@ -570,18 +557,22 @@ public class WarHandler extends AbstractArchiveHandler { int count = parser.getAttributeCount(); for (int i = 0; i < count; i++) { String attrName = parser.getAttributeName(i).getLocalPart(); - if ("delegate".equals(attrName)) { - delegate = Boolean.valueOf(parser.getAttributeValue(i)); - } else if ("extra-class-path".equals(attrName)) { - extraClassPath = parser.getAttributeValue(i); - } else if ("dynamic-reload-interval".equals(attrName)) { - if (parser.getAttributeValue(i) != null) { - // Log warning if dynamic-reload-interval is specified - // in sun-web.xml since it is not supported - if (logger.isLoggable(Level.WARNING)) { - logger.log(Level.WARNING, DYNAMIC_RELOAD_INTERVAL); + switch (attrName) { + case "delegate": + delegate = Boolean.valueOf(parser.getAttributeValue(i)); + break; + case "extra-class-path": + extraClassPath = parser.getAttributeValue(i); + break; + case "dynamic-reload-interval": + if (parser.getAttributeValue(i) != null) { + // Log warning if dynamic-reload-interval is specified + // in sun-web.xml since it is not supported + if (logger.isLoggable(Level.WARNING)) { + logger.log(Level.WARNING, DYNAMIC_RELOAD_INTERVAL); + } } - } + break; } } inClassLoader = true; @@ -686,7 +677,7 @@ public class WarHandler extends AbstractArchiveHandler { skipRoot("weblogic-web-app"); - int event = 0; + int event; while (parser.hasNext() && (event = parser.next()) != END_DOCUMENT) { if (event == START_ELEMENT) { String name = parser.getLocalName(); @@ -726,7 +717,7 @@ public class WarHandler extends AbstractArchiveHandler { protected void read(InputStream input) throws XMLStreamException { parser = getXMLInputFactory().createXMLStreamReader(input); - int event = 0; + int event; while (parser.hasNext() && (event = parser.next()) != END_DOCUMENT) { if (event == START_ELEMENT) { String name = parser.getLocalName();