You are viewing a plain text version of this content. The canonical link for it is here.
Posted to devnull@infra.apache.org by vl...@apache.org on 2019/06/08 18:42:12 UTC
[jmeter] 08/47: Fix bug - should not have used "set" Rework to
remove need to save CLASSPATH Kill rmiregistry when interrupted
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to annotated tag v2_3
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit e40b1687d010f39103cb975658417cf98d4daba0
Author: Sebastian Bazley <se...@apache.org>
AuthorDate: Wed Sep 19 08:47:59 2007 +0000
Fix bug - should not have used "set"
Rework to remove need to save CLASSPATH
Kill rmiregistry when interrupted
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@577197 13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: fb10111af3f321eecd507fcf0dbe27a360f8005f
---
bin/jmeter-server | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/bin/jmeter-server b/bin/jmeter-server
index 8ca9f55..cc58b66 100755
--- a/bin/jmeter-server
+++ b/bin/jmeter-server
@@ -20,11 +20,8 @@
## SERVER_PORT=1234 jmeter-server
##
-set OLDCLASSPATH=$CLASSPATH
-export OLDCLASSPATH
-set CLASSPATH=`dirname $0`/../lib/ext/ApacheJMeter_core.jar:`dirname $0`/../lib/jorphan.jar:`dirname $0`/../lib/logkit-1.2.jar
-export CLASSPATH
-rmiregistry $SERVER_PORT &
-set CLASSPATH=$OLDCLASSPATH
-export CLASSPATH
-`dirname $0`/jmeter -Dserver_port=${SERVER_PORT:-1099} -s -j jmeter-server.log "$@"
+DIRNAME=${DIRNAME}
+CLASSPATH=${DIRNAME}/../lib/ext/ApacheJMeter_core.jar:${DIRNAME}/../lib/jorphan.jar:${DIRNAME}/../lib/logkit-1.2.jar rmiregistry $SERVER_PORT &
+# stop rmiregistry on interrupt
+trap "kill $!" 2
+${DIRNAME}/jmeter -Dserver_port=${SERVER_PORT:-1099} -s -j jmeter-server.log "$@"
\ No newline at end of file