Merge pull request #761 from HubSpot/avoid-redundant-message

Only add originating message if it is different from the default message

Author: jasmith-hs

src/main/java/com/hubspot/jinjava/el/ExpressionResolver.java

@@ -186,16 +186,19 @@ public Object resolveExpression(String expression) {
           )
         );
       } else {
-        final String exceptionMessage = String.format(
+        String originatingException = getRootCauseMessage(e);
+        final String combinedMessage = String.format(
           "%s%nOriginating Exception:%n%s",
           e.getMessage(),
-          getRootCauseMessage(e)
+          originatingException
         );
         interpreter.addError(
           TemplateError.fromException(
             new TemplateSyntaxException(
-              exceptionMessage,
-              e.getMessage(),
+              expression,
+              StringUtils.endsWith(originatingException, e.getMessage())
+                ? e.getMessage()
+                : combinedMessage,
               interpreter.getLineNumber(),
               e
             )