You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2013/01/11 18:17:33 UTC
[1/5] git commit: Applied Jeff patch for Netty server tests
Applied Jeff patch for Netty server tests
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/d3a21aed
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/d3a21aed
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/d3a21aed
Branch: refs/heads/2.0
Commit: d3a21aed877711abcd1793015a842a85b747a7c3
Parents: 6982f41
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Fri Jan 11 16:00:04 2013 +0100
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Fri Jan 11 16:00:04 2013 +0100
----------------------------------------------------------------------
.../apache/mina/core/BenchmarkServerFactory.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/d3a21aed/mina-benchmarks/src/test/java/org/apache/mina/core/BenchmarkServerFactory.java
----------------------------------------------------------------------
diff --git a/mina-benchmarks/src/test/java/org/apache/mina/core/BenchmarkServerFactory.java b/mina-benchmarks/src/test/java/org/apache/mina/core/BenchmarkServerFactory.java
index 494232c..11ccc85 100755
--- a/mina-benchmarks/src/test/java/org/apache/mina/core/BenchmarkServerFactory.java
+++ b/mina-benchmarks/src/test/java/org/apache/mina/core/BenchmarkServerFactory.java
@@ -34,7 +34,7 @@ public class BenchmarkServerFactory implements BenchmarkFactory<BenchmarkServer>
case Mina:
return new MinaBenchmarkServer();
case Netty:
- return null;
+ return new NettyBenchmarkServer();
default:
throw new IllegalArgumentException("Invalid type " + type);
}