You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2012/10/31 13:43:43 UTC
svn commit: r1404115 - in
/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl:
EndpointImpl.java TransportImpl.java
Author: tross
Date: Wed Oct 31 12:43:42 2012
New Revision: 1404115
URL: http://svn.apache.org/viewvc?rev=1404115&view=rev
Log:
PROTON-112 - Applied patch from Hiram Chirino
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java?rev=1404115&r1=1404114&r2=1404115&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImpl.java Wed Oct 31 12:43:42 2012
@@ -94,7 +94,7 @@ public abstract class EndpointImpl imple
_remoteState = remoteState;
}
- void setLocalError(EndpointError localError)
+ public void setLocalError(EndpointError localError)
{
_localError = localError;
}
Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1404115&r1=1404114&r2=1404115&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java Wed Oct 31 12:43:42 2012
@@ -24,21 +24,9 @@ import org.apache.qpid.proton.codec.Comp
import org.apache.qpid.proton.codec.DecoderImpl;
import org.apache.qpid.proton.codec.EncoderImpl;
import org.apache.qpid.proton.codec.WritableBuffer;
-import org.apache.qpid.proton.engine.Connection;
-import org.apache.qpid.proton.engine.EndpointState;
-import org.apache.qpid.proton.engine.FrameTransport;
-import org.apache.qpid.proton.engine.Sasl;
-import org.apache.qpid.proton.engine.Transport;
-import org.apache.qpid.proton.engine.TransportException;
-import org.apache.qpid.proton.engine.TransportInput;
-import org.apache.qpid.proton.engine.TransportOutput;
-import org.apache.qpid.proton.engine.TransportWrapper;
+import org.apache.qpid.proton.engine.*;
import org.apache.qpid.proton.framing.TransportFrame;
-import org.apache.qpid.proton.type.AMQPDefinedTypes;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.DescribedType;
-import org.apache.qpid.proton.type.UnsignedInteger;
-import org.apache.qpid.proton.type.UnsignedShort;
+import org.apache.qpid.proton.type.*;
import org.apache.qpid.proton.type.transport.Attach;
import org.apache.qpid.proton.type.transport.Begin;
import org.apache.qpid.proton.type.transport.Close;
@@ -279,6 +267,14 @@ public class TransportImpl extends Endpo
Detach detach = new Detach();
detach.setHandle(localHandle);
+ EndpointError localError = link.getLocalError();
+ if( localError !=null ) {
+ org.apache.qpid.proton.type.transport.Error error = new org.apache.qpid.proton.type.transport.Error();
+ error.setCondition(Symbol.getSymbol(localError.getName()));
+ error.setDescription(localError.getDescription());
+ detach.setError(error);
+ }
+
int frameBytes = writeFrame(buffer, transportSession.getLocalChannel(), detach, null, null);
written += frameBytes;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org