diff --git a/src-db/database/sourcedata/STRSYNC_EXCLUDEDCOL.xml b/src-db/database/sourcedata/STRSYNC_EXCLUDEDCOL.xml
--- a/src-db/database/sourcedata/STRSYNC_EXCLUDEDCOL.xml
+++ b/src-db/database/sourcedata/STRSYNC_EXCLUDEDCOL.xml
@@ -520,6 +520,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -879,7 +892,7 @@
-
+
@@ -1261,6 +1274,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/retail/storeserver/synchronization/RetailSynchronizationRequestHandler.java b/src/org/openbravo/retail/storeserver/synchronization/RetailSynchronizationRequestHandler.java
--- a/src/org/openbravo/retail/storeserver/synchronization/RetailSynchronizationRequestHandler.java
+++ b/src/org/openbravo/retail/storeserver/synchronization/RetailSynchronizationRequestHandler.java
@@ -118,9 +118,10 @@
return true;
}
- // handle invalid offline here
+ // handle invalid offline here, two cases
final boolean isOffline = thisServerDefinition.getStatus().equals(
MobileServerState.OFFLINE.getValue());
+ // sync errors when going offline and still sync errors
if (isOffline && MobileServerController.getInstance().isThisAStoreServer()
&& thisServerDefinition.isOfflineIncomingErrors()
&& ReplicationUtils.doIncomingSyncErrorsExist()) {
@@ -128,6 +129,13 @@
writeResponseJSON(response, "INVALID_OFFLINE");
return false;
}
+ // delta which is too old when going offline and still is too old
+ if (isOffline && MobileServerController.getInstance().isThisAStoreServer()
+ && thisServerDefinition.isExpiredDeltaAge() && MobileServerUtils.isDeltaAgeExpired()) {
+ // send back invalid offline status
+ writeResponseJSON(response, "INVALID_OFFLINE");
+ return false;
+ }
// only forward to CS if online
final boolean isOnline = thisServerDefinition.getStatus().equals(
diff --git a/src/org/openbravo/retail/storeserver/synchronization/StoreServerTransitionToOfflineExternalHandler.java b/src/org/openbravo/retail/storeserver/synchronization/StoreServerTransitionToOfflineExternalHandler.java
--- a/src/org/openbravo/retail/storeserver/synchronization/StoreServerTransitionToOfflineExternalHandler.java
+++ b/src/org/openbravo/retail/storeserver/synchronization/StoreServerTransitionToOfflineExternalHandler.java
@@ -21,6 +21,7 @@
import org.apache.log4j.Logger;
import org.openbravo.mobile.core.servercontroller.MobileServerController.TransitionToOfflineExternalHandler;
+import org.openbravo.mobile.core.servercontroller.MobileServerUtils;
import org.openbravo.replication.symmetricds.util.ReplicationUtils;
/**
@@ -38,8 +39,12 @@
@Override
public boolean allowTransitionToOffline() {
final boolean allow = !ReplicationUtils.doIncomingSyncErrorsExist()
- && StoreServerVersionHandler.getInstance().areCentralStoreServerVersionsCompatible();
+ && StoreServerVersionHandler.getInstance().areCentralStoreServerVersionsCompatible()
+ && !MobileServerUtils.isDeltaAgeExpired();
if (!allow) {
+ if (MobileServerUtils.isDeltaAgeExpired()) {
+ log.info("Delta age is too old, can not go to offline");
+ }
if (ReplicationUtils.doIncomingSyncErrorsExist()) {
log.info("Can not transition to offline because there are incoming sync errors");
}
diff --git a/src/org/openbravo/retail/storeserver/synchronization/eventhandler/MobileServerEventHandler.java b/src/org/openbravo/retail/storeserver/synchronization/eventhandler/MobileServerEventHandler.java
--- a/src/org/openbravo/retail/storeserver/synchronization/eventhandler/MobileServerEventHandler.java
+++ b/src/org/openbravo/retail/storeserver/synchronization/eventhandler/MobileServerEventHandler.java
@@ -52,6 +52,9 @@
private static Property OFFLINE_ERROR_PROPERTY = ModelProvider.getInstance()
.getEntity(MobileServerDefinition.ENTITY_NAME)
.getProperty(MobileServerDefinition.PROPERTY_OFFLINEINCOMINGERRORS);
+ private static Property EXPIRED_DELTA_AGE_PROPERTY = ModelProvider.getInstance()
+ .getEntity(MobileServerDefinition.ENTITY_NAME)
+ .getProperty(MobileServerDefinition.PROPERTY_EXPIREDDELTAAGE);
private static Property STATUS_PROPERTY = ModelProvider.getInstance()
.getEntity(MobileServerDefinition.ENTITY_NAME)
.getProperty(MobileServerDefinition.PROPERTY_STATUS);
@@ -96,8 +99,10 @@
final Boolean offlineError = (Boolean) event.getCurrentState(OFFLINE_ERROR_PROPERTY);
if (currentStateOffline && !previousStateOffline) {
event.setCurrentState(OFFLINE_ERROR_PROPERTY, ReplicationUtils.doIncomingSyncErrorsExist());
+ event.setCurrentState(OFFLINE_ERROR_PROPERTY, MobileServerUtils.isDeltaAgeExpired());
} else if (currentStateOnline && offlineError != null && offlineError) {
event.setCurrentState(OFFLINE_ERROR_PROPERTY, false);
+ event.setCurrentState(EXPIRED_DELTA_AGE_PROPERTY, false);
}
}
}