Addressed comments

yahoo · Oct 24, 2016 · 1bf0d94 · 1bf0d94
1 parent cbb204e
commit 1bf0d94
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/fili-core/src/main/java/com/yahoo/bard/webservice/async/ResponseException.java b/fili-core/src/main/java/com/yahoo/bard/webservice/async/ResponseException.java
@@ -158,9 +158,14 @@ private static String buildMessage(
         String druidQueryString;
         try {
             druidQueryString = objectWriter.writeValueAsString(druidQuery);
-        } catch (JsonProcessingException e) {
-            druidQueryString = druidQuery.toString();
-            LOG.warn(String.format("Failed to properly serialize druid query %s", druidQueryString), e);
+        } catch (JsonProcessingException jse) {
+            try {
+                druidQueryString = druidQuery.toString();
+            } catch (Exception e) {
+                LOG.warn("Error invoking a druid query's toString.", e);
+                druidQueryString = "QUERY'S `toString` FAILED";
+            }
+            LOG.warn(String.format("Failed to serialize druid query %s", druidQueryString), jse);
         }
         return String.format(
                 "reason: %s, description: %s, statusCode: %d, druid query: %s, cause: %s",