Merge pull request #90 from ashleyry/fix/superfluouscode

zimbatm · zimbatm · commit 2e5e85b010e7 · 2016-01-01T16:53:18.000Z
Removed superfluous code
diff --git a/src/main/java/com/pusher/client/channel/impl/ChannelManager.java b/src/main/java/com/pusher/client/channel/impl/ChannelManager.java
@@ -53,10 +53,7 @@ public PresenceChannel getPresenceChannel(String channelName) throws IllegalArgu
     }
 
     private InternalChannel findChannelInChannelMap(String channelName){
-        if (channelNameToChannelMap.containsKey(channelName)){
-            return channelNameToChannelMap.get(channelName);
-        }
-        return null;
+        return channelNameToChannelMap.get(channelName);
     }
 
     public void setConnection(final InternalConnection connection) {

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,7 @@ public PresenceChannel getPresenceChannel(String channelName) throws IllegalArgu`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private InternalChannel findChannelInChannelMap(String channelName){`
`56`		`- if (channelNameToChannelMap.containsKey(channelName)){`
`57`		`- return channelNameToChannelMap.get(channelName);`
`58`		`- }`
`59`		`- return null;`
	`56`	`+ return channelNameToChannelMap.get(channelName);`
`60`	`57`	`}`
`61`	`58`
`62`	`59`	`public void setConnection(final InternalConnection connection) {`