Switch to spotbugs and fix some issues #69
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,14 +15,14 @@ | |
| /** | ||
| * Implements the main listener daemon thread. This is the class that gets | ||
| * launched by the command line, and owns the server socket, etc. | ||
| * | ||
| * @author mailto: <a href="[email protected]">Rick Knowles</a> | ||
| * @version $Id: Ajp13ConnectorFactory.java,v 1.12 2006/03/24 17:24:22 rickknowles Exp $ | ||
| */ | ||
| public class Ajp13ConnectorFactory implements ConnectorFactory { | ||
| public boolean start(Map args, Server server) throws IOException { | ||
| int listenPort = Option.AJP13_PORT.get(args); | ||
| // String listenAddress = Option.AJP13_LISTEN_ADDRESS.get(args); | ||
|
|
||
| if (listenPort < 0) { | ||
| return false; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,7 +36,7 @@ | |
| /** | ||
| * Manages the references to individual webapps within the container. This object handles | ||
| * the mapping of url-prefixes to webapps, and init and shutdown of any webapps it manages. | ||
| * | ||
| * @author <a href="mailto:[email protected]">Rick Knowles</a> | ||
| * @version $Id: HostConfiguration.java,v 1.8 2007/08/02 06:16:00 rickknowles Exp $ | ||
| */ | ||
|
|
@@ -61,8 +61,8 @@ public HostConfiguration(Server server, String hostname, ClassLoader commonLibCL | |
|
|
||
| try { | ||
| // Build the realm | ||
| Class<? extends LoginService> realmClass = Option.REALM_CLASS_NAME.get(args, LoginService.class, commonLibCL); | ||
| Constructor<? extends LoginService> realmConstr = realmClass.getConstructor(Map.class); | ||
| loginService = (LoginService) realmConstr.newInstance(args); | ||
| } catch (Throwable err) { | ||
| throw (IOException)new IOException("Failed to setup authentication realm").initCause(err); | ||
|
|
@@ -133,10 +133,10 @@ private void loadBuiltinMimeTypes() { | |
| */ | ||
| private Handler configureAccessLog(Handler handler, String webAppName) { | ||
| try { | ||
| Class<? extends RequestLog> loggerClass = Option.ACCESS_LOGGER_CLASSNAME.get(args, RequestLog.class, commonLibCL); | ||
| if (loggerClass!=null) { | ||
| // Build the realm | ||
| Constructor<? extends RequestLog> loggerConstr = loggerClass.getConstructor(String.class, Map.class); | ||
| RequestLogHandler rlh = new RequestLogHandler(); | ||
| rlh.setHandler(handler); | ||
| rlh.setRequestLog((RequestLog) loggerConstr.newInstance(webAppName, args)); | ||
|
|
@@ -192,7 +192,7 @@ public void postConfigure() throws Exception { | |
| public String getHostname() { | ||
| return this.hostname; | ||
| } | ||
|
|
||
| public void reloadWebApp(String prefix) { | ||
| WebAppContext webApp = this.webapps.get(prefix); | ||
| if (webApp != null) { | ||
|
|
@@ -230,10 +230,12 @@ protected File getWebRoot(File requestedWebroot, File warfile) throws IOExceptio | |
| File tempFile = File.createTempFile("dummy", "dummy"); | ||
| String userName = System.getProperty("user.name"); | ||
| unzippedDir = new File(tempFile.getParent(), | ||
| (userName != null ? WinstoneResourceBundle.globalReplace(userName, | ||
| new String[][] {{"/", ""}, {"\\", ""}, {",", ""}}) + "/" : "") + | ||
| "winstone/" + warfile.getName()); | ||
| if (!tempFile.delete()) { | ||
|
There was a problem hiding this comment. Or there is a Commons IO utility, or you can use |
||
| Logger.logDirectMessage(Logger.WARNING, null, "Failed To delete dummy file", null); | ||
| } | ||
| } | ||
| if (unzippedDir.exists()) { | ||
| if (!unzippedDir.isDirectory()) { | ||
|
|
@@ -250,43 +252,51 @@ protected File getWebRoot(File requestedWebroot, File warfile) throws IOExceptio | |
| if(!timestampFile.exists() || Math.abs(timestampFile.lastModified()- warfile.lastModified())>1000) { | ||
| // contents of the target directory is inconsistent from the war. | ||
| deleteRecursive(unzippedDir); | ||
| if (!unzippedDir.mkdirs()) { | ||
|
|
||
| Logger.logDirectMessage(Logger.WARNING, null, "Failed to recreate dirs " + unzippedDir.getAbsolutePath(), null); | ||
| } | ||
| } else { | ||
| // files are up to date | ||
| return unzippedDir; | ||
| } | ||
|
|
||
| // Iterate through the files | ||
| byte buffer[] = new byte[8192]; | ||
| try (JarFile warArchive = new JarFile(warfile)) { | ||
| for (Enumeration<JarEntry> e = warArchive.entries(); e.hasMoreElements();) { | ||
| JarEntry element = e.nextElement(); | ||
| if (element.isDirectory()) { | ||
| continue; | ||
| } | ||
| String elemName = element.getName(); | ||
|
|
||
| // If archive date is newer than unzipped file, overwrite | ||
| File outFile = new File(unzippedDir, elemName); | ||
| if (outFile.exists() && (outFile.lastModified() > warfile.lastModified())) { | ||
| continue; | ||
| } | ||
| File parentOutFile = outFile.getParentFile(); | ||
| if (!parentOutFile.mkdirs()) { | ||
|
There was a problem hiding this comment. We can drop Java 6 later and start using There was a problem hiding this comment. I'll clean this bit up then |
||
| Logger.logDirectMessage(Logger.WARNING, null, "Failed to create dirs " + parentOutFile.getAbsolutePath(), null); | ||
| } | ||
|
|
||
| // Copy out the extracted file | ||
| try (InputStream inContent = warArchive.getInputStream(element); | ||
| OutputStream outStream = new FileOutputStream(outFile)) { | ||
| int readBytes = inContent.read( buffer ); | ||
| while ( readBytes != -1 ) { | ||
| outStream.write( buffer, 0, readBytes ); | ||
| readBytes = inContent.read( buffer ); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // extraction completed | ||
| new FileOutputStream(timestampFile).close(); | ||
| if(!timestampFile.setLastModified(warfile.lastModified())) { | ||
| Logger.logDirectMessage(Logger.WARNING, null, "Failed to set timestamp " + timestampFile.getAbsolutePath(), null); | ||
| } | ||
|
|
||
| // Return webroot | ||
| return unzippedDir; | ||
|
|
@@ -302,7 +312,9 @@ private void deleteRecursive(File dir) { | |
| deleteRecursive(child); | ||
| } | ||
| } | ||
| if (!dir.delete()) { | ||
| Logger.logDirectMessage(Logger.WARNING, null, "Failed to delete dirs " + dir.getAbsolutePath(), null); | ||
| } | ||
| } | ||
|
|
||
| protected ContextHandlerCollection initMultiWebappDir(File webappsDir) { | ||
|
|
@@ -317,42 +329,46 @@ protected ContextHandlerCollection initMultiWebappDir(File webappsDir) { | |
| throw new WinstoneException(Launcher.RESOURCES.getString("HostConfig.WebAppDirIsNotDirectory", webappsDir.getPath())); | ||
| } else { | ||
| File children[] = webappsDir.listFiles(); | ||
| if (children != null) { | ||
| for (File aChildren : children) { | ||
| String childName = aChildren.getName(); | ||
|
|
||
| // Check any directories for warfiles that match, and skip: only deploy the war file | ||
| if (aChildren.isDirectory()) { | ||
| File matchingWarFile = new File(webappsDir, aChildren.getName() + ".war"); | ||
| if (matchingWarFile.exists() && matchingWarFile.isFile()) { | ||
| Logger.log(Logger.DEBUG, Launcher.RESOURCES, "HostConfig.SkippingWarfileDir", childName); | ||
| } else { | ||
| String prefix = childName.equalsIgnoreCase("ROOT") ? "" : "/" + childName; | ||
| if (!this.webapps.containsKey(prefix)) { | ||
| try { | ||
| WebAppContext context = create(aChildren, prefix); | ||
| webApps.addHandler(configureAccessLog(context,childName)); | ||
| Logger.log(Logger.INFO, Launcher.RESOURCES, "HostConfig.DeployingWebapp", childName); | ||
| } catch (Throwable err) { | ||
| Logger.log(Logger.ERROR, Launcher.RESOURCES, "HostConfig.WebappInitError", prefix, err); | ||
| } | ||
| } | ||
| } | ||
| } else if (childName.endsWith(".war")) { | ||
| String outputName = childName.substring(0, childName.lastIndexOf(".war")); | ||
| String prefix = outputName.equalsIgnoreCase("ROOT") ? "" : "/" + outputName; | ||
|
|
||
| if (!this.webapps.containsKey(prefix)) { | ||
| File outputDir = new File(webappsDir, outputName); | ||
| if (!outputDir.mkdirs()) { | ||
| Logger.logDirectMessage(Logger.WARNING, null, "Failed to mkdirs " + outputDir.getAbsolutePath(), null); | ||
| } | ||
| try { | ||
| WebAppContext context = create( | ||
| getWebRoot(new File(webappsDir, outputName), aChildren), prefix); | ||
| webApps.addHandler(configureAccessLog(context,outputName)); | ||
| Logger.log(Logger.INFO, Launcher.RESOURCES, "HostConfig.DeployingWebapp", childName); | ||
| } catch (Throwable err) { | ||
| Logger.log(Logger.ERROR, Launcher.RESOURCES, "HostConfig.WebappInitError", prefix, err); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,28 +16,28 @@ | |
|
|
||
| /** | ||
| * Manages the references to individual hosts within the container. This object handles | ||
| * the mapping of ip addresses and hostnames to groups of webapps, and init and | ||
| * shutdown of any hosts it manages. | ||
| * | ||
| * @author <a href="mailto:[email protected]">Rick Knowles</a> | ||
| * @version $Id: HostGroup.java,v 1.4 2006/03/24 17:24:21 rickknowles Exp $ | ||
| */ | ||
| public class HostGroup { | ||
|
|
||
| private final static String DEFAULT_HOSTNAME = "default"; | ||
| private final Server server; | ||
|
|
||
| // private Map args; | ||
| private Map<String, HostConfiguration> hostConfigs; | ||
| private String defaultHostName; | ||
|
|
||
| public HostGroup( | ||
| Server server, ClassLoader commonLibCL, | ||
| File commonLibCLPaths[], Map args) throws IOException { | ||
| this.server = server; | ||
| // this.args = args; | ||
| this.hostConfigs = new Hashtable<>(); | ||
|
|
||
| // Is this the single or multiple configuration ? Check args | ||
| File webappsDir = Option.WEBAPPS_DIR.get(args); | ||
|
|
||
|
|
@@ -58,7 +58,7 @@ public HostConfiguration getHostByName(String hostname) { | |
| } | ||
| return (HostConfiguration) this.hostConfigs.get(this.defaultHostName); | ||
| } | ||
|
|
||
| protected void initHost(File webappsDir, String hostname, | ||
| ClassLoader commonLibCL, | ||
| File commonLibCLPaths[], Map args) throws IOException { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If unused, please.do one of the following..
Looks like it is a bug unless I miss something