sebb 2005/01/07 18:28:06
Modified: src/core/org/apache/jmeter/util Tag: rel-2_0
JMeterVersion.java JMeterUtils.java
Log:
Make VERSION private to eliminate possiblilty of stale information in
JMeterUtils
Revision Changes Path
No revision
No revision
1.14.2.8 +10 -4
jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java
Index: JMeterVersion.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java,v
retrieving revision 1.14.2.7
retrieving revision 1.14.2.8
diff -u -r1.14.2.7 -r1.14.2.8
--- JMeterVersion.java 7 Jan 2005 19:04:52 -0000 1.14.2.7
+++ JMeterVersion.java 8 Jan 2005 02:28:06 -0000 1.14.2.8
@@ -39,9 +39,12 @@
/*
* The VERSION string is updated by the Ant build file, which looks for
the
* pattern: VERSION = <quote>.*<quote>
- *
+ *
+ * The string is made private so the compiler can't propagate it into
JMeterUtils
+ * This ensures that JMeterUtils always gets the correct version, even
if it is
+ * not re-compiled during the build.
*/
- static final String VERSION = "2.0.2";
+ private static final String VERSION = "2.0.2-20050108";
static final String COPYRIGHT = "Copyright (c) 1998-2005 The Apache
Software Foundation";
@@ -50,4 +53,7 @@
super();
}
+ static final String getVERSION() {
+ return VERSION;
+ }
}
1.66.2.3 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.66.2.2
retrieving revision 1.66.2.3
diff -u -r1.66.2.2 -r1.66.2.3
--- JMeterUtils.java 25 Sep 2004 20:58:15 -0000 1.66.2.2
+++ JMeterUtils.java 8 Jan 2005 02:28:06 -0000 1.66.2.3
@@ -1088,7 +1088,7 @@
*/
public static String getJMeterVersion()
{
- return JMeterVersion.VERSION;
+ return JMeterVersion.getVERSION();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
