JAL-3855 don’t need to query Alphafold2 repository directly from PDBe FTS client...

[jalview.git] / src / jalview / fts / service / pdb / PDBFTSRestClient.java

diff --git a/src/jalview/fts/service/pdb/PDBFTSRestClient.java b/src/jalview/fts/service/pdb/PDBFTSRestClient.java
index 04fb17c..a315300 100644 (file)
--- a/src/jalview/fts/service/pdb/PDBFTSRestClient.java
+++ b/src/jalview/fts/service/pdb/PDBFTSRestClient.java
@@ -207,6 +207,10 @@ public class PDBFTSRestClient extends FTSRestClient implements StructureFTSRestC
       return parsePDBJsonResponse(responseString, jsonObj, pdbRestRequest);
     } catch (Exception e)
     {
+      if (e.getMessage()==null)
+      {
+        throw(e);
+      }
       String exceptionMsg = e.getMessage();
       if (exceptionMsg.contains("SocketException"))
       {
@@ -323,8 +327,8 @@ public static String parseJsonExceptionString(String jsonErrorResponse)
       int numFound = Integer
               .valueOf(pdbResponse.get("numFound").toString());
       List<Object> docs = (List<Object>) pdbResponse.get("docs");
-      // add in any alphafold bits at the top
-      result = AlphafoldRestClient.getFTSData(pdbRestRequest);
+
+      result = new ArrayList<FTSData>(); 
       if (numFound > 0)
       {