You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ca...@apache.org on 2011/09/24 01:11:35 UTC
svn commit: r1175067 -
/incubator/jena/Scratch/PC/tdbloader2/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java
Author: castagna
Date: Fri Sep 23 23:11:35 2011
New Revision: 1175067
URL: http://svn.apache.org/viewvc?rev=1175067&view=rev
Log:
JENA-117
Modified:
incubator/jena/Scratch/PC/tdbloader2/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java
Modified: incubator/jena/Scratch/PC/tdbloader2/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader2/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java?rev=1175067&r1=1175066&r2=1175067&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader2/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java (original)
+++ incubator/jena/Scratch/PC/tdbloader2/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java Fri Sep 23 23:11:35 2011
@@ -205,7 +205,15 @@ public class MultiThreadedSortedDataBag<
if (spilled)
{
- if ( ( multithreaded ) && ( ! pool.isShutdown() ) ) pool.shutdown() ;
+ if ( ( multithreaded ) && ( ! pool.isShutdown() ) ) {
+ pool.shutdown() ;
+ try {
+ pool.awaitTermination(10, TimeUnit.MINUTES) ;
+ } catch (InterruptedException e) {
+ throw new AtlasException(e) ;
+ }
+
+ }
List<Iterator<E>> inputs = new ArrayList<Iterator<E>>(spillFiles.size() + (memSize > 0 ? 1 : 0));