You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2015/08/27 03:01:12 UTC
[2/2] qpid-proton git commit: Bug fixes to get the encode and decode
path working.
Bug fixes to get the encode and decode path working.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/a2559055
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/a2559055
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/a2559055
Branch: refs/heads/rajith-codec
Commit: a255905506bdba677fb06acef16dc7a63f3f79ba
Parents: 6ff2309
Author: Rajith Attapattu <ra...@apache.org>
Authored: Wed Aug 26 20:59:48 2015 -0400
Committer: Rajith Attapattu <ra...@apache.org>
Committed: Wed Aug 26 20:59:48 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/qpid/proton/Proton.java | 3 +--
.../qpid/proton/engine/impl/FrameParser2.java | 1 +
.../qpid/proton/engine/impl/FrameWriter2.java | 11 ++++++-----
.../proton/engine/impl/LegacyTypeHelper.java | 10 +++++-----
.../qpid/proton/engine/impl/TransportImpl.java | 4 ++--
.../qpid/proton/engine/impl/TransportImpl2.java | 20 ++++++++++----------
6 files changed, 25 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a2559055/proton-j/src/main/java/org/apache/qpid/proton/Proton.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/Proton.java b/proton-j/src/main/java/org/apache/qpid/proton/Proton.java
index c9c08f0..6b3a18c 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/Proton.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/Proton.java
@@ -44,8 +44,7 @@ import org.apache.qpid.proton.reactor.Reactor;
public final class Proton
{
-
- static boolean isNewCodec = Boolean.getBoolean("new-codec");
+ static boolean isNewCodec = true; // Boolean.getBoolean("new-codec");
private Proton()
{
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a2559055/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameParser2.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameParser2.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameParser2.java
index 00eb76b..c1ab38b 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameParser2.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameParser2.java
@@ -433,6 +433,7 @@ class FrameParser2 implements TransportInput
}
catch (Exception ex)
{
+ ex.printStackTrace();
state = State.ERROR;
frameParsingError = new TransportException(ex);
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a2559055/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter2.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter2.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter2.java
index 8feac53..ba222f7 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter2.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter2.java
@@ -31,6 +31,7 @@ import org.apache.qpid.proton.codec2.ByteArrayEncoder;
import org.apache.qpid.proton.codec2.CodecHelper;
import org.apache.qpid.proton.codec2.Type;
import org.apache.qpid.proton.framing.TransportFrame;
+import org.apache.qpid.proton.framing.TransportFrame2;
import org.apache.qpid.proton.transport2.Performative;
/**
@@ -169,17 +170,17 @@ class FrameWriter2
// XXX: this is a bit of a hack but it eliminates duplicate
// code, further refactor will fix this
- /*if (_frameType == AMQP_FRAME_TYPE)
+ if (_frameType == AMQP_FRAME_TYPE)
{
- TransportFrame frame = new TransportFrame(channel, (FrameBody) frameBody, Binary.create(originalPayload));
+ TransportFrame2 frame = new TransportFrame2(channel, (Performative) frameBody, null);
_transport.log(TransportImpl.OUTGOING, frame);
- ProtocolTracer tracer = _protocolTracer.get();
+ /*ProtocolTracer tracer = _protocolTracer.get();
if (tracer != null)
{
tracer.sentFrame(frame);
- }
- }*/
+ }*/
+ }
int capacity;
if (_maxFrameSize > 0)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a2559055/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LegacyTypeHelper.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LegacyTypeHelper.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LegacyTypeHelper.java
index 1ca8cd2..949e0a8 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LegacyTypeHelper.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LegacyTypeHelper.java
@@ -121,7 +121,7 @@ public class LegacyTypeHelper
{
if (error != null)
{
- return new ErrorCondition(error.getCondition().toString(), error.getDescription());
+ return new ErrorCondition(error.getCondition() == null ? null: error.getCondition().toString(), error.getDescription());
}
else
{
@@ -247,11 +247,11 @@ public class LegacyTypeHelper
s.setAddress(legacy.getAddress());
s.setCapabilities(convertToStringArray(legacy.getCapabilities()));
// s.setDefaultOutcome(legacy.getDefaultOutcome());
- s.setDistributionMode(legacy.getDistributionMode().toString());
+ s.setDistributionMode(legacy.getDistributionMode() == null ? null : legacy.getDistributionMode().toString());
s.setDurable(TerminusDurability.get(legacy.getDurable().getValue().byteValue()));
s.setDynamic(legacy.getDynamic());
s.setDynamicNodeProperties(legacy.getDynamicNodeProperties());
- s.setExpiryPolicy(TerminusExpiryPolicy.getEnum(legacy.getExpiryPolicy().toString()));
+ s.setExpiryPolicy(TerminusExpiryPolicy.getEnum(legacy.getExpiryPolicy().getPolicy().toString()));
s.setFilter(legacy.getFilter());
s.setOutcomes(convertToStringArray(legacy.getOutcomes()));
s.setTimeout(legacy.getTimeout().intValue());
@@ -268,7 +268,7 @@ public class LegacyTypeHelper
t.setDurable(TerminusDurability.get(legacy.getDurable().getValue().byteValue()));
t.setDynamic(legacy.getDynamic());
t.setDynamicNodeProperties(legacy.getDynamicNodeProperties());
- t.setExpiryPolicy(TerminusExpiryPolicy.getEnum(legacy.getExpiryPolicy().toString()));
+ t.setExpiryPolicy(TerminusExpiryPolicy.getEnum(legacy.getExpiryPolicy().getPolicy().toString()));
t.setTimeout(legacy.getTimeout().intValue());
return t;
}
@@ -279,7 +279,7 @@ public class LegacyTypeHelper
legacy.setAddress(s.getAddress());
legacy.setCapabilities(convertToSymbolArray(s.getCapabilities()));
// legacy.setDefaultOutcome(s.getDefaultOutcome());
- legacy.setDistributionMode(Symbol.valueOf(s.getDistributionMode().toString()));
+ legacy.setDistributionMode(s.getDistributionMode() == null ? null : Symbol.valueOf(s.getDistributionMode().toString()));
legacy.setDurable(org.apache.qpid.proton.amqp.messaging.TerminusDurability.get(UnsignedInteger.valueOf(s
.getDurable().getValue())));
legacy.setDynamic(s.getDynamic());
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a2559055/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
index 595afd6..d80ce58 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
@@ -343,7 +343,7 @@ public class TransportImpl extends EndpointImpl
@Override
public Sasl sasl()
{
- if(_sasl == null)
+ /*if(_sasl == null)
{
if(_processingStarted)
{
@@ -355,7 +355,7 @@ public class TransportImpl extends EndpointImpl
TransportWrapper transportWrapper = _sasl.wrap(_inputProcessor, _outputProcessor);
_inputProcessor = transportWrapper;
_outputProcessor = transportWrapper;
- }
+ }*/
return _sasl;
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a2559055/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl2.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl2.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl2.java
index 542f892..82b504e 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl2.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl2.java
@@ -321,7 +321,7 @@ public class TransportImpl2 extends EndpointImpl
@Override
public Sasl sasl()
{
- if(_sasl == null)
+ /*if(_sasl == null)
{
if(_processingStarted)
{
@@ -333,7 +333,7 @@ public class TransportImpl2 extends EndpointImpl
TransportWrapper transportWrapper = _sasl.wrap(_inputProcessor, _outputProcessor);
_inputProcessor = transportWrapper;
_outputProcessor = transportWrapper;
- }
+ }*/
return _sasl;
}
@@ -422,15 +422,15 @@ public class TransportImpl2 extends EndpointImpl
private void writeFlow(TransportSession ssn, TransportLink link)
{
Flow flow = new Flow();
- flow.setNextIncomingId(ssn.getNextIncomingId().intValue());
- flow.setNextOutgoingId(ssn.getNextOutgoingId().intValue());
+ flow.setNextIncomingId(ssn.getNextIncomingId() == null ? 0 : ssn.getNextIncomingId().intValue());
+ flow.setNextOutgoingId(ssn.getNextOutgoingId() == null ? 0 : ssn.getNextOutgoingId().intValue());
ssn.updateWindows();
- flow.setIncomingWindow(ssn.getIncomingWindowSize().intValue());
- flow.setOutgoingWindow(ssn.getOutgoingWindowSize().intValue());
+ flow.setIncomingWindow(ssn.getIncomingWindowSize() == null ? 0 : ssn.getIncomingWindowSize().intValue());
+ flow.setOutgoingWindow(ssn.getOutgoingWindowSize() == null ? 0 : ssn.getOutgoingWindowSize().intValue());
if (link != null) {
- flow.setHandle(link.getLocalHandle().intValue());
- flow.setDeliveryCount(link.getDeliveryCount().intValue());
- flow.setLinkCredit(link.getLinkCredit().intValue());
+ flow.setHandle(link.getLocalHandle() == null ? 0 : link.getLocalHandle().intValue());
+ flow.setDeliveryCount(link.getDeliveryCount() == null ? 0 : link.getDeliveryCount().intValue());
+ flow.setLinkCredit(link.getLinkCredit() == null? 0 : link.getLinkCredit().intValue());
flow.setDrain(link.getLink().getDrain());
}
writeFrame(ssn.getLocalChannel(), flow, null, null);
@@ -740,7 +740,7 @@ public class TransportImpl2 extends EndpointImpl
attach.setInitialDeliveryCount(0);
}
- writeFrame(transportSession.getLocalChannel(), attach, null, null);
+ //writeFrame(transportSession.getLocalChannel(), attach, null, null);
transportLink.sentAttach();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org