Author: sshyrkov
Date: Mon Jun 18 10:21:00 2007
New Revision: 17614
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17614&repname=
=3Djahia
Log:
Check for logger.isDebugEnabled() before performing logger.debug
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Big=
Text_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/events/JS=
PEventListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/events/Ja=
hiaEventGeneratorBaseService.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/BigText_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/BigText_Field.java&rev=3D176=
14&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/Big=
Text_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Big=
Text_Field.java Mon Jun 18 10:21:00 2007
@@ -109,7 +109,8 @@
value =3D JahiaBigTextField.rewriteURLs(value, jParams);
theField.setValue(value);
=
- logger.debug("handling mode : " + mode + " for field " +
+ if (logger.isDebugEnabled())
+ logger.debug("handling mode : " + mode + " for field " +
theField.getID() + " value=3D" + theField.getValue());
=
// Set Session attribute for AJAX sitemap
@@ -146,13 +147,15 @@
}
=
ignoreAllWarnings =3D jParams.getParameter("ignoreAllWarnings") !=
=3D null;
- logger.debug("ignoreAllWarnings: " + ignoreAllWarnings);
+ if (logger.isDebugEnabled())
+ logger.debug("ignoreAllWarnings: " + ignoreAllWarnings);
((ParamBean) jParams).getRequest().setAttribute("ignoreAllWarnings=
",
Boolean.valueOf(ignoreAllWarnings));
=
boolean out =3D true;
String fieldValue =3D jParams.getParameter("_" + theField.getID());
- logger.debug("GetFormData: theField.getValue(): " + theField.getVa=
lue() +
+ if (logger.isDebugEnabled())
+ logger.debug("GetFormData: theField.getValue(): " +
theField.getV=
alue() +
", fieldValue: " + fieldValue);
=
final JahiaSite site =3D ServicesRegistry.getInstance().
@@ -209,7 +212,8 @@
fieldValue =3D fieldValue.replaceAll("(?i)\\</html>", "");
}
=
- logger.debug("fieldValue: " + fieldValue);
+ if (logger.isDebugEnabled())
+ logger.debug("fieldValue: " + fieldValue);
=
fieldValue =3D StringUtils.replace(fieldValue, "\"" + jParams.getC=
ontextPath() + JahiaBigTextField.SERVLET_PATH, "\"" + JahiaBigTextField.URL=
_MARKER);
fieldValue =3D StringUtils.replace(fieldValue, "'" + jParams.getCo=
ntextPath() + JahiaBigTextField.SERVLET_PATH, "'" + JahiaBigTextField.URL_M=
ARKER);
@@ -227,7 +231,8 @@
=
final Set pageXRefs =3D ((JahiaBigTextField) theField).getInternal=
Links();
engineMap.put("pageXRefs", pageXRefs);
- logger.debug("pageXRefs: " + pageXRefs);
+ if (logger.isDebugEnabled())
+ logger.debug("pageXRefs: " + pageXRefs);
=
if (! ignoreAllWarnings) {
// Display or ignore URL integrity checks (warnings)
@@ -595,7 +600,8 @@
*/
public Collection getFieldGroupsNotHavingAccessOnPage(int pageID,
JahiaField field=
, ProcessingContext jParams, Map engineMap) throws JahiaException {
- logger.debug("Comparing ACLs of field " + field.getID() + " and pa=
ge " +
+ if (logger.isDebugEnabled())
+ logger.debug("Comparing ACLs of field " + field.getID() + " and
page=
" +
pageID);
final ContentPage page =3D ContentPage.getPage(pageID);
final JahiaBaseACL aclObject =3D getFieldACLObject(field, engineMa=
p);
@@ -606,7 +612,8 @@
=
// Get all the groups which can see the field
final Vector fieldACLGroups =3D aclObject.getGroupnameListNoAdmin(=
aclEntry);
- logger.debug("fieldACLGroups: " + fieldACLGroups);
+ if (logger.isDebugEnabled())
+ logger.debug("fieldACLGroups: " + fieldACLGroups);
=
if (page =3D=3D null) {
return fieldACLGroups;
@@ -614,7 +621,8 @@
=
// Get all the groups which can see the target page
final Vector pageACLGroups =3D page.getACL().getGroupnameListNoAdm=
in(aclEntry);
- logger.debug("pageACLGroups: " + pageACLGroups);
+ if (logger.isDebugEnabled())
+ logger.debug("pageACLGroups: " + pageACLGroups);
=
final Vector result =3D new Vector(fieldACLGroups.size());
=
@@ -629,7 +637,8 @@
// only add the group name once
if (! result.contains(groupID)) {
result.addElement(groupID);
- logger.debug("Adding group " + groupID + " to result");
+ if (logger.isDebugEnabled())
+ logger.debug("Adding group " + groupID + " to result"=
);
}
}
}
@@ -677,19 +686,22 @@
if (field.getID() <=3D 0) { // this means the field has not yet b=
een saved
// fetch the parent container ACL entry instead...
final JahiaContainer container =3D (JahiaContainer) engineMap.=
get("theContainer");
- logger.debug("Trying to use parent Container ACL instead: ID =
=3D " +
+ if (logger.isDebugEnabled())
+ logger.debug("Trying to use parent Container ACL instead: ID =
=3D " +
container.getID());
=
if (container.getID() <=3D 0) { // this means the container ha=
s not yet been saved
// fetch the parent container list ACL entry instead...
final int ctnListID =3D container.getListID();
- logger.debug("Trying to use parent ContainerList ACL inste=
ad: ID =3D " +
+ if (logger.isDebugEnabled())
+ logger.debug("Trying to use parent ContainerList ACL
inst=
ead: ID =3D " +
ctnListID);
=
if (ctnListID <=3D 0) { // this means the containerList is=
empty
// fetch the page ACL entry instead
final ContentPage fieldPage =3D ContentPage.getPage(fi=
eld.getPageID());
- logger.debug("Trying to use parent ContentPage ACL ins=
tead: ID =3D " +
+ if (logger.isDebugEnabled())
+ logger.debug("Trying to use parent ContentPage ACL in=
stead: ID =3D " +
field.getPageID());
=
if (fieldPage =3D=3D null) {
@@ -784,14 +796,16 @@
final JahiaField theFi=
eld, final boolean allLangs) throws JahiaException {
=
final String value =3D theField.getValue();
- logger.debug("composeWarningMessages... " + value);
+ if (logger.isDebugEnabled())
+ logger.debug("composeWarningMessages... " + value);
=
final Set pids =3D ((JahiaBigTextField) theField).getInternalLinks=
();
final Set wrongKeys =3D ((JahiaBigTextField) theField).getWrongURL=
Keys();
final EngineMessages result =3D new EngineMessages();
=
if (pids.size() > 0) {
- logger.debug("PIDs are: " + pids);
+ if (logger.isDebugEnabled())
+ logger.debug("PIDs are: " + pids);
=
final Iterator ite =3D pids.iterator();
final Vector langs;
@@ -905,7 +919,8 @@
result.add("BigText.wrongURLKeys", msg);
}
}
- logger.debug("Returning " + result.getSize() + " warning message(s=
): " + result);
+ if (logger.isDebugEnabled())
+ logger.debug("Returning " + result.getSize() + " warning
message(=
s): " + result);
return result;
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/eve=
nts/JSPEventListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/events/JSPEventListener.java&rev=
=3D17614&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/events/JS=
PEventListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/events/JS=
PEventListener.java Mon Jun 18 10:21:00 2007
@@ -90,7 +90,8 @@
ProcessingContext processingContext =3D je.getProcessingContext ();
if ((processingContext =3D=3D null) ||
!(processingContext instanceof ParamBean)) {
- logger.debug ("Cannot dispatch to JSP because we need request/=
response pair to do so for event " +
+ if (logger.isDebugEnabled())
+ logger.debug ("Cannot dispatch to JSP because we need
request/re=
sponse pair to do so for event " +
eventName);
return;
}
@@ -98,8 +99,9 @@
try {
String jspFileName =3D resolveJSPFullFileName (processingConte=
xt);
=
- logger.debug ("Dispatching to JSP " + jspFileName +
- " for processing of event " + eventName);
+ if (logger.isDebugEnabled())
+ logger.debug("Dispatching to JSP " + jspFileName
+ + " for processing of event " +
eventName);
if (paramBean !=3D null && paramBean.getRequest()!=3Dnull) {
paramBean.getRequest ().setAttribute ("eventName", eventNa=
me);
paramBean.getRequest ().setAttribute ("jahiaEvent", je);
@@ -108,7 +110,10 @@
.fetchServlet (paramBean, jspFileName);
long endTime =3D System.currentTimeMillis();
long executionTime =3D endTime - startTime;
- logger.debug("JSP Event Listener "+ jspFileName + " event=
=3D" + eventName + " execution time=3D" + executionTime + "ms");
+ if (logger.isDebugEnabled())
+ logger.debug("JSP Event Listener " +
jspFileName
+ + " event=3D" +
eventName + " execution time=3D"
+ + executionTime + "ms");
} else {
logger.warn("ParamBean is null, why ?");
}
@@ -128,12 +133,14 @@
(processingContext.getPage ().getPageTemplate ().getSource=
Path () !=3D null)) {
jspFullFileName =3D processingContext.getPage ().getPageTempla=
te ().
getSourcePath ();
- logger.debug ("template source path :" + jspFullFileName);
+ if (logger.isDebugEnabled())
+ logger.debug ("template source path :" + jspFullFileName);
=
jspFullFileName =3D jspFullFileName.substring (0,
jspFullFileName.lastIndexOf ("/") + 1) + jspFileName;
=
- logger.debug ("resolvedJSPFullFileName :" + jspFullFileName);
+ if (logger.isDebugEnabled())
+ logger.debug ("resolvedJSPFullFileName :" + jspFullFileName);
=
File jspFile =3D new File (processingContext.settings().getPat=
hResolver().resolvePath(jspFullFileName));
if (!jspFile.exists ()) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/eve=
nts/JahiaEventGeneratorBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/events/JahiaEventGeneratorBaseServ=
ice.java&rev=3D17614&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/events/Ja=
hiaEventGeneratorBaseService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/events/Ja=
hiaEventGeneratorBaseService.java Mon Jun 18 10:21:00 2007
@@ -90,7 +90,8 @@
List events =3D (List) tlevents.get();
if (events !=3D null) {
for (; !events.isEmpty(); ) {
- logger.debug("Fire aggregate for events : "+events);
+ if (logger.isDebugEnabled())
+ logger.debug("Fire aggregate for events : "+events);
Map aggregateEvents =3D new HashMap();
AggregatedEvents aggEvent =3D null;
for (; !events.isEmpty(); ) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
