Don't let these ThreadLocals escape

NonServletRequestCleanupAspect.java

/**
 * A aspect which has the same functionality as the ServletRequestCleanupFilter. The {@link NonServletRequestCleanupAspect}
 * is useful when code is executed which is not wrapped by the servlet filter, i.e. the handling of events in the
 * thread pools.
 *
 * @author reik, 4/19/12
 */
@Aspect
public class NonServletRequestCleanupAspect {

    @Pointcut("execution(void package.listeners.PartnerNotificationListener+.onApplicationEvent(..))")
    public void onPartnerNotification() { }

    @Pointcut("execution(void package.listeners.SaveUserEventListener+.onApplicationEvent(..))")
    public void onSaveUserEvent() { }

    @Pointcut("onPartnerNotification() || onSaveUserEvent()")
    public void onApplicationEventWithDatabaseAccess() { }

    @Around("package.NonServletRequestCleanupAspect.onApplicationEventWithDatabaseAccess()")
    public Object addCleaner(final ProceedingJoinPoint pjp) throws Throwable {
        try {
            CleanupService.setCleaner(this);
            return pjp.proceed();
        } finally {
            CleanupService.cleanup(this);
        }
    }
}

web.xml

    <filter-mapping>
        <filter-name>servletRequestCleanupFilter</filter-name>
        <url-pattern>/rpc/*</url-pattern>   
        <url-pattern>/fb/*</url-pattern>   
    </filter-mapping>