You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2013/08/12 00:11:39 UTC
[1/2] git commit: Return Executor instead of concrete class in FSC
Updated Branches:
refs/heads/1.0.x 78b296b02 -> 495a4e0e7
Return Executor instead of concrete class in FSC
In FtpServerContext, we should return the Executor interface as opposed
to the concrete ThreadPoolExecutor class.
FTPSERVER-445
Project: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/commit/d2ed4950
Tree: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/tree/d2ed4950
Diff: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/diff/d2ed4950
Branch: refs/heads/1.0.x
Commit: d2ed4950918fe20d03edb522fb87b28c7627bd63
Parents: 78b296b
Author: Niklas Gustavsson <ng...@apache.org>
Authored: Sun Aug 11 23:57:51 2013 +0200
Committer: Niklas Gustavsson <ng...@apache.org>
Committed: Sun Aug 11 23:57:51 2013 +0200
----------------------------------------------------------------------
.../org/apache/ftpserver/impl/DefaultFtpServerContext.java | 7 ++++---
.../main/java/org/apache/ftpserver/impl/FtpServerContext.java | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/d2ed4950/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java b/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
index 731b0f5..36b320e 100644
--- a/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
+++ b/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java
@@ -23,7 +23,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.ftpserver.ConnectionConfig;
@@ -85,8 +86,8 @@ public class DefaultFtpServerContext implements FtpServerContext {
/**
* The thread pool executor to be used by the server using this context
*/
- private ThreadPoolExecutor threadPoolExecutor = null;
+ private ExecutorService threadPoolExecutor = null;
static {
ADMIN_AUTHORITIES.add(new WritePermission());
@@ -262,7 +263,7 @@ public class DefaultFtpServerContext implements FtpServerContext {
this.connectionConfig = connectionConfig;
}
- public synchronized ThreadPoolExecutor getThreadPoolExecutor() {
+ public synchronized Executor getThreadPoolExecutor() {
if(threadPoolExecutor == null) {
int maxThreads = connectionConfig.getMaxThreads();
if(maxThreads < 1) {
http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/d2ed4950/core/src/main/java/org/apache/ftpserver/impl/FtpServerContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/ftpserver/impl/FtpServerContext.java b/core/src/main/java/org/apache/ftpserver/impl/FtpServerContext.java
index a5eb145..70868e3 100644
--- a/core/src/main/java/org/apache/ftpserver/impl/FtpServerContext.java
+++ b/core/src/main/java/org/apache/ftpserver/impl/FtpServerContext.java
@@ -20,7 +20,7 @@
package org.apache.ftpserver.impl;
import java.util.Map;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.Executor;
import org.apache.ftpserver.ConnectionConfig;
import org.apache.ftpserver.command.CommandFactory;
@@ -69,5 +69,5 @@ public interface FtpServerContext extends FtpletContext {
* Returns the thread pool executor for this context.
* @return the thread pool executor for this context.
*/
- ThreadPoolExecutor getThreadPoolExecutor();
+ Executor getThreadPoolExecutor();
}
[2/2] git commit: Ignore Eclipse project files
Posted by ng...@apache.org.
Ignore Eclipse project files
Project: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/commit/495a4e0e
Tree: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/tree/495a4e0e
Diff: http://git-wip-us.apache.org/repos/asf/mina-ftpserver/diff/495a4e0e
Branch: refs/heads/1.0.x
Commit: 495a4e0e7b98da85d41540b227855783e12f097e
Parents: d2ed495
Author: Niklas Gustavsson <ng...@apache.org>
Authored: Mon Aug 12 00:01:09 2013 +0200
Committer: Niklas Gustavsson <ng...@apache.org>
Committed: Mon Aug 12 00:01:09 2013 +0200
----------------------------------------------------------------------
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-ftpserver/blob/495a4e0e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4d7b35b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.project
+.classpath
+.settings
+target