diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IIncomingBatchService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IIncomingBatchService.java
index 67ae9bf5a3..6dc61a5884 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IIncomingBatchService.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IIncomingBatchService.java
@@ -36,9 +36,9 @@ public interface IIncomingBatchService {
 
     public List<IncomingBatch> findIncomingBatchErrors(int maxRows);
 
-    public boolean acquireIncomingBatch(IncomingBatch status);
+    public boolean acquireIncomingBatch(IncomingBatch batch);
 
-    public void insertIncomingBatch(IncomingBatch status);
+    public void insertIncomingBatch(IncomingBatch batch);
 
     public int updateIncomingBatch(JdbcTemplate jdbcTemplate, IncomingBatch batch);
     
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java
index 5ef42dfd0b..d93cf1e5eb 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java
@@ -111,12 +111,12 @@ public void updateOutgoingBatch(OutgoingBatch outgoingBatch) {
                                 outgoingBatch.getFailedDataId(),
                                 outgoingBatch.getLastUpdatedHostName(),
                                 outgoingBatch.getLastUpdatedTime(), outgoingBatch.getBatchId() },
-                        new int[] { Types.CHAR, Types.INTEGER, Types.INTEGER, Types.INTEGER,
-                                Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.INTEGER,
-                                Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.INTEGER,
-                                Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.INTEGER,
-                                Types.INTEGER, Types.INTEGER, Types.VARCHAR, Types.INTEGER,
-                                Types.VARCHAR, Types.INTEGER, Types.VARCHAR, Types.TIMESTAMP,
+                        new int[] { Types.CHAR, Types.INTEGER, Types.INTEGER, Types.BIGINT,
+                                Types.BIGINT, Types.BIGINT, Types.BIGINT, Types.BIGINT,
+                                Types.BIGINT, Types.BIGINT, Types.BIGINT, Types.BIGINT,
+                                Types.BIGINT, Types.BIGINT, Types.BIGINT, Types.BIGINT,
+                                Types.BIGINT, Types.BIGINT, Types.VARCHAR, Types.INTEGER,
+                                Types.VARCHAR, Types.BIGINT, Types.VARCHAR, Types.TIMESTAMP,
                                 Types.INTEGER });
     }
 
diff --git a/symmetric/symmetric-core/src/main/resources/symmetric-schema.xml b/symmetric/symmetric-core/src/main/resources/symmetric-schema.xml
index 9845bf93e0..050eb466e8 100644
--- a/symmetric/symmetric-core/src/main/resources/symmetric-schema.xml
+++ b/symmetric/symmetric-core/src/main/resources/symmetric-schema.xml
@@ -135,8 +135,6 @@
         <column name="unprocessed_count" type="BIGINT" default="0" description="" />        
         <column name="error_count" type="BIGINT" default="0" description="" />
     </table>
-
-
     -->
 
     <table name="channel" description="This table represents a category of data that can be synchronized independently of other channels. Channels allow control over the type of data flowing and prevents one type of synchronization from contending with another.">
@@ -329,25 +327,25 @@
         <column name="status" type="CHAR" size="2"  description="The current status of the Batch can be newly created (NE), sent to a Node (SE), acknowledged as successful (OK), and error (ER)." />
         <column name="load_flag"  type="BOOLEANINT" size="1" default="0" description="A flag that indicates that this batch is part of an initial load." />               
         <column name="error_flag"  type="BOOLEANINT" size="1" default="0" description="A flag that indicates that this batch was in error during the last synchornization attempt." />        
