Index: kernel-impl/src/main/java/org/sakaiproject/alias/impl/BaseAliasService.java =================================================================== --- kernel-impl/src/main/java/org/sakaiproject/alias/impl/BaseAliasService.java (revision 308498) +++ kernel-impl/src/main/java/org/sakaiproject/alias/impl/BaseAliasService.java (working copy) @@ -21,18 +21,6 @@ package org.sakaiproject.alias.impl; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Observable; -import java.util.Observer; -import java.util.Set; -import java.util.Stack; -import java.util.Arrays; - import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,21 +30,10 @@ import org.sakaiproject.authz.api.FunctionManager; import org.sakaiproject.authz.api.SecurityService; import org.sakaiproject.component.api.ServerConfigurationService; -import org.sakaiproject.entity.api.Edit; -import org.sakaiproject.entity.api.Entity; -import org.sakaiproject.entity.api.EntityManager; -import org.sakaiproject.entity.api.HttpAccess; -import org.sakaiproject.entity.api.Reference; -import org.sakaiproject.entity.api.ResourceProperties; -import org.sakaiproject.entity.api.ResourcePropertiesEdit; +import org.sakaiproject.entity.api.*; import org.sakaiproject.event.api.Event; import org.sakaiproject.event.api.EventTrackingService; -import org.sakaiproject.exception.IdInvalidException; -import org.sakaiproject.exception.IdUnusedException; -import org.sakaiproject.exception.IdUsedException; -import org.sakaiproject.exception.InUseException; -import org.sakaiproject.exception.PermissionException; -import org.sakaiproject.memory.api.Cache; +import org.sakaiproject.exception.*; import org.sakaiproject.memory.api.GenericMultiRefCache; import org.sakaiproject.memory.api.MemoryService; import org.sakaiproject.site.api.SiteService; @@ -67,16 +44,14 @@ import org.sakaiproject.tool.api.SessionManager; import org.sakaiproject.user.api.User; import org.sakaiproject.user.api.UserDirectoryService; -import org.sakaiproject.util.BaseResourceProperties; -import org.sakaiproject.util.BaseResourcePropertiesEdit; -import org.sakaiproject.util.SingleStorageUser; -import org.sakaiproject.util.StringUtil; -import org.sakaiproject.util.Validator; +import org.sakaiproject.util.*; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import java.util.*; + /** *
* BaseAliasService is ... @@ -93,9 +68,6 @@ /** The initial portion of a relative access point URL. */ protected String m_relativeAccessPoint = null; - /** A cache of calls to the service and the results. */ - protected Cache m_callCache = null; - /** A cache of calls to the getAliases calls */ protected GenericMultiRefCache m_targetCache = null; @@ -382,10 +354,6 @@ // <= 0 indicates no caching desired if ((m_cacheSeconds > 0) && (m_cacheCleanerSeconds > 0)) { - // build a synchronized map for the call cache, automatically checking for expiration every 15 mins, expire on user events, too. - m_callCache = memoryService().newCache( - "org.sakaiproject.alias.api.AliasService.callCache", - aliasReference("")); m_targetCache = memoryService().newGenericMultiRefCache( "org.sakaiproject.alias.api.AliasService.targetCache"); @@ -588,36 +556,9 @@ */ public String getTarget(String alias) throws IdUnusedException { - // check the cache - String ref = aliasReference(alias); - if (m_callCache != null) - { - String t = (String) m_callCache.get(ref); - if ( t != null ) - { - return t; - } - else - { - if (m_callCache.containsKey(ref)) - { - M_log.warn("Null Cache Entry found, should not happen SAK-12447 ref="+ref); - } - } - } - BaseAliasEdit a = (BaseAliasEdit) m_storage.get(alias); if (a == null) throw new IdUnusedException(alias); - - // cache - if (m_callCache != null) { - if ( a.getTarget() != null ) { - m_callCache.put(ref, a.getTarget()); - } - } - return a.getTarget(); - } // getTarget /**