Merge branch 'pr/63'

skriptble · skriptble · commit 9f4e27d3ada5 · 2018-05-30T10:25:55.000-04:00
GODRIVER-440 Change-Id: Iae3bdbd0b69fd9122d1a2a080ee975c04fe84a26
diff --git a/bson/element_test.go b/bson/element_test.go
@@ -1486,7 +1486,7 @@ func TestElement(t *testing.T) {
 						start: 0, offset: 2,
 						data: []byte{0x11, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x1, 0x00, 0x0},
 					}},
-					255, 256, nil,
+					256, 255, nil,
 				},
 			}
 
diff --git a/bson/value.go b/bson/value.go
@@ -817,7 +817,7 @@ func (v *Value) Timestamp() (uint32, uint32) {
 	if v.data[v.start] != '\x11' {
 		panic(ElementTypeError{"compact.Element.timestamp", Type(v.data[v.start])})
 	}
-	return binary.LittleEndian.Uint32(v.data[v.offset : v.offset+4]), binary.LittleEndian.Uint32(v.data[v.offset+4 : v.offset+8])
+	return binary.LittleEndian.Uint32(v.data[v.offset+4 : v.offset+8]), binary.LittleEndian.Uint32(v.data[v.offset : v.offset+4])
 }
 
 // TimestampOK is the same as Timestamp, except that it returns a boolean

Original file line number	Diff line number	Diff line change
`@@ -817,7 +817,7 @@ func (v *Value) Timestamp() (uint32, uint32) {`
`817`	`817`	`if v.data[v.start] != '\x11' {`
`818`	`818`	`panic(ElementTypeError{"compact.Element.timestamp", Type(v.data[v.start])})`
`819`	`819`	`}`
`820`		`- return binary.LittleEndian.Uint32(v.data[v.offset : v.offset+4]), binary.LittleEndian.Uint32(v.data[v.offset+4 : v.offset+8])`
	`820`	`+ return binary.LittleEndian.Uint32(v.data[v.offset+4 : v.offset+8]), binary.LittleEndian.Uint32(v.data[v.offset : v.offset+4])`
`821`	`821`	`}`
`822`	`822`
`823`	`823`	`// TimestampOK is the same as Timestamp, except that it returns a boolean`