From d4bbeaf772792afb75af18ac841f8c2c5300e937 Mon Sep 17 00:00:00 2001
From: Meghashyam Adoni <meghashyam.adoni@capitalone.com>
Date: Mon, 28 Dec 2015 09:36:53 -0500
Subject: [PATCH] Set 'expires' to null for session cookies

---
 .../java/net/lightbody/bmp/filters/HarCaptureFilter.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java
index eab705bcc..7c2035ea2 100644
--- a/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java
+++ b/browsermob-core-littleproxy/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java
@@ -545,7 +545,12 @@ protected void captureResponseCookies(HttpResponse httpResponse) {
                 harCookie.setHttpOnly(cookie.isHttpOnly());
                 harCookie.setPath(cookie.getPath());
                 harCookie.setSecure(cookie.isSecure());
-                harCookie.setExpires(new Date(System.currentTimeMillis() + cookie.getMaxAge()));
+                Date expires = null;
+                Long maxAge = cookie.getMaxAge();
+                if (maxAge > 0) {
+                    expires = new Date(System.currentTimeMillis() + maxAge);
+                }
+                harCookie.setExpires(expires);
 
                 harEntry.getResponse().getCookies().add(harCookie);
             }