WW-4282 Adds WARN level when DTD cannot be resolved locally
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b1d3401c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b1d3401c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b1d3401c Branch: refs/heads/master Commit: b1d3401c32dba235fda2624124da6b304911017d Parents: 750d680 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Wed Jan 15 09:13:39 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Wed Jan 15 09:13:39 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/com/opensymphony/xwork2/util/DomHelper.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b1d3401c/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java index 15a88d8..71ecc82 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java @@ -346,8 +346,10 @@ public class DomHelper { @Override public InputSource resolveEntity(String publicId, String systemId) { if (dtdMappings != null && dtdMappings.containsKey(publicId)) { - String val = dtdMappings.get(publicId).toString(); - return new InputSource(ClassLoaderUtil.getResourceAsStream(val, DomHelper.class)); + String dtdFile = dtdMappings.get(publicId); + return new InputSource(ClassLoaderUtil.getResourceAsStream(dtdFile, DomHelper.class)); + } else if (LOG.isWarnEnabled()) { + LOG.warn("Local DTD is missing for publicID: #0 - defined mappings: #1", publicId, dtdMappings); } return null; }
