FREEMARKER-55: (Return a specific List type as possible)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a9581498 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a9581498 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a9581498 Branch: refs/heads/3 Commit: a9581498bdce8d933093669f7b0fc3b46bcf3c6f Parents: cc6c469 Author: ddekany <[email protected]> Authored: Thu Jul 6 10:12:00 2017 +0200 Committer: ddekany <[email protected]> Committed: Thu Jul 6 10:12:00 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/freemarker/servlet/jsp/TaglibFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a9581498/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java index 386b34e..297fef2 100644 --- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java +++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java @@ -2049,7 +2049,7 @@ public class TaglibFactory implements TemplateHashModel { /** * TLD locations to look for when finding available JSP tag libraries. */ - private List<? extends MetaInfTldSource> metaInfTldSources; + private List<MetaInfTldSource> metaInfTldSources; /** * TLD classpath locations to look for when finding available JSP tag libraries. @@ -2093,7 +2093,7 @@ public class TaglibFactory implements TemplateHashModel { * Get the list of places where to look for {@code META-INF/**}{@code /*.tld} files. * @return the list of places where to look for {@code META-INF/**}{@code /*.tld} files */ - public List<? extends MetaInfTldSource> getMetaInfTldSources() { + public List<MetaInfTldSource> getMetaInfTldSources() { return (metaInfTldSources != null) ? metaInfTldSources : Collections.<MetaInfTldSource> emptyList(); }
