From fefa251339c08f0ecf2e43311c8c2203ac3f10c2 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Sun, 31 Jul 2016 22:19:27 -0700 Subject: [PATCH] revert changes joel made to java files so that they will compile --- src/java/iotcloud/Entry.java | 2 +- src/java/iotcloud/Slot.java | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/java/iotcloud/Entry.java b/src/java/iotcloud/Entry.java index 5e0f3f8..70f90ee 100644 --- a/src/java/iotcloud/Entry.java +++ b/src/java/iotcloud/Entry.java @@ -29,7 +29,7 @@ abstract class Entry implements Liveness { * byte tells the type of entry. */ - slottatic Entry decode(Slot slot, ByteBuffer bb) { + static Entry decode(Slot slot, ByteBuffer bb) { byte type=bb.get(); switch(type) { case TypeKeyValue: diff --git a/src/java/iotcloud/Slot.java b/src/java/iotcloud/Slot.java index c114a87..5828fd3 100644 --- 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 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() { -- 2.34.1