Author: rhs
Date: Thu Aug 22 15:25:32 2013
New Revision: 1516485
URL: http://svn.apache.org/r1516485
Log:
made logging use consistent ids
Modified:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
Modified:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter.java?rev=1516485&r1=1516484&r2=1516485&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter.java
(original)
+++
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter.java
Thu Aug 22 15:25:32 2013
@@ -46,13 +46,14 @@ class FrameWriter
private int _maxFrameSize;
private byte _frameType;
private ProtocolTracer _protocolTracer;
+ private Object _logCtx;
private int _frameStart = 0;
private int _payloadStart;
private int _performativeSize;
FrameWriter(EncoderImpl encoder, int maxFrameSize, byte frameType,
- ProtocolTracer protocolTracer)
+ ProtocolTracer protocolTracer, Object logCtx)
{
_encoder = encoder;
_bbuf = ByteBuffer.allocate(1024);
@@ -61,6 +62,7 @@ class FrameWriter
_maxFrameSize = maxFrameSize;
_frameType = frameType;
_protocolTracer = protocolTracer;
+ _logCtx = logCtx;
}
void setMaxFrameSize(int maxFrameSize)
@@ -153,7 +155,7 @@ class FrameWriter
// code, further refactor will fix this
if (_frameType == AMQP_FRAME_TYPE) {
TransportFrame frame = new TransportFrame(channel, (FrameBody)
frameBody, Binary.create(originalPayload));
- TransportImpl.log(this, TransportImpl.OUTGOING, frame);
+ TransportImpl.log(_logCtx, TransportImpl.OUTGOING, frame);
if( _protocolTracer!=null )
{
Modified:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java?rev=1516485&r1=1516484&r2=1516485&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
(original)
+++
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
Thu Aug 22 15:25:32 2013
@@ -96,7 +96,8 @@ public class SaslImpl implements Sasl, S
AMQPDefinedTypes.registerAllTypes(_decoder,_encoder);
_frameParser = new SaslFrameParser(this, _decoder);
- _frameWriter = new FrameWriter(_encoder, maxFrameSize,
FrameWriter.SASL_FRAME_TYPE, null);
+ _frameWriter = new FrameWriter(_encoder, maxFrameSize,
FrameWriter.SASL_FRAME_TYPE, null,
+ this);
}
@Override
Modified:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1516485&r1=1516484&r2=1516485&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
(original)
+++
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
Thu Aug 22 15:25:32 2013
@@ -128,7 +128,8 @@ public class TransportImpl extends Endpo
_maxFrameSize = maxFrameSize;
_frameWriter = new FrameWriter(_encoder, _remoteMaxFrameSize,
FrameWriter.AMQP_FRAME_TYPE,
- _protocolTracer);
+ _protocolTracer,
+ this);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
