fixup! fixup! WIP Refactoring and cleanup of BTree storage classes

Author: adamretter

exist-core/src/main/java/org/exist/storage/btree/AbstractBTree.java

@@ -545,9 +545,13 @@ public TreeMetrics treeStatistics() throws IOException {
 
     @Override
     public boolean flush() throws DBException {
-        boolean flushed = cache.flush();
-        flushed = flushed | super.flush();
-        return flushed;
+        try {
+            boolean flushed = cache.flush();
+            flushed = flushed | super.flush();
+            return flushed;
+        } catch (final IOException e) {
+            throw new DBException(e);
+        }
     }
 
     @Override
@@ -1715,7 +1719,7 @@ private void split(final Txn transaction, int pivot) throws IOException, BTreeEx
         /**
          * Set the parent-link in all child nodes to point to this node
          */
-        private void setAsParent() {
+        private void setAsParent() throws IOException {
             if (pageHeader.getStatus() == PageStatus.BRANCH) {
                 for (int i = 0; i < nPtrs; i++) {
                     final BTreeNode node = getBTreeNode(ptrs[i]);

exist-core/src/main/java/org/exist/storage/btree/AbstractPagedFile.java

@@ -151,7 +151,7 @@ public void close() throws DBException {
             raf.close();
         } catch (final IOException e) {
             throw new DBException("An error occurred whilst closing the database file '"
-                    + file == null ? "null" : FileUtils.fileName(file) + "': " + e.getMessage());
+                    + file == null ? "null" : FileUtils.fileName(file) + "': " + e.getMessage(), e);
         }
     }
 
@@ -197,8 +197,7 @@ public boolean flush() throws DBException {
                 flushed = true;
             }
         } catch (final IOException ioe) {
-            LOG.warn("report me");
-            //TODO : this exception is *silently* ignored ?
+            throw new DBException(ioe);
         } finally {
             fileHeaderWriteLock.unlock();
         }

exist-core/src/main/java/org/exist/storage/btree/DBException.java

@@ -1,4 +1,13 @@
 /*
+ * Copyright (C) 2014 Evolved Binary Ltd
+ *
+ * Changes made by Evolved Binary are proprietary and are not Open Source.
+ *
+ * NOTE: Parts of this file contain code from The eXist-db Authors.
+ *       The original license header is included below.
+ *
+ * ----------------------------------------------------------------------------
+ *
  * NOTE: This file is in part based on code from The dbXML Group.
  * The original license statement is also included below.
  *
@@ -72,6 +81,8 @@
  */
 package org.exist.storage.btree;
 
+import java.io.IOException;
+
 /**
  * A DBException is thrown by the database if an exception occurs in the
  * managing (creating, dropping) database objects such as Collections, Indexes,
@@ -100,4 +111,12 @@ public DBException(final int faultCode, final String message) {
 		this.faultCode = faultCode;
 	}
 
+	public DBException(final IOException e) {
+		super(e);
+	}
+
+	public DBException(final String message, final IOException e) {
+		super(message, e);
+	}
+
 }