You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2015/08/01 12:00:09 UTC
incubator-groovy git commit: Update TemplateServlet.java: remove
"super." so subclass may override "getScriptUriAsFile" or "getScriptUri"
(closes #74)
Repository: incubator-groovy
Updated Branches:
refs/heads/master 971cee027 -> ab4958d08
Update TemplateServlet.java: remove "super." so subclass may override "getScriptUriAsFile" or "getScriptUri" (closes #74)
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/ab4958d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/ab4958d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/ab4958d0
Branch: refs/heads/master
Commit: ab4958d085cec365e37616f02f9bef62bd12bc49
Parents: 971cee0
Author: qxo <qx...@gmail.com>
Authored: Tue Jul 28 13:09:53 2015 +0800
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sat Aug 1 11:58:36 2015 +0200
----------------------------------------------------------------------
.../src/main/java/groovy/servlet/TemplateServlet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4958d0/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
index 16f08e5..3e3d778 100644
--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
+++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
@@ -428,7 +428,7 @@ public class TemplateServlet extends AbstractHttpServlet {
long getMillis;
String name;
- File file = super.getScriptUriAsFile(request);
+ File file = getScriptUriAsFile(request);
if (file != null) {
name = file.getName();
if (!file.exists()) {
@@ -443,7 +443,7 @@ public class TemplateServlet extends AbstractHttpServlet {
template = getTemplate(file);
getMillis = System.currentTimeMillis() - getMillis;
} else {
- name = super.getScriptUri(request);
+ name = getScriptUri(request);
URL url = servletContext.getResource(name);
getMillis = System.currentTimeMillis();
template = getTemplate(url);