代码优化

smartboot · Nov 4, 2024 · 191a678 · 191a678
1 parent 70a2ebc
commit 191a678
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/impl/HttpServletRequestImpl.java b/servlet-core/src/main/java/tech/smartboot/servlet/impl/HttpServletRequestImpl.java
@@ -896,6 +896,19 @@ public CompletableFuture<Object> getCompletableFuture() {
     @Override
     public PushBuilder newPushBuilder() {
         org.smartboot.http.server.PushBuilder pushBuilder = request.newPushBuilder();
+        if (pushBuilder == null) {
+            return null;
+        }
+        String sessionId;
+        HttpSession session = getSession(false);
+        if (session != null) {
+            sessionId = session.getId();
+        } else {
+            sessionId = getRequestedSessionId();
+        }
+        if (sessionId != null) {
+            pushBuilder.setHeader(HeaderNameEnum.COOKIE.getName(), "JSESSIONID=" + sessionId);
+        }
         return new PushBuilder() {
             @Override
             public PushBuilder method(String method) {
@@ -955,7 +968,7 @@ public String getQueryString() {
 
             @Override
             public String getSessionId() {
-                return pushBuilder.getSessionId();
+                return sessionId;
             }
 
             @Override