James Moger
2012-03-24 462488624022a1cff16bebed6b3bb08b17ca80ab
Fixed null pointer for LuceneExecutor unit tests
1 files modified
7 ■■■■ changed files
src/com/gitblit/LuceneExecutor.java 7 ●●●● patch | view | raw | blame | history
src/com/gitblit/LuceneExecutor.java
@@ -143,6 +143,11 @@
    public LuceneExecutor(IStoredSettings settings, File repositoriesFolder) {
        this.storedSettings = settings;
        this.repositoriesFolder = repositoriesFolder;
        String exts = luceneIgnoreExtensions;
        if (settings != null) {
            exts = settings.getString(Keys.web.luceneIgnoreExtensions, exts);
        }
        excludedExtensions = new TreeSet<String>(StringUtils.getStringsFromValue(exts));
    }
    /**
@@ -532,7 +537,7 @@
                        // index the blob content
                        if (StringUtils.isEmpty(ext) || !excludedExtensions.contains(ext)) {                            
                            ObjectLoader ldr = repository.open(blobId, Constants.OBJ_BLOB);
                            InputStream in = ldr.openStream();
                            InputStream in = ldr.openStream();
                            int n;
                            while ((n = in.read(tmp)) > 0) {
                                os.write(tmp, 0, n);