You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2013/11/19 08:44:31 UTC
svn commit: r1543338 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/ipc/Server.java
Author: jing9
Date: Tue Nov 19 07:44:30 2013
New Revision: 1543338
URL: http://svn.apache.org/r1543338
Log:
HADOOP-10107. Merge change r1543335 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1543338&r1=1543337&r2=1543338&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Nov 19 07:44:30 2013
@@ -148,6 +148,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-10100. MiniKDC shouldn't use apacheds-all artifact. (rkanter via tucu)
+ HADOOP-10107. Server.getNumOpenConnections may throw NPE. (Kihwal Lee via
+ jing9)
+
Release 2.2.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1543338&r1=1543337&r2=1543338&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java Tue Nov 19 07:44:30 2013
@@ -2106,6 +2106,7 @@ public abstract class Server {
// Start the listener here and let it bind to the port
listener = new Listener();
this.port = listener.getAddress().getPort();
+ connectionManager = new ConnectionManager();
this.rpcMetrics = RpcMetrics.create(this);
this.rpcDetailedMetrics = RpcDetailedMetrics.create(this.port);
this.tcpNoDelay = conf.getBoolean(
@@ -2114,7 +2115,6 @@ public abstract class Server {
// Create the responder here
responder = new Responder();
- connectionManager = new ConnectionManager();
if (secretManager != null) {
SaslRpcServer.init(conf);