diff --git a/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java b/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java index cfdcddf77..ee25553b8 100755 --- a/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java +++ b/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java @@ -232,16 +232,6 @@ public class SectionTemplateMapping extends TemplateMapping { DataCollection da = SessionManager.getSession().retrieve (BASE_DATA_OBJECT_TYPE); SectionTemplateCollection c = new SectionTemplateCollection(da); - //Debug code, inserted by jensp 2009-05-26 - if (section == null) { - logger.error("WARNING: section is NULL at this point!"); - } - if (section.ID == null) { - logger.error("WARNING: ACSObject.ID is NULL at this point!"); - } - if (section.getID() == null) { - logger.error("WARNING: section.getID() returns NULL at this point!"); - } c.addEqualsFilter(SECTION + "." + ACSObject.ID, section.getID()); c.addOrder(CONTENT_TYPE + "." + ContentType.LABEL); c.addOrder(USE_CONTEXT); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java index 7629c22a1..ecf58a396 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java @@ -246,8 +246,6 @@ public class CMSPage extends Page implements ResourceHandler { RequestContext actx) throws IOException, ServletException { - s_log.error("Starting dispatch()..."); - DeveloperSupport.startStage("CMSPage.dispatch: serve page"); CMSExcursion excursion = new CMSExcursion() { @@ -257,14 +255,11 @@ public class CMSPage extends Page implements ResourceHandler { if (app == null) { // We're at the content center; do nothing. - s_log.info("dispatch: We're at the content center; do nothing."); } else if (app instanceof ContentSection) { - s_log.info("dispatch: Setting section = app"); section = (ContentSection) app; } else { // hack to deal with category browser mounted // under section app. - s_log.info("dispatch: hack for category browser"); app = app.getParentApplication(); if (app instanceof ContentSection) { section = (ContentSection) app; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemTemplatePatternGenerator.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemTemplatePatternGenerator.java index 3afd217a6..713e6c8e6 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemTemplatePatternGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemTemplatePatternGenerator.java @@ -64,9 +64,6 @@ public class ItemTemplatePatternGenerator implements PatternGenerator { if (mapping == null) { // there is no mapping so we try to get the default for the // content type - if (item.getContentSection() == null) { - logger.error("WARNING: item.getContentSection() returns NULL here!"); - } template = TemplateManagerFactory.getInstance().getDefaultTemplate (item.getContentSection(), item.getContentType(),