Skip to content

Commit e28a3ae

Browse files
committed
Merge ensure framer is not nil before accessing customPayload (#1385)
2 parents ce100a1 + 8812a33 commit e28a3ae

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,4 @@ Jens-W. Schicke-Uffmann <[email protected]>
129129
Ondrej Polakovič <[email protected]>
130130
Sergei Karetnikov <[email protected]>
131131
Stefan Miklosovic <[email protected]>
132+
Adam Burk <[email protected]>

session.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1547,7 +1547,10 @@ func (iter *Iter) Scan(dest ...interface{}) bool {
15471547
// custom QueryHandlers running in your C* cluster.
15481548
// See https://datastax.github.io/java-driver/manual/custom_payloads/
15491549
func (iter *Iter) GetCustomPayload() map[string][]byte {
1550-
return iter.framer.customPayload
1550+
if iter.framer != nil {
1551+
return iter.framer.customPayload
1552+
}
1553+
return nil
15511554
}
15521555

15531556
// Warnings returns any warnings generated if given in the response from Cassandra.

0 commit comments

Comments
 (0)