From 07b8c2ff8d67d191cae1a01ab6524ac0192d3189 Mon Sep 17 00:00:00 2001 From: wcrisman Date: Fri, 11 Jul 2014 10:41:39 -0700 Subject: [PATCH] Fixed bugs from last commit. --- .../src/com/foundation/web/ForwardingDomain.java | 4 ++-- .../src/com/foundation/web/FrameworkController.java | 5 +++-- .../src/com/foundation/web/PassThroughDomain.java | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Foundation Web Application/src/com/foundation/web/ForwardingDomain.java b/Foundation Web Application/src/com/foundation/web/ForwardingDomain.java index 6ffd92a..696e5a6 100644 --- a/Foundation Web Application/src/com/foundation/web/ForwardingDomain.java +++ b/Foundation Web Application/src/com/foundation/web/ForwardingDomain.java @@ -224,9 +224,9 @@ public ISession getSession(String sessionId) { return null; }//getSession()// /* (non-Javadoc) - * @see com.foundation.web.interfaces.IWebApplication#processRequest(com.foundation.web.interfaces.IRequest, com.foundation.web.interfaces.IResponse, com.foundation.web.interfaces.ISession, boolean, boolean) + * @see com.foundation.web.interfaces.IWebApplication#processRequest(com.foundation.web.interfaces.IRequest, com.foundation.web.interfaces.IResponse, com.foundation.web.interfaces.ISession, boolean, boolean, com.foundation.web.interfaces.IConnectionContext) */ -public void processRequest(IRequest request, IResponse response, ISession session, boolean isSecure, boolean clientHadBadSession) { +public void processRequest(IRequest request, IResponse response, ISession session, boolean isSecure, boolean clientHadBadSession, IConnectionContext connectionContext) { response.setForwardUri(toDomain + request.getUri()); }//processRequest()// /* (non-Javadoc) diff --git a/Foundation Web Application/src/com/foundation/web/FrameworkController.java b/Foundation Web Application/src/com/foundation/web/FrameworkController.java index a1829ab..a2ce5b8 100644 --- a/Foundation Web Application/src/com/foundation/web/FrameworkController.java +++ b/Foundation Web Application/src/com/foundation/web/FrameworkController.java @@ -8,6 +8,7 @@ import com.common.thread.IRunnable; import com.common.util.LiteHashMap; import com.foundation.web.controller.HtmlViewController; import com.foundation.web.controller.WebRequestController; +import com.foundation.web.interfaces.IConnectionContext; import com.foundation.web.interfaces.IRequest; import com.foundation.web.interfaces.IResponse; @@ -17,9 +18,9 @@ import com.foundation.web.interfaces.IResponse; public final class FrameworkController extends WebRequestController { private static final Integer INVALID_CLIENT_ID = new Integer(0); /* (non-Javadoc) - * @see com.foundation.web.IWebRequestHandler#processRequest(com.foundation.web.interfaces.IRequest, com.foundation.web.interfaces.IResponse, com.foundation.web.SessionData, com.foundation.SecureSessionData) + * @see com.foundation.web.IWebRequestHandler#processRequest(com.foundation.web.interfaces.IRequest, com.foundation.web.interfaces.IResponse, com.foundation.web.SessionData, com.foundation.web.SecureSessionData, com.foundation.web.interfaces.IConnectionContext) */ -public void processRequest(IRequest request, IResponse response, SessionData sessionData, SecureSessionData secureSessionData) { +public void processRequest(IRequest request, IResponse response, SessionData sessionData, SecureSessionData secureSessionData, IConnectionContext connectionContext) { String result = null; //Note that all calls to this method within the context of a single session are single threaded - the session's request handler is used by the web application to thread the requests on the session's thread.// diff --git a/Foundation Web Application/src/com/foundation/web/PassThroughDomain.java b/Foundation Web Application/src/com/foundation/web/PassThroughDomain.java index 89ee2ae..6a5c2bc 100644 --- a/Foundation Web Application/src/com/foundation/web/PassThroughDomain.java +++ b/Foundation Web Application/src/com/foundation/web/PassThroughDomain.java @@ -7,6 +7,7 @@ import javax.net.ssl.SSLContext; import com.foundation.web.WebApplication.ISslMapping; import com.foundation.web.WebOptions.SslMapping; import com.foundation.web.interfaces.ICachedResource; +import com.foundation.web.interfaces.IConnectionContext; import com.foundation.web.interfaces.IContent; import com.foundation.web.interfaces.IMimeTypeProvider; import com.foundation.web.interfaces.IPassThroughDomain; @@ -262,9 +263,9 @@ public ISession getSession(String sessionId) { return null; }//getSession()// /* (non-Javadoc) - * @see com.foundation.web.interfaces.IWebApplication#processRequest(com.foundation.web.interfaces.IRequest, com.foundation.web.interfaces.IResponse, com.foundation.web.interfaces.ISession, boolean, boolean) + * @see com.foundation.web.interfaces.IWebApplication#processRequest(com.foundation.web.interfaces.IRequest, com.foundation.web.interfaces.IResponse, com.foundation.web.interfaces.ISession, boolean, boolean, com.foundation.web.interfaces.IConnectionContext) */ -public void processRequest(IRequest request, IResponse response, ISession session, boolean isSecure, boolean clientHadBadSession) { +public void processRequest(IRequest request, IResponse response, ISession session, boolean isSecure, boolean clientHadBadSession, IConnectionContext connectionContext) { response.setForwardUri("https://" + request.getHost() + request.getUri() + (request.getParameterString() != null ? request.getParameterString() : "")); }//processRequest()// /* (non-Javadoc)