Author: bpapez
Date: Thu Sep 27 14:15:36 2007
New Revision: 18691
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18691&repname=
=3Djahia
Log:
http://www.jahia.net/jira/browse/JAHIA-2410: SP3 Page std Workflow: null va=
lue on my page field when my page is validated (green status)
- Hidden NPE (now also logged) due to a bug (unexpected that only Locale in=
getLocales is "shared")
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fields/Ja=
hiaFieldBaseService.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Con=
tentPage.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Jah=
iaPage.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fie=
lds/JahiaFieldBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/fields/JahiaFieldBaseService.java&=
rev=3D18691&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/fields/Ja=
hiaFieldBaseService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fields/Ja=
hiaFieldBaseService.java Thu Sep 27 14:15:36 2007
@@ -822,7 +822,7 @@
theField.setHasChanged(false);
fieldLoadedSuccessfully =3D true;
} catch (Throwable t) {
- logger.debug ("Error calling field load method fid[" + the=
Field.getID () + "]", t);
+ logger.warn ("Error calling field load method fid[" + theF=
ield.getID () + "]", t);
// Return the field anyway
/*
throw new JahiaException ("Error calling field specific lo=
ad method !",
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pag=
es/ContentPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/pages/ContentPage.java&rev=3D18691=
&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/pages/Con=
tentPage.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Con=
tentPage.java Thu Sep 27 14:15:36 2007
@@ -3725,13 +3725,13 @@
*/
public boolean hasEntries(int pageInfosFlag, String languageCode) {
boolean hasEntries =3D false;
- if (!hasEntries && (pageInfosFlag & ACTIVE_PAGE_INFOS) !=3D 0 || (=
pageInfosFlag & 0x08) !=3D 0) {
+ if (!hasEntries && ((pageInfosFlag & ACTIVE_PAGE_INFOS) !=3D 0 || =
(pageInfosFlag & 0x08) !=3D 0)) {
hasEntries =3D mActivePageInfos.containsKey(languageCode);
}
- if (!hasEntries && (pageInfosFlag & STAGING_PAGE_INFOS) !=3D 0 || =
(pageInfosFlag & 0x08) !=3D 0) {
+ if (!hasEntries && ((pageInfosFlag & STAGING_PAGE_INFOS) !=3D 0 ||=
(pageInfosFlag & 0x08) !=3D 0)) {
hasEntries |=3D mStagingPageInfos.containsKey(languageCode);
}
- if (!hasEntries && (pageInfosFlag & ARCHIVED_PAGE_INFOS) !=3D 0 ||=
(pageInfosFlag & 0x08) !=3D 0) {
+ if (!hasEntries && ((pageInfosFlag & ARCHIVED_PAGE_INFOS) !=3D 0 |=
| (pageInfosFlag & 0x08) !=3D 0)) {
hasEntries |=3D hasArchivedPageInfos(languageCode);
}
return hasEntries;
@@ -3750,10 +3750,10 @@
if ((pageInfosFlag & ACTIVE_PAGE_INFOS) !=3D 0) {
hasEntries =3D !mActivePageInfos.isEmpty();
}
- if (!hasEntries && (pageInfosFlag & STAGING_PAGE_INFOS) !=3D 0) {
+ if (!hasEntries && ((pageInfosFlag & STAGING_PAGE_INFOS) !=3D 0)) {
hasEntries |=3D !mStagingPageInfos.isEmpty();
}
- if (!hasEntries && (pageInfosFlag & ARCHIVED_PAGE_INFOS) !=3D 0) {
+ if (!hasEntries && ((pageInfosFlag & ARCHIVED_PAGE_INFOS) !=3D 0))=
{
// ensure to load versioning entries
try {
loadVersioningEntryStates();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pag=
es/JahiaPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/pages/JahiaPage.java&rev=3D18691&r=
epname=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/pages/Jah=
iaPage.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Jah=
iaPage.java Thu Sep 27 14:15:36 2007
@@ -117,12 +117,16 @@
// ( for some reason, it was not actived ), so change the loadRequ=
est to
// staging ohterwhise calls to getType(), getJahiaID() will fail !=
!!!
EntryLoadRequest newLoadRequest =3D loadRequest;
+ Locale locale =3D loadRequest.getFirstLocale(true);
+ if (locale =3D=3D null) {
+ locale =3D loadRequest.getFirstLocale(false);
+ }
if (loadRequest !=3D null && loadRequest.isCurrent()
&& contentPage !=3D null) {
if (!contentPage.hasActiveEntries()
|| (!contentPage.getSite().isMixLanguagesActive() && !=
contentPage
.hasEntries(ContentPage.ACTIVE_PAGE_INFOS,
- loadRequest.getFirstLocale(true).toStr=
ing()))) {
+ locale.toString()))) {
newLoadRequest =3D new EntryLoadRequest(
EntryLoadRequest.STAGING_WORKFLOW_STATE, 0, loadRe=
quest
.getLocales());
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
