Author: sshyrkov
Date: Wed Jan 23 19:06:15 2008
New Revision: 19572
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19572&repname=
=3Djahia
Log:
Rollback my commit 18771. Some side effects were noticed during site import
Modified:
trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java
Modified: trunk/core/src/java/org/jahia/services/workflow/WorkflowService.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/workflow/WorkflowService.java&rev=3D19572&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
--- trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java We=
d Jan 23 19:06:15 2008
@@ -659,27 +659,7 @@
=
public ContentObject getMainLinkObject(ContentObject object) throws Ja=
hiaException {
try {
- ContentObjectKey objectKey =3D (ContentObjectKey)object.getObj=
ectKey();
- ContentObjectKey mainKey =3D getMainLinkObject(objectKey);
- ContentObject obj =3D (ContentObject) ContentObject.getInstanc=
e(mainKey);
- if (obj =3D=3D null) {
- logger.warn("Object is not found for main object key: "
- + mainKey
- + ". Perhaps an inconsistency for content object: "
- + objectKey);
- int mode =3D getWorkflowMode(objectKey);
- ContentObjectKey newMainKey =3D getMainLinkObject(objectKe=
y,mode);
- if (newMainKey !=3D null && !newMainKey.equals(mainKey)) {
- obj =3D (ContentObject) ContentObject.getInstance(newM=
ainKey);
- if (obj !=3D null) {
- logger.warn("Found main object: " + newMainKey
- + " for content object: " + objectKey
- + ". Updating workflow entry.");
- workflowManager.updateWorkflowEntry(objectKey.toSt=
ring(),newMainKey.toString());
- }
- }
- }
- return obj;
+ return (ContentObject) ContentObject.getInstance(getMainLinkOb=
ject((ContentObjectKey)object.getObjectKey()));
} catch (ClassNotFoundException e) {
}
return null;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
