Author: hboutemy
Date: Sun Dec 14 12:39:26 2008
New Revision: 726526
URL: http://svn.apache.org/viewvc?rev=726526&view=rev
Log:
[MARTIFACT-26] string tokenizers ignore lone delimiters, so explicitly handle
such cases
The principle we're using here is that string -> version -> string should
always return the original value
(merged from maven-artifact r674057)
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java?rev=726526&r1=726525&r2=726526&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java
(original)
+++
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java
Sun Dec 14 12:39:26 2008
@@ -184,6 +184,12 @@
{
fallback = true;
}
+
+ // string tokenzier won't detect these and ignores them
+ if ( part1.indexOf( ".." ) >= 0 || part1.startsWith( "." ) ||
part1.endsWith( "." ) )
+ {
+ fallback = true;
+ }
}
catch ( NumberFormatException e )
{
