Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions

slightly better way of handling last loop

1 files changed, 3 insertions, 1 deletions

diff --git a/include/diaspora.php b/include/diaspora.php
index 35cd66059..7551ea9b3 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -161,7 +161,9 @@ function find_diaspora_person_by_handle($handle) {
 			// whether the function is locked or not. Maybe the locking thread
 			// has died or something. At any rate, a duplicate in 'fcontact'
 			// is a much smaller problem than a deadlocked thread
-			$got_lock = (($endlessloop + 1) < $maxloops ? lock_function('find_diaspora_person_by_handle', false) : true );
+			$got_lock = lock_function('find_diaspora_person_by_handle', false);
+			if(($endlessloop + 1) >= $maxloops)
+				$got_lock = true;
 
 			if($got_lock) {
 				logger('find_diaspora_person_by_handle: create or refresh', LOGGER_DEBUG);