tdraier 2005/10/07 18:08:17 CEST
Modified files:
core/src/java/org/jahia/data/containers
JahiaContentContainerFacade.java
Log:
fixed container initialization
Revision Changes Path
1.9 +9 -5
jahia/core/src/java/org/jahia/data/containers/JahiaContentContainerFacade.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/containers/JahiaContentContainerFacade.java.diff?r1=1.8&r2=1.9&f=h
Index: JahiaContentContainerFacade.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/containers/JahiaContentContainerFacade.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JahiaContentContainerFacade.java 7 Oct 2005 12:45:27 -0000 1.8
+++ JahiaContentContainerFacade.java 7 Oct 2005 16:08:17 -0000 1.9
@@ -294,7 +294,8 @@
JahiaContainer container =
loadContainer(loadFlag,loadVersion,jParams,locales,createMissingLanguages);
if ( container != null ){
container.setLanguageCode(locale.toString());
- container.fieldsStructureCheck(jParams);
+ if ( !this.containerStructureChecked )
+ container.fieldsStructureCheck(jParams);
PublicContentFieldEntryState entryStateKey =
new PublicContentFieldEntryState(
container.getWorkflowState(),
@@ -313,7 +314,8 @@
JahiaContainer stagingContainer =
loadContainer(loadFlag,loadVersion,jParams,locales,createMissingLanguages);
if ( (stagingContainer != null) &&
(stagingContainer.getWorkflowState()>EntryLoadRequest.ACTIVE_WORKFLOW_STATE) ){
stagingContainer.setLanguageCode(locale.toString());
- stagingContainer.fieldsStructureCheck(jParams);
+ if ( !this.containerStructureChecked )
+ stagingContainer.fieldsStructureCheck(jParams);
PublicContentFieldEntryState entryStateKey =
new PublicContentFieldEntryState(
stagingContainer.getWorkflowState(),
@@ -327,7 +329,8 @@
// so we store the active as staging to ensure we have
loaded all staged fields as well
if ( stagingContainer != null) {
stagingContainer.setLanguageCode(locale.toString());
- stagingContainer.fieldsStructureCheck(jParams);
+ if ( !this.containerStructureChecked )
+ stagingContainer.fieldsStructureCheck(jParams);
PublicContentFieldEntryState entryStateKey =
new PublicContentFieldEntryState(
EntryLoadRequest.STAGING_WORKFLOW_STATE,
@@ -406,7 +409,8 @@
}
if ( this.containers.get(entryStateKey) == null ){
- container.fieldsStructureCheck(jParams);
+ if ( !this.containerStructureChecked )
+ container.fieldsStructureCheck(jParams);
this.containers.put(entryStateKey,container);
this.activeAndStagingEntryStates.add(entryStateKey);
}
@@ -496,12 +500,12 @@
this.fields.put(I,contentFieldFacade);
}
}
- this.containerStructureChecked = true;
if ( hasChanged ){
// return a clean container instance
container = this.loadContainer(loadFlag,loadVersion,
jParams,locales,createMissingLanguages);
}
+ this.containerStructureChecked = true;
}
return container;
