[Wonder-cvs] SF.net SVN: wonder:[11539] trunk/Wonder/Frameworks/WOAdaptors/ERWOAdaptor/ Sources/com/webobjects/appserver

[<rm...@us...>]

Revision: 11539
          http://wonder.svn.sourceforge.net/wonder/?rev=11539&view=rev
Author:   rmendis
Date:     2010-10-12 23:05:28 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
Final refactoring for Netty <-> WO conversions

Modified Paths:
--------------
    trunk/Wonder/Frameworks/WOAdaptors/ERWOAdaptor/Sources/com/webobjects/appserver/WONettyAdaptor.java
    trunk/Wonder/Frameworks/WOAdaptors/ERWOAdaptor/Sources/com/webobjects/appserver/WOResponseWrapper.java

Modified: trunk/Wonder/Frameworks/WOAdaptors/ERWOAdaptor/Sources/com/webobjects/appserver/WONettyAdaptor.java
===================================================================
--- trunk/Wonder/Frameworks/WOAdaptors/ERWOAdaptor/Sources/com/webobjects/appserver/WONettyAdaptor.java	2010-10-12 14:30:12 UTC (rev 11538)
+++ trunk/Wonder/Frameworks/WOAdaptors/ERWOAdaptor/Sources/com/webobjects/appserver/WONettyAdaptor.java	2010-10-12 23:05:28 UTC (rev 11539)
@@ -256,6 +256,16 @@
 				cookie.isSecure());
 		return wocookie;
 	}
+	
+	/**
+	 * Converts a WOResponse to a Netty HttpResponse
+	 * 
+	 * @param woresponse	A WOResponse
+	 * @return	HttpResponse
+	 */
+	private static HttpResponse asHttpResponse(WOResponse woresponse) {
+		return new WOResponseWrapper(woresponse);
+	}
 
 	/**
 	 * Originally inspired by:
@@ -284,7 +294,7 @@
 
 			// send a response
 			NSDelayedCallbackCenter.defaultCenter().eventEnded();
-			writeResponse(new WOResponseWrapper(woresponse), e);
+			writeResponse(asHttpResponse(woresponse), e);
 		}
 		
 		private void writeResponse(HttpResponse response, MessageEvent e) throws IOException {

Modified: trunk/Wonder/Frameworks/WOAdaptors/ERWOAdaptor/Sources/com/webobjects/appserver/WOResponseWrapper.java
===================================================================
--- trunk/Wonder/Frameworks/WOAdaptors/ERWOAdaptor/Sources/com/webobjects/appserver/WOResponseWrapper.java	2010-10-12 14:30:12 UTC (rev 11538)
+++ trunk/Wonder/Frameworks/WOAdaptors/ERWOAdaptor/Sources/com/webobjects/appserver/WOResponseWrapper.java	2010-10-12 23:05:28 UTC (rev 11539)
@@ -36,6 +36,16 @@
 	private WOResponse wrapping;
 	private ChannelBuffer _content = ChannelBuffers.EMPTY_BUFFER;
 	
+	/**
+	 * Converts a WOCookie to a Netty cookie
+	 * 
+	 * @param wocookie
+	 * @return A Netty cookie
+	 */
+	private static Cookie asCookie(WOCookie wocookie) {
+		return new WOCookieWrapper(wocookie);
+	}
+	
 	public WOResponseWrapper(WOResponse response) {
 		super();
 		wrapping = response;
@@ -117,7 +127,7 @@
 			if(!wocookies.isEmpty()) {
 				CookieEncoder cookieEncoder = new CookieEncoder(true);
 				for (WOCookie wocookie : wocookies) {
-					Cookie cookie = new WOCookieWrapper(wocookie);
+					Cookie cookie = asCookie(wocookie);
 					cookieEncoder.addCookie(cookie);
 				} return cookieEncoder.encode();
 			} else return null;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.