Fix NPE in Veto handlers.

gshakhn · Jan 18, 2016 · c1b1c2f · c1b1c2f
1 parent 5199027
commit c1b1c2f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -5,6 +5,10 @@
   <vendor>George Shakhnazaryan, Arjan Molenaar</vendor>
   <change-notes>
     <![CDATA[<pre>
+1.4.1
+
+ * Fix Veto handler failing with NPE
+
 1.4.0
 
  * Rename a Java class and the FitNesse reference is updated

diff --git a/src/main/scala/fitnesse/idea/decisiontable/FitnesseVetoDecisionInputOutputRename.scala b/src/main/scala/fitnesse/idea/decisiontable/FitnesseVetoDecisionInputOutputRename.scala
@@ -7,6 +7,6 @@ import fitnesse.idea.table.Table
 class FitnesseVetoDecisionInputOutputRename extends Condition[PsiElement] {
 
   // Return true if rename should be veto'ed.
-  override def value(t: PsiElement): Boolean = t.isInstanceOf[DecisionInput] || t.isInstanceOf[DecisionOutput] || (!t.isInstanceOf[Table] && value(t.getParent))
+  override def value(t: PsiElement): Boolean = t.isInstanceOf[DecisionInput] || t.isInstanceOf[DecisionOutput] || (!t.isInstanceOf[Table] && t.getParent != null && value(t.getParent))
 
 }
diff --git a/src/main/scala/fitnesse/idea/scripttable/FitnesseVetoScriptRowRename.scala b/src/main/scala/fitnesse/idea/scripttable/FitnesseVetoScriptRowRename.scala
@@ -7,6 +7,6 @@ import fitnesse.idea.table.Table
 class FitnesseVetoScriptRowRename extends Condition[PsiElement] {
 
   // Return true if rename should be veto'ed.
-  override def value(t: PsiElement): Boolean = t.isInstanceOf[ScriptRow] || (!t.isInstanceOf[Table] && value(t.getParent))
+  override def value(t: PsiElement): Boolean = t.isInstanceOf[ScriptRow] || (!t.isInstanceOf[Table] && t.getParent != null && value(t.getParent))
 
 }