Merge pull request #1314 from anthonyjacques20/main

Fix Race condition in object store with nats context
nats-io · Jun 13, 2023 · ad14f4d · ad14f4d
2 parents b2d067b + 00df958
commit ad14f4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/object.go b/object.go
@@ -622,6 +622,7 @@ func (obs *obs) Get(name string, opts ...GetObjectOpt) (ObjectResult, error) {
 	result.digest = sha256.New()
 
 	processChunk := func(m *Msg) {
+		var err error
 		if ctx != nil {
 			select {
 			case <-ctx.Done():

diff --git a/test/object_test.go b/test/object_test.go
@@ -97,6 +97,12 @@ func TestObjectBasics(t *testing.T) {
 	expectOk(t, result.Error())
 	defer result.Close()
 
+	// Now get the object back with a context option.
+	result, err = obs.Get("BLOB", nats.Context(context.Background()))
+	expectOk(t, err)
+	expectOk(t, result.Error())
+	defer result.Close()
+
 	// Check info.
 	info, err = result.Info()
 	expectOk(t, err)