Author: tdraier
Date: Fri Aug 11 16:11:31 2006
New Revision: 14889
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14889&repname=jahia
Log:
removed useless and costly lookupGroup
Modified:
trunk/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java
Modified: trunk/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java&rev=14889&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java (original)
+++ trunk/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java Fri Aug 11
16:11:31 2006
@@ -17,32 +17,33 @@
*/package org.jahia.taglibs.esi;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import org.apache.commons.lang.RandomStringUtils;
+import org.jahia.bin.Jahia;
+import org.jahia.params.ParamBean;
+import org.jahia.params.SessionState;
+import org.jahia.registries.ServicesRegistry;
+import org.jahia.resourcebundle.JahiaResourceBundle;
+import org.jahia.services.acl.JahiaACLManagerService;
+import org.jahia.services.esi.EsiInvalidationWriterService;
+import org.jahia.services.esi.EsiService;
+import org.jahia.services.esi.tagstack.Fragment;
+import org.jahia.services.usermanager.JahiaGroupManagerService;
+import org.jahia.services.usermanager.JahiaUser;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.Tag;
-import org.jahia.registries.ServicesRegistry;
-import org.jahia.bin.Jahia;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.text.DateFormat;
import java.util.Date;
-import java.util.Vector;
import java.util.Enumeration;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import org.jahia.resourcebundle.JahiaResourceBundle;
-import org.jahia.services.esi.EsiService;
-import org.jahia.services.esi.EsiInvalidationWriterService;
-import org.jahia.services.esi.tagstack.Fragment;
-import org.jahia.services.usermanager.*;
-import org.jahia.services.acl.JahiaACLManagerService;
-import org.jahia.params.ParamBean;
-import org.jahia.params.SessionState;
-import org.apache.commons.lang.RandomStringUtils;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.Vector;
public class JesiFragmentTag extends JesiBodyTag {
@@ -548,30 +549,16 @@
Enumeration userMembershipEnum = userMembership.elements();
while (userMembershipEnum.hasMoreElements()) {
String jahiaGroupName = (String) userMembershipEnum.nextElement ();
- JahiaGroup curGroup = groupService.lookupGroup(jahiaGroupName);
-
- //sanity check
- if (curGroup==null) {
- //probably due to the fact that when sites are deleted, the
user group membership is not deleted:
- logger.debug("cannot lookup Group ["+jahiaGroupName+"]!
Current detectedGroups is ["+detectedGroups+"]."); //Client request is
["+((HttpServletRequest)
pageContext.getRequest()).getAttribute("esi.request.url")+"]");
+ //if isn't not used anywhere by Jahia, then no need to use it
+ //in the fragment key.
+ if (!aclService.isGroupUsedInAclEntries(jahiaGroupName)) {
+ if (logger.isDebugEnabled()) logger.debug("Ignoring ldadp
curGroup ["+jahiaGroupName+"] because it is not used by Jahia");
continue;
}
+ else
+ if (logger.isDebugEnabled()) logger.debug("Including ldadp
curGroup ["+jahiaGroupName+"] because it is used by Jahia");
- //Is this an LDAP curGroup?
- String groupProvider = curGroup.getProviderName();
- if
(groupProvider.equals(JahiaGroupManagerLDAPProvider.PROVIDER_NAME)) {
- //if isn't not used anywhere by Jahia, then no need to use it
- //in the fragment key.
- if (!aclService.isGroupUsedInAclEntries(jahiaGroupName)) {
- if (logger.isDebugEnabled()) logger.debug("Ignoring ldadp
curGroup ["+jahiaGroupName+"] because it is not used by Jahia");
- continue;
- }
- else
- if (logger.isDebugEnabled()) logger.debug("Including ldadp
curGroup ["+jahiaGroupName+"] because it is used by Jahia");
- }
-
- //detectedGroups.append(jahiaGroupName);
- detectedGroups.append(curGroup.getGroupKey()); //unique key over
all sites/servers
+ detectedGroups.append(jahiaGroupName); //unique key over all
sites/servers
if (userMembershipEnum.hasMoreElements())
detectedGroups.append("_");
