Add a nil check for error to be on the safe side

aerospike · Jul 27, 2022 · b6b5865 · b6b5865
1 parent 4344fff
commit b6b5865
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/command.go b/command.go
@@ -2448,7 +2448,7 @@ func (cmd *baseCommand) executeAt(ifc command, policy *BasePolicy, isRead bool,
 		}
 
 		if notFirstIteration {
-			if !ifc.prepareRetry(ifc, isClientTimeout || err.Matches(types.SERVER_NOT_AVAILABLE)) {
+			if !ifc.prepareRetry(ifc, isClientTimeout || (err != nil && err.Matches(types.SERVER_NOT_AVAILABLE))) {
 				if bc, ok := ifc.(batcher); ok {
 					// Batch may be retried in separate commands.
 					alreadyRetried, err := bc.retryBatch(bc, cmd.node.cluster, deadline, cmd.commandSentCounter, commandSentCounter)