Skip to content

Commit 5557da6

Browse files
authored
Merge pull request #315 from svanharmelen/b-data-race
Fix a data race condition in the memoryStore
2 parents 1696afc + c01072b commit 5557da6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

store.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ type memoryStore struct {
3535
messageMap map[int][]byte
3636
}
3737

38-
func (store memoryStore) NextSenderMsgSeqNum() int {
38+
func (store *memoryStore) NextSenderMsgSeqNum() int {
3939
return store.senderMsgSeqNum + 1
4040
}
4141

42-
func (store memoryStore) NextTargetMsgSeqNum() int {
42+
func (store *memoryStore) NextTargetMsgSeqNum() int {
4343
return store.targetMsgSeqNum + 1
4444
}
4545

@@ -62,7 +62,7 @@ func (store *memoryStore) SetNextTargetMsgSeqNum(nextSeqNum int) error {
6262
return nil
6363
}
6464

65-
func (store memoryStore) CreationTime() time.Time {
65+
func (store *memoryStore) CreationTime() time.Time {
6666
return store.creationTime
6767
}
6868

@@ -93,7 +93,7 @@ func (store *memoryStore) SaveMessage(seqNum int, msg []byte) error {
9393
return nil
9494
}
9595

96-
func (store memoryStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error) {
96+
func (store *memoryStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error) {
9797
var msgs [][]byte
9898
for seqNum := beginSeqNum; seqNum <= endSeqNum; seqNum++ {
9999
if m, ok := store.messageMap[seqNum]; ok {
@@ -106,9 +106,9 @@ func (store memoryStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, erro
106106
type memoryStoreFactory struct{}
107107

108108
func (f memoryStoreFactory) Create(sessionID SessionID) (MessageStore, error) {
109-
var m memoryStore
109+
m := new(memoryStore)
110110
m.Reset()
111-
return &m, nil
111+
return m, nil
112112
}
113113

114114
//NewMemoryStoreFactory returns a MessageStoreFactory instance that created in-memory MessageStores

0 commit comments

Comments
 (0)