Author: markt
Date: Tue Oct 20 22:26:17 2015
New Revision: 1709694
URL: http://svn.apache.org/viewvc?rev=1709694&view=rev
Log:
Fix PushBuilder bugs
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1709694&r1=1709693&r2=1709694&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Tue
Oct 20 22:26:17 2015
@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpSession;
import javax.servlet.http.PushBuilder;
+import org.apache.catalina.Context;
import org.apache.catalina.connector.Request;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
@@ -120,9 +121,9 @@ public class ApplicationPushBuilder impl
addHeader("referer", referer.toString());
// Session
- ApplicationContext appContext = (ApplicationContext)
request.getServletContext();
- sessionCookieName =
SessionConfig.getSessionCookieName(appContext.getContext());
- sessionPathParameterName =
SessionConfig.getSessionUriParamName(appContext.getContext());
+ Context context = catalinaRequest.getContext();
+ sessionCookieName = SessionConfig.getSessionCookieName(context);
+ sessionPathParameterName =
SessionConfig.getSessionUriParamName(context);
HttpSession session = request.getSession(false);
if (session != null) {
@@ -143,8 +144,10 @@ public class ApplicationPushBuilder impl
}
// Cookies
- for (Cookie requestCookie : request.getCookies()) {
- cookies.add(requestCookie);
+ if (request.getCookies() != null) {
+ for (Cookie requestCookie : request.getCookies()) {
+ cookies.add(requestCookie);
+ }
}
for (Cookie responseCookie :
catalinaRequest.getResponse().getCookies()) {
if (responseCookie.getMaxAge() < 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
