← Back to branch summary

~ubuntu-branches/ubuntu/utopic/plexus-velocity/utopic

« back to all changes in this revision

Viewing changes to src/main/java/org/codehaus/plexus/velocity/ContextClassLoaderResourceLoader.java

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg
  • Date: 2013-08-06 10:56:03 UTC
  • mfrom: (1.1.2) (2.2.5 sid)
  • Revision ID: package-import@ubuntu.com-20130806105603-jj3sb2w91rnh01b3
Tags: 1.1.8-1
http://bugs.debian.org/654128
* New upstream release
* Switched the build dependency on Commons Collections to 3.x
* debian/control:
  - Updated Standards-Version to 3.9.4 (no changes)
  - Removed Michael Koch from the uploaders (Closes: #654128)
  - Use canonical URLs for the Vcs-* fields
* debian/copyright: Updated the Format URI

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/java/org/codehaus/plexus/velocity/ContextClassLoaderResourceLoader.java
45
45
        {
46
46
            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
47
47
 
48
 
            result= classLoader.getResourceAsStream( name );
 
48
            if ( name.startsWith( "/" ) )
 
49
            {
 
50
                name = name.substring( 1 );
 
51
            }
 
52
 
 
53
            result = classLoader.getResourceAsStream( name );
49
54
        }
50
55
        catch( Exception fnfe )
51
56
        {