Author: markt
Date: Sat Oct 17 19:28:15 2009
New Revision: 826296

URL: http://svn.apache.org/viewvc?rev=826296&view=rev
Log:
Fix Eclipse warnings

Modified:
    tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=826296&r1=826295&r2=826296&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java 
Sat Oct 17 19:28:15 2009
@@ -94,6 +94,7 @@
 public class HostManagerServlet
     extends HttpServlet implements ContainerServlet {
 
+    private static final long serialVersionUID = 1L;
 
     // ----------------------------------------------------- Instance Variables
 
@@ -366,12 +367,14 @@
 
         // Validate and create appBase
         File appBaseFile = null;
+        File file = null;
         if (appBase == null || appBase.length() == 0) {
-            appBase = name;
+            file = new File(name);
+        } else {
+            file = new File(appBase);
         }
-        File file = new File(appBase);
         if (!file.isAbsolute())
-            file = new File(System.getProperty("catalina.base"), appBase);
+            file = new File(System.getProperty("catalina.base"), 
file.getPath());
         try {
             appBaseFile = file.getCanonicalFile();
         } catch (IOException e) {
@@ -408,12 +411,14 @@
                     try {
                         is.close();
                     } catch (IOException e) {
+                        // Ignore
                     }
                 }
                 if (os != null) {
                     try {
                         os.close();
                     } catch (IOException e) {
+                        // Ignore
                     }
                 }
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to