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

Merge branch 'feature/scriptbuilder-fixes' of https://github.com/ccustine/jclouds 

* 'feature/scriptbuilder-fixes' of https://github.com/ccustine/jclouds:
  Fix for classloader issues in OSGi, web apps, etc.
This commit is contained in:
Adrian Cole 2011-03-12 14:30:50 -08:00
parent d9cb934feb cfb74ffcc1
commit b81156a1f3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/util/Utils.java
View File

@ -134,8 +134,8 @@ public class Utils {
public static String writeFunctionFromResource(String function, OsFamily family) { public static String writeFunctionFromResource(String function, OsFamily family) {
try { try {
return CharStreams.toString(Resources.newReaderSupplier(Resources.getResource(String return CharStreams.toString(Resources.newReaderSupplier(Resources.getResource(Utils.class, String
.format("functions/%s.%s", function, ShellToken.SH.to(family))), Charsets.UTF_8)); .format("/functions/%s.%s", function, ShellToken.SH.to(family))), Charsets.UTF_8));
} catch (IOException e) { } catch (IOException e) {
throw new FunctionNotFoundException(function, family, e); throw new FunctionNotFoundException(function, family, e);
} }