JBoss Remoting SVN: r6274 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2011-03-01 16:37:47 -0500 (Tue, 01 Mar 2011)
New Revision: 6274
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
Log:
JBREM-1275: Changed "dosMaxThreads" and "dosTimeout" to "secondaryMaxThreads" and
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-03-01 21:36:37 UTC (rev 6273)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-03-01 21:37:47 UTC (rev 6274)
@@ -96,8 +96,8 @@
protected boolean isCallbackServer = false;
protected List secondaryBindPorts = new ArrayList();
protected List secondaryConnectPorts = new ArrayList();
- protected int dosMaxThreads = Bisocket.DOS_MAX_THREADS_DEFAULT;
- protected int dosTimeout = Bisocket.DOS_TIMEOUT_DEFAULT;
+ protected int dosMaxThreads = Bisocket.SECONDARY_MAX_THREADS_DEFAULT;
+ protected int dosTimeout = Bisocket.SECONDARY_TIMEOUT_DEFAULT;
public static BisocketServerInvoker getBisocketServerInvoker(String listenerId)
@@ -755,7 +755,7 @@
secondaryConnectPorts = new ArrayList(secondaryBindPorts);
}
- o = configuration.get(Bisocket.DOS_MAX_THREADS);
+ o = configuration.get(Bisocket.SECONDARY_MAX_THREADS);
if (o instanceof String && ((String) o).length() > 0)
{
try
@@ -765,15 +765,15 @@
}
catch (NumberFormatException e)
{
- log.warn("Invalid format for " + "\"" + Bisocket.DOS_MAX_THREADS + "\": " + o);
+ log.warn("Invalid format for " + "\"" + Bisocket.SECONDARY_MAX_THREADS + "\": " + o);
}
}
else if (o != null)
{
- log.warn("\"" + Bisocket.DOS_MAX_THREADS + "\" must be specified as a String");
+ log.warn("\"" + Bisocket.SECONDARY_MAX_THREADS + "\" must be specified as a String");
}
- o = configuration.get(Bisocket.DOS_TIMEOUT);
+ o = configuration.get(Bisocket.SECONDARY_TIMEOUT);
if (o instanceof String && ((String) o).length() > 0)
{
try
@@ -783,12 +783,12 @@
}
catch (NumberFormatException e)
{
- log.warn("Invalid format for " + "\"" + Bisocket.DOS_TIMEOUT + "\": " + o);
+ log.warn("Invalid format for " + "\"" + Bisocket.SECONDARY_TIMEOUT + "\": " + o);
}
}
else if (o != null)
{
- log.warn("\"" + Bisocket.DOS_TIMEOUT + "\" must be specified as a String");
+ log.warn("\"" + Bisocket.SECONDARY_TIMEOUT + "\" must be specified as a String");
}
if (isCallbackServer)
13 years, 10 months
JBoss Remoting SVN: r6273 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2011-03-01 16:36:37 -0500 (Tue, 01 Mar 2011)
New Revision: 6273
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
Log:
JBREM-1275: Changed "dosMaxThreads" and "dosTimeout" to "secondaryMaxThreads" and
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-03-01 21:35:03 UTC (rev 6272)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-03-01 21:36:37 UTC (rev 6273)
@@ -87,8 +87,8 @@
protected boolean isCallbackServer = false;
protected int secondaryBindPort = -1;
protected int secondaryConnectPort = -1;
- protected int dosMaxThreads = Bisocket.DOS_MAX_THREADS_DEFAULT;
- protected int dosTimeout = Bisocket.DOS_TIMEOUT_DEFAULT;
+ protected int dosMaxThreads = Bisocket.SECONDARY_MAX_THREADS_DEFAULT;
+ protected int dosTimeout = Bisocket.SECONDARY_TIMEOUT_DEFAULT;
public static BisocketServerInvoker getBisocketServerInvoker(String listenerId)
@@ -537,7 +537,7 @@
log.warn("\"" + Bisocket.SECONDARY_CONNECT_PORT + "\" must be specified as a String");
}
- o = configuration.get(Bisocket.DOS_MAX_THREADS);
+ o = configuration.get(Bisocket.SECONDARY_MAX_THREADS);
if (o instanceof String && ((String) o).length() > 0)
{
try
@@ -547,15 +547,15 @@
}
catch (NumberFormatException e)
{
- log.warn("Invalid format for " + "\"" + Bisocket.DOS_MAX_THREADS + "\": " + o);
+ log.warn("Invalid format for " + "\"" + Bisocket.SECONDARY_MAX_THREADS + "\": " + o);
}
}
else if (o != null)
{
- log.warn("\"" + Bisocket.DOS_MAX_THREADS + "\" must be specified as a String");
+ log.warn("\"" + Bisocket.SECONDARY_MAX_THREADS + "\" must be specified as a String");
}
- o = configuration.get(Bisocket.DOS_TIMEOUT);
+ o = configuration.get(Bisocket.SECONDARY_TIMEOUT);
if (o instanceof String && ((String) o).length() > 0)
{
try
@@ -565,12 +565,12 @@
}
catch (NumberFormatException e)
{
- log.warn("Invalid format for " + "\"" + Bisocket.DOS_TIMEOUT + "\": " + o);
+ log.warn("Invalid format for " + "\"" + Bisocket.SECONDARY_TIMEOUT + "\": " + o);
}
}
else if (o != null)
{
- log.warn("\"" + Bisocket.DOS_TIMEOUT + "\" must be specified as a String");
+ log.warn("\"" + Bisocket.SECONDARY_TIMEOUT + "\" must be specified as a String");
}
if (isCallbackServer)
13 years, 10 months
JBoss Remoting SVN: r6272 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2011-03-01 16:35:03 -0500 (Tue, 01 Mar 2011)
New Revision: 6272
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java
Log:
JBREM-1275: Changed "dosMaxThreads" and "dosTimeout" to "secondaryMaxThreads" and
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java 2011-03-01 21:34:24 UTC (rev 6271)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java 2011-03-01 21:35:03 UTC (rev 6272)
@@ -78,11 +78,11 @@
public static final String SECONDARY_CONNECT_PORT = "secondaryConnectPort";
/**
- * Configuration keys and default valuesfor parameters related to DOS attack
+ * Configuration keys and default values for parameters related to DOS attack
* on BisocketServerInvoker.SecondaryServerSocketThread
*/
- public static final String DOS_MAX_THREADS = "dosMaxThreads";
- public static final String DOS_TIMEOUT = "dosTimeout";
- public static final int DOS_MAX_THREADS_DEFAULT = 50;
- public static final int DOS_TIMEOUT_DEFAULT = 60000;
+ public static final String SECONDARY_MAX_THREADS = "secondaryMaxThreads";
+ public static final String SECONDARY_TIMEOUT = "secondaryTimeout";
+ public static final int SECONDARY_MAX_THREADS_DEFAULT = 50;
+ public static final int SECONDARY_TIMEOUT_DEFAULT = 60000;
}
13 years, 10 months
JBoss Remoting SVN: r6271 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2011-03-01 16:34:24 -0500 (Tue, 01 Mar 2011)
New Revision: 6271
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java
Log:
JBREM-1275: Changed "dosMaxThreads" and "dosTimeout" to "secondaryMaxThreads" and
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java 2011-03-01 21:33:33 UTC (rev 6270)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java 2011-03-01 21:34:24 UTC (rev 6271)
@@ -215,7 +215,7 @@
public void testConfigurationDefault() throws Throwable
{
log.info("entering " + getName());
- doConfigurationTest(false, false, Bisocket.DOS_MAX_THREADS_DEFAULT, Bisocket.DOS_TIMEOUT_DEFAULT);
+ doConfigurationTest(false, false, Bisocket.SECONDARY_MAX_THREADS_DEFAULT, Bisocket.SECONDARY_TIMEOUT_DEFAULT);
log.info(getName() + " PASSES");
}
@@ -325,13 +325,13 @@
{
if (useInvokerLocator)
{
- locatorURI += "&" + Bisocket.DOS_MAX_THREADS + "=" + Integer.toString(dosMaxThreadsValue);
- locatorURI += "&" + Bisocket.DOS_TIMEOUT + "=" + Integer.toString(dosTimeoutValue);
+ locatorURI += "&" + Bisocket.SECONDARY_MAX_THREADS + "=" + Integer.toString(dosMaxThreadsValue);
+ locatorURI += "&" + Bisocket.SECONDARY_TIMEOUT + "=" + Integer.toString(dosTimeoutValue);
}
else
{
- config.put(Bisocket.DOS_MAX_THREADS, Integer.toString(dosMaxThreadsValue));
- config.put(Bisocket.DOS_TIMEOUT, Integer.toString(dosTimeoutValue));
+ config.put(Bisocket.SECONDARY_MAX_THREADS, Integer.toString(dosMaxThreadsValue));
+ config.put(Bisocket.SECONDARY_TIMEOUT, Integer.toString(dosTimeoutValue));
}
}
serverLocator = new InvokerLocator(locatorURI);
13 years, 10 months
JBoss Remoting SVN: r6270 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2011-03-01 16:33:33 -0500 (Tue, 01 Mar 2011)
New Revision: 6270
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java
Log:
JBREM-1275: Changed "dosMaxThreads" and "dosTimeout" to "secondaryMaxThreads" and
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java 2011-03-01 21:31:32 UTC (rev 6269)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java 2011-03-01 21:33:33 UTC (rev 6270)
@@ -80,11 +80,11 @@
public static final String SECONDARY_CONNECT_PORTS = "secondaryConnectPorts";
/**
- * Configuration keys and default valuesfor parameters related to DOS attack
+ * Configuration keys and default values for parameters related to DOS attack
* on BisocketServerInvoker.SecondaryServerSocketThread
*/
- public static final String DOS_MAX_THREADS = "dosMaxThreads";
- public static final String DOS_TIMEOUT = "dosTimeout";
- public static final int DOS_MAX_THREADS_DEFAULT = 50;
- public static final int DOS_TIMEOUT_DEFAULT = 60000;
+ public static final String SECONDARY_MAX_THREADS = "secondaryMaxThreads";
+ public static final String SECONDARY_TIMEOUT = "secondaryTimeout";
+ public static final int SECONDARY_MAX_THREADS_DEFAULT = 50;
+ public static final int SECONDARY_TIMEOUT_DEFAULT = 60000;
}
13 years, 10 months
JBoss Remoting SVN: r6269 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/dos.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2011-03-01 16:31:32 -0500 (Tue, 01 Mar 2011)
New Revision: 6269
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java
Log:
JBREM-1275: Changed "dosMaxThreads" and "dosTimeout" to "secondaryMaxThreads" and
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java 2011-02-28 22:53:50 UTC (rev 6268)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/dos/DosTestCase.java 2011-03-01 21:31:32 UTC (rev 6269)
@@ -215,7 +215,7 @@
public void testConfigurationDefault() throws Throwable
{
log.info("entering " + getName());
- doConfigurationTest(false, false, Bisocket.DOS_MAX_THREADS_DEFAULT, Bisocket.DOS_TIMEOUT_DEFAULT);
+ doConfigurationTest(false, false, Bisocket.SECONDARY_MAX_THREADS_DEFAULT, Bisocket.SECONDARY_TIMEOUT_DEFAULT);
log.info(getName() + " PASSES");
}
@@ -325,13 +325,13 @@
{
if (useInvokerLocator)
{
- locatorURI += "&" + Bisocket.DOS_MAX_THREADS + "=" + Integer.toString(dosMaxThreadsValue);
- locatorURI += "&" + Bisocket.DOS_TIMEOUT + "=" + Integer.toString(dosTimeoutValue);
+ locatorURI += "&" + Bisocket.SECONDARY_MAX_THREADS + "=" + Integer.toString(dosMaxThreadsValue);
+ locatorURI += "&" + Bisocket.SECONDARY_TIMEOUT + "=" + Integer.toString(dosTimeoutValue);
}
else
{
- config.put(Bisocket.DOS_MAX_THREADS, Integer.toString(dosMaxThreadsValue));
- config.put(Bisocket.DOS_TIMEOUT, Integer.toString(dosTimeoutValue));
+ config.put(Bisocket.SECONDARY_MAX_THREADS, Integer.toString(dosMaxThreadsValue));
+ config.put(Bisocket.SECONDARY_TIMEOUT, Integer.toString(dosTimeoutValue));
}
}
serverLocator = new InvokerLocator(locatorURI);
13 years, 10 months