Author: mickw
Date: 2006-03-31 11:39:06 +0200 (Fri, 31 Mar 2006)
New Revision: 2678
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/velocity/URLVelocityTemplateLoader.java
Log:
hang fix. must ALWAYS use URLResourceLoader.getURL(..) to obtain the correct
url-path (ie localhost) to use on (clustered) server machines.
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/velocity/URLVelocityTemplateLoader.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/velocity/URLVelocityTemplateLoader.java
2006-03-31 09:06:32 UTC (rev 2677)
+++
trunk/src/java/no/schibstedsok/front/searchportal/velocity/URLVelocityTemplateLoader.java
2006-03-31 09:39:06 UTC (rev 2678)
@@ -59,7 +59,7 @@
private static final String ERR_RESOURCE_NOT_FOUND = "Cannot find resource
";
private static final String DEBUG_LOOKING_FOR = "Looking for ";
private static final String DEBUG_EXISTS = "Positive HEAD on ";
- private static final String DEBUG_FULL_URL_IS = "Full URL is ";
+ private static final String DEBUG_FULL_URL_IS = "Real URL is ";
private static final String DEBUG_HOST_HEADER_IS = "URL's host-header is ";
private static final String DEBUG_DOESNT_EXIST = "Using fallback URL";
@@ -146,17 +146,17 @@
LOG.trace(DEBUG_HOST_HEADER_IS + hostHeader);
conn.addRequestProperty("host", hostHeader);
- }else{
+ }else if( UrlResourceLoader.urlExists(getFallbackURL( url )) ){
LOG.trace(DEBUG_DOESNT_EXIST);
- final URL u = new URL( getFallbackURL( url ));
+ final URL u = new URL(
UrlResourceLoader.getURL(getFallbackURL( url )));
LOG.trace(DEBUG_FULL_URL_IS + u);
conn = u.openConnection();
final String hostHeader =
UrlResourceLoader.getHostHeader(getFallbackURL( url ));
LOG.trace(DEBUG_HOST_HEADER_IS + hostHeader);
conn.addRequestProperty("host", hostHeader);
}
-
+
}catch( IOException e ){
LOG.error( ERR_RESOURCE_NOT_FOUND + url, e );
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
