mobeigi/filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE

Browse Source
This commit is contained in:
Reinhard Pointner 2016-03-27 22:16:20 +00:00
parent ca155e2e9b
commit 6b70a50ba9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/net/filebot/format/ExpressionBindings.java
View File

@ -66,9 +66,6 @@ public class ExpressionBindings extends AbstractMap<String, Object> implements B
}
} catch (Exception e) {
// check InvocationTargetException cause
if (e.getCause() instanceof NullPointerException) {
return null;
}
if (e.getCause() instanceof BindingException) {
throw (BindingException) e.getCause();
}

3
source/net/filebot/format/MediaBindingBean.java
View File

@ -1054,7 +1054,8 @@ public class MediaBindingBean {
}
private String getOriginalFileName(File file) {
return getNameWithoutExtension(xattr.getOriginalName(file));
String name = xattr.getOriginalName(file);
return name == null ? null : getNameWithoutExtension(name);
}
private List<String> getKeywords() {