Author: sshyrkov
Date: Tue Jun 26 20:09:01 2007
New Revision: 17786
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17786&repname=
=3Djahia
Log:
SOUK-11: Workflow error causing 'missing' pages
http://www.jahia.net/jira/browse/SOUK-11
Resolved: prevent NPE
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/wor=
kflow/WorkflowService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/workflow/WorkflowService.java&rev=
=3D17786&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/services/workflow/=
WorkflowService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java Tue Jun 26 20:09:01 2007
@@ -1251,22 +1251,24 @@
ContentObjectKey contentObjectKey =3D (ContentObjectKey) itera=
tor.next();
try {
ContentObject childContentObject =3D (ContentObject) Conte=
ntObject.getInstance(contentObjectKey);
- if (!childContentObject.checkAdminAccess(jParams.getUser()=
)) {
- try {
- final EngineMessage msg =3D new EngineMessage(
- "org.jahia.services.workflow.WorkflowServi=
ce.noAdminRightsError");
- activationResults
- .appendError(new IsValidForActivationResul=
ts(
- contentObjectKey.getType(),
- Integer.parseInt(contentObjectKey.=
getIDInType()),
- ContentField.SHARED_LANGUAGE, msg)=
);
- activationResults.setStatus(ActivationTestResults.=
PARTIAL_OPERATION_STATUS);
- } catch (ClassNotFoundException cnfe) {
- logger.debug ("Error while creating activation tes=
t node result",
- cnfe);
- }
- } else if ( !(childContentObject instanceof ContentField) =
) {
- activationResults.merge(childContentObject.activateMet=
adatas(languageCodes, versioningActive, saveVersion, jParams.getUser(), jPa=
rams, stateModifContext));
+ if (contentObject !=3D null && !contentObject.getStagingLa=
nguages(false,true).isEmpty()) {
+ if
(!childContentObject.checkAdminAccess(jParams.getUser(=
))) {
+ try {
+ final EngineMessage msg =3D new EngineMessage(
+
"org.jahia.services.workflow.WorkflowServ=
ice.noAdminRightsError");
+ activationResults
+ .appendError(new
IsValidForActivationResu=
lts(
+ contentObjectKey.getType(),
+
Integer.parseInt(contentObjectKey=
.getIDInType()),
+ ContentField.SHARED_LANGUAGE,
msg=
));
+
activationResults.setStatus(ActivationTestResults=
.PARTIAL_OPERATION_STATUS);
+ } catch (ClassNotFoundException cnfe) {
+ logger.debug ("Error while creating activation
te=
st node result",
+ cnfe);
+ }
+ } else if ( !(childContentObject instanceof
ContentField)=
) {
+
activationResults.merge(childContentObject.activateMe=
tadatas(languageCodes, versioningActive, saveVersion, jParams.getUser(), jP=
arams, stateModifContext));
+ }
}
} catch (ClassNotFoundException e) {
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
