From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 9 Nov 2006 18:11:46 +0000 (+0000)
Subject: Check conensus is not null
X-Git-Tag: Release_2_2~154
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a2299be0ebb414d06b12d6735312a1bb1147694f;p=jalview.git

Check conensus is not null
---

diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index 7c36208..64fd62e 100755
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -153,14 +153,16 @@ public class ResidueColourScheme implements ColourSchemeI
           s = String.valueOf(c);
         }
 
+        if (consensus == null || consensus[j] == null)
+          return false;
 
-      if ((((Integer) consensus[j].get(AAFrequency.MAXCOUNT)).intValue() != -1) &&
-                consensus[j].contains(s))
+        if ( ( ( (Integer) consensus[j].get(AAFrequency.MAXCOUNT)).intValue() != -1) &&
+            consensus[j].contains(s))
         {
-            if (((Float)consensus[j].get(ignoreGaps)).floatValue() >= threshold)
-            {
-                return true;
-            }
+          if ( ( (Float) consensus[j].get(ignoreGaps)).floatValue() >= threshold)
+          {
+            return true;
+          }
         }
 
         return false;