0031343: Suddenly incremental refresh is not working because lastUpdatedTimestamp becomes "null"

diff -r b17dfd0a4fef src/org/openbravo/retail/posterminal/master/BPLocation.java
--- a/src/org/openbravo/retail/posterminal/master/BPLocation.java	Mon Nov 02 11:06:08 2015 +0100
+++ b/src/org/openbravo/retail/posterminal/master/BPLocation.java	Tue Nov 03 18:57:55 2015 +0100
@@ -39,8 +39,8 @@
   @Override
   protected List<String> getQuery(JSONObject jsonsent) throws JSONException {
     Long lastUpdated = jsonsent.has("lastUpdated")
-        && !jsonsent.get("lastUpdated").equals("undefined") ? jsonsent.getLong("lastUpdated")
-        : null;
+        && !jsonsent.get("lastUpdated").equals("undefined")
+        && !jsonsent.get("lastUpdated").equals("null") ? jsonsent.getLong("lastUpdated") : null;
     // if it is a total refresh we need to ensure that all(AND) entities are active. In a
     // incremental refresh, we need to retrieve it if some (OR) ot the entities have changed
     String operator = lastUpdated == null ? " AND " : " OR ";
diff -r b17dfd0a4fef src/org/openbravo/retail/posterminal/master/BusinessPartner.java
--- a/src/org/openbravo/retail/posterminal/master/BusinessPartner.java	Mon Nov 02 11:06:08 2015 +0100
+++ b/src/org/openbravo/retail/posterminal/master/BusinessPartner.java	Tue Nov 03 18:57:55 2015 +0100
@@ -33,8 +33,9 @@
 
   @Override
   protected List<String> getQuery(JSONObject jsonsent) throws JSONException {
-    Long lastUpdated = (jsonsent.has("lastUpdated") && jsonsent.get("lastUpdated") != null && !jsonsent
-        .get("lastUpdated").equals("undefined")) ? jsonsent.getLong("lastUpdated") : null;
+    Long lastUpdated = jsonsent.has("lastUpdated")
+        && !jsonsent.get("lastUpdated").equals("undefined")
+        && !jsonsent.get("lastUpdated").equals("null") ? jsonsent.getLong("lastUpdated") : null;
     // if it is a total refresh we need to ensure that all(AND) entities are active. In a
     // incremental refresh, we need to retrieve it if some (OR) ot the entities have changed
     String operator = lastUpdated == null ? " AND " : " OR ";
diff -r b17dfd0a4fef src/org/openbravo/retail/posterminal/master/Discount.java
--- a/src/org/openbravo/retail/posterminal/master/Discount.java	Mon Nov 02 11:06:08 2015 +0100
+++ b/src/org/openbravo/retail/posterminal/master/Discount.java	Tue Nov 03 18:57:55 2015 +0100
@@ -118,8 +118,8 @@
     today.put("today", value);
     jsonsent.put("parameters", today);
     Long lastUpdated = jsonsent.has("lastUpdated")
-        && !jsonsent.get("lastUpdated").equals("undefined") ? jsonsent.getLong("lastUpdated")
-        : null;
+        && !jsonsent.get("lastUpdated").equals("undefined")
+        && !jsonsent.get("lastUpdated").equals("null") ? jsonsent.getLong("lastUpdated") : null;
     // if it is a total refresh we need to ensure that all(AND) entities are active. In a
     // incremental refresh, we need to retrieve it if some (OR) ot the entities have changed
     jsonsent.put("operator", lastUpdated == null ? " AND " : " OR ");
diff -r b17dfd0a4fef src/org/openbravo/retail/posterminal/master/Product.java
--- a/src/org/openbravo/retail/posterminal/master/Product.java	Mon Nov 02 11:06:08 2015 +0100
+++ b/src/org/openbravo/retail/posterminal/master/Product.java	Tue Nov 03 18:57:55 2015 +0100
@@ -83,8 +83,8 @@
     HQLPropertyList regularProductsHQLProperties = ModelExtensionUtils.getPropertyExtensions(
         extensions, args);
     Long lastUpdated = jsonsent.has("lastUpdated")
-        && !jsonsent.get("lastUpdated").equals("undefined") ? jsonsent.getLong("lastUpdated")
-        : null;
+        && !jsonsent.get("lastUpdated").equals("undefined")
+        && !jsonsent.get("lastUpdated").equals("null") ? jsonsent.getLong("lastUpdated") : null;
     // regular products
     String hql = "select"
         + regularProductsHQLProperties.getHqlSelect()
diff -r b17dfd0a4fef src/org/openbravo/retail/posterminal/master/SalesRepresentative.java
--- a/src/org/openbravo/retail/posterminal/master/SalesRepresentative.java	Mon Nov 02 11:06:08 2015 +0100
+++ b/src/org/openbravo/retail/posterminal/master/SalesRepresentative.java	Tue Nov 03 18:57:55 2015 +0100
@@ -34,8 +34,8 @@
   @Override
   protected List<String> getQuery(JSONObject jsonsent) throws JSONException {
     Long lastUpdated = jsonsent.has("lastUpdated")
-        && !jsonsent.get("lastUpdated").equals("undefined") ? jsonsent.getLong("lastUpdated")
-        : null;
+        && !jsonsent.get("lastUpdated").equals("undefined")
+        && !jsonsent.get("lastUpdated").equals("null") ? jsonsent.getLong("lastUpdated") : null;
     List<String> hqlQueries = new ArrayList<String>();
     HQLPropertyList regularSalesRepresentativeHQLProperties = ModelExtensionUtils
         .getPropertyExtensions(extensions);

diff -r 9320552a7445 src/org/openbravo/mobile/core/process/ProcessHQLQuery.java
--- a/src/org/openbravo/mobile/core/process/ProcessHQLQuery.java	Mon Nov 02 12:20:37 2015 +0100
+++ b/src/org/openbravo/mobile/core/process/ProcessHQLQuery.java	Tue Nov 03 18:57:04 2015 +0100
@@ -57,9 +57,16 @@
         OBContext.setAdminMode();
       }
 
-      Long lastUpdated = jsonsent.has("lastUpdated")
-          && !jsonsent.get("lastUpdated").equals("undefined") ? jsonsent.getLong("lastUpdated")
-          : null;
+      Long lastUpdated = null;
+      try {
+        lastUpdated = (jsonsent.has("lastUpdated") && !jsonsent.isNull("lastUpdated")
+            && !jsonsent.get("lastUpdated").equals("null") && !jsonsent.get("lastUpdated").equals(
+            "undefined")) ? jsonsent.getLong("lastUpdated") : null;
+      } catch (Exception e) {
+        lastUpdated = null;
+        log.warn("lastUpdated param is not a valid timestamp. Full refresh will be executed this time: "
+            + e.getMessage());
+      }
 
       String dateFormat = jsonsent.has("_dateFormat") ? jsonsent.getString("_dateFormat") : null;