You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/10/07 19:47:59 UTC
wicket git commit: WICKET-6194 PushBuilder API integration
Repository: wicket
Updated Branches:
refs/heads/master e80380e15 -> 70606d73e
WICKET-6194 PushBuilder API integration
Fix the cast to Tomcat's implementation of HttpServletRequest
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/70606d73
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/70606d73
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/70606d73
Branch: refs/heads/master
Commit: 70606d73e9165d37c1d8b7c7820279fb4be18770
Parents: e80380e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 7 21:46:59 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 7 21:46:59 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/http2/markup/head/PushHeaderItem.java | 1 -
.../org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/70606d73/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java
index 69141eb..bb4c985 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java
@@ -266,7 +266,6 @@ public class PushHeaderItem extends HeaderItem
// Push the resources if the "if-modified-since" is not available
push(request);
}
-
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/70606d73/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java
index 141a296..7cacd52 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java
@@ -34,7 +34,7 @@ public class Tomcat85PushBuilder implements PushBuilder
{
Request request = RequestCycle.get().getRequest();
HttpServletRequest httpRequest = (HttpServletRequest) request.getContainerRequest();
- org.apache.catalina.connector.Request tomcatRequest = (org.apache.catalina.connector.Request) httpRequest;
+ org.apache.catalina.connector.RequestFacade tomcatRequest = (org.apache.catalina.connector.RequestFacade) httpRequest;
org.apache.catalina.servlet4preview.http.PushBuilder pushBuilder = tomcatRequest.getPushBuilder();
for (String path : paths)
{