You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/12 19:29:04 UTC
svn commit: r1243288 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Author: rmannibucau
Date: Sun Feb 12 18:29:04 2012
New Revision: 1243288
URL: http://svn.apache.org/viewvc?rev=1243288&view=rev
Log:
if the user didn't modify include/exclude properties simply ignore the include one using built in 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=1243288&r1=1243287&r2=1243288&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:29:04 2012
@@ -203,13 +203,15 @@ public class DeploymentsResolver impleme
// so that we can choose not to filter modules with descriptors on the full list
final UrlSet prefiltered = urlSet;
- final Filter includeFilter = Filters.patterns(include);
+ 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
final IncludeExcludeFilter filter = new IncludeExcludeFilter(includeFilter, Filters.patterns(exclude));
// filter using user parameters
urlSet = urlSet.filter(filter);
+ } else {
+ includeFilter = null;
}
if (prefiltered.size() == urlSet.size()) {