Author: sebb
Date: Fri Jan 19 09:01:25 2007
New Revision: 497877
URL: http://svn.apache.org/viewvc?view=rev&rev=497877
Log:
Bug 41414 - Mac OS X may add extra item to -jar classpath
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/NewDriver.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/NewDriver.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/NewDriver.java?view=diff&rev=497877&r1=497876&r2=497877
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/NewDriver.java
(original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/NewDriver.java
Fri Jan 19 09:01:25 2007
@@ -47,15 +47,22 @@
// Find JMeter home dir
StringTokenizer tok = new StringTokenizer(cp,
File.pathSeparator);
- if (tok.countTokens() == 1) {
+ if (tok.countTokens() == 1
+ || (tok.countTokens() == 2
+ &&
System.getProperty("os.name").toLowerCase().startsWith("mac os x")
+ )
+ ) {
File jar = new File(tok.nextToken());
try {
jmDir =
jar.getCanonicalFile().getParentFile().getParent();
} catch (IOException e) {
}
- } else {
- File userDir = new File(System.getProperty("user.dir"));
- jmDir = userDir.getAbsoluteFile().getParent();
+ } else {// e.g. started from IDE with full classpath
+ jmDir = System.getProperty("jmeter.home","");// Allow
override
+ if (jmDir.length() == 0) {
+ File userDir = new
File(System.getProperty("user.dir"));
+ jmDir = userDir.getAbsoluteFile().getParent();
+ }
}
/*
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=497877&r1=497876&r2=497877
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Fri Jan 19 09:01:25 2007
@@ -47,6 +47,7 @@
<li>Added timeout for WebService (SOAP) Sampler</li>
<li>Bug 40804 - Change Counter default to max = Long.MAX_VALUE</li>
<li>BeanShell Post-Processor no longer ignores samples with zero-length result
data</li>
+<li>Use property jmeter.home (if present) to override user.dir when starting
JMeter</li>
</ul>
<h4>Bug fixes:</h4>
@@ -65,6 +66,7 @@
<li>Bug 40954 - Statistical mode in distributed testing shows wrong
results</li>
<li>Fix ClassCast Exception when using sampler that returns null, e..g
TestAction</li>
<li>Bug 41277 - add Latency and Encoding to CSV output</li>
+<li>Bug 41414 - Mac OS X may add extra item to -jar classpath</li>
</ul>
<h3>Version 2.2</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
