From: Jim Procter Date: Fri, 4 May 2018 13:37:59 +0000 (+0100) Subject: JAL-2976 patch NPE when trying to open Uniprot FTS X-Git-Tag: Release_2_10_4~14 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3587df3dbcbd892eedd41a42d9f4e02a8b1e96ce;p=jalview.git JAL-2976 patch NPE when trying to open Uniprot FTS --- diff --git a/src/jalview/fts/core/FTSRestClient.java b/src/jalview/fts/core/FTSRestClient.java index 076e212..f94d455 100644 --- a/src/jalview/fts/core/FTSRestClient.java +++ b/src/jalview/fts/core/FTSRestClient.java @@ -284,7 +284,8 @@ public abstract class FTSRestClient implements FTSRestClientI public boolean equals(Object otherObject) { FTSDataColumnI that = (FTSDataColumnI) otherObject; - return this.getCode().equals(that.getCode()) + return otherObject == null ? false + : this.getCode().equals(that.getCode()) && this.getName().equals(that.getName()) && this.getGroup().equals(that.getGroup()); }