[jbosscache-commits] JBoss Cache SVN: r7521 - core/branches/1.4.X/src/org/jboss/cache.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-01-20 05:37:05 -0500 (Tue, 20 Jan 2009)
New Revision: 7521

Modified:
   core/branches/1.4.X/src/org/jboss/cache/Version.java
Log:
Version calculation to deal with -SNAPSHOT suffixes

Modified: core/branches/1.4.X/src/org/jboss/cache/Version.java
===================================================================
--- core/branches/1.4.X/src/org/jboss/cache/Version.java	2009-01-20 01:46:15 UTC (rev 7520)
+++ core/branches/1.4.X/src/org/jboss/cache/Version.java	2009-01-20 10:37:05 UTC (rev 7521)
@@ -96,13 +96,19 @@
       if (versionString == null)
          throw new IllegalArgumentException("versionString is null");
 
+      String toUse = versionString;
+      if (versionString.endsWith("-SNAPSHOT"))
+      {
+         toUse = versionString.substring(0, versionString.indexOf("-SNAPSHOT"));
+      }
+
       // Special cases for version prior to 1.2.4.SP2
-      if ("1.2.4".equals(versionString))
+      if ("1.2.4".equals(toUse))
          return 124;
-      else if ("1.2.4.SP1".equals(versionString))
+      else if ("1.2.4.SP1".equals(toUse))
          return 1241;
 
-      StringTokenizer tokenizer = new StringTokenizer(versionString, ".");
+      StringTokenizer tokenizer = new StringTokenizer(toUse, ".");
 
       int major = 0;
       int minor = 0;