[dna-commits] DNA SVN: r730 - trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation.
Author: rhauch
Date: 2009-02-20 10:40:37 -0500 (Fri, 20 Feb 2009)
New Revision: 730
Modified:
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/FederatingRequestProcessor.java
Log:
DNA-282 Federation connector improperly handles root-level node with one projection of a
non-root node from a single source
Minor change to a usage of CompositeRequest within the federation connector.
Modified:
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/FederatingRequestProcessor.java
===================================================================
---
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/FederatingRequestProcessor.java 2009-02-16
17:21:58 UTC (rev 729)
+++
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/FederatingRequestProcessor.java 2009-02-20
15:40:37 UTC (rev 730)
@@ -655,13 +655,14 @@
contributions.add(contribution);
}
} else {
- List<ReadNodeRequest> fromSourceCommands = new
ArrayList<ReadNodeRequest>(numPaths);
+ List<Request> fromSourceCommands = new
ArrayList<Request>(numPaths);
for (Path pathInSource : pathsInSource) {
fromSourceCommands.add(new ReadNodeRequest(new
Location(pathInSource), workspace));
}
Request request = CompositeRequest.with(fromSourceCommands);
sourceConnection.execute(context, request);
- for (ReadNodeRequest fromSource : fromSourceCommands) {
+ for (Request requestObj : fromSourceCommands) {
+ ReadNodeRequest fromSource = (ReadNodeRequest)requestObj;
if (fromSource.hasError()) continue;
// Figure out how long we can cache this contribution ...