Hi Matej, On Fri, May 22, 2009 at 1:11 AM, <[email protected]> wrote: > --- > jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java > (original) > +++ > jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java > Thu May 21 23:11:22 2009 > @@ -1207,8 +1207,11 @@ > throws RepositoryException { > InputStream in = > RepositoryImpl.class.getResourceAsStream("repository.properties"); > try { > - props.load(in); > - in.close(); > + if (in != null) > + { > + props.load(in); > + in.close(); > + }
I don't think this change comes from Jackrabbit trunk. It's OK to customize the feature branch, but it would be better to split such changes out to separate commits that explain why the change was made. About this specific change, the repository.properties file should always be included in the classpath (just like RepositoryImpl.class itself), so I'd rather not add conditionals like this. I guess you haven't marked the src/main/resources-filtered folder as a source folder in your IDE. Another minor point, please avoid using tabs in Jackrabbit code. We're using only spaces for indentation. BR, Jukka Zitting
