svn commit: [jahia] r18001 - /trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java

[cmailleux]

Author: cmailleux
Date: Fri Jul 13 13:04:31 2007
New Revision: 18001

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18001&repname=
=3Djahia
Log:
Correct commit 17787 by reactivating metadata activation an dstill avoid NPE

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=3D18001&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 Fr=
i Jul 13 13:04:31 2007
@@ -1243,7 +1243,7 @@
             ContentObjectKey contentObjectKey =3D (ContentObjectKey) itera=
tor.next();
             try {
                 ContentObject childContentObject =3D (ContentObject) Conte=
ntObject.getInstance(contentObjectKey);
-                if (contentObject !=3D null && !contentObject.getStagingLa=
nguages(false,true).isEmpty()) {
+                if (childContentObject !=3D null) {
                     if (!childContentObject.checkAdminAccess(jParams.getUs=
er())) {
                         try {
                             final EngineMessage msg =3D new EngineMessage(

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list