Author: jvermillard
Date: Tue Aug 12 12:46:55 2008
New Revision: 685281
URL: http://svn.apache.org/viewvc?rev=685281&view=rev
Log:
Applying DIRMINA-615 patch
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java?rev=685281&r1=685280&r2=685281&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java
Tue Aug 12 12:46:55 2008
@@ -24,6 +24,7 @@
import java.nio.channels.DatagramChannel;
import java.util.Collections;
import java.util.Iterator;
+import java.util.concurrent.Executor;
import org.apache.mina.core.polling.AbstractPollingIoConnector;
import org.apache.mina.core.service.IoConnector;
@@ -64,7 +65,39 @@
super(new DefaultDatagramSessionConfig(), processor);
}
- public TransportMetadata getTransportMetadata() {
+ /**
+ * Constructor for [EMAIL PROTECTED] NioDatagramConnector} with default
configuration which will use a built-in
+ * thread pool executor to manage the given number of processor instances.
The processor class must have
+ * a constructor that accepts ExecutorService or Executor as its single
argument, or, failing that, a
+ * no-arg constructor.
+ *
+ * @param processorClass the processor class.
+ * @param processorCount the number of processors to instantiate.
+ * @see
org.apache.mina.core.service.SimpleIoProcessorPool#SimpleIoProcessorPool(Class,
Executor, int)
+ * @since 2.0.0-M4
+ */
+ public NioDatagramConnector(Class<? extends IoProcessor<NioSession>>
processorClass,
+ int processorCount) {
+ super(new DefaultDatagramSessionConfig(), processorClass,
processorCount);
+ }
+
+ /**
+ * Constructor for [EMAIL PROTECTED] NioDatagramConnector} with default
configuration with default configuration which will use a built-in
+ * thread pool executor to manage the default number of processor
instances. The processor class must have
+ * a constructor that accepts ExecutorService or Executor as its single
argument, or, failing that, a
+ * no-arg constructor. The default number of instances is equal to the
number of processor cores
+ * in the system, plus one.
+ *
+ * @param processorClass the processor class.
+ * @see
org.apache.mina.core.service.SimpleIoProcessorPool#SimpleIoProcessorPool(Class,
Executor, int)
+ * @see org.apache.mina.core.service.SimpleIoProcessorPool#DEFAULT_SIZE
+ * @since 2.0.0-M4
+ */
+ public NioDatagramConnector(Class<? extends IoProcessor<NioSession>>
processorClass) {
+ super(new DefaultDatagramSessionConfig(), processorClass);
+ }
+
+ public TransportMetadata getTransportMetadata() {
return NioDatagramSession.METADATA;
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java?rev=685281&r1=685280&r2=685281&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
Tue Aug 12 12:46:55 2008
@@ -90,8 +90,40 @@
super(new DefaultSocketSessionConfig(), executor, processor);
((DefaultSocketSessionConfig) getSessionConfig()).init(this);
}
-
+
/**
+ * Constructor for [EMAIL PROTECTED] NioSocketConnector} with default
configuration which will use a built-in
+ * thread pool executor to manage the given number of processor instances.
The processor class must have
+ * a constructor that accepts ExecutorService or Executor as its single
argument, or, failing that, a
+ * no-arg constructor.
+ *
+ * @param processorClass the processor class.
+ * @param processorCount the number of processors to instantiate.
+ * @see
org.apache.mina.core.service.SimpleIoProcessorPool#SimpleIoProcessorPool(Class,
Executor, int)
+ * @since 2.0.0-M4
+ */
+ public NioSocketConnector(Class<? extends IoProcessor<NioSession>>
processorClass,
+ int processorCount) {
+ super(new DefaultSocketSessionConfig(), processorClass,
processorCount);
+ }
+
+ /**
+ * Constructor for [EMAIL PROTECTED] NioSocketConnector} with default
configuration with default configuration which will use a built-in
+ * thread pool executor to manage the default number of processor
instances. The processor class must have
+ * a constructor that accepts ExecutorService or Executor as its single
argument, or, failing that, a
+ * no-arg constructor. The default number of instances is equal to the
number of processor cores
+ * in the system, plus one.
+ *
+ * @param processorClass the processor class.
+ * @see
org.apache.mina.core.service.SimpleIoProcessorPool#SimpleIoProcessorPool(Class,
Executor, int)
+ * @see org.apache.mina.core.service.SimpleIoProcessorPool#DEFAULT_SIZE
+ * @since 2.0.0-M4
+ */
+ public NioSocketConnector(Class<? extends IoProcessor<NioSession>>
processorClass) {
+ super(new DefaultSocketSessionConfig(), processorClass);
+ }
+
+ /**
* [EMAIL PROTECTED]
*/
@Override
