Merge branch 'develop' (JAL-4102 2.11.2.6 patch release) into features/r2_11_2_alphaf...

[jalview.git] / src / jalview / gui / structurechooser / ThreeDBStructureChooserQuerySource.java

diff --git a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
index 8b4258f..cbc6add 100644 (file)
--- a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
+++ b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
@@ -453,7 +453,10 @@ public class ThreeDBStructureChooserQuerySource
           pdbEntry.setRetrievalUrl(urlStr);
         }
         pdbEntry.setProvider(typeColumn);
-        pdbEntry.setProviderPage(modelPage);
+        if (modelPage != null)
+        {
+          pdbEntry.setProviderPage(modelPage);
+        }
         selectedSeq.getDatasetSequence().addPDBId(pdbEntry);
       }
       pdbEntriesToView[count++] = pdbEntry;
@@ -546,6 +549,11 @@ public class ThreeDBStructureChooserQuerySource
       try
       {
         resultList = pdbquery.executePDBFTSRestRequest(pdbRequest);
+        if (resultList.getNumberOfItemsFound() == 0)
+        {
+          Console.info("Unexpectedly returned no results for pdbe query: "
+                  + pdb_Query);
+        }
         results.add(resultList);
         lastPdbRequest = pdbRequest;
       } catch (Exception ex)