Author: sebb
Date: Fri Sep 16 11:40:58 2011
New Revision: 1171514
URL: http://svn.apache.org/viewvc?rev=1171514&view=rev
Log:
Use constant for default UDP port
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ShutdownClient.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1171514&r1=1171513&r2=1171514&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Fri Sep 16
11:40:58 2011
@@ -93,6 +93,8 @@ public class JMeter implements JMeterPlu
private static final Logger log = LoggingManager.getLoggerForClass();
+ public static final int UDP_PORT_DEFAULT = 4445; // needed for
ShutdownClient
+
public static final String HTTP_PROXY_PASS = "http.proxyPass"; //
$NON-NLS-1$
public static final String HTTP_PROXY_USER = "http.proxyUser"; //
$NON-NLS-1$
@@ -1037,7 +1039,7 @@ public class JMeter implements JMeterPlu
}
private static void startUdpDdaemon(final JMeterEngine engine) {
- int port = JMeterUtils.getPropDefault("jmeterengine.nongui.port",
4445); // $NON-NLS-1$
+ int port = JMeterUtils.getPropDefault("jmeterengine.nongui.port",
UDP_PORT_DEFAULT); // $NON-NLS-1$
int maxPort =
JMeterUtils.getPropDefault("jmeterengine.nongui.maxport", 4455); // $NON-NLS-1$
if (port > 1000){
final DatagramSocket socket = getSocket(port, maxPort);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ShutdownClient.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ShutdownClient.java?rev=1171514&r1=1171513&r2=1171514&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ShutdownClient.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ShutdownClient.java
Fri Sep 16 11:40:58 2011
@@ -23,13 +23,15 @@ import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
+import org.apache.jmeter.JMeter;
+
/**
* Simple utility to send a shutdown message to a non-GUI instance of JMeter
*/
public class ShutdownClient {
public static void main(String[] args) throws IOException {
- int port = 4445;
+ int port = JMeter.UDP_PORT_DEFAULT;
if (args.length > 1){
port = Integer.parseInt(args[1]);
} else if (args.length == 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
