Skip to content

Commit dee2fa1

Browse files
authored
Merge pull request #547 from devoxx/issue-546
Fix #546 Null check
2 parents 4543eef + f8a4179 commit dee2fa1

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/main/java/com/devoxx/genie/util/ChatMessageContextUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ private static void setWindowContext(@NotNull ChatMessageContext chatMessageCont
8282

8383
// Set editor info if available
8484
Editor selectedTextEditor = editorFileButtonManager.getSelectedTextEditor();
85-
if (chatMessageContext.getFilesContext().isEmpty() && selectedTextEditor != null) {
85+
if ((chatMessageContext.getFilesContext() == null || chatMessageContext.getFilesContext().isEmpty()) &&
86+
selectedTextEditor != null) {
8687
addDefaultEditorInfoToMessageContext(selectedTextEditor, chatMessageContext);
8788
}
8889
}

src/main/resources/META-INF/plugin.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
]]></description>
3636

3737
<change-notes><![CDATA[
38+
<h2>V0.4.20</h2>
39+
<UL>
40+
<LI>Fix #546 : NPE on chatMessageContext.getFilesContext().isEmpty() by @stephanj</LI>
41+
</UL>
3842
<h2>V0.4.19</h2>
3943
<UL>
4044
<LI>Fix #529 : Concurrency improvement by @stephanj</LI>

0 commit comments

Comments
 (0)