Author: bcarothers Date: 2010-01-07 09:43:33 -0500 (Thu, 07 Jan 2010) New Revision: 1550 Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapRequestProcessor.java Log: Fixed one eclipse warning and added some asserts to clarify intent. Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java 2010-01-07 14:39:17 UTC (rev 1549) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java 2010-01-07 14:43:33 UTC (rev 1550) @@ -33,6 +33,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import org.jboss.dna.common.util.HashCode; import org.jboss.dna.graph.ExecutionContext; import org.jboss.dna.graph.Location; import org.jboss.dna.graph.connector.UuidAlreadyExistsException; @@ -721,6 +722,11 @@ return false; } + @Override + public int hashCode() { + return HashCode.compute(getName()); + } + /** * {@inheritDoc} * Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapRequestProcessor.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapRequestProcessor.java 2010-01-07 14:39:17 UTC (rev 1549) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapRequestProcessor.java 2010-01-07 14:43:33 UTC (rev 1550) @@ -98,8 +98,13 @@ public void process( ReadAllChildrenRequest request ) { MapWorkspace workspace = getWorkspace(request, request.inWorkspace()); MapNode node = getTargetNode(workspace, request, request.of()); - if (node == null) return; + if (node == null) { + assert request.hasError(); + return; + } + Location actualLocation = getActualLocation(request.of(), node); + assert actualLocation != null; Path path = actualLocation.getPath(); // Get the names of the children ... List<MapNode> children = node.getChildren(); @@ -142,13 +147,19 @@ public void process( ReadAllPropertiesRequest request ) { MapWorkspace workspace = getWorkspace(request, request.inWorkspace()); MapNode node = getTargetNode(workspace, request, request.at()); - if (node == null) return; + if (node == null) { + assert request.hasError(); + return; + } + // Get the properties of the node ... Location actualLocation = getActualLocation(request.at(), node); request.addProperty(propertyFactory.create(DnaLexicon.UUID, node.getUuid())); for (Property property : node.getProperties().values()) { request.addProperty(property); } + + assert actualLocation != null; request.setActualLocationOfNode(actualLocation); setCacheableInfo(request); }