sebb 2004/05/20 17:23:33
Modified: src/protocol/http/org/apache/jmeter/protocol/http/sampler
Tag: rel-2_0 HTTPSampler2.java
Log:
Allow for missing expiry date (was causing NPE)
Revision Changes Path
No revision
No revision
1.8.2.4 +6 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Index: HTTPSampler2.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- HTTPSampler2.java 13 Apr 2004 18:31:56 -0000 1.8.2.3
+++ HTTPSampler2.java 21 May 2004 00:23:33 -0000 1.8.2.4
@@ -22,6 +22,7 @@
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Date;
import java.util.Iterator;
import org.apache.commons.httpclient.ConnectMethod;
@@ -766,6 +767,7 @@
org.apache.commons.httpclient.Cookie [] c = state.getCookies();
for (int i= 0; i < c.length ; i++)
{
+ Date exp = c[i].getExpiryDate();// might be absent
cookieManager.add(
new org.apache.jmeter.protocol.http.control.
Cookie(c[i].getName(),
@@ -773,7 +775,8 @@
c[i].getDomain(),
c[i].getPath(),
c[i].getSecure(),
-
c[i].getExpiryDate().getTime()
+ exp != null ?
exp.getTime()
+ :
System.currentTimeMillis() + 1000 * 60 * 60 * 24 //cf CookieManager
)
);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
