Skip to content

Commit cd176de

Browse files
committed
fixed BKNDLSS-16948 Fix error message when setting null value for channelName argument on channel subscription
1 parent 8298497 commit cd176de

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/com/backendless/rt/messaging/MessagingSubscription.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,23 @@ protected MessagingSubscription( SubscriptionNames subscriptionName, RTCallback
1515
public static MessagingSubscription connect( String channel, RTCallback callback )
1616
{
1717
if(channel == null || channel.isEmpty())
18-
throw new IllegalArgumentException( "channel can't be or empty" );
18+
throw createChannelNullException();
1919

2020
final MessagingSubscription messagingSubscription = new MessagingSubscription( SubscriptionNames.PUB_SUB_CONNECT, callback );
2121
messagingSubscription.putOption( "channel", channel );
2222

2323
return messagingSubscription;
2424
}
2525

26+
private static IllegalArgumentException createChannelNullException()
27+
{
28+
return new IllegalArgumentException( "channel can't be null or empty" );
29+
}
30+
2631
public static MessagingSubscription subscribe( String channel, RTCallback callback )
2732
{
2833
if(channel == null || channel.isEmpty())
29-
throw new IllegalArgumentException( "channel can't be or empty" );
34+
throw createChannelNullException();
3035

3136
final MessagingSubscription messagingSubscription = new MessagingSubscription( SubscriptionNames.PUB_SUB_MESSAGES, callback );
3237
messagingSubscription.putOption( "channel", channel );
@@ -44,7 +49,7 @@ public static MessagingSubscription subscribe( String channel, String selector,
4449
public static MessagingSubscription command( String channel, RTCallback callback )
4550
{
4651
if(channel == null || channel.isEmpty())
47-
throw new IllegalArgumentException( "channel can't be or empty" );
52+
throw createChannelNullException();
4853

4954
final MessagingSubscription messagingSubscription = new MessagingSubscription( SubscriptionNames.PUB_SUB_COMMANDS, callback );
5055
messagingSubscription.putOption( "channel", channel );
@@ -55,7 +60,7 @@ public static MessagingSubscription command( String channel, RTCallback callbac
5560
public static MessagingSubscription userStatus( String channel, RTCallback callback )
5661
{
5762
if(channel == null || channel.isEmpty())
58-
throw new IllegalArgumentException( "channel can't be or empty" );
63+
throw createChannelNullException();
5964

6065
final MessagingSubscription messagingSubscription = new MessagingSubscription( SubscriptionNames.PUB_SUB_USERS, callback );
6166
messagingSubscription.putOption( "channel", channel );

0 commit comments

Comments
 (0)