SYMMETRICDS-577

JumpMind · Jan 31, 2012 · 2de021f · 2de021f
1 parent 56708da
commit 2de021f
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/OutgoingBatches.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/OutgoingBatches.java
@@ -31,11 +31,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-
-import org.jumpmind.symmetric.model.OutgoingBatch.Status;
 
 /**
- * 
+ * A container for {@link OutgoingBatch}s.
  */
 public class OutgoingBatches implements Serializable {
 
@@ -99,7 +97,7 @@ public int countBatches(boolean includeOnlyErrors) {
         int count = 0;
         if (batches != null) {
             for (OutgoingBatch batch : batches) {
-                if (includeOnlyErrors && batch.getStatus() == OutgoingBatch.Status.ER) {
+                if (includeOnlyErrors && batch.isErrorFlag()) {
                     count++;
                 } else {
                     count++;
@@ -141,7 +139,7 @@ public boolean containsLoadBatches() {
 
     public boolean containsBatchesInError() {
         for (OutgoingBatch b : batches) {
-            if (b.getStatus() == Status.ER) {
+            if (b.isErrorFlag()) {
                 return true;
             }
         }
@@ -243,7 +241,7 @@ public void sortChannels(List<NodeChannel> channels) {
 
         final HashMap<String, Date> errorChannels = new HashMap<String, Date>();
         for (OutgoingBatch batch : batches) {
-            if (batch.getStatus().equals(OutgoingBatch.Status.ER)) {
+            if (batch.isErrorFlag()) {
                 errorChannels.put(batch.getChannelId(), batch.getLastUpdatedTime());
             }
         }