Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:jclouds/jclouds 

* 'master' of git@github.com:jclouds/jclouds:
  Added a null check for the 'application.host' servlet context parameter
This commit is contained in:
Adrian Cole 2011-07-05 23:35:59 -07:00
parent c4c40eaff5 7debc1e3d6
commit 6b1720bfde
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java
View File

@ -119,8 +119,8 @@ public class GuiceServletConfig extends GuiceServletContextListener {
} }
private static URI withUrl(ServletContext servletContext, String url) { private static URI withUrl(ServletContext servletContext, String url) {
return URI.create("http://" + servletContext.getInitParameter("application.host") return URI.create("http://" + checkNotNull(servletContext.getInitParameter("application.host"), "application.host")
+ servletContext.getContextPath() + url); + servletContext.getContextPath() + url);
} }
private Properties loadJCloudsProperties( private Properties loadJCloudsProperties(