[pr feedback] gosqs: ReceiveMessage() exit earlier if queue not found

Admiral-Piett · Sep 26, 2019 · 8a82883 · 8a82883
1 parent f7154e4
commit 8a82883
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/app/gosqs/gosqs.go b/app/gosqs/gosqs.go
@@ -374,15 +374,13 @@ func ReceiveMessage(w http.ResponseWriter, req *http.Request) {
 	for loops > 0 {
 		app.SyncQueues.RLock()
 		_, queueFound := app.SyncQueues.Queues[queueName]
-		var messageFound bool
-		if queueFound {
-			messageFound = len(app.SyncQueues.Queues[queueName].Messages)-numberOfHiddenMessagesInQueue(*app.SyncQueues.Queues[queueName]) != 0
-		}
-		app.SyncQueues.RUnlock()
 		if !queueFound {
+			app.SyncQueues.RUnlock()
 			createErrorResponse(w, req, "QueueNotFound")
 			return
 		}
+		messageFound := len(app.SyncQueues.Queues[queueName].Messages)-numberOfHiddenMessagesInQueue(*app.SyncQueues.Queues[queueName]) != 0
+		app.SyncQueues.RUnlock()
 		if !messageFound {
 			time.Sleep(100 * time.Millisecond)
 			loops--