NPE in SvgFile.isSvg(String)

[ilnur-z]

Where is a NullPointerException on method org.eclipse.birt.report.engine.util.SvgFile.isSvg(String) then uri is null.
I think that because some brackets needed:

if (uri != null && ( uri.endsWith(".svg") || uri.toLowerCase().contains(URL_IMAGE_TYPE_SVG) ) )

(just like on method org.eclipse.birt.report.engine.util.SvgFile.isSvg(String, String, String))

caused by 59c1d03

[wimjongman]

Please add the stacktrace

[ilnur-z]

here stacktrace
stack.log

[ilnur-z]

ImageManager2 is our little modified ImageManager, which not takes rasterised data for svg-images (not convert svg to raster).
its addImage method looks like:

public ImageEntry addImage(IImageContent image) throws IOException {
    ImageEntry entry = images.get(image.getURI());
    if (entry != null) {
        return entry;
    }
    String fileName = generateFileName(image.getExtension(), image.getMIMEType());
    entry = new ImageEntry(pkg, fileName, image.getMIMEType(), image);
    byte[] imgData;
    if (SvgFile.isSvg(image.getURI())) {
        imgData = image.getData();
    } else {
        imgData = entry.getImage().getData();
    }
    if (processEntry(entry, imgData)) {
        images.put(image.getURI(), entry);
    }
    return entry;
}

[speckyspooky]

Yes, I can confirm the NPE is based through the missing brackets.
I added a PR #1526 some minutes ago to fix it.