Commitca0aea2

zhourenjian

committed

Fixed bug on setting pair (key, null)

1 parent44845c5 commitca0aea2Copy full SHA for ca0aea2

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,12 @@ public String getProperty(String name) {`
`21`	`21`	`/**`
`22`	`22`	`* @j2sNative`
`23`	`23`	`var toExpire = new Date();`
`24`		`-toExpire.setTime (new Date().getTime () + (365 * 24 * 3600 * 1000));`
	`24`	`+if (value == null) {`
	`25`	`+value = "";`
	`26`	`+toExpire.setTime (new Date().getTime () - 24 * 3600 * 1000);`
	`27`	`+} else {`
	`28`	`+toExpire.setTime (new Date().getTime () + 365 * 24 * 3600 * 1000);`
	`29`	`+}`
`25`	`30`	`document.cookie = name + "=" + value`
`26`	`31`	`+ "; expires=" + toExpire.toGMTString ()`
`27`	`32`	`+ "; path=/";`

Lines changed: 5 additions & 1 deletion

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`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,11 @@ public String getProperty(String name) {`
`95`	`95`	`return;`
`96`	`96`	`}`
`97`	`97`	`try {`
`98`		`-xssIfr.contentWindow.createCookie (name, value, 365);`
	`98`	`+if (value == null) {`
	`99`	`+xssIfr.contentWindow.createCookie (name, value, -1);`
	`100`	`+} else {`
	`101`	`+xssIfr.contentWindow.createCookie (name, value, 365);`
	`102`	`+}`
`99`	`103`	`} catch (e) { }`
`100`	`104`	`*/`
`101`	`105`	`publicvoidsetProperty(Stringname,Stringvalue) {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`varexpires="";`
`12`	`12`	`if(days!=null){`
`13`	`13`	`vartoExpireDate=newDate();`
`14`		`-toExpireDate.setTime(toExpireDate.getTime()+(days243600*1000));`
	`14`	`+toExpireDate.setTime(toExpireDate.getTime()+days243600*1000);`
`15`	`15`	`expires="; expires="+toExpireDate.toGMTString();`
`16`	`16`	`}`
`17`	`17`	`document.cookie=name+"="+value+expires+"; path=/";`

Comments

(0)