You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by as...@apache.org on 2011/07/07 14:19:15 UTC
svn commit: r1143790 - in
/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio:
DefaultNHttpClientConnection.java DefaultNHttpServerConnection.java
reactor/IOSessionImpl.java
Author: asankha
Date: Thu Jul 7 12:19:14 2011
New Revision: 1143790
URL: http://svn.apache.org/viewvc?rev=1143790&view=rev
Log:
avoid NPE when address is unresolved and connection debugging is used
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java?rev=1143790&r1=1143789&r2=1143790&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java Thu Jul 7 12:19:14 2011
@@ -267,11 +267,11 @@ public class DefaultNHttpClientConnectio
final InetSocketAddress remote = ((InetSocketAddress) this.session.getRemoteAddress());
final InetSocketAddress local = ((InetSocketAddress) this.session.getLocalAddress());
- buf.append(local.getAddress().getHostAddress())
+ buf.append(local.getAddress() != null ? local.getAddress().getHostAddress() : local.getAddress())
.append(':')
.append(local.getPort())
.append("->")
- .append(remote.getAddress().getHostAddress())
+ .append(remote.getAddress() != null ? remote.getAddress().getHostAddress() : remote.getAddress())
.append(':')
.append(remote.getPort());
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java?rev=1143790&r1=1143789&r2=1143790&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java Thu Jul 7 12:19:14 2011
@@ -269,11 +269,11 @@ public class DefaultNHttpServerConnectio
final InetSocketAddress remote = ((InetSocketAddress) this.session.getRemoteAddress());
final InetSocketAddress local = ((InetSocketAddress) this.session.getLocalAddress());
- buf.append(remote.getAddress().getHostAddress())
+ buf.append(remote.getAddress() != null ? remote.getAddress().getHostAddress() : remote.getAddress())
.append(':')
.append(remote.getPort())
.append("->")
- .append(local.getAddress().getHostAddress())
+ .append(local.getAddress() != null ? local.getAddress().getHostAddress() : local.getAddress())
.append(':')
.append(local.getPort());
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java?rev=1143790&r1=1143789&r2=1143790&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java Thu Jul 7 12:19:14 2011
@@ -318,11 +318,11 @@ public class IOSessionImpl implements IO
final InetSocketAddress remote = ((InetSocketAddress) getRemoteAddress());
final InetSocketAddress local = ((InetSocketAddress) getLocalAddress());
- buffer.append(local.getAddress().getHostAddress())
+ buffer.append(local.getAddress() != null ? local.getAddress().getHostAddress() : local.getAddress())
.append(':')
.append(local.getPort())
.append("<->")
- .append(remote.getAddress().getHostAddress())
+ .append(remote.getAddress() != null ? remote.getAddress().getHostAddress() : remote.getAddress())
.append(':')
.append(remote.getPort());