Merge branch 'master' of github.com:ibm-messaging/mq-golang

Author: ibmmqmet

ibmmq/ibmmq_test.go

@@ -289,3 +289,33 @@ func TestRoundTo4(t *testing.T) {
 		}
 	}
 }
+
+func TestNewMQDLHWithNilMQMD(t *testing.T) {
+	dlh := NewMQDLH(nil)
+	if dlh == nil {
+		t.Logf("Expected the MQDLH to not be nil, Got: %v", dlh)
+		t.Fail()
+	}
+}
+
+func TestNewMQDLHWithMQMD(t *testing.T) {
+	mqmd := NewMQMD()
+	mqmd.PutDate = "20060102"
+	mqmd.PutTime = "150405.00"
+
+	dlh := NewMQDLH(mqmd)
+	if dlh == nil {
+		t.Logf("Expected the MQDLH to not be nil. Got: %v", dlh)
+		t.Fail()
+	}
+
+	if dlh.PutDate != mqmd.PutDate {
+		t.Logf("PutDate is wrong. Expected: %q. Got: %q", mqmd.PutDate, dlh.PutDate)
+		t.Fail()
+	}
+
+	if dlh.PutTime != mqmd.PutTime {
+		t.Logf("PutTime is wrong. Expected: %q. Got: %q", mqmd.PutTime, dlh.PutTime)
+		t.Fail()
+	}
+}

ibmmq/mqiDLH.go

@@ -53,15 +53,15 @@ func NewMQDLH(md *MQMD) *MQDLH {
 	dlh.CodedCharSetId = MQCCSI_UNDEFINED
 	dlh.PutApplType = 0
 	dlh.PutApplName = ""
-	dlh.PutTime = md.PutTime // Copy over the original put timestamp
-	dlh.PutDate = md.PutDate
 	dlh.Format = ""
 	dlh.DestQName = ""
 	dlh.DestQMgrName = ""
 
 	dlh.strucLength = int(MQDLH_CURRENT_LENGTH)
 
 	if md != nil {
+		dlh.PutTime = md.PutTime // Copy over the original put timestamp
+		dlh.PutDate = md.PutDate
 		dlh.Encoding = md.Encoding
 		if md.CodedCharSetId == MQCCSI_DEFAULT {
 			dlh.CodedCharSetId = MQCCSI_INHERIT