[jboss-cvs] JBossAS SVN: r94204 - in projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual: plugins/context and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-10-01 04:45:11 -0400 (Thu, 01 Oct 2009)
New Revision: 94204

Modified:
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/AssembledDirectory.java
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/AbstractContextFactory.java
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java
Log:
Small fixes from FindBugs.

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/AssembledDirectory.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/AssembledDirectory.java	2009-10-01 07:37:13 UTC (rev 94203)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/AssembledDirectory.java	2009-10-01 08:45:11 UTC (rev 94204)
@@ -606,4 +606,10 @@
    {
       directory.cleanup();   
    }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      return (obj instanceof AssembledDirectory) && super.equals(obj);
+   }
 }

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/AbstractContextFactory.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/AbstractContextFactory.java	2009-10-01 07:37:13 UTC (rev 94203)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/AbstractContextFactory.java	2009-10-01 08:45:11 UTC (rev 94204)
@@ -35,7 +35,7 @@
  */
 public abstract class AbstractContextFactory implements VFSContextFactory
 {
-   private String[] protocols;
+   private final String[] protocols;
 
    protected AbstractContextFactory(String... protocols)
    {

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-10-01 07:37:13 UTC (rev 94203)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-10-01 08:45:11 UTC (rev 94204)
@@ -691,7 +691,8 @@
    protected DelegatingHandler mountZipStream(VirtualFileHandler parent, String name, InputStream zipStream) throws IOException, URISyntaxException
    {
       DelegatingHandler delegator = new DelegatingHandler(this, parent, name);
-      ZipStreamWrapper wrapper = new ZipStreamWrapper(zipStream, name, parent.getLastModified());
+      long lastModified = (parent != null) ? parent.getLastModified() : System.currentTimeMillis();
+      ZipStreamWrapper wrapper = new ZipStreamWrapper(zipStream, name, lastModified);
 
       URL delegatorUrl = null;
 

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java	2009-10-01 07:37:13 UTC (rev 94203)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryHandler.java	2009-10-01 08:45:11 UTC (rev 94204)
@@ -44,6 +44,9 @@
  */
 public class ZipEntryHandler extends AbstractVirtualFileHandler implements StructuredVirtualFileHandler
 {
+   /** serialVersionUID */
+   private static final long serialVersionUID = 1L;
+
    /** The url */
    private URL url;