edits

diff --git a/version2/src/C/LastMessage.h b/version2/src/C/LastMessage.h
index 22d7d99dc6980f27135f42fe54e7becaf89dc650..c08e0ba75c8210dc98456af4142474f4b87588e2 100644 (file)
--- a/version2/src/C/LastMessage.h
+++ b/version2/src/C/LastMessage.h
@@ -10,7 +10,6 @@
  * @version 1.0
  */
 
-
 class LastMessage : public Entry {
 private:
        int64_t machineid;
@@ -22,7 +21,6 @@ public:
                machineid(_machineid),
                seqnum(_seqnum) {
        }
-
        int64_t getMachineID() { return machineid; }
        int64_t getSequenceNumber() { return seqnum; }
        void encode(ByteBuffer *bb);

diff --git a/version2/src/C/NewKey.cc b/version2/src/C/NewKey.cc
index a8a9526a12a5e6699c19af19f54a3c2d345b8706..25798394ec7f37bc752a896e91dacaba8445a031 100644 (file)
--- a/version2/src/C/NewKey.cc
+++ b/version2/src/C/NewKey.cc
@@ -2,6 +2,16 @@
 #include "ByteBuffer.h"
 #include "IoTString.h"
 
+NewKey::NewKey(Slot *slot, IoTString *_key, int64_t _machineid) :
+       Entry(slot),
+       key(new IoTString(_key)),
+       machineid(_machineid) {
+}
+
+NewKey::~NewKey() {
+       delete key;
+}
+
 Entry *decode(Slot *slot, ByteBuffer *bb) {
        int keylength = bb->getInt();
        Array<char> *key = new Array<char>(keylength);
@@ -11,6 +21,8 @@ Entry *decode(Slot *slot, ByteBuffer *bb) {
        return new NewKey(slot, IoTString_shallow(key), machineid);
 }
 
+Entry *NewKey::getCopy(Slot *s) { return new NewKey(s, new IoTString(key), machineid); }
+
 void NewKey::encode(ByteBuffer *bb) {
        bb->put(TypeNewKey);
        bb->putInt(key->length());

diff --git a/version2/src/C/NewKey.h b/version2/src/C/NewKey.h
index ffb577ac9401c6a16dc55b6036c9f36c1eef6d12..2abb1be0707bc8e70418c686af80da2ba7eaf004 100644 (file)
--- a/version2/src/C/NewKey.h
+++ b/version2/src/C/NewKey.h
@@ -9,32 +9,22 @@
  * @version 1.0
  */
 
-
 class NewKey : public Entry {
 private:
        IoTString *key;
        int64_t machineid;
 
-
 public:
-       NewKey(Slot *slot, IoTString *_key, int64_t _machineid) :
-               Entry(slot),
-               key(_key),
-               machineid(_machineid) {
-       }
-
+       NewKey(Slot *slot, IoTString *_key, int64_t _machineid);
+       ~NewKey();
        int64_t getMachineID() { return machineid; }
        IoTString *getKey() { return key; }
        void setSlot(Slot *s) { parentslot = s; }
-
-
        void encode(ByteBuffer *bb);
        int getSize();
        char getType() { return TypeNewKey; }
-
-       Entry *getCopy(Slot *s) { return new NewKey(s, key, machineid); }
+       Entry *getCopy(Slot *s);
 };
 
 Entry *NewKey_decode(Slot *slot, ByteBuffer *bb);
-
 #endif