Author: bpapez
Date: Thu Sep 20 09:24:38 2007
New Revision: 18568
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18568&repname=
=3Djahia
Log:
JAHIA-1990: Refactor usage of set / resetSubstituteEntryLoadRequest
- instead of resetSubstituteEntryLoadRequest, we now set back to the previo=
us Substitute-EntryLoadRequest
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/languages/Ma=
nageSiteLanguages.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etMenuItemsAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/Abst=
ractAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/Fields=
EditHelperAbstract.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaC=
ontentFieldFacade.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaS=
mallTextSharedLangField.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/addcontain=
er/AddContainer_Engine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/metadata/M=
etadata_Engine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/pages/Page=
Properties_Engine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Pag=
e_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/updatecont=
ainer/UpdateContainer_Engine.java
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/metadata/=
core/listeners/ContentCreationDateListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreatorListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastContributorListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastModificationDateListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastPublisherListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastPublishingDateListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentPagePathListener.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/langua=
ges/ManageSiteLanguages.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/admin/languages/ManageSiteLanguages.java&re=
v=3D18568&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/admin/languages/Ma=
nageSiteLanguages.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/languages/Ma=
nageSiteLanguages.java Thu Sep 20 09:24:38 2007
@@ -528,6 +528,8 @@
}
=
//ProcessingContext jParams =3D jData.params();
+ EntryLoadRequest savedEntryLoadRequest =3D =
+ jParams.getSubstituteEntryLoadRequest();
EntryLoadRequest entryLoadRequest =3D new EntryLoadRequest(
EntryLoadRequest.STAGING_WORKFLOW_STATE, 0, locales, t=
rue);
jParams.setSubstituteEntryLoadRequest(entryLoadRequest);
@@ -556,8 +558,7 @@
if (activationResults.getStatus() !=3D ActivationTestResul=
ts.COMPLETED_OPERATION_STATUS) {
logger.debug("Activation results=3D" + activationResul=
ts.toString());
}
-
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
=
// now let's remove the languageCodeSet elements from the =
site
// settings, by also taking care of the mappings.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/=
ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/admin/sites/ManageSites.java&rev=3D18568&re=
pname=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/admin/sites/Manage=
Sites.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java Thu Sep 20 09:24:38 2007
@@ -1065,6 +1065,8 @@
ArrayList locales =3D new ArrayList();
locales.add(selectedLocale);
saveRequest.setLocales(locales);
+ EntryLoadRequest savedEntryLoadRequest =3D =
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest(saveRequest);
=
JahiaPageService pageService =3D ServicesRegistry.getI=
nstance().getJahiaPageService();
@@ -1078,7 +1080,7 @@
jParams.getUser().getUserKey(),
site.getAclID(),
jParams);
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadRe=
quest);
=
logger.debug("Home Page created");
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionm=
enus/GetMenuItemsAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java&re=
v=3D18568&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/ajax/actionmenus/G=
etMenuItemsAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etMenuItemsAction.java Thu Sep 20 09:24:38 2007
@@ -144,6 +144,8 @@
STAGING_WORKFLOW_STATE,
0,
jParams.getLocales());
+ EntryLoadRequest savedEntryLoadRequest =3D =
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest(elr);
=
final ContentBean bean;
@@ -198,7 +200,7 @@
// to display ajax response sended
if (logger.isDebugEnabled()) logger.debug(getReadableInfo(info=
));
=
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadRequest);
=
// Fill up the tag names (Order matters !!!)
final Vector xmlTagNames =3D new Vector();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/AbstractAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/AbstractAction.java&rev=3D185=
68&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/blogs/actions/Abst=
ractAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/Abst=
ractAction.java Thu Sep 20 09:24:38 2007
@@ -225,11 +225,12 @@
STAGING_WORKFLOW_STATE, =
0, =
jParams.getEntryLoadRequest().getLocales());
- =
+ EntryLoadRequest savedEntryLoadRequest =3D =
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest(elr);
JahiaContainer postContainer =3D containerService.loadContainer(
id, LoadFlags.ALL, jParams, elr);
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadRequest);
return postContainer;
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
FieldsEditHelperAbstract.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/FieldsEditHelperAbstract.java&r=
ev=3D18568&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/data/fields/Fields=
EditHelperAbstract.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/Fields=
EditHelperAbstract.java Thu Sep 20 09:24:38 2007
@@ -253,6 +253,8 @@
} else {
doUpdate =3D true;
}
+ EntryLoadRequest savedEntryLoadRequest =3D =
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest(elh.getPreviousEntry=
LoadRequest());
engineMap.put("fieldsEditCallingEngineName", engineName); =
// todo : make as Constant
if (doUpdate &&
@@ -291,7 +293,7 @@
engineMap, jParams);
}
}
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
logger.debug("processLastScreen > the field value is now "=
+
theField.getValue());
}
@@ -400,6 +402,8 @@
processingEntryLoadRequest.getLocales()
.add(elh.getCurrentLocale());
}
+ EntryLoadRequest savedEntryLoadRequest =3D =
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest(
processingEntryLoadRequest);
if (EngineToolBox.getInstance().processFieldTypes(theF=
ield, theContainer, engineName, jParams, mode, engineMap))
@@ -412,7 +416,7 @@
engineMap, jParams);
}
}
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadRe=
quest);
=
if (engineMap.get(engineName + "." + "fieldForm") !=3D=
null) {
fieldIDs.add(new Integer(theField.getID()));
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
JahiaContentFieldFacade.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/JahiaContentFieldFacade.java&re=
v=3D18568&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/data/fields/JahiaC=
ontentFieldFacade.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaC=
ontentFieldFacade.java Thu Sep 20 09:24:38 2007
@@ -211,6 +211,8 @@
elr.setWithMarkedForDeletion(true);
=
try {
+ EntryLoadRequest savedEntryLoadRequest =3D =
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest(elr);
JahiaField field =3D ServicesRegistry.getInstance()
.getJahiaFieldService()
@@ -218,7 +220,7 @@
loadFlag,
jParams,
elr);
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
if ( field !=3D null ){
String rawValue =3D field.getRawValue();
if ( rawValue =3D=3D null ){
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
JahiaSmallTextSharedLangField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/JahiaSmallTextSharedLangField.j=
ava&rev=3D18568&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/data/fields/JahiaS=
mallTextSharedLangField.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaS=
mallTextSharedLangField.java Thu Sep 20 09:24:38 2007
@@ -338,6 +338,8 @@
loadRequest.getLocales().clear();
loadRequest.getLocales().add(LanguageCodeConverters.languageCodeTo=
Locale(languageCode));
Vector values =3D new Vector();
+ EntryLoadRequest savedEntryLoadRequest =3D
+ context.getSubstituteEntryLoadRequest();
try {
context.setSubstituteEntryLoadRequest(loadRequest);
Iterator iterator =3D arrayList.iterator();
@@ -372,7 +374,7 @@
}
} catch (Throwable t) {
} finally {
- context.resetSubstituteEntryLoadRequest();
+ context.setSubstituteEntryLoadRequest(savedEntryLoadRequest);
}
=
int size =3D values.size();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/addc=
ontainer/AddContainer_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.ja=
va&rev=3D18568&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/engines/addcontain=
er/AddContainer_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/addcontain=
er/AddContainer_Engine.java Thu Sep 20 09:24:38 2007
@@ -910,7 +910,8 @@
new EntryLoadRequest(field.getWorkflowState(), fie=
ld.getVersionID(), new ArrayList());
processingEntryLoadRequest.getLocales().add(LanguageCodeCo=
nverters.languageCodeToLocale(
field.getLanguageCode()));
-
+ EntryLoadRequest savedEntryLoadRequest =3D
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest(processingEntryLoadR=
equest);
if (field.getID() =3D=3D 0) {
// create the field only once
@@ -918,7 +919,7 @@
// saveField(field, theContainer.getAclID(), jP=
arams);
}
EngineToolBox.getInstance().processFieldTypes(field, theCo=
ntainer, ENGINE_NAME, jParams, mode, engineMap);
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
if (newFieldID =3D=3D 0) {
newFieldID =3D field.getID();
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/meta=
data/Metadata_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/metadata/Metadata_Engine.java&rev=
=3D18568&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/engines/metadata/M=
etadata_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/metadata/M=
etadata_Engine.java Thu Sep 20 09:24:38 2007
@@ -499,7 +499,8 @@
processingEntryLoadRequest.getLocales ()
.add (LanguageCodeConverters.languageCodeT=
oLocale (
field.getLanguageCode ()));
-
+ EntryLoadRequest savedEntryLoadRequest =3D
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest (
processingEntryLoadRequest);
if (field.getID () =3D=3D 0) {
@@ -513,7 +514,7 @@
EngineToolBox.getInstance().processFieldTypes =
(field, theContainer, ENGINE_NAME, jParams, mode, engineMap);
}
engineMap.put (ENGINE_NAME + "." + "theField", fie=
ld);
- jParams.resetSubstituteEntryLoadRequest ();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLo=
adRequest);
}
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/page=
s/PageProperties_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/pages/PageProperties_Engine.java&re=
v=3D18568&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/engines/pages/Page=
Properties_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/pages/Page=
Properties_Engine.java Thu Sep 20 09:24:38 2007
@@ -837,12 +837,14 @@
pageTempBean =3D (JahiaPageEngineTempBean) engineMap.get("pageTemp=
Bean");
=
// load page title for the processing language Code
+ EntryLoadRequest savedEntryLoadRequest =3D
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest(elh.getCurrentEntryLoadReque=
st());
final String pageTitle =3D contentPage.getTitle(jParams.getEntryLo=
adRequest());
if (pageTempBean.getTitle(elh.getCurrentLanguageCode()) =3D=3D nul=
l && (pageTitle !=3D null)) {
pageTempBean.setTitle(elh.getCurrentLanguageCode(), pageTitle);
}
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadRequest);
if (pageTempBean.getTitle(elh.getCurrentLanguageCode()) !=3D null)=
{
engineMap.put("dataPageTitle", pageTempBean.getTitle(elh.getCu=
rrentLanguageCode()));
} else {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Page_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Page_Field.java&rev=3D18568&=
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/engines/shared/Pag=
e_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Pag=
e_Field.java Thu Sep 20 09:24:38 2007
@@ -112,6 +112,8 @@
EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(=
JahiaEngine.ENGINE_LANGUAGE_HELPER);
EntryLoadRequest entryLoadRequest =3D elh.getCurrentEntryLoadReque=
st();
entryLoadRequest.setFirstLocale(processingLocale.toString());
+ EntryLoadRequest savedEntryLoadRequest =3D
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest(entryLoadRequest);
=
String fieldsEditCallingEngineName =3D (String) engineMap.get("fie=
ldsEditCallingEngineName");
@@ -130,7 +132,7 @@
logger.debug("Saving pagefield");
return saveData(jParams, engineMap, theField);
}
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadRequest);
return false;
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/upda=
tecontainer/UpdateContainer_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/updatecontainer/UpdateContainer_Eng=
ine.java&rev=3D18568&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/engines/updatecont=
ainer/UpdateContainer_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/updatecont=
ainer/UpdateContainer_Engine.java Thu Sep 20 09:24:38 2007
@@ -1219,11 +1219,13 @@
}
}
engineMap.put("theField", field);
+ EntryLoadRequest savedEntryLoadRequest =3D
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest(
processingEntryLoadRequest);
EngineToolBox.getInstance().processFieldTypes(fiel=
d,
theContainer, AddContainer_Engine.ENGINE_N=
AME, jParams, mode, engineMap);
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLo=
adRequest);
}
if (newFieldID =3D=3D 0 && field.getID() > 0) {
newFieldID =3D field.getID();
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=3D18568&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 20 09:24:38 2007
@@ -814,6 +814,7 @@
boolean fieldLoadedSuccessfully =3D false;
// @todo : find a better way
if (jParams !=3D null ){
+ EntryLoadRequest savedEntryLoadRequest =3D jParams.getSubstitu=
teEntryLoadRequest();
try {
jParams.setSubstituteEntryLoadRequest (loadVersion);
logger.debug ("Calling field specific load");
@@ -829,7 +830,7 @@
JahiaException.DATA_ERROR, JahiaException.ERROR_SEVERITY);
*/
} finally {
- jParams.resetSubstituteEntryLoadRequest ();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
}
} else {
theField.load (loadFlag, null, loadVersion);
@@ -1097,10 +1098,16 @@
public void deleteField (int fieldID, ProcessingContext jParams)
throws JahiaException {
ContentField contentField =3D ContentField.getField (fieldID);
+ EntryLoadRequest savedEntryLoadRequest =3D
+ jParams.getSubstituteEntryLoadRequest();
jParams.setSubstituteEntryLoadRequest (EntryLoadRequest.STAGED);
JahiaField theField =3D contentFieldToJahiaField (contentField,
jParams.getEntryLoadRequest ());
- jParams.resetSubstituteEntryLoadRequest ();
+ if (savedEntryLoadRequest =3D=3D null) {
+ jParams.resetSubstituteEntryLoadRequest();
+ } else { =
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadRequest);
+ } =
// JahiaField theField =3D loadFieldInfo( fieldID, EntryLoadReques=
t.STAGED );
=
boolean doIndexField =3D !ServicesRegistry.getInstance ().getJahia=
SitesService ()
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentCreationDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentCre=
ationDateListener.java&rev=3D18568&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/metadata/=
core/listeners/ContentCreationDateListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreationDateListener.java Thu Sep 20 09:24:38 2007
@@ -100,6 +100,8 @@
if ( contentObject =3D=3D null || jParams=3D=3Dnull ){
return;
}
+ EntryLoadRequest savedEntryLoadRequest =3D
+ jParams.getSubstituteEntryLoadRequest();
boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
try {
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(),jParams);
@@ -114,7 +116,7 @@
logger.debug(t);
} finally {
if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
}
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentCreatorListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentCre=
atorListener.java&rev=3D18568&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/metadata/=
core/listeners/ContentCreatorListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentCreatorListener.java Thu Sep 20 09:24:38 2007
@@ -24,6 +24,7 @@
import org.jahia.data.fields.JahiaField;
import org.jahia.engines.metadata.Metadata_Engine;
import org.jahia.params.ProcessingContext;
+import org.jahia.services.version.EntryLoadRequest;
import org.jahia.bin.Jahia;
=
import java.util.HashMap;
@@ -101,6 +102,7 @@
if ( jParams.getUser() !=3D null ){
userName =3D jParams.getUser().getUsername();
}
+ EntryLoadRequest savedEntryLoadRequest =3D jParams.getSubstituteEn=
tryLoadRequest();
boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
try {
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(),jParams);
@@ -115,7 +117,7 @@
logger.debug("Exception occured on contentObjectCreated event"=
,t);
} finally {
if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
}
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentLastContributorListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentLas=
tContributorListener.java&rev=3D18568&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/metadata/=
core/listeners/ContentLastContributorListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastContributorListener.java Thu Sep 20 09:24:38 2007
@@ -33,6 +33,7 @@
import org.jahia.params.ProcessingContext;
import org.jahia.services.fields.ContentField;
import org.jahia.services.usermanager.JahiaUser;
+import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.workflow.WorkflowEvent;
import org.jahia.services.pages.ContentPage;
import org.jahia.services.containers.ContentContainer;
@@ -283,6 +284,7 @@
if ( jParams =3D=3D null ){
jParams =3D Jahia.getThreadParamBean();
}
+ EntryLoadRequest savedEntryLoadRequest =3D jParams.getSubstituteEn=
tryLoadRequest();
boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
try {
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(),jParams, true);
@@ -298,14 +300,10 @@
jahiaField.setValue(userName);
jahiaField.save(jParams);
}
- } catch ( Throwable t ){
- if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
+ } finally {
+ if (resetStagingLoadRequest) {
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
}
- throw new Exception(t);
- }
- if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentLastModificationDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentLas=
tModificationDateListener.java&rev=3D18568&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/metadata/=
core/listeners/ContentLastModificationDateListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastModificationDateListener.java Thu Sep 20 09:24:38=
2007
@@ -261,6 +261,7 @@
ProcessingContext jParams,
JahiaEvent theEvent)
throws Exception {
+ EntryLoadRequest savedEntryLoadRequest =3D jParams.getSubstituteEn=
tryLoadRequest();
boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
try {
if(logger.isDebugEnabled())logger.debug("Updating metadata for=
object "+contentObject);
@@ -271,14 +272,10 @@
}
jahiaField.setObject(String.valueOf(theEvent.getEventTime()));
jahiaField.save(jParams);
- } catch ( Throwable t ){
+ } finally{
if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
}
- throw new Exception(t);
- }
- if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentLastPublisherListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentLas=
tPublisherListener.java&rev=3D18568&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/metadata/=
core/listeners/ContentLastPublisherListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastPublisherListener.java Thu Sep 20 09:24:38 2007
@@ -24,6 +24,7 @@
import org.jahia.data.fields.JahiaField;
import org.jahia.services.fields.ContentField;
import org.jahia.services.usermanager.JahiaUser;
+import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.pages.ContentPage;
import org.jahia.services.containers.ContentContainer;
import org.jahia.services.containers.ContentContainerList;
@@ -177,6 +178,7 @@
ProcessingContext jParams,
JahiaEvent theEvent)
throws Exception {
+ EntryLoadRequest savedEntryLoadRequest =3D jParams.getSubstituteEn=
tryLoadRequest();
boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
try {
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(), jParams, false);
@@ -192,14 +194,10 @@
}
jahiaField.setValue(userName);
jahiaField.save(jParams);
- } catch ( Throwable t ){
+ } finally {
if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
}
- throw new Exception(t);
- }
- if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentLastPublishingDateListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentLas=
tPublishingDateListener.java&rev=3D18568&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/metadata/=
core/listeners/ContentLastPublishingDateListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentLastPublishingDateListener.java Thu Sep 20 09:24:38 2=
007
@@ -24,6 +24,7 @@
import org.jahia.data.fields.JahiaField;
import org.jahia.services.fields.ContentField;
import org.jahia.services.pages.ContentPage;
+import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.containers.ContentContainer;
import org.jahia.services.containers.ContentContainerList;
import org.jahia.bin.Jahia;
@@ -169,6 +170,7 @@
ProcessingContext jParams,
JahiaEvent theEvent)
throws Exception {
+ EntryLoadRequest savedEntryLoadRequest =3D jParams.getSubstituteEn=
tryLoadRequest();
boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
try {
JahiaField jahiaField =3D contentObject.getMetadataAsJahiaFiel=
d(this.getMetadataName(), jParams, true);
@@ -178,14 +180,10 @@
}
jahiaField.setObject(String.valueOf(theEvent.getEventTime()));
jahiaField.save(jParams);
- } catch ( Throwable t ){
+ } finally {
if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
}
- throw new Exception(t);
- }
- if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/met=
adata/core/listeners/ContentPagePathListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/metadata/core/listeners/ContentPag=
ePathListener.java&rev=3D18568&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/metadata/=
core/listeners/ContentPagePathListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/metadata/=
core/listeners/ContentPagePathListener.java Thu Sep 20 09:24:38 2007
@@ -28,6 +28,7 @@
import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.fields.ContentField;
+import org.jahia.services.version.EntryLoadRequest;
=
import java.util.HashMap;
=
@@ -108,7 +109,7 @@
return;
}
String pagePath =3D "";
-
+ EntryLoadRequest savedEntryLoadRequest =3D jParams.getSubstituteEn=
tryLoadRequest();
boolean resetStagingLoadRequest =3D MetadataTools.switchToStagingE=
ntryLoadRequest(jParams);
try {
pagePath =3D contentObject.getPagePathString(jParams);
@@ -126,7 +127,7 @@
logger.debug(t);
} finally {
if (resetStagingLoadRequest){
- jParams.resetSubstituteEntryLoadRequest();
+ jParams.setSubstituteEntryLoadRequest(savedEntryLoadReques=
t);
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
