Author: cbrisson Date: Sun Oct 14 22:51:38 2018 New Revision: 1843864 URL: http://svn.apache.org/viewvc?rev=1843864&view=rev Log: [engine] Allow SimpleNode.dump() to be called before initialization
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java?rev=1843864&r1=1843863&r2=1843864&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java Sun Oct 14 22:51:38 2018 @@ -281,13 +281,16 @@ public class SimpleNode implements Node */ public final void dump(String prefix, PrintStream out) { - String encoding = rsvc.getString(RuntimeConstants.INPUT_ENCODING); Charset charset = null; - try + if (rsvc == null) /* may be null if node isn't yet initialized */ { - charset = Charset.forName(encoding); + String encoding = rsvc.getString(RuntimeConstants.INPUT_ENCODING); + try + { + charset = Charset.forName(encoding); + } + catch (Exception e) {} } - catch (Exception e) {} if (charset == null) { charset = Charset.defaultCharset();