You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by jw...@apache.org on 2016/06/30 16:33:20 UTC
groovy git commit: GROOVY-7842 - MarkupTemplateEngine Totally Broken
when used with a Security Manager (closes #358)
Repository: groovy
Updated Branches:
refs/heads/master 8408636bb -> cbe02a2df
GROOVY-7842 - MarkupTemplateEngine Totally Broken when used with a Security Manager (closes #358)
When running under a Security Manager an exception would be thrown because
the empty codebase value was added as a Permission name which can not be
empty. So use the same codebase value that is used by GStringTemplateEngine
and StreamingTemplateEngine for unnamed code sources.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/cbe02a2d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/cbe02a2d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/cbe02a2d
Branch: refs/heads/master
Commit: cbe02a2df3ee657ab19b713f6b9bd4764b87eca0
Parents: 8408636
Author: John Wagenleitner <jw...@apache.org>
Authored: Tue Jun 28 17:50:40 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Thu Jun 30 09:30:57 2016 -0700
----------------------------------------------------------------------
.../src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/cbe02a2d/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
index dc87bbf..60ed446 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
@@ -201,7 +201,7 @@ public class MarkupTemplateEngine extends TemplateEngine {
@SuppressWarnings("unchecked")
public MarkupTemplateMaker(final Reader reader, String sourceName, Map<String, String> modelTypes) {
String name = sourceName != null ? sourceName : "GeneratedMarkupTemplate" + counter.getAndIncrement();
- templateClass = groovyClassLoader.parseClass(new GroovyCodeSource(reader, name, ""), modelTypes);
+ templateClass = groovyClassLoader.parseClass(new GroovyCodeSource(reader, name, "x"), modelTypes);
this.modeltypes = modelTypes;
}