Author: sebb
Date: Thu Sep 15 23:06:53 2011
New Revision: 1171313
URL: http://svn.apache.org/viewvc?rev=1171313&view=rev
Log:
Bug 51831 - Cannot disable UDP server or change the maximum UDP port
Also failed to check max port initially
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/xdocs/changes.xml
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=1171313&r1=1171312&r2=1171313&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Thu Sep 15
23:06:53 2011
@@ -133,15 +133,6 @@ public class JMeter implements JMeterPlu
- /** UDP port used in non-GUI runs. Disabled if <=1000. */
- private static final int UDP_PORT =
JMeterUtils.getPropDefault("jmeterengine.nongui.port", 4445); // $NON-NLS-1$
-
- /** Maximum UDP port used in non-GUI runs. Disabled if <= UDP_PORT */
- private static final int UDP_PORT_MAX =
JMeterUtils.getPropDefault("jmeterengine.nongui.maxport", 4455); // $NON-NLS-1$
-
-
-
-
/**
* Define the understood options. Each CLOptionDescriptor contains:
* <ul>
@@ -1046,8 +1037,10 @@ public class JMeter implements JMeterPlu
}
private static void startUdpDdaemon(final JMeterEngine engine) {
- if (UDP_PORT > 1000){
- final DatagramSocket socket = getSocket(UDP_PORT, UDP_PORT_MAX);
+ int port = JMeterUtils.getPropDefault("jmeterengine.nongui.port",
4445); // $NON-NLS-1$
+ int maxPort =
JMeterUtils.getPropDefault("jmeterengine.nongui.maxport", 4455); // $NON-NLS-1$
+ if (port > 1000){
+ final DatagramSocket socket = getSocket(port, maxPort);
if (socket != null) {
Thread waiter = new Thread("UDP Listener"){
@Override
@@ -1094,14 +1087,14 @@ public class JMeter implements JMeterPlu
private static DatagramSocket getSocket(int udpPort, int udpPortMax) {
DatagramSocket socket = null;
int i = udpPort;
- do {
+ while (i<= udpPortMax) {
try {
socket = new DatagramSocket(i);
break;
} catch (SocketException e) {
- // ignored
+ i++;
}
- } while (++i <= udpPortMax);
+ }
return socket;
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1171313&r1=1171312&r2=1171313&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Sep 15 23:06:53 2011
@@ -113,6 +113,7 @@ This can be overridden by setting the JM
<h3>General</h3>
<ul>
+<li>Bug 51831 - Cannot disable UDP server or change the maximum UDP port</li>
</ul>
<!-- ==================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
