Fix NPE and ensure changes are tracked accurately. Fixes #13.

jcoleman · jcoleman · commit 53736e1366d8 · 2012-11-13T20:45:00.000-05:00
diff --git a/src/main/java/com/radiadesign/catalina/session/RedisSession.java b/src/main/java/com/radiadesign/catalina/session/RedisSession.java
@@ -53,10 +53,11 @@ public void setAttribute(String key, Object value) {
     }
 
     Object oldValue = getAttribute(key);
-    if ( value == null && oldValue != null
-         || oldValue == null && value != null
-         || !value.getClass().isInstance(oldValue)
-         || !value.equals(oldValue) ) {
+    if ( (value != null || oldValue != null)
+         && ( value == null && oldValue != null
+              || oldValue == null && value != null
+              || !value.getClass().isInstance(oldValue)
+              || !value.equals(oldValue) ) ) {
       changedAttributes.put(key, value);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,11 @@ public void setAttribute(String key, Object value) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`Object oldValue = getAttribute(key);`
`56`		`- if ( value == null && oldValue != null`
`57`		`- \|\| oldValue == null && value != null`
`58`		`- \|\| !value.getClass().isInstance(oldValue)`
`59`		`- \|\| !value.equals(oldValue) ) {`
	`56`	`+ if ( (value != null \|\| oldValue != null)`
	`57`	`+ && ( value == null && oldValue != null`
	`58`	`+ \|\| oldValue == null && value != null`
	`59`	`+ \|\| !value.getClass().isInstance(oldValue)`
	`60`	`+ \|\| !value.equals(oldValue) ) ) {`
`60`	`61`	`changedAttributes.put(key, value);`
`61`	`62`	`}`
`62`	`63`