[Archive-access-cvs] SF.net SVN: archive-access: [1988] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/proxy

[<bra...@us...>]

Revision: 1988
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1988&view=rev
Author:   bradtofel
Date:     2007-09-10 18:00:47 -0700 (Mon, 10 Sep 2007)

Log Message:
-----------
FEATURE: added missing capability to explicitly set localhostNames List via Spring.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java	2007-09-11 00:59:47 UTC (rev 1987)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java	2007-09-11 01:00:47 UTC (rev 1988)
@@ -48,20 +48,14 @@
 	private List<String> localhostNames = null;
 
 	/**
-	 * @param list
-	 */
-	public void init(List<String> list) {
-		this.localhostNames = InetAddressUtil.getAllLocalHostNames();
-		if((list != null) && (list.size() > 0)) {
-			localhostNames.addAll(list);
-		}
-	}
-	/**
 	 * 
 	 */
 	public void init() {
-		List<String> empty = null;
-		init(empty);
+		if(localhostNames == null) {
+			localhostNames = InetAddressUtil.getAllLocalHostNames();
+		} else {
+			localhostNames.addAll(InetAddressUtil.getAllLocalHostNames());
+		}
 	}
 	private boolean isLocalRequest(HttpServletRequest httpRequest) {
 		return this.localhostNames.contains(httpRequest.getServerName());
@@ -113,5 +107,11 @@
 
 		return wbRequest;
 	}
+	public List<String> getLocalhostNames() {
+		return localhostNames;
+	}
+	public void setLocalhostNames(List<String> localhostNames) {
+		this.localhostNames = localhostNames;
+	}
 
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java	2007-09-11 00:59:47 UTC (rev 1987)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java	2007-09-11 01:00:47 UTC (rev 1988)
@@ -24,6 +24,8 @@
  */
 package org.archive.wayback.proxy;
 
+import java.util.List;
+
 import org.archive.wayback.RequestParser;
 import org.archive.wayback.requestparser.CompositeRequestParser;
 import org.archive.wayback.requestparser.FormRequestParser;
@@ -36,8 +38,8 @@
  * @version $Date$, $Revision$
  */
 public class ProxyRequestParser extends CompositeRequestParser {
+	private ProxyReplayRequestParser prrp = new ProxyReplayRequestParser();
 	protected RequestParser[] getRequestParsers() {
-		ProxyReplayRequestParser prrp = new ProxyReplayRequestParser();
 		prrp.init();
 		RequestParser[] theParsers = {
 				prrp,
@@ -46,4 +48,10 @@
 				};
 		return theParsers;
 	}
+	public List<String> getLocalhostNames() {
+		return prrp.getLocalhostNames();
+	}
+	public void setLocalhostNames(List<String> localhostNames) {
+		prrp.setLocalhostNames(localhostNames);
+	}
 }


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