From 5dead7cbd5078d78295bc9c619b10f79d2dd8daf Mon Sep 17 00:00:00 2001
From: bjl23 <bjl23@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 7 Feb 2011 15:58:24 +0000
Subject: [PATCH] improved detection of unformatted SDB store

---
 .../servlet/setup/JenaDataSourceSetupSDB.java   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java
index b739e38d2..4a2bf7c6d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java
@@ -650,12 +650,17 @@ public class JenaDataSourceSetupSDB extends JenaDataSourceSetupBase implements j
      * @return
      */
     private boolean isSetUp(Store store) throws SQLException {
-        return StoreUtils.isFormatted(store);
-//        try {
-//            return (SDBFactory.connectNamedModel(store, JenaDataSourceSetupBase.JENA_TBOX_ASSERTIONS_MODEL)).size() > 0;    
-//        } catch (Exception e) { 
-//            return false;
-//        }
+        if (!(StoreUtils.isFormatted(store))) {
+            return false;
+        }
+        
+        // even if the store exists, it may be empty
+        
+        try {
+            return (SDBFactory.connectNamedModel(store, JenaDataSourceSetupBase.JENA_TBOX_ASSERTIONS_MODEL)).size() > 0;    
+        } catch (Exception e) { 
+            return false;
+        }
     }
     
     private static final String STOREDESC_ATTR = "storeDesc";