Fixing a regression caused by upgrading to proton-j version 1.31. Fix addresses the case where a property value is null. (#321)

Author: yvgopal

azure-servicebus/src/main/java/com/microsoft/azure/servicebus/MessageConverter.java

@@ -145,7 +145,14 @@ else if (body instanceof AmqpSequence)
 				}
 				else
 				{
-					convertedProperties.put(entry.getKey(), entry.getValue().toString());
+					if(entry.getValue() == null)
+					{
+						convertedProperties.put(entry.getKey(), null);
+					}
+					else
+					{
+						convertedProperties.put(entry.getKey(), entry.getValue().toString());
+					}
 				}
 			}
 

azure-servicebus/src/test/java/com/microsoft/azure/servicebus/SendReceiveTests.java

@@ -152,6 +152,13 @@ public void testBasicReceiveAndComplete() throws InterruptedException, ServiceBu
 		TestCommons.testBasicReceiveAndComplete(this.sender, this.sessionId, this.receiver);
 	}
 
+	@Test
+	public void testBasicReceiveAndCompleteMessageWithProperties() throws InterruptedException, ServiceBusException, ExecutionException
+	{
+		this.receiver = ClientFactory.createMessageReceiverFromEntityPath(factory, this.receiveEntityPath, ReceiveMode.PEEKLOCK);
+		TestCommons.testBasicReceiveAndCompleteMessageWithProperties(this.sender, this.sessionId, this.receiver);
+	}
+	
 	@Test
 	public void testBasicReceiveAndAbandon() throws InterruptedException, ServiceBusException, ExecutionException
 	{

azure-servicebus/src/test/java/com/microsoft/azure/servicebus/SessionTests.java

@@ -163,6 +163,14 @@ public void testBasicReceiveAndComplete() throws InterruptedException, ServiceBu
 		TestCommons.testBasicReceiveAndComplete(this.sender, sessionId, this.session);
 	}
 
+	@Test
+	public void testBasicReceiveAndCompleteMessageWithProperties() throws InterruptedException, ServiceBusException, ExecutionException
+	{
+		String sessionId = TestUtils.getRandomString();
+		this.session = ClientFactory.acceptSessionFromEntityPath(this.factory, this.receiveEntityPath, sessionId, ReceiveMode.PEEKLOCK);
+		TestCommons.testBasicReceiveAndCompleteMessageWithProperties(this.sender, sessionId, this.session);
+	}
+	
 	@Test
 	public void testBasicReceiveAndAbandon() throws InterruptedException, ServiceBusException, ExecutionException
 	{

azure-servicebus/src/test/java/com/microsoft/azure/servicebus/TestCommons.java

@@ -9,6 +9,7 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -186,6 +187,32 @@ public static void testBasicReceiveAndComplete(IMessageSender sender, String ses
 		Assert.assertNull("Message was not properly completed", receivedMessage);
 	}
 
+	public static void testBasicReceiveAndCompleteMessageWithProperties(IMessageSender sender, String sessionId, IMessageReceiver receiver) throws InterruptedException, ServiceBusException, ExecutionException
+	{		
+		String messageId = UUID.randomUUID().toString();
+		Message message = new Message("AMQP message");
+		message.setMessageId(messageId);
+		if(sessionId != null)
+		{
+			message.setSessionId(sessionId);
+		}
+		HashMap<String, String> messageProps = new HashMap<>();
+		messageProps.put("key1", "value1");
+		messageProps.put("key2", null); // Some customers are using it this way
+		message.setProperties(messageProps);
+		sender.send(message);
+				
+		IMessage receivedMessage = receiver.receive();
+		Assert.assertNotNull("Message not received", receivedMessage);
+		Assert.assertEquals("Message Id did not match", messageId, receivedMessage.getMessageId());
+		Map<String, String> receivedProps = receivedMessage.getProperties();
+		Assert.assertEquals("All sent properties not recieved", "value1", receivedProps.get("key1"));
+		Assert.assertNull("Property with null value not received",  receivedProps.get("key2"));
+		receiver.complete(receivedMessage.getLockToken());
+		receivedMessage = receiver.receive(SHORT_WAIT_TIME);
+		Assert.assertNull("Message was not properly completed", receivedMessage);
+	}
+	
 	public static void testBasicReceiveAndAbandon(IMessageSender sender, String sessionId, IMessageReceiver receiver) throws InterruptedException, ServiceBusException, ExecutionException
 	{		
 		String messageId = UUID.randomUUID().toString();