Author: sebb
Date: Fri Aug 12 01:37:45 2011
New Revision: 1156933
URL: http://svn.apache.org/viewvc?rev=1156933&view=rev
Log:
Change static code to allow DSTAMP to be used as version qualifier
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java?rev=1156933&r1=1156932&r2=1156933&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java Fri
Aug 12 01:37:45 2011
@@ -53,7 +53,12 @@ public class JMeterVersion {
private static final String REVID;
static {
- REVID = REVISION.split("\\s+")[1]; // extract the id
+ String[] parts = REVISION.split("\\s+");
+ if (parts.length == 3) { // Assume SVN $Revision is presemt
+ REVID = " r" + parts[1]; // extract the id
+ } else { // assume DSTAMP is present
+ REVID = "." + REVISION;
+ }
}
/*
@@ -74,6 +79,6 @@ public class JMeterVersion {
}
static final String getVERSION() {
- return VERSION+" r"+REVID;
+ return VERSION+REVID;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
