You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2012/10/11 12:22:46 UTC
svn commit: r1396975 -
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java
Author: tabish
Date: Thu Oct 11 10:22:46 2012
New Revision: 1396975
URL: http://svn.apache.org/viewvc?rev=1396975&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-4095
Add check null on engine.
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java?rev=1396975&r1=1396974&r2=1396975&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOOutputStream.java Thu Oct 11 10:22:46 2012
@@ -197,7 +197,7 @@ public class NIOOutputStream extends Out
// wrap more packets until we reach the end of data, but only when plain
// has no more space since we are non-blocking and a write might not have
// written anything.
- if (data.hasRemaining() && !plain.hasRemaining()) {
+ if (engine != null && data.hasRemaining() && !plain.hasRemaining()) {
plain.clear();
engine.wrap(data, plain);
plain.flip();