Sync git svn branch with SVN repository r33249.

[simantics/platform.git] / bundles / org.simantics.db.indexing / src / org / simantics / db / indexing / IndexedRelationsSearcherBase.java

diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java
index f26f9a9616de93681bad61b7bc204f0142a0068e..4afbb174e0eb565958f51a94c0fdfc836d2219bb 100644 (file)
--- a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java
+++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java
@@ -705,27 +705,22 @@ abstract public class IndexedRelationsSearcherBase {
                                                                                        mon.worked(1);\r
                                                                                }\r
                                                                        }\r
-\r
-                                                                       s.release();\r
-\r
                                                                } catch (DatabaseException e) {\r
-                                                                       throw new IllegalStateException(e);\r
+                                                                   Logger.defaultLogError("DatabaseException occured during initializing index", e);\r
+                                                               } catch (Throwable t) {\r
+                                                                   Logger.defaultLogError("Fatal error occured during initializing index", t);\r
+                                                               } finally {\r
+                                                                   s.release();\r
                                                                }\r
-                                                               \r
                                                        }\r
-                               \r
                        });\r
-                       \r
                     }\r
-                    \r
                     try {\r
                                                s.acquire(INDEXING_THREAD_COUNT);\r
                                        } catch (InterruptedException e) {\r
                                                e.printStackTrace();\r
                                        }\r
-                    \r
                 }\r
-                \r
             });\r
 \r
             // http://www.gossamer-threads.com/lists/lucene/java-dev/47895\r