permit any object type for callback correlators

Author: ibmmqmet

ibmmq/mqiCBC.go

@@ -36,8 +36,8 @@ for the hObj
 */
 type MQCBC struct {
 	CallType       int32
-	CallbackArea   []byte // These byte arrays are saved/restored in parent function
-	ConnectionArea []byte
+	CallbackArea   interface{} // These fields are saved/restored in parent function
+	ConnectionArea interface{}
 	State          int32
 	DataLength     int32
 	BufferLength   int32

ibmmq/mqiCBD.go

@@ -34,7 +34,7 @@ MQCBD is a structure containing the MQ Callback Descriptor
 type MQCBD struct {
 	CallbackType     int32
 	Options          int32
-	CallbackArea     []byte
+	CallbackArea     interface{}
 	CallbackFunction MQCB_FUNCTION
 	CallbackName     string
 	MaxMsgLength     int32

ibmmq/mqiCTLO.go

@@ -32,7 +32,7 @@ import "C"
 MQCTLO is a structure containing the MQ Control Options
 */
 type MQCTLO struct {
-	ConnectionArea []byte
+	ConnectionArea interface{}
 	Options        int32
 }
 

ibmmq/mqicb.go

@@ -46,8 +46,8 @@ type MQCB_FUNCTION func(*MQObject, *MQMD, *MQGMO, []byte, *MQCBC, *MQReturn)
 type cbInfo struct {
 	hObj             *MQObject
 	callbackFunction MQCB_FUNCTION
-	callbackArea     []byte
-	connectionArea   []byte
+	callbackArea     interface{}
+	connectionArea   interface{}
 }
 
 // This map is indexed by a combination of the hConn and hObj values

samples/amqscb.go

@@ -153,7 +153,7 @@ func mainWithRc() int {
 	// Keep the program running until the callback has indicated there are no
 	// more messages.
 	d, _ := time.ParseDuration("5s")
-	for ok {
+	for ok && err == nil {
 		time.Sleep(d)
 	}