diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2006-12-15 15:13:27 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2006-12-15 15:13:27 +0000 |
| commit | 37bae33a43029e6c6e6ff1818d87763d5278da0c (patch) | |
| tree | 5c47e15bc545bd8d09916d771fa31ecbf0ffe69a | |
| parent | 8175edfb428e91557b22d8bc6dd8fd3aa40c63bb (diff) | |
| download | qpid-python-37bae33a43029e6c6e6ff1818d87763d5278da0c.tar.gz | |
Changed name of getType() method to avoid clash with generated method of same name
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@487579 13f79535-47bb-0310-9956-ffa450edef68
6 files changed, 6 insertions, 6 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java b/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java index 37efe1a34f..d829144b11 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java +++ b/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java @@ -24,7 +24,7 @@ import org.apache.mina.common.ByteBuffer; public abstract class AMQBody { - protected abstract byte getType(); + protected abstract byte getFrameType(); /** * Get the size of the body diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java b/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java index 21c4bc8d5b..e75f37d623 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java +++ b/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java @@ -45,7 +45,7 @@ public class AMQFrame extends AMQDataBlock implements EncodableAMQDataBlock public void writePayload(ByteBuffer buffer) { - buffer.put(bodyFrame.getType()); + buffer.put(bodyFrame.getFrameType()); // TODO: how does channel get populated EncodingUtils.writeUnsignedShort(buffer, channel); EncodingUtils.writeUnsignedInteger(buffer, bodyFrame.getSize()); diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java index c3e02aed56..6659b4ff8f 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java +++ b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java @@ -42,7 +42,7 @@ public abstract class AMQMethodBody extends AMQBody protected abstract void writeMethodPayload(ByteBuffer buffer); - protected byte getType() + protected byte getFrameType() { return TYPE; } diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java b/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java index 2aae833fcd..3a2e4b3b3c 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java +++ b/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java @@ -28,7 +28,7 @@ public class ContentBody extends AMQBody public ByteBuffer payload; - protected byte getType() + protected byte getFrameType() { return TYPE; } diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java b/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java index 46b933b2c3..a59869b1d8 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java +++ b/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java @@ -53,7 +53,7 @@ public class ContentHeaderBody extends AMQBody this.bodySize = bodySize; } - protected byte getType() + protected byte getFrameType() { return TYPE; } diff --git a/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java b/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java index 6bbdaaeed5..7a160ef471 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java +++ b/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java @@ -27,7 +27,7 @@ public class HeartbeatBody extends AMQBody public static final byte TYPE = 8; public static AMQFrame FRAME = new HeartbeatBody().toFrame(); - protected byte getType() + protected byte getFrameType() { return TYPE; } |