svn commit: r657739 - in /mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server: HttpServiceContext.java context/AbstractHttpServiceContext.java transport/mina/SingleHttpSessionIoHandler.java

[jv...@apache.org]

Author: jvermillard
Date: Mon May 19 00:23:34 2008
New Revision: 657739

URL: http://svn.apache.org/viewvc?rev=657739&view=rev
Log:
added access to local socket address ( ASYNCWEB-13 )

Modified:
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java
    mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java

Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java?rev=657739&r1=657738&r2=657739&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceContext.java Mon May 19 00:23:34 2008
@@ -42,6 +42,13 @@
      */
     InetSocketAddress getRemoteAddress();
 
+    /**
+     * Returns the socket address of the server.
+     *
+     * @return the socket address of the server
+     */
+    InetSocketAddress getLocalAddress();
+
 
     /**
      * Returns the request which is received from the client.

Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java?rev=657739&r1=657738&r2=657739&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/context/AbstractHttpServiceContext.java Mon May 19 00:23:34 2008
@@ -23,8 +23,6 @@
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 
-import org.apache.asyncweb.common.HttpHeaderConstants;
-import org.apache.asyncweb.common.HttpRequest;
 import org.apache.asyncweb.common.*;
 import org.apache.asyncweb.common.HttpResponse;
 import org.apache.asyncweb.common.HttpResponseStatus;
@@ -49,6 +47,8 @@
     private final Logger log = LoggerFactory.getLogger( AbstractHttpServiceContext.class );
 
     private final InetSocketAddress remoteAddress;
+    
+    private final InetSocketAddress localAddress;
 
     private final HttpRequest request;
 
@@ -64,7 +64,7 @@
 
 
 
-    public AbstractHttpServiceContext( InetSocketAddress remoteAddress,
+    public AbstractHttpServiceContext( InetSocketAddress localAddress, InetSocketAddress remoteAddress,
                                        HttpRequest request, ServiceContainer container )
     {
         if ( remoteAddress == null )
@@ -72,6 +72,11 @@
             throw new NullPointerException( "remoteAddress" );
         }
 
+        if ( localAddress == null )
+        {
+            throw new NullPointerException( "localAddress" );
+        }
+        
         if ( request == null )
         {
             throw new NullPointerException( "request" );
@@ -83,6 +88,7 @@
         }
 
         this.remoteAddress = remoteAddress;
+        this.localAddress = localAddress;
         this.request = request;
         this.container = container;
         this.session = container.getSessionAccessor().getSession( this, false );
@@ -182,6 +188,11 @@
         return remoteAddress;
     }
 
+    public InetSocketAddress getLocalAddress()
+    {
+        return localAddress;
+    }
+
 
     public HttpRequest getRequest()
     {

Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java?rev=657739&r1=657738&r2=657739&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java Mon May 19 00:23:34 2008
@@ -397,7 +397,7 @@
 
         private DefaultHttpServiceContext( HttpRequest request )
         {
-            super( ( InetSocketAddress ) session.getRemoteAddress(), request, container );
+            super( ( InetSocketAddress ) session.getLocalAddress(), ( InetSocketAddress ) session.getRemoteAddress(), request, container );
         }
 
         private WriteFuture getWriteFuture()