From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 8 Mar 2018 07:56:08 +0000 (+0200)
Subject: IndexedRelationsSearcherBase possible deadlock with semaphore
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=44a85c15ab421bad78087c20e153db8f6bcb343c;p=simantics%2Fplatform.git

IndexedRelationsSearcherBase possible deadlock with semaphore

refs #7805

Change-Id: I0a3e7d03b648d2b03b187baf171c0c95b4b7abb9
(cherry picked from commit 3826e289058a51d09310b7ba1251e959dc0ed3d0)
---

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 b303dfc4c..cf22a0dbf 100644
--- 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
@@ -677,10 +677,10 @@ abstract public class IndexedRelationsSearcherBase {
                                 }
                             }
                         }
-
-                        s.release();
                     } catch (DatabaseException e) {
                         throw new IllegalStateException(e);
+                    } finally {
+                        s.release();
                     }
                 });
             }