*) Better error handling for assortment import

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2067 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · May 8, 2006 · 9104001 · 9104001
1 parent d40ccc5
commit 9104001
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/source/de/anomic/plasma/dbImport/plasmaWordIndexAssortmentImporter.java b/source/de/anomic/plasma/dbImport/plasmaWordIndexAssortmentImporter.java
@@ -38,7 +38,10 @@ else if (!this.importAssortmentFile.canRead())
             errorMsg = "AssortmentFile '" + this.importAssortmentFile + "' is not readable.";
         else if (!this.importAssortmentFile.canWrite()) 
             errorMsg = "AssortmentFile '" + this.importAssortmentFile + "' is not writeable.";
-
+        if (errorMsg != null) {
+            this.log.logSevere(errorMsg);
+            throw new IllegalStateException(errorMsg);
+        }        
 
         // getting the assortment length 
         File importAssortmentPath = null;
@@ -51,12 +54,9 @@ else if (!this.importAssortmentFile.canWrite())
             }
         } catch (NumberFormatException e) {
             errorMsg = "Unable to parse the assortment file number.";
-        }        
-
-        if (errorMsg != null) {
             this.log.logSevere(errorMsg);
             throw new IllegalStateException(errorMsg);
-        }
+        }        
 
         // initializing the import assortment db
         this.log.logInfo("Initializing source assortment file");