edits

[iotcloud.git] / version2 / src / C / TransactionPart.cc

diff --git a/version2/src/C/TransactionPart.cc b/version2/src/C/TransactionPart.cc
index 2c94865e177941f8ff47dc852df221ce61cb3627..1b47b06d488d66e5fd4c336ce621fde6a311329b 100644 (file)
--- a/version2/src/C/TransactionPart.cc
+++ b/version2/src/C/TransactionPart.cc
@@ -1,10 +1,11 @@
 #include "TransactionPart.h"
+#include "ByteBuffer.h"
 
 int TransactionPart::getSize() {
        if (data == NULL) {
                return (4 * sizeof(int64_t)) + (2 * sizeof(int32_t)) + (2 * sizeof(char));
        }
-       return (4 * sizeof(int64_t)) + (2 * sizeof(int32_t)) + (2 * sizeof(char)) + data.length;
+       return (4 * sizeof(int64_t)) + (2 * sizeof(int32_t)) + (2 * sizeof(char)) + data->length();
 }
 
 void TransactionPart::setSlot(Slot *s) {
@@ -19,7 +20,7 @@ int64_t TransactionPart::getArbitratorId() {
        return arbitratorId;
 }
 
-Pair<int64_t int32_t> *TransactionPart::getPartId() {
+Pair<int64_t, int32_t> *TransactionPart::getPartId() {
        return partId;
 }
 
@@ -28,7 +29,7 @@ int TransactionPart::getPartNumber() {
 }
 
 int TransactionPart::getDataSize() {
-       return data.length;
+       return data->length();
 }
 
 Array<char> *TransactionPart::getData() {
@@ -36,7 +37,7 @@ Array<char> *TransactionPart::getData() {
 }
 
 bool TransactionPart::isLastPart() {
-       return isLastPart;
+       return fldisLastPart;
 }
 
 int64_t TransactionPart::getMachineId() {
@@ -67,22 +68,22 @@ Entry *TransactionPart_decode(Slot *s, ByteBuffer *bb) {
        Array<char> *data = new Array<char>(dataSize);
        bb->get(data);
 
-       TransactionPart returnTransactionPart = new TransactionPart(s, machineId, arbitratorId, clientLocalSequenceNumber, partNumber, data, isLastPart);
-       returnTransactionPart.setSequenceNumber(sequenceNumber);
+       TransactionPart * returnTransactionPart = new TransactionPart(s, machineId, arbitratorId, clientLocalSequenceNumber, partNumber, data, isLastPart);
+       returnTransactionPart->setSequenceNumber(sequenceNumber);
 
        return returnTransactionPart;
 }
 
 void TransactionPart::encode(ByteBuffer *bb) {
-       bb->put(Entry.TypeTransactionPart);
+       bb->put(TypeTransactionPart);
        bb->putLong(sequenceNumber);
        bb->putLong(machineId);
        bb->putLong(arbitratorId);
        bb->putLong(clientLocalSequenceNumber);
        bb->putInt(partNumber);
-       bb->putInt(data.length);
+       bb->putInt(data->length());
 
-       if (isLastPart) {
+       if (fldisLastPart) {
                bb->put((char)1);
        } else {
                bb->put((char)0);
@@ -96,8 +97,8 @@ char TransactionPart::getType() {
 }
 
 Entry *TransactionPart::getCopy(Slot *s) {
-       TransactionPart *copyTransaction = new TransactionPart(s, machineId, arbitratorId, clientLocalSequenceNumber, partNumber, data, isLastPart);
-       copyTransaction.setSequenceNumber(sequenceNumber);
+       TransactionPart *copyTransaction = new TransactionPart(s, machineId, arbitratorId, clientLocalSequenceNumber, partNumber, data, fldisLastPart);
+       copyTransaction->setSequenceNumber(sequenceNumber);
 
        return copyTransaction;
 }