Merge.

anthonyvercolano · anthonyvercolano · commit 1fc274afdea4 · 2016-06-07T13:41:35.000-07:00
diff --git a/csharp/device/Microsoft.Azure.Devices.Client/Message.cs b/csharp/device/Microsoft.Azure.Devices.Client/Message.cs
@@ -529,7 +529,7 @@ internal AmqpMessage ToAmqpMessage(bool setBodyCalled = true)
                         // correct this gap. The intention of setting this two variable is
                         // so that GetBody should not be called and all Properties are
                         // readonly because the amqpMessage has been serialized.
-
+                        
                         this.SetSizeInBytesCalled();
                         if (this.bodyStream == null)
                         {

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ internal AmqpMessage ToAmqpMessage(bool setBodyCalled = true)`
`529`	`529`	`// correct this gap. The intention of setting this two variable is`
`530`	`530`	`// so that GetBody should not be called and all Properties are`
`531`	`531`	`// readonly because the amqpMessage has been serialized.`
`532`		`-`
	`532`	`+`
`533`	`533`	`this.SetSizeInBytesCalled();`
`534`	`534`	`if (this.bodyStream == null)`
`535`	`535`	`{`