Revision: 3660
http://bigdata.svn.sourceforge.net/bigdata/?rev=3660&view=rev
Author: thompsonbry
Date: 2010-09-28 13:39:13 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
The QueryEngine's service thread was not terminating during reopen() of the EmbeddedFederation. This was causing the build to timeout. I changed the order in which the client's thread pool and the embedded federation services are shutdown so that the services are shutdown first. This fixes the problem.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/service/EmbeddedFederation.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/service/EmbeddedFederation.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/service/EmbeddedFederation.java 2010-09-28 13:36:17 UTC (rev 3659)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/service/EmbeddedFederation.java 2010-09-28 13:39:13 UTC (rev 3660)
@@ -830,8 +830,6 @@
if (log.isInfoEnabled())
log.info("begin");
- super.shutdown();
-
if (abstractTransactionService != null) {
abstractTransactionService.shutdown();
@@ -865,6 +863,8 @@
// // Note: don't clear ref until all down since nextTimestamp() still active.
// abstractTransactionService = null;
+ super.shutdown();
+
if (log.isInfoEnabled())
log.info("done");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
