svn commit: r1769415 - in /velocity/engine/trunk/velocity-engine-core/src/main: java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java parser/Parser.jjt

[cbrisson]

Author: cbrisson
Date: Sat Nov 12 20:36:30 2016
New Revision: 1769415

URL: http://svn.apache.org/viewvc?rev=1769415&view=rev
Log:
[engine] suppress stack trace display when we obviously don't need it

Modified:
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java
    velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?rev=1769415&r1=1769414&r2=1769415&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
 Sat Nov 12 20:36:30 2016
@@ -362,7 +362,7 @@ public class ResourceManagerImpl
             }
             catch (ParseErrorException pee)
             {
-                log.error("ResourceManager.getResource() parse exception", 
pee);
+                log.error("ResourceManager: parse exception: {}", 
pee.getMessage());
                 throw pee;
             }
             catch (RuntimeException re)

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java?rev=1769415&r1=1769414&r2=1769415&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader2.java
 Sat Nov 12 20:36:30 2016
@@ -249,7 +249,7 @@ public abstract class ResourceLoader2
             if (log.isDebugEnabled())
             {
                 log.debug("Could not load resource '{}' from ResourceLoader 
{}",
-                        resourceName, this.getClass().getName(), e);
+                        resourceName, this.getClass().getName());
             }
         }
         finally

Modified: velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt?rev=1769415&r1=1769414&r2=1769415&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt 
(original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/parser/Parser.jjt Sat 
Nov 12 20:36:30 2016
@@ -214,7 +214,7 @@ public class Parser
         }
         catch (ParseException pe)
         {
-            log.error("{}: {}", currentTemplate.getName(), pe.getMessage(), 
pe);
+            log.error("{}: {}", currentTemplate.getName(), pe.getMessage());
             throw new TemplateParseException (pe.currentToken,
                                pe.expectedTokenSequences, pe.tokenImage, 
currentTemplate.getName());
                }