Skip to content

Commit a3e2b03

Browse files
committed
Merge branch '4.x.x-stable' into 5.1.x-stable
Conflicts: src/main/java/com/rabbitmq/client/impl/AMQConnection.java
2 parents 2c8d021 + 7607dbc commit a3e2b03

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import java.util.concurrent.atomic.AtomicBoolean;
3636

3737
final class Copyright {
38-
final static String COPYRIGHT="Copyright (c) 2007-2017 Pivotal Software, Inc.";
38+
final static String COPYRIGHT="Copyright (c) 2007-2018 Pivotal Software, Inc.";
3939
final static String LICENSE="Licensed under the MPL. See http://www.rabbitmq.com/";
4040
}
4141

@@ -252,7 +252,7 @@ public AMQConnection(ConnectionParams params, FrameHandler frameHandler, Metrics
252252
this.metricsCollector = metricsCollector;
253253

254254
this.errorOnWriteListener = params.getErrorOnWriteListener() != null ? params.getErrorOnWriteListener() :
255-
(connection, exception) -> { };
255+
(connection, exception) -> { throw exception; }; // we just propagate the exception for non-recoverable connections
256256
this.workPoolTimeout = params.getWorkPoolTimeout();
257257
}
258258

0 commit comments

Comments
 (0)