[dna-commits] DNA SVN: r1403 - trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation.

[dna-commits at lists.jboss.org]

Author: bcarothers
Date: 2009-12-04 15:31:02 -0500 (Fri, 04 Dec 2009)
New Revision: 1403

Modified:
   trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/FederatedRepositoryConnection.java
Log:
DNA-573

Applied patch that forces the FRC to wait for all requests to be fully processed before returning. This corrects the defect. 

Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/FederatedRepositoryConnection.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/FederatedRepositoryConnection.java	2009-12-04 12:26:35 UTC (rev 1402)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/FederatedRepositoryConnection.java	2009-12-04 20:31:02 UTC (rev 1403)
@@ -224,6 +224,11 @@
                 abort = true;
                 throw e;
             } finally {
+                if (!awaitAllSubtasks) {
+                    // We need to guarantee that the fork processor is closed and released all its resources before we close
+                    // ...
+                    fork.await();
+                }
                 join.close();
             }
             if (request instanceof CompositeRequest) {