-        <column name="byte_count" type="INTEGER" required="true" default="0"  description="The number of bytes that were sent as part of this batch." />
-        <column name="extract_count" type="INTEGER"  required="true" default="0"  description="The number of times this an attempt to extract this batch occurred." />
-        <column name="sent_count" type="INTEGER"  required="true" default="0"  description="The number of times this batch was sent.  A batch can be sent multiple times if an ACK is not received." />
-        <column name="load_count" type="INTEGER"  required="true" default="0"  description="The number of times an attempt to load this batch occurred." />
-        <column name="data_event_count" type="INTEGER" required="true" default="0"  description="The number of data_events that are part of this batch." />
-        <column name="reload_event_count" type="INTEGER" required="true" default="0"  description="The number of reload events that are part of this batch." />
-        <column name="insert_event_count" type="INTEGER" required="true" default="0" description="The number of insert events that are part of this batch." />
-        <column name="update_event_count" type="INTEGER" required="true" default="0" description="The number of update events that are part of this batch." />
-        <column name="delete_event_count" type="INTEGER" required="true" default="0" description="The number of delete events that are part of this batch." />
-        <column name="other_event_count" type="INTEGER" required="true" default="0" description="The number of other event types that are part of this batch.  This includes any events types that are not a reload, insert, update or delete event type." />
-        <column name="router_millis" type="INTEGER" required="true" default="0" description="The number of milliseconds spent creating this batch." />
-        <column name="network_millis" type="INTEGER" required="true" default="0" description="The number of milliseconds spent transfering this batch across the network." />
-        <column name="filter_millis" type="INTEGER" required="true" default="0" description="The number of milliseconds spent in filters processing data." />
-        <column name="load_millis" type="INTEGER" required="true" default="0" description="The number of milliseconds spent loading the data into the target database." />
-        <column name="extract_millis" type="INTEGER" required="true" default="0" description="The number of milliseconds spent extracting the data out of the source database." />
+        <column name="byte_count" type="BIGINT" required="true" default="0"  description="The number of bytes that were sent as part of this batch." />
+        <column name="extract_count" type="BIGINT"  required="true" default="0"  description="The number of times this an attempt to extract this batch occurred." />
+        <column name="sent_count" type="BIGINT"  required="true" default="0"  description="The number of times this batch was sent.  A batch can be sent multiple times if an ACK is not received." />
+        <column name="load_count" type="BIGINT"  required="true" default="0"  description="The number of times an attempt to load this batch occurred." />
+        <column name="data_event_count" type="BIGINT" required="true" default="0"  description="The number of data_events that are part of this batch." />
+        <column name="reload_event_count" type="BIGINT" required="true" default="0"  description="The number of reload events that are part of this batch." />
+        <column name="insert_event_count" type="BIGINT" required="true" default="0" description="The number of insert events that are part of this batch." />
+        <column name="update_event_count" type="BIGINT" required="true" default="0" description="The number of update events that are part of this batch." />
+        <column name="delete_event_count" type="BIGINT" required="true" default="0" description="The number of delete events that are part of this batch." />
+        <column name="other_event_count" type="BIGINT" required="true" default="0" description="The number of other event types that are part of this batch.  This includes any events types that are not a reload, insert, update or delete event type." />
+        <column name="router_millis" type="BIGINT" required="true" default="0" description="The number of milliseconds spent creating this batch." />
+        <column name="network_millis" type="BIGINT" required="true" default="0" description="The number of milliseconds spent transfering this batch across the network." />
+        <column name="filter_millis" type="BIGINT" required="true" default="0" description="The number of milliseconds spent in filters processing data." />
+        <column name="load_millis" type="BIGINT" required="true" default="0" description="The number of milliseconds spent loading the data into the target database." />
+        <column name="extract_millis" type="BIGINT" required="true" default="0" description="The number of milliseconds spent extracting the data out of the source database." />
         <column name="sql_state" type="VARCHAR" size="10"  description="For a status of error (ER), this is the XOPEN or SQL 99 SQL State." />
         <column name="sql_code" type="INTEGER" required="true" default="0" description="For a status of error (ER), this is the error code from the database that is specific to the vendor. " />
         <column name="sql_message" type="LONGVARCHAR" description="For a status of error (ER), this is the error message that describes the error." />
