Author: mickw
Date: 2006-03-31 13:04:40 +0200 (Fri, 31 Mar 2006)
New Revision: 2681
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/velocity/URLVelocityTemplateLoader.java
Log:
same again.
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/velocity/URLVelocityTemplateLoader.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/velocity/URLVelocityTemplateLoader.java
2006-03-31 10:40:20 UTC (rev 2680)
+++
trunk/src/java/no/schibstedsok/front/searchportal/velocity/URLVelocityTemplateLoader.java
2006-03-31 11:04:40 UTC (rev 2681)
@@ -138,23 +138,15 @@
if( UrlResourceLoader.urlExists(url) ){
- LOG.trace(DEBUG_EXISTS + url);
- final URL u = new URL( UrlResourceLoader.getURL(url) );
- LOG.trace(DEBUG_FULL_URL_IS + u);
- conn = u.openConnection();
- final String hostHeader = UrlResourceLoader.getHostHeader(url);
- LOG.trace(DEBUG_HOST_HEADER_IS + hostHeader);
- conn.addRequestProperty("host", hostHeader);
+ conn = getURLConnection(url);
}else if( UrlResourceLoader.urlExists(getFallbackURL( url )) ){
LOG.trace(DEBUG_DOESNT_EXIST);
- 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);
+ conn = getURLConnection(getFallbackURL( url ));
+
+ }else{
+ throw new ResourceNotFoundException( ERR_RESOURCE_NOT_FOUND +
url );
}
}catch( IOException e ){
@@ -171,6 +163,18 @@
return url.replaceFirst(oldUrl, newUrl);
}
-
+
+
+ private URLConnection getURLConnection(final String url) throws
IOException{
+
+ LOG.trace(DEBUG_EXISTS + url);
+ final URL u = new URL( UrlResourceLoader.getURL(url) );
+ LOG.trace(DEBUG_FULL_URL_IS + u);
+ final URLConnection conn = u.openConnection();
+ final String hostHeader = UrlResourceLoader.getHostHeader(url);
+ LOG.trace(DEBUG_HOST_HEADER_IS + hostHeader);
+ conn.addRequestProperty("host", hostHeader);
+ return conn;
+ }
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
