summaryrefslogtreecommitdiff
path: root/java/common
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2007-08-08 17:49:47 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2007-08-08 17:49:47 +0000
commit457bdffb215d923371a5573939fbc583e7fa4f51 (patch)
tree36c816d8828c866b46cd01b0ece5ebd4d3115e4b /java/common
parent6ce5c06fc48c0216e32ff45624ac00152db62466 (diff)
downloadqpid-python-457bdffb215d923371a5573939fbc583e7fa4f51.tar.gz
changed the API based on the discussions with rafi and arnaud. also fixed the compilation errors
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@563959 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common')
-rw-r--r--java/common/src/main/java/org/apache/qpidity/ProtocolHeader.java4
-rw-r--r--java/common/src/main/java/org/apache/qpidity/Session.java5
-rw-r--r--java/common/src/main/java/org/apache/qpidity/ToyClient.java4
3 files changed, 5 insertions, 8 deletions
diff --git a/java/common/src/main/java/org/apache/qpidity/ProtocolHeader.java b/java/common/src/main/java/org/apache/qpidity/ProtocolHeader.java
index 5e397ae574..4e654f706b 100644
--- a/java/common/src/main/java/org/apache/qpidity/ProtocolHeader.java
+++ b/java/common/src/main/java/org/apache/qpidity/ProtocolHeader.java
@@ -66,8 +66,8 @@ class ProtocolHeader
buf.put(AMQP);
buf.put((byte) 1);
buf.put((byte) 1);
- buf.put((byte) 0);
- buf.put((byte) 10);
+ buf.put( major);
+ buf.put(minor);
buf.flip();
return buf;
}
diff --git a/java/common/src/main/java/org/apache/qpidity/Session.java b/java/common/src/main/java/org/apache/qpidity/Session.java
index 228c4cf495..067fc8c83c 100644
--- a/java/common/src/main/java/org/apache/qpidity/Session.java
+++ b/java/common/src/main/java/org/apache/qpidity/Session.java
@@ -21,11 +21,8 @@
package org.apache.qpidity;
import java.nio.ByteBuffer;
-
import java.util.HashMap;
import java.util.Map;
-
-import org.apache.qpidity.api.Message;
/**
* Session
*
@@ -160,7 +157,7 @@ public class Session extends Invoker
channel.data(bytes);
}
- public void end()
+ public void endData()
{
channel.end();
}
diff --git a/java/common/src/main/java/org/apache/qpidity/ToyClient.java b/java/common/src/main/java/org/apache/qpidity/ToyClient.java
index 2e27dc8574..4ec838bc35 100644
--- a/java/common/src/main/java/org/apache/qpidity/ToyClient.java
+++ b/java/common/src/main/java/org/apache/qpidity/ToyClient.java
@@ -79,11 +79,11 @@ class ToyClient extends SessionDelegate
ssn.headers(new DeliveryProperties(),
new MessageProperties());
ssn.data("this is the data");
- ssn.end();
+ ssn.endData();
ssn.messageTransfer("fdsa", (short) 0, (short) 1);
ssn.data("this should be rejected");
- ssn.end();
+ ssn.endData();
ssn.sync();
}