-        <column name="failed_data_id" type="INTEGER" required="true" default="0" description="For a status of error (ER), this is the data_id that was being processed when the batch failed." />
+        <column name="failed_data_id" type="BIGINT" required="true" default="0" description="For a status of error (ER), this is the data_id that was being processed when the batch failed." />
         <column name="last_update_hostname" type="VARCHAR" size="255"  description="The host name of the process that last did work on this batch." />
         <column name="last_update_time" type="TIMESTAMP"  description="Timestamp when a process last updated this entry." />
         <column name="create_time" type="TIMESTAMP"  description="Timestamp when this entry was created." />
@@ -368,16 +366,16 @@
         <column name="node_id" type="VARCHAR" size="50" required="true" primaryKey="true"  description="The node_id of the source of the batch being loaded." />
         <column name="channel_id" type="VARCHAR" size="20"  description="The channel_id of the batch being loaded." />
         <column name="status" type="CHAR" size="2"  description="The current status of the Batch can be successfully loaded (OK) or error (ER)." />
-        <column name="network_millis" type="INTEGER" required="true" default="0" description="The number of milliseconds spent transfering this batch across the network." />
-        <column name="filter_millis" type="INTEGER" required="true" default="0" description="The number of milliseconds spent in filters processing data." />
-        <column name="database_millis" type="INTEGER" required="true" default="0" description="The number of milliseconds spent loading the data into the target database." />
-        <column name="failed_row_number" type="INTEGER" required="true" default="0" description="For a status of error (ER), this is the data_id that was being processed when the batch failed." />
-        <column name="byte_count" type="INTEGER" required="true" default="0" description="The number of bytes that were sent as part of this batch." />
-        <column name="statement_count" type="INTEGER" required="true" default="0" description="The number of statements run to load this batch." />
-        <column name="fallback_insert_count" type="INTEGER" required="true" default="0" description="The number of times an update was turned into an insert because the data was not already in the target database." />
-        <column name="fallback_update_count" type="INTEGER" required="true" default="0" description="The number of times an insert was turned into an update because a data row already existed in the target database." />
-        <column name="missing_delete_count" type="INTEGER" required="true" default="0" description="THe number of times a delete did not effect the database because the row was already deleted." />
-        <column name="skip_count" type="INTEGER" required="true" default="0" description="The number of times a batch was sent and skipped because it had already been loaded according to incoming_batch" />
+        <column name="network_millis" type="BIGINT" required="true" default="0" description="The number of milliseconds spent transfering this batch across the network." />
+        <column name="filter_millis" type="BIGINT" required="true" default="0" description="The number of milliseconds spent in filters processing data." />
+        <column name="database_millis" type="BIGINT" required="true" default="0" description="The number of milliseconds spent loading the data into the target database." />
+        <column name="failed_row_number" type="BIGINT" required="true" default="0" description="For a status of error (ER), this is the data_id that was being processed when the batch failed." />
+        <column name="byte_count" type="BIGINT" required="true" default="0" description="The number of bytes that were sent as part of this batch." />
+        <column name="statement_count" type="BIGINT" required="true" default="0" description="The number of statements run to load this batch." />
+        <column name="fallback_insert_count" type="BIGINT" required="true" default="0" description="The number of times an update was turned into an insert because the data was not already in the target database." />
+        <column name="fallback_update_count" type="BIGINT" required="true" default="0" description="The number of times an insert was turned into an update because a data row already existed in the target database." />
+        <column name="missing_delete_count" type="BIGINT" required="true" default="0" description="THe number of times a delete did not effect the database because the row was already deleted." />
+        <column name="skip_count" type="BIGINT" required="true" default="0" description="The number of times a batch was sent and skipped because it had already been loaded according to incoming_batch" />
         <column name="sql_state" type="VARCHAR" size="10"  description="For a status of error (ER), this is the XOPEN or SQL 99 SQL State." />
         <column name="sql_code" type="INTEGER" required="true" default="0" description="For a status of error (ER), this is the error code from the database that is specific to the vendor. " />
         <column name="sql_message" type="LONGVARCHAR" description="For a status of error (ER), this is the error message that describes the error." />
