Skip to content

Commit 5ed8c76

Browse files
author
David R. MacIver
committed
sigh. Accidentally committed to default
1 parent cb23b73 commit 5ed8c76

File tree

3 files changed

+4
-53
lines changed

3 files changed

+4
-53
lines changed

src/com/rabbitmq/client/impl/AMQConnection.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,9 @@ private class MainLoop extends Thread {
428428
// for non-zero channels (and any inbound commands on
429429
// channel zero that aren't Connection.CloseOk) must
430430
// be discarded.
431-
_channelManager
432-
.getChannel(frame.channel)
433-
.handleFrame(frame);
431+
ChannelN channel = _channelManager.getChannel(frame.channel);
432+
// FIXME: catch NullPointerException and throw more informative one?
433+
channel.handleFrame(frame);
434434
}
435435
}
436436
}

src/com/rabbitmq/client/impl/ChannelManager.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,9 @@ public synchronized void setChannelMax(int value) {
6262
* Public API - Looks up an existing channel associated with this connection.
6363
* @param channelNumber the number of the required channel
6464
* @return the relevant channel descriptor
65-
* @throws UnknownChannelException if there is no Channel associated with the
66-
* required channel number.
6765
*/
6866
public ChannelN getChannel(int channelNumber) {
69-
ChannelN result = _channelMap.get(channelNumber);
70-
if(result == null) throw new UnknownChannelException(channelNumber);
71-
return result;
67+
return _channelMap.get(channelNumber);
7268
}
7369

7470
public void handleSignal(ShutdownSignalException signal) {

src/com/rabbitmq/client/impl/UnknownChannelException.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)