You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/01/18 15:56:46 UTC
[04/30] struts git commit: Replaces call to deprecated api
Replaces call to deprecated api
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/26f153d2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/26f153d2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/26f153d2
Branch: refs/heads/master
Commit: 26f153d262f7a4dfb767c391afece8ac1d9e1c0d
Parents: 24a5bce
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Wed Nov 25 20:29:43 2015 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Wed Nov 25 20:29:43 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/struts2/views/tiles/TilesResult.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/26f153d2/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
----------------------------------------------------------------------
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java b/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
index 490de79..72d7916 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
@@ -28,9 +28,9 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.result.ServletDispatcherResult;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
import com.opensymphony.xwork2.ActionInvocation;
+import org.apache.tiles.servlet.context.ServletUtil;
/**
* <!-- START SNIPPET: description -->
@@ -84,6 +84,7 @@ public class TilesResult extends ServletDispatcherResult {
public TilesResult(String location) {
super(location);
}
+
/**
* Dispatches to the given location. Does its forward via a RequestDispatcher. If the
* dispatch fails a 404 error will be sent back in the http response.
@@ -97,7 +98,8 @@ public class TilesResult extends ServletDispatcherResult {
setLocation(location);
ServletContext servletContext = ServletActionContext.getServletContext();
- TilesContainer container = TilesAccess.getContainer(servletContext);
+
+ TilesContainer container = ServletUtil.getContainer(servletContext);
HttpServletRequest request = ServletActionContext.getRequest();
HttpServletResponse response = ServletActionContext.getResponse();