aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Brisson <cbrisson@apache.org>2016-11-14 22:32:06 +0000
committerClaude Brisson <cbrisson@apache.org>2016-11-14 22:32:06 +0000
commit7e5b6e6910383ab46bb1f557817f147ab54739eb (patch)
tree93f4cf377dcc2819eb45d48599ccb8da0757d51c
parent09adaee35de543cdc070f915589a5fdd2616fe4e (diff)
downloadapache-velocity-engine-7e5b6e6910383ab46bb1f557817f147ab54739eb.tar.gz
[engine] fix VelocimacroFactory logging initialization sequence
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1769700 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
index a66656f5..c1bfb954 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
@@ -54,7 +54,7 @@ public class VelocimacroFactory
/**
* the log for this instance
*/
- private final Logger log;
+ private Logger log = null;
/**
* VMManager : deal with namespace management
@@ -106,7 +106,6 @@ public class VelocimacroFactory
public VelocimacroFactory(final RuntimeServices rsvc)
{
this.rsvc = rsvc;
- this.log = rsvc.getLog("macro");
/*
* we always access in a synchronized(), so we
@@ -127,6 +126,7 @@ public class VelocimacroFactory
*/
synchronized(this)
{
+ log = rsvc.getLog("macro");
log.trace("initialization starting.");
/*