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/14 21:07:47 UTC
[14/50] [abbrv] qpid-proton git commit: Fixed compilation errors.
Fixed compilation errors.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/a7f13b70
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/a7f13b70
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/a7f13b70
Branch: refs/heads/rajith-codec
Commit: a7f13b70561a0bcd70e7a7b2044feb533cd200e6
Parents: 67aba85
Author: Rajith Attapattu <ra...@apache.org>
Authored: Fri Feb 20 20:40:28 2015 -0500
Committer: Rajith Attapattu <ra...@apache.org>
Committed: Thu Jul 9 09:12:38 2015 -0400
----------------------------------------------------------------------
.../org/apache/qpid/proton/message2/Header.java | 10 +++++-----
.../apache/qpid/proton/message2/Properties.java | 6 +++---
.../qpid/proton/security/SaslOutcome.java | 2 +-
.../apache/qpid/proton/transport/Attach.java | 10 +++++-----
.../org/apache/qpid/proton/transport/Begin.java | 10 +++++-----
.../apache/qpid/proton/transport/Detach.java | 4 ++--
.../qpid/proton/transport/Disposition.java | 8 ++++----
.../org/apache/qpid/proton/transport/Flow.java | 16 ++++++++--------
.../org/apache/qpid/proton/transport/Open.java | 6 +++---
.../apache/qpid/proton/transport/Source.java | 4 ++--
.../apache/qpid/proton/transport/Target.java | 6 +++---
.../apache/qpid/proton/transport/Transfer.java | 20 ++++++++++----------
12 files changed, 51 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/message2/Header.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message2/Header.java b/proton-j/src/main/java/org/apache/qpid/proton/message2/Header.java
index fb0efa1..a1e15a6 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/message2/Header.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/message2/Header.java
@@ -120,15 +120,15 @@ public final class Header implements Encodable
{
case 0:
- header.setDeliveryCount((int) l.get(4));
+ header.setDeliveryCount((Integer) l.get(4));
case 1:
- header.setFirstAcquirer(l.get(3) == null ? false : (boolean) l.get(3));
+ header.setFirstAcquirer(l.get(3) == null ? false : (Boolean) l.get(3));
case 2:
- header.setTtl((int) l.get(2));
+ header.setTtl((Integer) l.get(2));
case 3:
- header.setPriority(l.get(1) == null ? 4 : (byte) l.get(1));
+ header.setPriority(l.get(1) == null ? 4 : (Byte) l.get(1));
case 4:
- header.setDurable(l.get(0) == null ? false : (boolean) l.get(0));
+ header.setDurable(l.get(0) == null ? false : (Boolean) l.get(0));
}
return header;
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/message2/Properties.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message2/Properties.java b/proton-j/src/main/java/org/apache/qpid/proton/message2/Properties.java
index b6d4e31..8b6eeb6 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/message2/Properties.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/message2/Properties.java
@@ -228,13 +228,13 @@ public final class Properties implements Encodable
case 0:
props.setReplyToGroupId((String) l.get(12));
case 1:
- props.setGroupSequence((int) l.get(11));
+ props.setGroupSequence((Integer) l.get(11));
case 2:
props.setGroupId((String) l.get(10));
case 3:
- props.setCreationTime(new Date((long) l.get(9)));
+ props.setCreationTime(new Date((Long) l.get(9)));
case 4:
- props.setAbsoluteExpiryTime(new Date((long) l.get(8)));
+ props.setAbsoluteExpiryTime(new Date((Long) l.get(8)));
case 5:
props.setContentEncoding((String) l.get(7));
case 6:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/security/SaslOutcome.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/security/SaslOutcome.java b/proton-j/src/main/java/org/apache/qpid/proton/security/SaslOutcome.java
index 7e87f9c..6fb6511 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/security/SaslOutcome.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/security/SaslOutcome.java
@@ -96,7 +96,7 @@ public final class SaslOutcome implements Encodable
case 0:
saslOutcome.setAdditionalData( (byte[]) l.get( 1 ) );
case 1:
- saslOutcome.setCode(SaslCode.valueOf((byte)l.get(0)));
+ saslOutcome.setCode(SaslCode.valueOf((Byte)l.get(0)));
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/transport/Attach.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport/Attach.java b/proton-j/src/main/java/org/apache/qpid/proton/transport/Attach.java
index 3e2587b..0756eb8 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport/Attach.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport/Attach.java
@@ -285,9 +285,9 @@ public final class Attach implements Encodable
attach.setOfferedCapabilities((String) val2);
}
case 3:
- attach.setMaxMessageSize((long) l.get(10));
+ attach.setMaxMessageSize((Long) l.get(10));
case 4:
- attach.setInitialDeliveryCount((int) l.get(9));
+ attach.setInitialDeliveryCount((Integer) l.get(9));
case 5:
Boolean incompleteUnsettled = (Boolean) l.get(8);
attach.setIncompleteUnsettled(incompleteUnsettled == null ? false : incompleteUnsettled);
@@ -299,14 +299,14 @@ public final class Attach implements Encodable
attach.setSource((Source) l.get(5));
case 9:
attach.setRcvSettleMode(l.get(4) == null ? ReceiverSettleMode.FIRST
- : ReceiverSettleMode.values()[(int) l.get(4)]);
+ : ReceiverSettleMode.values()[(Integer) l.get(4)]);
case 10:
- attach.setSndSettleMode(l.get(3) == null ? SenderSettleMode.MIXED : SenderSettleMode.values()[(int) l
+ attach.setSndSettleMode(l.get(3) == null ? SenderSettleMode.MIXED : SenderSettleMode.values()[(Integer) l
.get(3)]);
case 11:
attach.setRole(Boolean.TRUE.equals(l.get(2)) ? Role.RECEIVER : Role.SENDER);
case 12:
- attach.setHandle((int) l.get(1));
+ attach.setHandle((Integer) l.get(1));
case 13:
attach.setName((String) l.get(0));
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/transport/Begin.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport/Begin.java b/proton-j/src/main/java/org/apache/qpid/proton/transport/Begin.java
index d0db101..4806b58 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport/Begin.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport/Begin.java
@@ -184,15 +184,15 @@ public final class Begin implements Encodable
begin.setOfferedCapabilities((String) val2);
}
case 3:
- begin.setHandleMax(l.get(4) == null ? 0xffffffff : (int) l.get(4));
+ begin.setHandleMax(l.get(4) == null ? 0xffffffff : (Integer) l.get(4));
case 4:
- begin.setOutgoingWindow((int) l.get(3));
+ begin.setOutgoingWindow((Integer) l.get(3));
case 5:
- begin.setIncomingWindow((int) l.get(2));
+ begin.setIncomingWindow((Integer) l.get(2));
case 6:
- begin.setNextOutgoingId((int) l.get(1));
+ begin.setNextOutgoingId((Integer) l.get(1));
case 7:
- begin.setRemoteChannel((int) l.get(0));
+ begin.setRemoteChannel((Integer) l.get(0));
}
return begin;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/transport/Detach.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport/Detach.java b/proton-j/src/main/java/org/apache/qpid/proton/transport/Detach.java
index c7bdacd..fbe7d17 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport/Detach.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport/Detach.java
@@ -103,9 +103,9 @@ public final class Detach implements Encodable
case 0:
detach.setError((ErrorCondition) l.get(2));
case 1:
- detach.setClosed(l.get(1) == null ? false : (boolean) l.get(1));
+ detach.setClosed(l.get(1) == null ? false : (Boolean) l.get(1));
case 2:
- detach.setHandle((int) l.get(0));
+ detach.setHandle((Integer) l.get(0));
}
return detach;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/transport/Disposition.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport/Disposition.java b/proton-j/src/main/java/org/apache/qpid/proton/transport/Disposition.java
index 1ebe240..441b005 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport/Disposition.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport/Disposition.java
@@ -148,15 +148,15 @@ public final class Disposition implements Encodable
{
case 0:
- disposition.setBatchable(l.get(5) == null ? false : (boolean) l.get(5));
+ disposition.setBatchable(l.get(5) == null ? false : (Boolean) l.get(5));
case 1:
disposition.setState((DeliveryState) l.get(4));
case 2:
- disposition.setSettled(l.get(3) == null ? false : (boolean) l.get(3));
+ disposition.setSettled(l.get(3) == null ? false : (Boolean) l.get(3));
case 3:
- disposition.setLast((int) l.get(2));
+ disposition.setLast((Integer) l.get(2));
case 4:
- disposition.setFirst((int) l.get(1));
+ disposition.setFirst((Integer) l.get(1));
case 5:
disposition.setRole(Boolean.TRUE.equals(l.get(0)) ? Role.RECEIVER : Role.SENDER);
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/transport/Flow.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport/Flow.java b/proton-j/src/main/java/org/apache/qpid/proton/transport/Flow.java
index ccd5850..1e01b61 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport/Flow.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport/Flow.java
@@ -207,21 +207,21 @@ public final class Flow implements Encodable
case 2:
flow.setDrain(l.get(8) == null ? false : (Boolean) l.get(8));
case 3:
- flow.setAvailable((int) l.get(7));
+ flow.setAvailable((Integer) l.get(7));
case 4:
- flow.setLinkCredit((int) l.get(6));
+ flow.setLinkCredit((Integer) l.get(6));
case 5:
- flow.setDeliveryCount((int) l.get(5));
+ flow.setDeliveryCount((Integer) l.get(5));
case 6:
- flow.setHandle((int) l.get(4));
+ flow.setHandle((Integer) l.get(4));
case 7:
- flow.setOutgoingWindow((int) l.get(3));
+ flow.setOutgoingWindow((Integer) l.get(3));
case 8:
- flow.setNextOutgoingId((int) l.get(2));
+ flow.setNextOutgoingId((Integer) l.get(2));
case 9:
- flow.setIncomingWindow((int) l.get(1));
+ flow.setIncomingWindow((Integer) l.get(1));
case 10:
- flow.setNextIncomingId((int) l.get(0));
+ flow.setNextIncomingId((Integer) l.get(0));
}
return flow;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/transport/Open.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport/Open.java b/proton-j/src/main/java/org/apache/qpid/proton/transport/Open.java
index 9255042..5496eda 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport/Open.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport/Open.java
@@ -234,11 +234,11 @@ public final class Open implements Encodable
open.setOutgoingLocales((String) val4);
}
case 5:
- open.setIdleTimeOut((long) l.get(4));
+ open.setIdleTimeOut((Long) l.get(4));
case 6:
- open.setChannelMax(l.get(3) == null ? 65535 : (int) l.get(3));
+ open.setChannelMax(l.get(3) == null ? 65535 : (Integer) l.get(3));
case 7:
- open.setMaxFrameSize(l.get(2) == null ? Integer.MAX_VALUE : (int) l.get(2));
+ open.setMaxFrameSize(l.get(2) == null ? Integer.MAX_VALUE : (Integer) l.get(2));
case 8:
open.setHostname((String) l.get(1));
case 9:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/transport/Source.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport/Source.java b/proton-j/src/main/java/org/apache/qpid/proton/transport/Source.java
index 3aaa41f..ed0162c 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport/Source.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport/Source.java
@@ -155,12 +155,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 : (int) l.get(3));
+ source.setTimeout(l.get(3) == null ? 0 : (Long) l.get(3));
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((byte) l.get(1)));
+ source.setDurable(l.get(1) == null ? TerminusDurability.NONE : TerminusDurability.get((Byte) l.get(1)));
case 10:
source.setAddress((String) l.get(0));
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/transport/Target.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport/Target.java b/proton-j/src/main/java/org/apache/qpid/proton/transport/Target.java
index 466cf55..a2c22c0 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport/Target.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport/Target.java
@@ -78,14 +78,14 @@ public final class Target extends Terminus implements Encodable
case 1:
target.setDynamicNodeProperties((Map<Object, Object>) l.get(5));
case 2:
- target.setDynamic(l.get(4) == null ? false : (boolean) l.get(4));
+ target.setDynamic(l.get(4) == null ? false : (Boolean) l.get(4));
case 3:
- target.setTimeout(l.get(3) == null ? 0 : (int) l.get(3));
+ target.setTimeout(l.get(3) == null ? 0 : (Integer) l.get(3));
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((byte) l.get(1)));
+ target.setDurable(l.get(1) == null ? TerminusDurability.NONE : TerminusDurability.get((Byte) l.get(1)));
case 6:
target.setAddress((String) l.get(0));
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a7f13b70/proton-j/src/main/java/org/apache/qpid/proton/transport/Transfer.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport/Transfer.java b/proton-j/src/main/java/org/apache/qpid/proton/transport/Transfer.java
index 602f650..42f38be 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport/Transfer.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport/Transfer.java
@@ -42,7 +42,7 @@ public final class Transfer implements Encodable
private int _messageFormat;
- private Boolean _settled;
+ private boolean _settled;
private boolean _more;
@@ -204,27 +204,27 @@ public final class Transfer implements Encodable
switch (11 - l.size())
{
case 0:
- transfer.setBatchable(l.get(10) == null ? false : (boolean) l.get(10));
+ transfer.setBatchable(l.get(10) == null ? false : (Boolean) l.get(10));
case 1:
- transfer.setAborted(l.get(9) == null ? false : (boolean) l.get(9));
+ transfer.setAborted(l.get(9) == null ? false : (Boolean) l.get(9));
case 2:
- transfer.setResume(l.get(8) == null ? false : (boolean) l.get(8));
+ transfer.setResume(l.get(8) == null ? false : (Boolean) l.get(8));
case 3:
transfer.setState((DeliveryState) l.get(7));
case 4:
- transfer.setRcvSettleMode(l.get(6) == null ? null : ReceiverSettleMode.values()[(int) l.get(6)]);
+ transfer.setRcvSettleMode(l.get(6) == null ? null : ReceiverSettleMode.values()[(Integer) l.get(6)]);
case 5:
- transfer.setMore(l.get(5) == null ? false : (boolean) l.get(5));
+ transfer.setMore(l.get(5) == null ? false : (Boolean) l.get(5));
case 6:
- transfer.setSettled((boolean) l.get(4));
+ transfer.setSettled((Boolean) l.get(4));
case 7:
- transfer.setMessageFormat((int) l.get(3));
+ transfer.setMessageFormat((Integer) l.get(3));
case 8:
transfer.setDeliveryTag((byte[]) l.get(2));
case 9:
- transfer.setDeliveryId((int) l.get(1));
+ transfer.setDeliveryId((Integer) l.get(1));
case 10:
- transfer.setHandle((int) l.get(0));
+ transfer.setHandle((Integer) l.get(0));
}
return transfer;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org