From 9104001e7c75e1c62c528587cd733b00c46bf8ba Mon Sep 17 00:00:00 2001
From: theli <theli@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 8 May 2006 07:58:22 +0000
Subject: [PATCH] *) Better error handling for assortment import

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2067 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 .../dbImport/plasmaWordIndexAssortmentImporter.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/de/anomic/plasma/dbImport/plasmaWordIndexAssortmentImporter.java b/source/de/anomic/plasma/dbImport/plasmaWordIndexAssortmentImporter.java
index 33b8a6be2..61804a32f 100644
--- a/source/de/anomic/plasma/dbImport/plasmaWordIndexAssortmentImporter.java
+++ b/source/de/anomic/plasma/dbImport/plasmaWordIndexAssortmentImporter.java
@@ -38,7 +38,10 @@ public class plasmaWordIndexAssortmentImporter extends AbstractImporter implemen
             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 @@ public class plasmaWordIndexAssortmentImporter extends AbstractImporter implemen
             }
         } 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");