svn commit: r1243297 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java

[rm...@apache.org]

Author: rmannibucau
Date: Sun Feb 12 18:53:47 2012
New Revision: 1243297

URL: http://svn.apache.org/viewvc?rev=1243297&view=rev
Log:
fixing the test checking if we are using defaults or not for inclusion/exclusions

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=1243297&r1=1243296&r2=1243297&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java Sun Feb 12 18:53:47 2012
@@ -206,7 +206,7 @@ public class DeploymentsResolver impleme
             Filter includeFilter = Filters.patterns(include);
 
             // we should exclude system apps before and apply user properties after
-            if (!".*".equals(include) && !"".equals(exclude)) { // if we are using default this will not do anything
+            if (!".*".equals(include) || !"".equals(exclude)) { // if we are using default this will not do anything
                 final IncludeExcludeFilter filter = new IncludeExcludeFilter(includeFilter, Filters.patterns(exclude));
                 // filter using user parameters
                 urlSet = urlSet.filter(filter);