svn commit: r1730036 - in /ofbiz/branches/release15.12: ./ framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java

Author: jleroux
Date: Fri Feb 12 15:04:40 2016
New Revision: 1730036

URL: http://svn.apache.org/viewvc?rev=1730036&view=rev
Log:
"Applied fix from trunk for revision: 1730035  "
------------------------------------------------------------------------
r1730035 | jleroux | 2016-02-12 16:03:48 +0100 (ven. 12 févr. 2016) | 4 lignes

A patch from Oleg Andreyev for "Error during first attempt of the synchronisation" https://issues.apache.org/jira/browse/OFBIZ-6893

Trivial error due to incorrect parameters passed to EntityQuery.where()

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 15:04:40 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035

Modified: ofbiz/branches/release15.12/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java?rev=1730036&r1=1730035&r2=1730036&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java (original)
+++ ofbiz/branches/release15.12/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java Fri Feb 12 15:04:40 2016
@@ -894,7 +894,7 @@ public class EntitySyncContext {
                 EntityListIterator eli = EntityQuery.use(delegator)
                                                     .select(fieldsToSelect)
                                                     .from(modelEntity.getEntityName())
-                                                    .where(ModelEntity.STAMP_TX_FIELD, EntityOperator.NOT_EQUAL, null)
+                                                    .where(EntityCondition.makeCondition(ModelEntity.STAMP_TX_FIELD, EntityOperator.NOT_EQUAL, null))
                                                     .orderBy(ModelEntity.STAMP_TX_FIELD)
                                                     .queryIterator();
                 GenericValue nextValue = eli.next();