[Bigdata-commit] SF.net SVN: bigdata:[8559] branches/BIGDATA_RELEASE_1_3_0/bigdata/src

[<tho...@us...>]

Revision: 8559
          http://sourceforge.net/p/bigdata/code/8559
Author:   thompsonbry
Date:     2014-07-16 16:05:36 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
code cleanup

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/journal/IIndexManager.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/TestHierarchicalLockingTasks.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/journal/IIndexManager.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/journal/IIndexManager.java	2014-07-16 16:01:00 UTC (rev 8558)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/journal/IIndexManager.java	2014-07-16 16:05:36 UTC (rev 8559)
@@ -34,7 +34,6 @@
  * Interface for managing named indices.
  * 
  * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
  */
 public interface IIndexManager extends IIndexStore, ICounterSetAccess {
 

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/TestHierarchicalLockingTasks.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/TestHierarchicalLockingTasks.java	2014-07-16 16:01:00 UTC (rev 8558)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/TestHierarchicalLockingTasks.java	2014-07-16 16:05:36 UTC (rev 8559)
@@ -29,7 +29,6 @@
 
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 
 import com.bigdata.btree.IIndex;
 import com.bigdata.btree.ILocalBTreeView;
@@ -130,9 +129,9 @@
              * those that are not spanned by the namespace.
              */
 
-            final Future<Void> ft = journal
-                    .submit(new AbstractTask<Void>(journal
-                            .getConcurrencyManager(), ITx.UNISOLATED, namespace) {
+            journal.submit(
+                    new AbstractTask<Void>(journal.getConcurrencyManager(),
+                            ITx.UNISOLATED, namespace) {
 
                         @Override
                         protected Void doTask() throws Exception {
@@ -167,15 +166,8 @@
                             // Done.
                             return null;
                         }
-                    });
+                    }).get();
 
-            try {
-                // Await outcome.
-                ft.get();
-            } finally {
-                ft.cancel(true/* mayInterruptIfRunning */);
-            }
-
         } finally {
 
             journal.destroy();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.