Repository: karaf Updated Branches: refs/heads/master 743539bb0 -> d32c7bf10
[KARAF-2749] Use Matcher.matches() instead of find() in the BundleSelector Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d32c7bf1 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d32c7bf1 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d32c7bf1 Branch: refs/heads/master Commit: d32c7bf1027f221b870556523f901aea7b565241 Parents: 743539b Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Jul 10 19:19:42 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Jul 10 19:19:42 2014 +0200 ---------------------------------------------------------------------- .../karaf/bundle/core/internal/BundleSelectorImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d32c7bf1/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java index bd728a2..638739b 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java @@ -54,7 +54,7 @@ public class BundleSelectorImpl { Pattern pattern = Pattern.compile("^\\d+$"); Matcher matcher = pattern.matcher(id); - if (matcher.find()) { + if (matcher.matches()) { Bundle bundle = this.getBundleById(id); addBundle(bundle, id, bundles); return; @@ -63,7 +63,7 @@ public class BundleSelectorImpl { // id as a number range pattern = Pattern.compile("^(\\d+)-(\\d+)$"); matcher = pattern.matcher(id); - if (matcher.find()) { + if (matcher.matches()) { int index = id.indexOf('-'); long startId = Long.parseLong(id.substring(0, index)); long endId = Long.parseLong(id.substring(index + 1)); @@ -166,17 +166,17 @@ public class BundleSelectorImpl { if (version != null) { String bundleVersion = bundle.getHeaders().get(Constants.BUNDLE_VERSION); if (bundleVersion != null) { - boolean nameMatch = (nameMatcher != null && nameMatcher.find()) || symbolicNameMatcher.find(); + boolean nameMatch = (nameMatcher != null && nameMatcher.matches()) || symbolicNameMatcher.matches(); if (nameMatch) { Pattern versionPattern = Pattern.compile(version); Matcher versionMatcher = versionPattern.matcher(bundleVersion); - if (versionMatcher.find()) { + if (versionMatcher.matches()) { result.add(bundle); } } } } else { - boolean nameMatch = (nameMatcher != null && nameMatcher.find()) || symbolicNameMatcher.find(); + boolean nameMatch = (nameMatcher != null && nameMatcher.matches()) || symbolicNameMatcher.matches(); if (nameMatch) { result.add(bundle); } @@ -194,7 +194,7 @@ public class BundleSelectorImpl { for (Bundle bundle : bundles) { Matcher locationMatcher = locationPattern.matcher(bundle.getLocation()); - if (locationMatcher.find()) { + if (locationMatcher.matches()) { result.add(bundle); } }
