Bug 550949 - [region] enable the ALL optimization from cached startI20190915-1800I20190914-1800I20190913-1800I20190912-1800I20190911-1805

Change-Id: I84bdbb2fc3f03e040863f46dafb8591250a3349b
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

4 files changed, 6 insertions, 6 deletions

diff --git a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
index e680ac795..3cc52a778 100644
--- a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.equinox.region
-Bundle-Version: 1.4.500.qualifier
+Bundle-Version: 1.4.600.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Fragment-Host: system.bundle
 ExtensionBundle-Activator: org.eclipse.equinox.internal.region.RegionManager
diff --git a/bundles/org.eclipse.equinox.region/pom.xml b/bundles/org.eclipse.equinox.region/pom.xml
index 963b38fc4..59808587e 100644
--- a/bundles/org.eclipse.equinox.region/pom.xml
+++ b/bundles/org.eclipse.equinox.region/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.region</artifactId>
-  <version>1.4.500-SNAPSHOT</version>
+  <version>1.4.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java
index 79447a21e..f150db101 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java
@@ -175,7 +175,7 @@ public final class StandardRegionDigraphPersistence implements RegionDigraphPers
 					namespaceFilters = new ArrayList<>(numFilters);
 					filters.put(namespace, namespaceFilters);
 				}
-				namespaceFilters.add(FrameworkUtil.createFilter(filter));
+				namespaceFilters.add(StandardRegionFilterBuilder.createFilter(filter));
 			}
 		}
 		digraph.connect(tail, new StandardRegionFilter(filters), head);
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilterBuilder.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilterBuilder.java
index b6cf224f0..7f33eccc8 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilterBuilder.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilterBuilder.java
@@ -46,7 +46,7 @@ public final class StandardRegionFilterBuilder implements RegionFilterBuilder {
 		return this;
 	}
 
-	public Filter createFilter(String spec) throws InvalidSyntaxException {
+	public static Filter createFilter(String spec) throws InvalidSyntaxException {
 		// TODO need to use BundleContext.createFilter here
 		Filter filter = FrameworkUtil.createFilter(spec);
 		return (StandardRegionFilter.ALL.equals(filter)) ? StandardRegionFilter.ALL : filter;
@@ -73,8 +73,8 @@ public final class StandardRegionFilterBuilder implements RegionFilterBuilder {
 	private Collection<Filter> getNamespaceFilters(String namespace) {
 		Collection<Filter> namespaceFilters = policy.get(namespace);
 		if (namespaceFilters == null) {
-				// use set to avoid duplicates
-				namespaceFilters = new LinkedHashSet<Filter>();
+			// use set to avoid duplicates
+			namespaceFilters = new LinkedHashSet<Filter>();
 			policy.put(namespace, namespaceFilters);
 		}
 		return namespaceFilters;