JAL-3210 Merge branch 'develop' into trialMerge

[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 cd3e5c9..c52da40 100644 (file)
--- a/src/jalview/fts/service/pdb/PDBFTSRestClient.java
+++ b/src/jalview/fts/service/pdb/PDBFTSRestClient.java
@@ -171,35 +171,34 @@ public class PDBFTSRestClient extends FTSRestClient
       ClientResponse clientResponse = webResource
               .accept(MediaType.APPLICATION_JSON).get(clientResponseClass );
 
-      int status = clientResponse.getStatus();
-
       // Get the JSON string from the response object or directly from the
       // client (JavaScript)
-      Map<String, Object> jsonObj = (Platform.isJS() && status == 200
-              ? clientResponse.getEntity(Map.class)
-              : null);
-      String responseString = (jsonObj == null
-              ? clientResponse.getEntity(String.class)
-              : null);
+      Map<String, Object> jsonObj = null;
+      String responseString = null;
 
       // System.out.println("query >>>>>>> " + pdbRestRequest.toString());
 
       // Check the response status and report exception if one occurs
-      switch (status)
+      int responseStatus = clientResponse.getStatus();
+      switch (responseStatus)
       {
       case 200:
+        if (Platform.isJS())
+        {
+          jsonObj = clientResponse.getEntity(Map.class);
+        }
+        else
+        {
+          responseString = clientResponse.getEntity(String.class);
+        }
         break;
       case 400:
         throw new Exception(parseJsonExceptionString(responseString));
       default:
-        throw new Exception(getMessageByHTTPStatusCode(status, "PDB"));
+        throw new Exception(
+                getMessageByHTTPStatusCode(responseStatus, "PDB"));
       }
 
-      // Make redundant objects eligible for garbage collection to conserve
-      // memory
-      clientResponse = null;
-      client = null;
-
       // Process the response and return the result to the caller.
       return parsePDBJsonResponse(responseString, jsonObj, pdbRestRequest);
     } catch (Exception e)