From 0947834ac950fb4dd59b719cbdddc1726e68674b Mon Sep 17 00:00:00 2001 From: "Brian S. O'Neill" Date: Thu, 11 Jan 2007 23:19:44 +0000 Subject: Fixes for bugs found using FindBugs. --- .../com/amazon/carbonado/repo/replicated/ReplicatedRepository.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/amazon/carbonado/repo/replicated') diff --git a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java index 5edc42c..c292d9c 100644 --- a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java +++ b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java @@ -385,7 +385,7 @@ class ReplicatedRepository if (orderBy == null) { Set pkSet = StorableIntrospector.examine(type).getPrimaryKeyProperties().keySet(); - orderBy = pkSet.toArray(new String[0]); + orderBy = pkSet.toArray(new String[pkSet.size()]); } } @@ -565,11 +565,15 @@ class ReplicatedRepository lastMasterEntry = masterEntry; masterEntry = null; } else { + // If compare is zero, replicaEntry and masterEntry are + // either both null or both non-null. + if (replicaEntry == null && masterEntry == null) { // Both cursors exhausted -- resync is complete. break; } + // Both replicaEntry and masterEntry are non-null. if (!replicaEntry.equalProperties(masterEntry)) { // Replica is stale. resyncTask = prepareResyncTask(trigger, replicaEntry, masterEntry); -- cgit v1.2.3