ensure framer exists before accessing customPayload

chandervir-k · Jun 9, 2020 · 8812a33 · 8812a33
1 parent cb62e19
commit 8812a33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -115,3 +115,4 @@ Pavel Buchinchik <p.buchinchik@gmail.com>
 Rintaro Okamura <rintaro.okamura@gmail.com>
 Yura Sokolov <y.sokolov@joom.com>; <funny.falcon@gmail.com>
 Jorge Bay <jorgebg@apache.org>
+Adam Burk <amburk@gmail.com>
diff --git a/session.go b/session.go
@@ -1463,7 +1463,10 @@ func (iter *Iter) Scan(dest ...interface{}) bool {
 // custom QueryHandlers running in your C* cluster.
 // See https://datastax.github.io/java-driver/manual/custom_payloads/
 func (iter *Iter) GetCustomPayload() map[string][]byte {
-	return iter.framer.customPayload
+	if iter.framer != nil {
+		return iter.framer.customPayload
+	}
+	return nil
 }
 
 // Warnings returns any warnings generated if given in the response from Cassandra.