From 2ad4348870bb30dadbc0b3006ed60c21a76e79c2 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 7 Feb 2011 22:33:05 +0000
Subject: [PATCH] NIHVIVO-2052 Check more explicitly for failure to delete the
 live index.

---
 .../webapp/search/lucene/LuceneIndexer.java   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java
index a84e649d2..c3d08f46e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java
@@ -277,18 +277,26 @@ public class LuceneIndexer implements IndexerIface {
 
     private synchronized void bringRebuildOnLine() {
         closeWriter();
-        deleteDir(new File(liveIndexDir));
         File offLineDir = new File(currentOffLineDir);
         File liveDir = new File(liveIndexDir);
+
+        boolean deleted = deleteDir(liveDir);
+        if (! deleted ){
+            log.error("failed to delete live index directory " 
+                    + liveDir.getAbsolutePath());
+            return;
+        }
+
         boolean success =  offLineDir.renameTo( liveDir );
         if( ! success ){
             log.error("could not move off line index at " 
                     + offLineDir.getAbsolutePath() + " to live index directory " 
                     + liveDir.getAbsolutePath());
-        }else{            
-            deleteDir(new File(currentOffLineDir));
-            currentOffLineDir = null;
-        }
+            return;
+        }            
+
+        deleteDir(new File(currentOffLineDir));
+        currentOffLineDir = null;
     }  
     
     private synchronized String getOffLineBuildDir(){
@@ -323,8 +331,10 @@ public class LuceneIndexer implements IndexerIface {
         if (dir.isDirectory()) {
             String[] children = dir.list();
             for (int i=0; i<children.length; i++) {
-                boolean success = deleteDir(new File(dir, children[i]));
-                if (!success) {
+                File child = new File(dir, children[i]);
+				boolean success = deleteDir(child);
+                if (!success) {
+                	log.warn("failed to delete " + child.getAbsolutePath());
                     return false;
                 }
             }