[jboss-cvs] JBossAS SVN: r80324 - trunk/server/src/main/org/jboss/web/deployers.

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

Author: alesj
Date: 2008-10-31 16:31:14 -0400 (Fri, 31 Oct 2008)
New Revision: 80324

Modified:
   trunk/server/src/main/org/jboss/web/deployers/WARStructure.java
Log:
Make webInfLibMetaDataFilter null by default.

Modified: trunk/server/src/main/org/jboss/web/deployers/WARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/WARStructure.java	2008-10-31 18:09:04 UTC (rev 80323)
+++ trunk/server/src/main/org/jboss/web/deployers/WARStructure.java	2008-10-31 20:31:14 UTC (rev 80324)
@@ -49,7 +49,7 @@
    private VirtualFileFilter webInfLibFilter = DEFAULT_WEB_INF_LIB_FILTER;
 
    /** The web-inf/lib/[some-archive]/META-INF filter */
-   private VirtualFileFilter webInfLibMetaDataFilter = DEFAULT_WEB_INF_LIB_FILTER;
+   private VirtualFileFilter webInfLibMetaDataFilter;
 
    /**
     * Sets the default relative order 1000.
@@ -173,7 +173,7 @@
                   for (VirtualFile jar : archives)
                   {
                      // either same as plain lib filter, null or accepts the jar
-                     if (webInfLibMetaDataFilter == webInfLibFilter || webInfLibMetaDataFilter == null || webInfLibMetaDataFilter.accepts(jar))
+                     if (webInfLibMetaDataFilter == null || webInfLibMetaDataFilter == webInfLibFilter || webInfLibMetaDataFilter.accepts(jar))
                         metaDataLocations.add("WEB-INF/lib/" + jar.getName() + "/META-INF");
                   }
                }