@@ -396,4 +394,74 @@
         <column name="locking_server_id" type="VARCHAR" size="255" description="The name of the server that currently has a lock.  This is typically a host name, but it can be overridden using the -Druntime.symmetric.cluster.server.id=name System property."/>
         <column name="lock_time" type="TIMESTAMP" description="The time a lock is aquired.  Use the cluster.lock.timeout.ms to specify a lock timeout period." />
     </table>
+    
+    <table name="alert_def" description="The definition of an alert">
+        <column name="alert_def_id" type="VARCHAR" size="50" primaryKey="true" required="true"  description="Unique identifier for an alert defintion" />    
+        <column name="node_group_id" type="VARCHAR" size="50" required="true" description="The node group that this alert is assigned to.  If assigned to all node groups, then this value should be 'ALL'" />
+        <column name="type" type="VARCHAR" size="50" required="true" description="The name of the type of alert." />
+        <column name="short_desc" type="VARCHAR" size="100" required="true" description="A short description of the alert"/>
+        <column name="severity" type="VARCHAR" size="10" required="true" description="The severity level of this alert.  Possible values are: CRITICAL, WARN and INFO." />
+        <column name="enabled" type="BOOLEANINT" size="1" default="0" description="Indicates whether this alert is currently enabled."/>
+        <column name="ack_required" type="BOOLEANINT" size="1" default="0" description="Indicates whether this alert requires acknowledgement."/>
+        <column name="start_time" type="TIME" description="The start time for the active window."/>
+        <column name="end_time" type="TIME" description="The end time for the active window.  Note that if the end_time is less than the start_time then the window crosses a day boundary."/>        
+        <column name="create_time" type="TIMESTAMP" required="true"  description="Timestamp when this entry was created." />
+        <column name="last_update_by" type="VARCHAR" size="50"  description="The user who last updated this entry." />
+        <column name="last_update_time" type="TIMESTAMP" required="true"  description="Timestamp when a user last updated this entry." />
+    </table>
+    
+    <table name="alert_def_param" description="Parameters that configure an specific alert type">
+        <column name="alert_def_id" type="VARCHAR" size="50" primaryKey="true" required="true"  description="Unique identifier for an alert defintion" />    
+        <column name="param_key" type="VARCHAR" size="100" required="true" primaryKey="true" description="The name of the parameter."/>
+        <column name="param_value" type="LONGVARCHAR" description="The value of the parameter." />
+        <column name="create_time" type="TIMESTAMP" required="true"  description="Timestamp when this entry was created." />
+        <column name="last_update_by" type="VARCHAR" size="50"  description="The user who last updated this entry." />
+        <column name="last_update_time" type="TIMESTAMP" required="true"  description="Timestamp when a user last updated this entry." />
+    </table>
+    
+    <table name="notifier_def" description="Defines a type of notification">
+        <column name="notifier_def_id" type="VARCHAR" size="50" primaryKey="true" required="true"  description="Unique identifier for an alert defintion" />    
+        <column name="type" type="VARCHAR" size="50" required="true" description="The name of the type of notification." />
+        <column name="create_time" type="TIMESTAMP" required="true"  description="Timestamp when this entry was created." />
+        <column name="last_update_by" type="VARCHAR" size="50"  description="The user who last updated this entry." />
+        <column name="last_update_time" type="TIMESTAMP" required="true"  description="Timestamp when a user last updated this entry." />
+    </table>    
+
+    <table name="notifier_def_param" description="Parameters that configure an specific notify type">
+        <column name="notifier_def_id" type="VARCHAR" size="50" primaryKey="true" required="true"  description="Unique identifier for an alert defintion" />    
+        <column name="param_key" type="VARCHAR" size="100" required="true" primaryKey="true" description="The name of the parameter."/>
+        <column name="param_value" type="LONGVARCHAR" description="The value of the parameter." />
+        <column name="create_time" type="TIMESTAMP" required="true"  description="Timestamp when this entry was created." />
+        <column name="last_update_by" type="VARCHAR" size="50"  description="The user who last updated this entry." />
+        <column name="last_update_time" type="TIMESTAMP" required="true"  description="Timestamp when a user last updated this entry." />
+    </table>
+    
+    <table name="alert_def_notifier" description="Defines a type of notification">
+        <column name="notifier_def_id" type="VARCHAR" size="50" primaryKey="true" required="true"  description="Unique identifier for an alert defintion" />    
+        <column name="alert_def_id" type="VARCHAR" size="50" primaryKey="true" required="true"  description="Unique identifier for an alert defintion" />
+        <column name="enabled" type="BOOLEANINT" size="1" default="0" description="Indicates whether this alert is currently enabled."/>
+        <column name="start_time" type="TIME" description="The start time for the active window."/>
+        <column name="end_time" type="TIME" description="The end time for the active window.  Note that if the end_time is less than the start_time then the window crosses a day boundary."/>
+        <column name="last_update_by" type="VARCHAR" size="50"  description="The user who last updated this entry." />
+        <column name="last_update_time" type="TIMESTAMP" required="true"  description="Timestamp when a user last updated this entry." />
+    </table>    
+    
+    <table name="alert_event" description="An actual alert">
+        <column name="alert_event_id" type="INTEGER" autoIncrement="true" primaryKey="true"  required="true"  description="Unique identifier for an alert event" />
+        <column name="node_id" type="VARCHAR" size="50" required="true" primaryKey="true" description="Reference to the node that created the alert" />
+        <column name="alert_def_id" type="VARCHAR" size="50" required="true"  description="Reference to the alert defintion" />    
+        <column name="message" type="VARCHAR" size="2000" required="true" description="Details about the alert"/>
+        <column name="create_time" type="TIMESTAMP" required="true"  description="Timestamp when this entry was created" />
+        <column name="ack_time" type="TIMESTAMP" required="true"  description="Timestamp when a user acknowledged this alert" />
+        <column name="ack_by" type="VARCHAR" size="50" required="true" description="Who acknowledged the alert"/>
+    </table>
+    
+    <table name="alert_event_notifier" description="Record of notifications sent in response to the alert">
+        <column name="alert_event_id" type="INTEGER" primaryKey="true"  required="true"  description="Unique identifier for an alert event" />
+        <column name="node_id" type="VARCHAR" size="50" required="true" primaryKey="true" description="Reference to the node that created the alert" />
+        <column name="notifier_def_id" type="VARCHAR" size="50" primaryKey="true" required="true"  description="Unique identifier for an alert defintion" />            
+        <column name="status" type="VARCHAR" size="50" required="true"  description="The current status of this notification" />    
+        <column name="create_time" type="TIMESTAMP" required="true"  description="Timestamp when this entry was created." />
+    </table>
+        
 </database>
