aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Brisson <cbrisson@apache.org>2020-05-29 15:04:20 +0200
committerGitHub <noreply@github.com>2020-05-29 15:04:20 +0200
commit6b6a42ab9cbedb3591c2c95ab0e7e94db7d89ce2 (patch)
tree7f0bbf83d28164bb413c4bb399dd17eb394b5634
parent5944aa9200410cdee784304d2970b69e37a5c141 (diff)
parent95e4623cc3f899edc70af2abd49e92606d3eea0e (diff)
downloadapache-velocity-engine-6b6a42ab9cbedb3591c2c95ab0e7e94db7d89ce2.tar.gz
Merge pull request #15 from donnerpeter/classloader-leak
don't leak classes via Stop.STOP_ALL stack trace
-rw-r--r--velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java
index 3df68991..1ffe0170 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java
@@ -36,7 +36,12 @@ import java.util.ArrayList;
*/
public class Stop extends Directive
{
- private static final StopCommand STOP_ALL = new StopCommand("StopCommand to exit merging");
+ private static final StopCommand STOP_ALL = new StopCommand("StopCommand to exit merging") {
+ @Override
+ public synchronized Throwable fillInStackTrace() {
+ return this;
+ }
+ };
private boolean hasMessage = false;