mcardle 2005/08/30 17:35:05 CEST
Modified files:
core/src/java/org/jahia/aop EsiJspContentDetectionAspect.java
Log:
* ignores containerLists with 0 ID
* added more debugging messages
* detects containerList bean
Revision Changes Path
1.4 +23 -13
jahia/core/src/java/org/jahia/aop/EsiJspContentDetectionAspect.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/aop/EsiJspContentDetectionAspect.java.diff?r1=1.3&r2=1.4&f=h
Index: EsiJspContentDetectionAspect.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/aop/EsiJspContentDetectionAspect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EsiJspContentDetectionAspect.java 24 Aug 2005 15:19:44 -0000 1.3
+++ EsiJspContentDetectionAspect.java 30 Aug 2005 15:35:04 -0000 1.4
@@ -37,9 +37,9 @@
public void addContainerList (JoinPoint joinPoint)
throws Throwable {
Object obj = joinPoint.getCallee();
- if (obj instanceof FieldBean)
+ if (obj instanceof ContainerListBean)
addContent(joinPoint, (ContainerListBean)obj,
"ContainerListBean","addContainerList");
- else if (obj instanceof JahiaField)
+ else if (obj instanceof JahiaContainerList)
addContent(joinPoint, (JahiaContainerList)obj,
"JahiaContainerList","addContainerList");
}
/**
@@ -52,10 +52,11 @@
public void addContainer (JoinPoint joinPoint)
throws Throwable {
Object obj = joinPoint.getCallee();
- if (obj instanceof FieldBean)
+ if (obj instanceof ContainerBean)
addContent(joinPoint, (ContainerBean)obj,
"ContainerBean","addContainer");
- else if (obj instanceof JahiaField)
+ else if (obj instanceof JahiaContainer)
addContent(joinPoint, (JahiaContainer)obj,
"JahiaContainer","addContainer");
+ else if (verbose) System.err.println(" addContainer :
UNKNOWN OBJECT TYPE: "+ obj);
}
/**
* Aspect which detects access to a Field (usually from JSP pages or
tags)
@@ -70,6 +71,7 @@
addContent(joinPoint, (FieldBean)obj, "FieldBean","addField");
else if (obj instanceof JahiaField)
addContent(joinPoint, (JahiaField)obj, "JahiaField","addField");
+ else if (verbose) System.err.println(" addField : UNKNOWN
OBJECT TYPE: "+ obj);
}
/**
* Aspect which detects access to a Page (usually from JSP pages or
tags)
@@ -85,6 +87,7 @@
addContent(joinPoint, (PageBean)obj, "PageBean","addPage");
else if (obj instanceof JahiaPage)
addContent(joinPoint, (JahiaPage)obj, "JahiaPage","addPage");
+ else if (verbose) System.err.println(" addPage : UNKNOWN
OBJECT TYPE: "+ obj);
}
/**
@@ -155,6 +158,7 @@
}
String contentType = null;
int objID = -1;
+ boolean AddedOK = true;
if (aspObj instanceof PageBean) {
objID = ((PageBean) aspObj).getID();
@@ -192,21 +196,27 @@
}
else if (aspObj instanceof JahiaContainerList) {
objID =((JahiaContainerList) aspObj).getID();
- jesiObj.addContainerList(objID);
- contentType = "JahiaContainerList";
- int ctnID = ((JahiaContainerList) aspObj).getParentEntryID();
- addParentContainer(ctnID, jesiObj, aspectName, contentType,
objID);
+ //ignore ctnList 0
+ if (objID !=0) {
+ jesiObj.addContainerList(objID);
+ contentType = "JahiaContainerList";
+ int ctnID = ((JahiaContainerList) aspObj).getParentEntryID();
+ addParentContainer(ctnID, jesiObj, aspectName, contentType,
objID);
+ } else AddedOK=false;
}
else if (aspObj instanceof ContainerListBean) {
objID =((ContainerListBean) aspObj).getID();
- jesiObj.addContainerList(objID);
- contentType = "ContainerListBean";
- int ctnID = ((ContainerListBean) aspObj).getParentContainerID();
- addParentContainer(ctnID, jesiObj, aspectName, contentType,
objID);
+ //ignore ctnList 0
+ if (objID !=0) {
+ jesiObj.addContainerList(objID);
+ contentType = "ContainerListBean";
+ int ctnID = ((ContainerListBean)
aspObj).getParentContainerID();
+ addParentContainer(ctnID, jesiObj, aspectName, contentType,
objID);
+ } else AddedOK=false;
}
else System.err.println(" " + aspectName + ": Not a recognized
object type : " + aspObj);
- if (verbose) System.err.println(" " + aspectName + ":
added " + contentType + " " +
+ if (verbose && AddedOK) System.err.println(" " +
aspectName + ": added " + contentType + " " +
" ID[" +objID + "]"
+ " to " + jesiObj.getObjDetails());