\ No newline at end of file
diff --git a/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/service/impl/IncomingBatchServiceTest.java b/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/service/impl/IncomingBatchServiceTest.java
new file mode 100644
index 0000000000..1da27f38e2
--- /dev/null
+++ b/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/service/impl/IncomingBatchServiceTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to JumpMind Inc under one or more contributor 
+ * license agreements.  See the NOTICE file distributed
+ * with this work for additional information regarding 
+ * copyright ownership.  JumpMind Inc licenses this file
+ * to you under the GNU Lesser General Public License (the
+ * "License"); you may not use this file except in compliance
+ * with the License. 
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see           
+ * <http://www.gnu.org/licenses/>.
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License. 
 */
+package org.jumpmind.symmetric.service.impl;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.jumpmind.symmetric.model.IncomingBatch;
+import org.jumpmind.symmetric.model.IncomingBatch.Status;
+import org.jumpmind.symmetric.test.AbstractDatabaseTest;
+import org.jumpmind.symmetric.test.TestConstants;
+import org.junit.Test;
+
+public class IncomingBatchServiceTest extends AbstractDatabaseTest {
+
+
+    public IncomingBatchServiceTest() throws Exception {
+        super();
+    }
+    
+    @Test
+    public void testInsertAndUpdateIncomingBatchMaxSize() {        
+        IncomingBatch batch = new IncomingBatch();
+        batch.setStatus(Status.ER);
+        batch.setNodeId("XXXXX");
+        batch.setChannelId(TestConstants.TEST_CHANNEL_ID);
+        batch.setByteCount(Long.MAX_VALUE);
+        batch.setDatabaseMillis(Long.MAX_VALUE);
+        batch.setFailedRowNumber(Long.MAX_VALUE);
+        batch.setFallbackInsertCount(Long.MAX_VALUE);
+        batch.setFilterMillis(Long.MAX_VALUE);
+        batch.setMissingDeleteCount(Long.MAX_VALUE);
+        batch.setNetworkMillis(Long.MAX_VALUE);
+        batch.setSkipCount(Long.MAX_VALUE);
+        batch.setStatementCount(Long.MAX_VALUE);
+        getIncomingBatchService().insertIncomingBatch(batch);
+        List<IncomingBatch> batches = getIncomingBatchService().findIncomingBatchErrors(1);
+        Assert.assertEquals(1, batches.size());
+        batch.setBatchId(batches.get(0).getBatchId());
+        batch.setStatus(Status.OK);
+        getIncomingBatchService().updateIncomingBatch(batch);
+    }
+
+
+}
\ No newline at end of file
diff --git a/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceTest.java b/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceTest.java
index aed57458b4..d9f32dacdc 100644
--- a/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceTest.java
+++ b/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceTest.java
@@ -21,32 +21,34 @@
 
 package org.jumpmind.symmetric.service.impl;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import org.jumpmind.symmetric.common.Constants;
