diff --git a/src/lab5/dbs/fortune_1.db b/src/lab5/dbs/fortune_1.db index 4acae8cf19bbbe044708c3d5fa4f79fbae9feaf4..630867c64adab5619228360c6bef5933c07be310 100644 --- a/src/lab5/dbs/fortune_1.db +++ b/src/lab5/dbs/fortune_1.db @@ -3017,5 +3017,11 @@ come at you rapidly. "Style Invitational Report from Week 278" published August 2, 1998 % -fhhrihir +c1 +% +c2 +% +c4 +% +c3 % diff --git a/src/lab5/dbs/fortune_2.db b/src/lab5/dbs/fortune_2.db index 4acae8cf19bbbe044708c3d5fa4f79fbae9feaf4..630867c64adab5619228360c6bef5933c07be310 100644 --- a/src/lab5/dbs/fortune_2.db +++ b/src/lab5/dbs/fortune_2.db @@ -3017,5 +3017,11 @@ come at you rapidly. "Style Invitational Report from Week 278" published August 2, 1998 % -fhhrihir +c1 +% +c2 +% +c4 +% +c3 % diff --git a/src/lab5/error1.tmp b/src/lab5/error1.tmp new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/lab5/error2.tmp b/src/lab5/error2.tmp new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/lab5/error3.tmp b/src/lab5/error3.tmp new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/lab5/error4.tmp b/src/lab5/error4.tmp new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/lab5/errors1.tmp b/src/lab5/errors1.tmp new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/lab5/errors2.tmp b/src/lab5/errors2.tmp new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/lab5/serverPeer.py b/src/lab5/serverPeer.py index 49060028eeefc56f332aba82a42606a40b7d68f2..2e8c146a2516c6d7b5d015e369209d19688fa282 100755 --- a/src/lab5/serverPeer.py +++ b/src/lab5/serverPeer.py @@ -144,7 +144,10 @@ class Server(orb.Peer): for key, value in self.peer_list.peers.items(): if (self.id != key): - value.write_local([fortune]) + try: + value.write_local([fortune]) + except: + pass finally: self.drwlock.write_release() diff --git a/src/modules/Server/Lock/distributedReadWriteLock.py b/src/modules/Server/Lock/distributedReadWriteLock.py index 158e8bfbc3419e7819dfcf5480bd8bb447cf6f1e..83ed71b5b9985eb9eab5da9797c99abdf7a4adf5 100644 --- a/src/modules/Server/Lock/distributedReadWriteLock.py +++ b/src/modules/Server/Lock/distributedReadWriteLock.py @@ -46,7 +46,6 @@ class DistributedReadWriteLock(readWriteLock.ReadWriteLock): self.lock.acquire() self.distributed_lock.acquire() self.write_acquire_local() - time.sleep(6) pass def write_release(self):