From 51831d852a2d6cc668c14ab12af8e8dc88c3c384 Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 8 Mar 2018 09:56:08 +0200
Subject: [PATCH] IndexedRelationsSearcherBase possible deadlock with semaphore

refs #7805

Change-Id: I0a3e7d03b648d2b03b187baf171c0c95b4b7abb9
(cherry picked from commit 3826e289058a51d09310b7ba1251e959dc0ed3d0)
---
 .../simantics/db/indexing/IndexedRelationsSearcherBase.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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();
                     }
                 });
             }
-- 
2.43.2