-import org.jumpmind.symmetric.model.Data;
-import org.jumpmind.symmetric.model.DataEventType;
-import org.jumpmind.symmetric.model.NodeChannel;
-import org.jumpmind.symmetric.model.OutgoingBatch;
-import org.jumpmind.symmetric.model.OutgoingBatches;
-import org.jumpmind.symmetric.model.TriggerHistory;
-import org.jumpmind.symmetric.service.IDataService;
-import org.jumpmind.symmetric.service.IOutgoingBatchService;
-import org.jumpmind.symmetric.test.AbstractDatabaseTest;
-import org.jumpmind.symmetric.test.TestConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.core.ConnectionCallback;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Set;
+
+import junit.framework.Assert;
+
+import org.jumpmind.symmetric.common.Constants;
+import org.jumpmind.symmetric.model.Data;
+import org.jumpmind.symmetric.model.DataEventType;
+import org.jumpmind.symmetric.model.Node;
+import org.jumpmind.symmetric.model.NodeChannel;
+import org.jumpmind.symmetric.model.OutgoingBatch;
+import org.jumpmind.symmetric.model.OutgoingBatch.Status;
+import org.jumpmind.symmetric.model.OutgoingBatches;
+import org.jumpmind.symmetric.model.TriggerHistory;
+import org.jumpmind.symmetric.service.IDataService;
+import org.jumpmind.symmetric.service.IOutgoingBatchService;
+import org.jumpmind.symmetric.test.AbstractDatabaseTest;
+import org.jumpmind.symmetric.test.TestConstants;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.ConnectionCallback;
 
 /**
  * 
@@ -137,6 +139,36 @@ public void testChannelCachingLastExtracted() {
         Assert.assertEquals(formatter.format(halfHourAgo.getTime()), formatter.format(nodeChannel
                 .getLastExtractedTime()));
 
+    }
+    
+    @Test
+    public void testInsertOutgoingBatchMaxSize() {        
+        OutgoingBatch batch = new OutgoingBatch();
+        batch.setStatus(Status.NE);
+        batch.setNodeId("XXXXX");
+        batch.setChannelId(TestConstants.TEST_CHANNEL_ID);
+        batch.setByteCount(Long.MAX_VALUE);
+        batch.setDataEventCount(Long.MAX_VALUE);
+        batch.setDeleteEventCount(Long.MAX_VALUE);
+        batch.setFailedDataId(Long.MAX_VALUE);
+        batch.setExtractCount(Long.MAX_VALUE);
+        batch.setExtractMillis(Long.MAX_VALUE);
+        batch.setFilterMillis(Long.MAX_VALUE);
+        batch.setInsertEventCount(Long.MAX_VALUE);
+        batch.setLoadCount(Long.MAX_VALUE);
+        batch.setLoadMillis(Long.MAX_VALUE);
+        batch.setNetworkMillis(Long.MAX_VALUE);
+        batch.setOtherEventCount(Long.MAX_VALUE);
+        batch.setReloadEventCount(Long.MAX_VALUE);
+        batch.setRouterMillis(Long.MAX_VALUE);
+        batch.setUpdateEventCount(Long.MAX_VALUE);
+        batch.setSentCount(Long.MAX_VALUE);
+        getOutgoingBatchService().insertOutgoingBatch(batch);
+        OutgoingBatches batches = getOutgoingBatchService().getOutgoingBatches(new Node("XXXXX", TestConstants.TEST_ROOT_NODE_GROUP));
+        Assert.assertEquals(1, batches.getBatches().size());
+        batch.setBatchId(batches.getBatches().get(0).getBatchId());
+        batch.setStatus(Status.OK);
+        getOutgoingBatchService().updateOutgoingBatch(batch);
     }
 
     @Test
@@ -262,7 +294,7 @@ protected void createDataEvent(String tableName, int triggerHistoryId, String ch
         history.setTriggerHistoryId(triggerHistoryId);
         Data data = new Data(tableName, type, "r.o.w., dat-a", "p-k d.a.t.a", history, channelId, null, null);
         dataService.insertDataAndDataEventAndOutgoingBatch(data, nodeId, "", false);
-    }
+    }        
 
     protected int getBatchSize(final long batchId) {
         return (Integer) getJdbcTemplate().execute(new ConnectionCallback<Object>() {
diff --git a/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/test/AbstractDatabaseTest.java b/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/test/AbstractDatabaseTest.java
index ad261feb56..8ee760d1ce 100644
--- a/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/test/AbstractDatabaseTest.java
+++ b/symmetric/symmetric-server/src/test/java/org/jumpmind/symmetric/test/AbstractDatabaseTest.java
@@ -31,6 +31,7 @@
 import org.jumpmind.symmetric.db.IDbDialect;
 import org.jumpmind.symmetric.service.IConfigurationService;
 import org.jumpmind.symmetric.service.IDataService;
+import org.jumpmind.symmetric.service.IIncomingBatchService;
 import org.jumpmind.symmetric.service.INodeService;
 import org.jumpmind.symmetric.service.IOutgoingBatchService;
 import org.jumpmind.symmetric.service.IParameterService;
@@ -120,6 +121,10 @@ protected ITriggerRouterService getTriggerRouterService() {
 
     protected IOutgoingBatchService getOutgoingBatchService() {
         return AppUtils.find(Constants.OUTGOING_BATCH_SERVICE, getSymmetricEngine());
+    }
+    
+    protected IIncomingBatchService getIncomingBatchService() {
+        return AppUtils.find(Constants.INCOMING_BATCH_SERVICE, getSymmetricEngine());
     }
 
     protected DataSource getDataSource() {