revert changes joel made to java files so that they will compile

[iotcloud.git] / src / java / iotcloud / Slot.java

diff --git a/src/java/iotcloud/Slot.java b/src/java/iotcloud/Slot.java
index c114a8762c0eba7f83fdfe03178fc89000ffca5a..5828fd325eff8e8663f50f2fe9cedc5ed78cce22 100644 (file)
--- a/src/java/iotcloud/Slot.java
+++ b/src/java/iotcloud/Slot.java
@@ -17,20 +17,20 @@ class Slot implements Liveness {
        static final int HMAC_SIZE=32;
 
        /** Sequence number of the slot. */
-       private long seqnum;//
+       private long seqnum;
        /** HMAC of previous slot. */
-       private byte[] prevhmac;//
+       private byte[] prevhmac;
        /** HMAC of this slot. */
-       private byte[] hmac;//
+       private byte[] hmac;
        /** Machine that sent this slot. */
-       private long machineid;//
+       private long machineid;
        /** Vector of entries in this slot. */
        private Vector<Entry> entries;
        /** Pieces of information that are live. */
-       private int livecount;//
+       private int livecount;
        /** Flag that indicates whether this slot is still live for
         * recording the machine that sent it. */
-       private boolean seqnumlive;//
+       private boolean seqnumlive;
        /** Number of bytes of free space. */
        private int freespace;
        /** Reference to Table */
@@ -52,13 +52,8 @@ class Slot implements Liveness {
                this(_table, _seqnum, _machineid, _prevhmac, null);
        }
 
-<<<<<<< HEAD
-       Slot(long _seqnum, long _machineid) {
-               this(_seqnum, _machineid, new byte[ HMAC_SIZE], null);
-=======
        Slot(Table _table, long _seqnum, long _machineid) {
                this(_table, _seqnum, _machineid, new byte[HMAC_SIZE], null);
->>>>>>> f80cc30f294899f47cef3507334f8ca357862e5e
        }
 
        byte[] getHMAC() {