Author: sebb
Date: Fri Jun 2 16:50:51 2006
New Revision: 411338
URL: http://svn.apache.org/viewvc?rev=411338&view=rev
Log:
Use ExpiresMillis() method
Modified:
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=411338&r1=411337&r2=411338&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Fri Jun 2 16:50:51 2006
@@ -102,11 +102,11 @@
PrintWriter writer = new PrintWriter(new FileWriter(file));
writer.println("# JMeter generated Cookie file");// $NON-NLS-1$
PropertyIterator cookies = getCookies().iterator();
- long now = System.currentTimeMillis() / 1000;
+ long now = System.currentTimeMillis();
while (cookies.hasNext()) {
Cookie cook = (Cookie) cookies.next().getObjectValue();
// Note: now is always > 0, so no need to check for
that separately
- if (cook.getExpires() > now) { // only save unexpired
cookies
+ if (cook.getExpiresMillis() > now) { // only save
unexpired cookies
writer.println(cook.toString());
}
}
@@ -214,7 +214,7 @@
* Create an HttpClient cookie from a JMeter cookie
*/
private org.apache.commons.httpclient.Cookie makeCookie(Cookie jmc){
- long exp = jmc.getExpires() * 1000;
+ long exp = jmc.getExpiresMillis();
return new org.apache.commons.httpclient.Cookie(
jmc.getDomain(),
jmc.getName(),
@@ -300,7 +300,7 @@
Date expiryDate = cookies[i].getExpiryDate();
long exp = 0;
if (expiryDate!= null) {
- exp=expiryDate.getTime() / 1000;
+ exp=expiryDate.getTime();
}
Cookie newCookie = new Cookie(
cookies[i].getName(),
@@ -308,10 +308,10 @@
cookies[i].getDomain(),
cookies[i].getPath(),
cookies[i].getSecure(),
- exp);
+ exp / 1000);
// Store session cookies as well as unexpired ones
- if (exp == 0 || exp >= (System.currentTimeMillis() / 1000)) {
+ if (exp == 0 || exp >= System.currentTimeMillis()) {
add(newCookie); // Has its own debug log; removes matching
cookies
} else {
removeMatchingCookies(newCookie);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
