add check for LockUntil field

Azure · Aug 5, 2024 · 51d950d · 51d950d
1 parent 0afa328
commit 51d950d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/v2/lockrenewer.go b/v2/lockrenewer.go
@@ -182,11 +182,11 @@ func (plr *peekLockRenewer) startPeriodicRenewal(ctx context.Context, message *a
 
 func (plr *peekLockRenewer) renewMessageLock(ctx context.Context, message *azservicebus.ReceivedMessage, options *azservicebus.RenewMessageLockOptions) error {
 	lockLostErr := &azservicebus.Error{Code: azservicebus.CodeLockLost}
-	renewalTimeout := time.Until(*message.LockedUntil) // assumes messages.LockedUntil is set
-	if renewalTimeout < 0 {
-		// if the lock is already expired, we should not attempt to renew it.
+	if message.LockedUntil == nil || time.Until(*message.LockedUntil) < 0 {
+		// if the lock doesn't exist or is already expired, we should not attempt to renew it.
 		return lockLostErr
 	}
+	renewalTimeout := time.Until(*message.LockedUntil)
 	if *plr.renewalTimeout > 0 {
 		renewalTimeout = *plr.renewalTimeout
 	}