You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2008/01/11 12:46:51 UTC
svn commit: r611148 -
/felix/trunk/maven-obr-plugin/src/main/java/org/osgi/impl/bundle/obr/resource/VersionRange.java
Author: mcculls
Date: Fri Jan 11 03:46:42 2008
New Revision: 611148
URL: http://svn.apache.org/viewvc?rev=611148&view=rev
Log:
FELIX-456: remove extraneous whitespace from version range before parsing
Modified:
felix/trunk/maven-obr-plugin/src/main/java/org/osgi/impl/bundle/obr/resource/VersionRange.java
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/osgi/impl/bundle/obr/resource/VersionRange.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/osgi/impl/bundle/obr/resource/VersionRange.java?rev=611148&r1=611147&r2=611148&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/osgi/impl/bundle/obr/resource/VersionRange.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/osgi/impl/bundle/obr/resource/VersionRange.java Fri Jan 11 03:46:42 2008
@@ -28,7 +28,7 @@
char start = '[';
char end = ']';
- static String V = "[0-9]+(\\.[0-9]+(\\.[0-9]+(\\.[a-zA-Z0-9_-]+)?)?)?";
+ static String V = "\\s*[0-9]+(\\.[0-9]+(\\.[0-9]+(\\.[a-zA-Z0-9_-]+)?)?)?\\s*";
static Pattern RANGE = Pattern.compile("(\\(|\\[)(" + V + "),(" + V
+ ")(\\)|\\])");
@@ -37,8 +37,8 @@
Matcher m = RANGE.matcher(string);
if (m.matches()) {
start = m.group(1).charAt(0);
- low = new Version(m.group(2));
- high = new Version(m.group(6));
+ low = new Version(m.group(2).trim());
+ high = new Version(m.group(6).trim());
end = m.group(10).charAt(0);
if (low.compareTo(high) >= 0)
throw new IllegalArgumentException(