Skip to content

Revert 16803 #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2018
Merged

Revert 16803 #347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions src/com/backendless/Messaging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,22 +574,18 @@ public MessageStatus publish( String channelName, Object message,
* delivery.
* @return a data structure which contains ID of the published message and the status of the publish operation.
*/
public MessageStatus publish( String channelName, Object message, PublishOptions publishOptions, DeliveryOptions deliveryOptions )
public MessageStatus publish( String channelName, Object message, PublishOptions publishOptions,
DeliveryOptions deliveryOptions )
{
channelName = getCheckedChannelName( channelName );

if( message == null )
throw new IllegalArgumentException( ExceptionMessage.NULL_MESSAGE );

if (deliveryOptions.getSegmentQuery() != null && deliveryOptions.getSegmentQuery().isEmpty())
if( deliveryOptions.getPushBroadcast() == 0 && deliveryOptions.getPushSinglecast().isEmpty() )
{
MessageStatus ms = new MessageStatus( null, PublishStatusEnum.FAILED );
ms.setErrorMessage( "Empty recipient list for singlecast publishing." );
return ms;
}

if( deliveryOptions.getPushBroadcast() == 0 && deliveryOptions.getPushSinglecast() == null )
deliveryOptions.setPushBroadcast( PushBroadcastMask.ALL );
}

return (MessageStatus) Invoker.invokeSync( MESSAGING_MANAGER_SERVER_ALIAS, "publish", new Object[] { channelName, message, publishOptions, deliveryOptions } );
}
Expand Down Expand Up @@ -672,18 +668,6 @@ public void publish( String channelName, Object message, PublishOptions publishO
if( message == null )
throw new IllegalArgumentException( ExceptionMessage.NULL_MESSAGE );

if( deliveryOptions.getSegmentQuery() != null && deliveryOptions.getSegmentQuery().isEmpty() )
{
MessageStatus ms = new MessageStatus( null, PublishStatusEnum.FAILED );
ms.setErrorMessage( "Empty recipient list for singlecast publishing." );
if( responder != null )
responder.handleResponse( ms );
return;
}

if( deliveryOptions.getPushBroadcast() == 0 && deliveryOptions.getPushSinglecast() == null )
deliveryOptions.setPushBroadcast( PushBroadcastMask.ALL );

Invoker.invokeAsync( MESSAGING_MANAGER_SERVER_ALIAS, "publish", new Object[] { channelName, message, publishOptions, deliveryOptions }, responder );
}
catch( Throwable e )
Expand Down