You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/12/16 14:45:19 UTC
svn commit: r1774603 - in /qpid/java/branches/6.1.x:
broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java
Author: orudyy
Date: Fri Dec 16 14:45:19 2016
New Revision: 1774603
URL: http://svn.apache.org/viewvc?rev=1774603&view=rev
Log:
QPID-7515: Verify that message parameter in publishMessage operation is not null
Modified:
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1774603&r1=1774602&r2=1774603&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Fri Dec 16 14:45:19 2016
@@ -704,6 +704,11 @@ public abstract class AbstractVirtualHos
@Override
public int publishMessage(@Param(name = "message") final ManageableMessage message)
{
+ if (message == null)
+ {
+ throw new IllegalArgumentException("Message is not provided");
+ }
+
final String address = message.getAddress();
MessageDestination destination = address == null ? getDefaultDestination() : getAttainedMessageDestination(address);
if(destination == null)
Modified: qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java?rev=1774603&r1=1774602&r2=1774603&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java (original)
+++ qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java Fri Dec 16 14:45:19 2016
@@ -189,6 +189,14 @@ public class PublishMessageRestTest exte
assertEquals("Unexpected number of enqueues after queue creation", 1, enqueues);
}
+ public void testPublishMissingMesssageParameter() throws Exception
+ {
+ getRestTestHelper().submitRequest(_publishMessageOpUrl,
+ "POST",
+ Collections.emptyMap(),
+ SC_UNPROCESSABLE_ENTITY);
+ }
+
private <M extends Message> M publishMessageWithContent(final Object content, final Class<M> expectedMessageClass) throws Exception
{
Map<String, Object> messageBody = new HashMap<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org