Repository: wicket Updated Branches: refs/heads/master 77d8bf32d -> 35a7d6d5f
Use ApplicationPushBuilder instead of org.apache.catalina.servlet4preview.http.PushBuilder because it will be removed in Tomcat http://markmail.org/message/hf65x4ko4ro5lvus Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/35a7d6d5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/35a7d6d5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/35a7d6d5 Branch: refs/heads/master Commit: 35a7d6d5f9877b02bb2e6292b5b03533dc87d817 Parents: 77d8bf3 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Sep 28 12:15:25 2017 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Sep 28 12:15:25 2017 +0300 ---------------------------------------------------------------------- .../org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/35a7d6d5/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 1aac741..32faf6b 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 @@ -18,6 +18,7 @@ package org.apache.wicket.http2.markup.head; import javax.servlet.http.HttpServletRequest; +import org.apache.catalina.core.ApplicationPushBuilder; import org.apache.wicket.http2.markup.head.PushItemHeaderValue.HeaderOperation; import org.apache.wicket.request.Request; import org.apache.wicket.request.cycle.RequestCycle; @@ -37,7 +38,7 @@ public class Tomcat85PushBuilder implements PushBuilder Request request = RequestCycle.get().getRequest(); HttpServletRequest httpRequest = (HttpServletRequest) request.getContainerRequest(); org.apache.catalina.connector.RequestFacade tomcatRequest = (org.apache.catalina.connector.RequestFacade) httpRequest; - org.apache.catalina.servlet4preview.http.PushBuilder pushBuilder = tomcatRequest.newPushBuilder(); + ApplicationPushBuilder pushBuilder = (ApplicationPushBuilder) tomcatRequest.newPushBuilder(); if (pushBuilder != null) { for (PushItem pushItem : pushItems)
