Author: manik.surtani(a)jboss.com Date: 2008-06-26 20:17:00 -0400 (Thu, 26 Jun 2008) New Revision: 6080 Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/commands/write/EvictCommand.java Log: Null chk Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/commands/write/EvictCommand.java =================================================================== --- core/branches/2.2.X/src/main/java/org/jboss/cache/commands/write/EvictCommand.java 2008-06-27 00:00:18 UTC (rev 6079) +++ core/branches/2.2.X/src/main/java/org/jboss/cache/commands/write/EvictCommand.java 2008-06-27 00:17:00 UTC (rev 6080) @@ -1,12 +1,12 @@ package org.jboss.cache.commands.write; +import org.jboss.cache.DataContainer; import org.jboss.cache.Fqn; import org.jboss.cache.InvocationContext; import org.jboss.cache.NodeSPI; -import org.jboss.cache.DataContainer; -import org.jboss.cache.notifications.Notifier; import org.jboss.cache.commands.Visitor; import org.jboss.cache.commands.read.AbstractDataCommand; +import org.jboss.cache.notifications.Notifier; import java.util.List; @@ -51,11 +51,15 @@ public Object perform(InvocationContext ctx) { NodeSPI node = dataContainer.peek(fqn, false, false); - if (node != null && node.isResident()) + if (node == null) { + return false; + } + else if (node.isResident()) + { return true; } - if (recursive) + else if (recursive) { List<Fqn> nodesToEvict = dataContainer.getNodesForEviction(fqn, true); for (Fqn aFqn : nodesToEvict)