diff --git a/magic-api-servlet/magic-api-servlet-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpServletRequest.java b/magic-api-servlet/magic-api-servlet-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpServletRequest.java index ef6e4eb8..586ea054 100644 --- a/magic-api-servlet/magic-api-servlet-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpServletRequest.java +++ b/magic-api-servlet/magic-api-servlet-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpServletRequest.java @@ -13,6 +13,7 @@ import org.ssssssss.magicapi.core.servlet.MagicCookie; import org.ssssssss.magicapi.core.servlet.MagicHttpServletRequest; import org.ssssssss.magicapi.core.servlet.MagicHttpSession; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.InputStream; @@ -83,6 +84,10 @@ public class MagicJavaEEHttpServletRequest implements MagicHttpServletRequest { @Override public MagicCookie[] getCookies() { + Cookie[] cookies = request.getCookies(); + if (cookies == null) { + return new MagicJavaEECookie[0]; + } return Arrays.stream(request.getCookies()).map(MagicJavaEECookie::new).toArray(MagicJavaEECookie[]::new); }