You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2007/01/26 00:11:58 UTC
svn commit: r500044 - in /jakarta/httpcomponents/httpcore/trunk:
module-main/src/main/java/org/apache/http/
module-main/src/main/java/org/apache/http/impl/
module-nio/src/main/java/org/apache/http/nio/impl/
Author: olegk
Date: Thu Jan 25 15:11:58 2007
New Revision: 500044
URL: http://svn.apache.org/viewvc?view=rev&rev=500044
Log:
Added #getRemotePort and #getLocalPort to the HttpInetConnection interface
Modified:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpInetConnection.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/NHttpConnectionBase.java
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpInetConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpInetConnection.java?view=diff&rev=500044&r1=500043&r2=500044
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpInetConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpInetConnection.java Thu Jan 25 15:11:58 2007
@@ -46,6 +46,10 @@
InetAddress getLocalAddress();
+ int getLocalPort();
+
InetAddress getRemoteAddress();
+
+ int getRemotePort();
}
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java?view=diff&rev=500044&r1=500043&r2=500044
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java Thu Jan 25 15:11:58 2007
@@ -120,11 +120,27 @@
}
}
+ public int getLocalPort() {
+ if (this.socket != null) {
+ return this.socket.getLocalPort();
+ } else {
+ return -1;
+ }
+ }
+
public InetAddress getRemoteAddress() {
if (this.socket != null) {
return this.socket.getInetAddress();
} else {
return null;
+ }
+ }
+
+ public int getRemotePort() {
+ if (this.socket != null) {
+ return this.socket.getPort();
+ } else {
+ return -1;
}
}
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java?view=diff&rev=500044&r1=500043&r2=500044
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java Thu Jan 25 15:11:58 2007
@@ -118,11 +118,27 @@
}
}
+ public int getLocalPort() {
+ if (this.socket != null) {
+ return this.socket.getLocalPort();
+ } else {
+ return -1;
+ }
+ }
+
public InetAddress getRemoteAddress() {
if (this.socket != null) {
return this.socket.getInetAddress();
} else {
return null;
+ }
+ }
+
+ public int getRemotePort() {
+ if (this.socket != null) {
+ return this.socket.getPort();
+ } else {
+ return -1;
}
}
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/NHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/NHttpConnectionBase.java?view=diff&rev=500044&r1=500043&r2=500044
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/NHttpConnectionBase.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/NHttpConnectionBase.java Thu Jan 25 15:11:58 2007
@@ -228,12 +228,30 @@
}
}
+ public int getLocalPort() {
+ SocketAddress address = this.session.getLocalAddress();
+ if (address instanceof InetSocketAddress) {
+ return ((InetSocketAddress) address).getPort();
+ } else {
+ return -1;
+ }
+ }
+
public InetAddress getRemoteAddress() {
SocketAddress address = this.session.getRemoteAddress();
if (address instanceof InetSocketAddress) {
return ((InetSocketAddress) address).getAddress();
} else {
return null;
+ }
+ }
+
+ public int getRemotePort() {
+ SocketAddress address = this.session.getRemoteAddress();
+ if (address instanceof InetSocketAddress) {
+ return ((InetSocketAddress) address).getPort();
+ } else {
+ return -1;
}
}
Re: svn commit: r500044 - in
/jakarta/httpcomponents/httpcore/trunk:
module-main/src/main/java/org/apache/http/
module-main/src/main/java/org/apache/http/impl/
module-nio/src/main/java/org/apache/http/nio/impl/
Posted by Oleg Kalnichevski <ol...@apache.org>.
On Fri, 2007-01-26 at 23:03 +0100, Roland Weber wrote:
> > Added #getRemotePort and #getLocalPort to the HttpInetConnection interface
>
> That one broke some code in HttpClient. I'll fix it this weekend.
>
Sorry about that. Fixed.
Cheers
Oleg
> cheers,
> Roland
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: httpcomponents-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: httpcomponents-dev-help@jakarta.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: httpcomponents-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: httpcomponents-dev-help@jakarta.apache.org
Re: svn commit: r500044 - in /jakarta/httpcomponents/httpcore/trunk:
module-main/src/main/java/org/apache/http/ module-main/src/main/java/org/apache/http/impl/
module-nio/src/main/java/org/apache/http/nio/impl/
Posted by Roland Weber <ht...@dubioso.net>.
> Added #getRemotePort and #getLocalPort to the HttpInetConnection interface
That one broke some code in HttpClient. I'll fix it this weekend.
cheers,
Roland
---------------------------------------------------------------------
To unsubscribe, e-mail: httpcomponents-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: httpcomponents-dev-help@jakarta.apache.org