Fixed #890

JabRef · Mar 4, 2016 · 855e00d · 855e00d
1 parent 317b45e
commit 855e00d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,7 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 ### Fixed
 - Fixed [#598](https://github.com/JabRef/jabref/issues/598) and [#402](https://github.com/JabRef/jabref/issues/402): No more issues with invalid icons for ExternalFileTypes in global search or after editing the settings
 - Fixed [#883](https://github.com/JabRef/jabref/issues/883): No NPE during cleanup
+- Fixed [#890](https://github.com/JabRef/jabref/issues/890): No NPE when renaming file
 - Fixed [#466](https://github.com/JabRef/jabref/issues/466): Rename PDF cleanup now also changes case of file name
 - Fixed [#621](https://github.com/JabRef/jabref/issues/621) and [#669](https://github.com/JabRef/jabref/issues/669): Encoding and preamble now end with newline.
 - Make BibTex parser more robust against missing newlines

diff --git a/src/main/java/net/sf/jabref/logic/layout/Layout.java b/src/main/java/net/sf/jabref/logic/layout/Layout.java
@@ -107,7 +107,7 @@ public void setPostFormatter(LayoutFormatter formatter) {
     }
 
     public String doLayout(BibEntry bibtex, BibDatabase database) {
-        return doLayout(bibtex, database, null);
+        return doLayout(bibtex, database, Optional.empty());
     }
 
     /**