Author: bpapez
Date: Thu May 31 17:56:04 2007
New Revision: 17426
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17426&repname=
=3Djahia
Log:
if-clause for filtering isNotMarkedForDeletion results in staging moved fur=
ther down
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaContainerManager.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/ma=
nager/JahiaContainerManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.jav=
a&rev=3D17426&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaContainerManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaContainerManager.java Thu May 31 17:56:04 2007
@@ -315,26 +315,27 @@
} else {
retval =3D dao.getPublishedContainerIdsFromList(id);
}
- if (loadVersion !=3D null && loadVersion.isStaging() && !l=
oadVersion.isWithMarkedForDeletion()) {
- List list =3D retval;
- retval =3D new ArrayList(list.size());
- Set addedCtnIds =3D new HashSet();
- Set deletedInStaging =3D new HashSet();
- =
- for (int i =3D 0; i < list.size(); i++)
{
- Object[] objects =3D (Object[])
list.get(i);
- long version =3D ((Long)
objects[1]).longValue();
- if
(!deletedInStaging.contains(objects[0])
- &&
!addedCtnIds.contains(objects[0]) && version > -1) {
- retval.add(objects[0]);
-
addedCtnIds.add(objects[0]);
- } else if (!compareMode &&
version =3D=3D -1) {
-
deletedInStaging.add(objects[0]);
- }
- }
- }
}
- if(!compareMode && cache!=3Dnull && !(loadVersion !=3D null &&=
loadVersion.getWorkflowState()<=3DEntryLoadRequest.VERSIONED_WORKFLOW_STAT=
E)) {
+ if (loadVersion !=3D null && loadVersion.isStaging() && !loadV=
ersion.isWithMarkedForDeletion()) {
+ List list =3D retval;
+ retval =3D new ArrayList(list.size());
+ Set addedCtnIds =3D new HashSet();
+ Set deletedInStaging =3D new HashSet();
+ =
+ for (int i =3D 0, size =3D list.size(); i <
size; i++) {
+ Object[] objects =3D (Object[])
list.get(i);
+ long version =3D ((Long)
objects[1]).longValue();
+ if
(!deletedInStaging.contains(objects[0])
+ &&
!addedCtnIds.contains(objects[0]) && version > -1) {
+ retval.add(objects[0]);
+ addedCtnIds.add(objects[0]);
+ } else if (!compareMode && version
=3D=3D -1) {
+
deletedInStaging.add(objects[0]);
+ }
+ }
+ } =
+ if (!compareMode && cache !=3D null && =
+ !(loadVersion !=3D null &&
loadVersion.getWorkflowState() <=
=3D EntryLoadRequest.VERSIONED_WORKFLOW_STATE)) {
cache.put(cacheKey,retval);
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
