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/10/05 18:46:49 UTC
[3/5] qpid-proton git commit: Bug fixes.
Bug fixes.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/a8a21afb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/a8a21afb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/a8a21afb
Branch: refs/heads/rajith-codec
Commit: a8a21afba57a0ac2a2c234308f3ab7f7b1f99281
Parents: 041c573
Author: Rajith Attapattu <ra...@apache.org>
Authored: Sun Oct 4 18:13:35 2015 -0400
Committer: Rajith Attapattu <ra...@apache.org>
Committed: Sun Oct 4 18:13:35 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/qpid/proton/transport2/Attach.java | 8 ++++----
.../java/org/apache/qpid/proton/transport2/Begin.java | 11 +++++++++--
.../java/org/apache/qpid/proton/transport2/Open.java | 4 ++--
.../java/org/apache/qpid/proton/transport2/Source.java | 5 +++--
.../java/org/apache/qpid/proton/transport2/Target.java | 5 +++--
.../java/org/apache/qpid/proton/transport2/Transfer.java | 2 +-
6 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a8a21afb/proton-j/src/main/java/org/apache/qpid/proton/transport2/Attach.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Attach.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Attach.java
index e3b82da..043c62a 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Attach.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Attach.java
@@ -74,10 +74,10 @@ public final class Attach implements Encodable, Performative
public void setName(String name)
{
- if (name == null)
+ /*if (name == null)
{
throw new NullPointerException("the name field is mandatory");
- }
+ }*/
_name = name;
}
@@ -218,7 +218,7 @@ public final class Attach implements Encodable, Performative
@Override
public void encode(Encoder encoder)
- {
+ {
encoder.putDescriptor();
encoder.putUlong(CODE);
encoder.putList();
@@ -250,7 +250,7 @@ public final class Attach implements Encodable, Performative
CodecHelper.encodeSymbolArray(encoder, _offeredCapabilities);
CodecHelper.encodeSymbolArray(encoder, _desiredCapabilities);
CodecHelper.encodeMap(encoder, _properties);
- //encoder.end();
+ encoder.end();
}
public static final class Factory implements DescribedTypeFactory
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a8a21afb/proton-j/src/main/java/org/apache/qpid/proton/transport2/Begin.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Begin.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Begin.java
index f8d3a1c..5b3e877 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Begin.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Begin.java
@@ -141,7 +141,14 @@ public final class Begin implements Encodable, Performative
encoder.putDescriptor();
encoder.putUlong(CODE);
encoder.putList();
- encoder.putUshort(_remoteChannel);
+ if (_remoteChannel == -1)
+ {
+ encoder.putNull();
+ }
+ else
+ {
+ encoder.putInt(_remoteChannel);
+ }
encoder.putUint(_nextOutgoingId);
encoder.putUint(_incomingWindow);
encoder.putUint(_outgoingWindow);
@@ -194,7 +201,7 @@ public final class Begin implements Encodable, Performative
case 6:
begin.setNextOutgoingId(l.get(1) == null ? 0 : (Integer) l.get(1));
case 7:
- begin.setRemoteChannel(l.get(0) == null ? -1 : ((Short)l.get(0)).intValue());
+ begin.setRemoteChannel(l.get(0) == null ? -1 : ((Number)l.get(0)).intValue());
}
return begin;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a8a21afb/proton-j/src/main/java/org/apache/qpid/proton/transport2/Open.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Open.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Open.java
index 9a1de2a..e4ca0f0 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Open.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Open.java
@@ -173,7 +173,7 @@ public final class Open implements Encodable, Performative
encoder.putString(_containerId);
encoder.putString(_hostname);
encoder.putUint(_maxFrameSize);
- encoder.putUshort(_channelMax);
+ encoder.putInt(_channelMax);
encoder.putLong(_idleTimeOut);
CodecHelper.encodeSymbolArray(encoder, _outgoingLocales);
CodecHelper.encodeSymbolArray(encoder, _incomingLocales);
@@ -241,7 +241,7 @@ public final class Open implements Encodable, Performative
case 5:
open.setIdleTimeOut(l.get(4) == null ? 0 : (Long) l.get(4));
case 6:
- open.setChannelMax(l.get(3) == null ? 65535 : (Short)l.get(3));
+ open.setChannelMax(l.get(3) == null ? 65535 : ((Number)l.get(3)).intValue());
case 7:
open.setMaxFrameSize(l.get(2) == null ? Integer.MAX_VALUE : (Integer) l.get(2));
case 8:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a8a21afb/proton-j/src/main/java/org/apache/qpid/proton/transport2/Source.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Source.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Source.java
index 8e8ebbd..96ab9eb 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Source.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Source.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import org.apache.qpid.proton.codec2.AbstractEncoder;
import org.apache.qpid.proton.codec2.CodecHelper;
import org.apache.qpid.proton.codec2.DecodeException;
import org.apache.qpid.proton.codec2.DescribedTypeFactory;
@@ -158,12 +159,12 @@ public final class Source extends Terminus implements Encodable
Boolean dynamic = (Boolean) l.get(4);
source.setDynamic(dynamic == null ? false : dynamic);
case 7:
- source.setTimeout(l.get(3) == null ? 0 : (Integer) l.get(3));
+ source.setTimeout(l.get(3) == null ? 0 : ((Number)l.get(3)).intValue());
case 8:
source.setExpiryPolicy(l.get(2) == null ? TerminusExpiryPolicy.SESSION_END : TerminusExpiryPolicy
.getEnum((String) l.get(2)));
case 9:
- source.setDurable(l.get(1) == null ? TerminusDurability.NONE : TerminusDurability.get(((Integer)l.get(1)).byteValue()));
+ source.setDurable(l.get(1) == null ? TerminusDurability.NONE : TerminusDurability.get(((Number)l.get(1)).byteValue()));
case 10:
source.setAddress((String) l.get(0));
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a8a21afb/proton-j/src/main/java/org/apache/qpid/proton/transport2/Target.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Target.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Target.java
index 2abd816..ef4461a 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Target.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Target.java
@@ -25,6 +25,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import org.apache.qpid.proton.codec2.AbstractEncoder;
import org.apache.qpid.proton.codec2.CodecHelper;
import org.apache.qpid.proton.codec2.DecodeException;
import org.apache.qpid.proton.codec2.DescribedTypeFactory;
@@ -83,12 +84,12 @@ public final class Target extends Terminus implements Encodable
case 2:
target.setDynamic(l.get(4) == null ? false : (Boolean) l.get(4));
case 3:
- target.setTimeout(l.get(3) == null ? 0 : (Integer) l.get(3));
+ target.setTimeout(l.get(3) == null ? 0 : ((Number)l.get(3)).longValue());
case 4:
target.setExpiryPolicy(l.get(2) == null ? TerminusExpiryPolicy.SESSION_END : TerminusExpiryPolicy
.getEnum((String) l.get(2)));
case 5:
- target.setDurable(l.get(1) == null ? TerminusDurability.NONE : TerminusDurability.get(((Integer)l.get(1)).byteValue()));
+ target.setDurable(l.get(1) == null ? TerminusDurability.NONE : TerminusDurability.get(((Number)l.get(1)).byteValue()));
case 6:
target.setAddress((String) l.get(0));
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a8a21afb/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java
index 82e71de..993d4cc 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java
@@ -209,7 +209,7 @@ public final class Transfer implements Encodable, Performative
{
List<Object> l = (List<Object>) in;
Transfer transfer = new Transfer();
-
+ System.out.println(l);
switch (11 - l.size())
{
case 0:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org