JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / analysis / Finder.java

diff --git a/src/jalview/analysis/Finder.java b/src/jalview/analysis/Finder.java
index fe3abe4..72097e0 100644 (file)
--- a/src/jalview/analysis/Finder.java
+++ b/src/jalview/analysis/Finder.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -152,7 +152,8 @@ public class Finder
           }
         }
 
-        if (isIncludeDescription() && regex.search(seq.getDescription()))
+        if (isIncludeDescription() && seq.getDescription() != null
+                && regex.search(seq.getDescription()))
         {
           idMatch.addElement(seq);
           hasResults = true;
@@ -205,7 +206,7 @@ public class Finder
           {
             continue;
           }
-// if invalid string used, then regex has no matched to/from
+          // if invalid string used, then regex has no matched to/from
           int sres = seq
                   .findPosition(resIndex
                           + Integer.parseInt(spaces.elementAt(resIndex)