Bug Fix: Merge pull request #1101 from Caltech-IPAC/u/gpdf/fix-tap-error-handling

Bug Fix: Improve nested error handling in retrieval of TAP error documents

Author: robyww

docs/release-notes.md

@@ -41,6 +41,9 @@
   - Fixed: mouse wheel / trackpad scrolling performance issue ([Firefly-793](https://github.com/Caltech-IPAC/firefly/pull/1098))
   - Fixed: Handle redirects when retrieving TAP errors ([DM-30073](https://github.com/Caltech-IPAC/firefly/pull/1092))
   - Fixed: problem is misusing the referer header
+- 2021.2.X
+  - Fixed: initialization of userInfo object
+  - Fixed: further refinement to error handling when retrieving TAP error documents
 
 
 ##### _Pull Request in this release_

src/firefly/java/edu/caltech/ipac/firefly/server/query/AsyncTapQuery.java

@@ -52,7 +52,7 @@ public AsyncJob submitRequest(ServerRequest request) throws DataAccessException
         if (maxrec > -1) { inputs.setParam("MAXREC", Integer.toString(maxrec)); }
         inputs.setParam("LANG", lang); // in tap 1.0, lang param is required
         inputs.setParam("request", "doQuery"); // in tap 1.0, request param is required
-        
+
         AsyncTapJob asyncTap = new AsyncTapJob();
         HttpServices.postData(inputs, (method -> {
             String location = HttpServices.getResHeader(method, "Location", null);
@@ -64,7 +64,7 @@ public AsyncJob submitRequest(ServerRequest request) throws DataAccessException
                 asyncTap.setErrorMsg("Failed to submit async job to " + serviceUrl);
             }
         }));
-        
+
         if (asyncTap.getPhase() == AsyncJob.Phase.PENDING) {
             HttpServices.postData(HttpServiceInput.createWithCredential(asyncTap.baseJobUrl + "/phase").setParam("PHASE", "RUN"));
         }
@@ -107,7 +107,7 @@ private static String getErrResp(HttpMethod method, String errorUrl) {
         } catch (DataAccessException e) {
             errMsg = e.getMessage();
         } catch (Exception e) {
-            errMsg = "Unable to get error from " + errorUrl;
+            errMsg = "Unknown error retrieving error document from "+errorUrl;
         }
         return errMsg;
     }
@@ -208,19 +208,21 @@ public String getErrorMsg()  {
                     } else if (HttpServices.isRedirected(method)) {
                         String location = HttpServices.getResHeader(method, "Location", null);
                         if (location != null) {
-                            HttpServices.getData(HttpServiceInput.createWithCredential(location),
+                            HttpServices.Status redirectStatus = HttpServices.getData(HttpServiceInput.createWithCredential(location),
                                 (redirectMethod -> err.setSource(getErrResp(redirectMethod, errorUrl))));
+                            if (redirectStatus.isError()) {
+                                err.setSource("Error retrieving redirected error document from "+location+": "+redirectStatus.getErrMsg());
+                            }
                         } else {
-                            throw new RuntimeException("Request redirected without a location header");
+                            throw new RuntimeException("Error document request redirected without a location header");
                         }
+                    } else {
+                        err.setSource("Error retrieving error document from "+errorUrl+": "+method.getStatusText());
                     }
                 } catch (Exception e) {
                     throw new RuntimeException(e.getMessage());
                 }
             }));
-            if (status.isError()) {
-                return "Unable to get error from "+errorUrl+" "+status.getErrMsg();
-            }
             return err.getSource();
         }
 
@@ -248,14 +250,3 @@ private String getFilename(String urlStr) {
 
     }
 }
-
-
-
-
-
-
-
-
-
-
-