[fix] dboissier#224 NPE on Idea 2018.2 when building Server Tree

cunneen · Jul 26, 2018 · 3ebf6dc · 3ebf6dc
1 parent 47eb8d3
commit 3ebf6dc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+Version 0.12.1
+    * [fix] #224 NPE encountered in IDEA 2018.2 during Server tree building
+
 Version 0.12.0
     * [fix] #137 Date is incorrect in the DatePicker when editing the cell
     * [fix] #217 Modifying a server configuration does not work

diff --git a/snapshot/mongo4idea-0.11.0.zip b/snapshot/mongo4idea-0.11.0.zip
diff --git a/snapshot/mongo4idea-0.12.0-SNAPSHOT.zip → snapshot/mongo4idea-0.12.1-SNAPSHOT.zip b/snapshot/mongo4idea-0.12.0-SNAPSHOT.zip → snapshot/mongo4idea-0.12.1-SNAPSHOT.zip
diff --git a/src/main/java/org/codinjutsu/tools/mongo/view/model/MongoTreeBuilder.java b/src/main/java/org/codinjutsu/tools/mongo/view/model/MongoTreeBuilder.java
@@ -54,6 +54,10 @@ public class MongoTreeBuilder extends AbstractTreeBuilder {
 
     public MongoTreeBuilder(@NotNull Tree tree) {
         init(tree, new DefaultTreeModel(new DefaultMutableTreeNode()), new MyTreeStructure(), (descriptorLeft, descriptorRight) -> {
+            if (descriptorLeft.getElement() == null || descriptorRight.getElement() == null) {
+                return 0;
+            }
+
             if (descriptorLeft instanceof ServerDescriptor && descriptorRight instanceof ServerDescriptor) {
                 MongoServer mongoServerLeft = (MongoServer) descriptorLeft.getElement();
                 MongoServer mongoServerRight = (MongoServer) descriptorRight.getElement();

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -17,7 +17,7 @@
 <idea-plugin>
     <name>Mongo Plugin</name>
     <description>Mongo integration for Intellij</description>
-    <version>0.12.0</version>
+    <version>0.12.1</version>
     <vendor email="david.boissier [at] gmail [dot] com" url="http://codinjutsu.blogspot.com">David Boissier</vendor>
 
 	<idea-version since-build="145.0"/>