Fixed bug on setting pair (key, null)

zhourenjian · zhourenjian · commit ca0aea2bc790 · 2009-11-09T03:01:09.000Z
diff --git a/sources/net.sf.j2s.ajax/store/net/sf/j2s/store/CookieStore.java b/sources/net.sf.j2s.ajax/store/net/sf/j2s/store/CookieStore.java
@@ -21,7 +21,12 @@ public String getProperty(String name) {
 	/**
 	 * @j2sNative
 var toExpire = new Date();
-toExpire.setTime (new Date().getTime () + (365 * 24 * 3600 * 1000));
+if (value == null) {
+	value = "";
+	toExpire.setTime (new Date().getTime () - 24 * 3600 * 1000);
+} else {
+	toExpire.setTime (new Date().getTime () + 365 * 24 * 3600 * 1000);
+}
 document.cookie = name + "=" + value
 		+ "; expires=" + toExpire.toGMTString ()
 		+ "; path=/";
diff --git a/sources/net.sf.j2s.ajax/store/net/sf/j2s/store/INIFileStore.java b/sources/net.sf.j2s.ajax/store/net/sf/j2s/store/INIFileStore.java
@@ -55,7 +55,11 @@ public void setProperty(String name, String value) {
 		if (lastModified > lastUpdated) {
 			load();
 		}
-		properties.setProperty(name, value);
+		if (value == null) {
+			properties.remove(name);
+		} else {
+			properties.setProperty(name, value);
+		}
 		save();
 	}
 
diff --git a/sources/net.sf.j2s.ajax/store/net/sf/j2s/store/XSSCookieStore.java b/sources/net.sf.j2s.ajax/store/net/sf/j2s/store/XSSCookieStore.java
@@ -95,7 +95,11 @@ public String getProperty(String name) {
 	return;
 }
 try {
-	xssIfr.contentWindow.createCookie (name, value, 365);
+	if (value == null) {
+		xssIfr.contentWindow.createCookie (name, value, -1);
+	} else {
+		xssIfr.contentWindow.createCookie (name, value, 365);
+	}
 } catch (e) { }
 	 */
 	public void setProperty(String name, String value) {
diff --git a/sources/net.sf.j2s.ajax/store/net/sf/j2s/store/xss-cookie.html b/sources/net.sf.j2s.ajax/store/net/sf/j2s/store/xss-cookie.html
@@ -11,7 +11,7 @@
 	var expires = "";
 	if (days != null) {
 		var toExpireDate = new Date();
-		toExpireDate.setTime (toExpireDate.getTime () + (days * 24 * 3600 * 1000));
+		toExpireDate.setTime (toExpireDate.getTime () + days * 24 * 3600 * 1000);
 		expires = "; expires=" + toExpireDate.toGMTString ();
 	}
 	document.cookie = name + "=" + value + expires + "; path=/";

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,11 @@ public void setProperty(String name, String value) {`
`55`	`55`	`if (lastModified > lastUpdated) {`
`56`	`56`	`load();`
`57`	`57`	`}`
`58`		`- properties.setProperty(name, value);`
	`58`	`+ if (value == null) {`
	`59`	`+ properties.remove(name);`
	`60`	`+ } else {`
	`61`	`+ properties.setProperty(name, value);`
	`62`	`+ }`
`59`	`63`	`save();`
`60`	`64`	`}`
`61`	`65`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`var expires = "";`
`12`	`12`	`if (days != null) {`
`13`	`13`	`var toExpireDate = new Date();`
`14`		`- toExpireDate.setTime (toExpireDate.getTime () + (days * 24 * 3600 * 1000));`
	`14`	`+ toExpireDate.setTime (toExpireDate.getTime () + days * 24 * 3600 * 1000);`
`15`	`15`	`expires = "; expires=" + toExpireDate.toGMTString ();`
`16`	`16`	`}`
`17`	`17`	`document.cookie = name + "=" + value + expires + "; path=/";`