/**
 * Created on 2008-8-6 上午12:16:34
 */
package cn.net.openid.jos.web.filter;

import java.io.IOException;

import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import cn.net.openid.jos.domain.Domain;
import cn.net.openid.jos.service.UnresolvedDomainException;

/**
 * @author Sutra Zhou
 * 
 */
public class DomainFilter extends OncePerRequestServiceFilter {
	private static final Log log = LogFactory.getLog(DomainFilter.class);
	private static final String DOMAIN_ATTRIBUTE_NAME = "domain";

	/**
	 * Get domain from the session/request.
	 * 
	 * @param request
	 *            the HTTP request
	 * @return the domain in the session or request, null if session is null or
	 *         attribute is not exists in session and request.
	 */
	public static Domain getDomain(HttpServletRequest request) {
		Domain domain = null;
		HttpSession session = request.getSession(false);
		if (session != null) {
			domain = (Domain) request.getSession().getAttribute(
					DOMAIN_ATTRIBUTE_NAME);
		}
		if (domain == null) {
			domain = (Domain) request.getAttribute(DOMAIN_ATTRIBUTE_NAME);
		}
		if (log.isDebugEnabled()) {
			if (domain != null) {
				log.debug(domain + ": " + domain.getUsernameConfiguration());
			}
		}
		return domain;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see
	 * org.springframework.web.filter.OncePerRequestFilter#doFilterInternal(
	 * javax.servlet.http.HttpServletRequest,
	 * javax.servlet.http.HttpServletResponse, javax.servlet.FilterChain)
	 */
	@Override
	protected void doFilterInternal(HttpServletRequest request,
			HttpServletResponse response, FilterChain filterChain)
			throws ServletException, IOException {
		log.debug("Begin of domain filter.");
		if (getDomain(request) == null) {
			Domain domain = getService().parseDomain(request);
			if (domain != null) {
				this.setDomain(request, domain);
			} else {
				throw new UnresolvedDomainException();
			}
		}
		filterChain.doFilter(request, response);
		log.debug("End of domain filter.");
	}

	private void setDomain(HttpServletRequest request, Domain domain) {
		log.debug("Put domain info into session.");
		HttpSession session = request.getSession(true);
		session.setAttribute(DOMAIN_ATTRIBUTE_NAME, domain);

		log.debug("Put domain info into request.");
		request.setAttribute(DOMAIN_ATTRIBUTE_NAME, domain);
		if (log.isDebugEnabled()) {
			log.debug(domain + "" + domain.getUsernameConfiguration());
		}
	}
}

@@ -438,68 +438,8 @@
 ain;
-%0Aimport cn.net.openid.jos.service.UnresolvedDomainException;
 %0A%0A/*
@@ -1944,34 +1944,8 @@
 t);%0A
-%09%09%09if (domain != null) %7B%0A%09
 %09%09%09t
@@ -1980,68 +1980,8 @@
 n);%0A
-%09%09%09%7D else %7B%0A%09%09%09%09throw new UnresolvedDomainException();%0A%09%09%09%7D%0A
 %09%09%7D%0A

Move the unresolved domain check to the service layer and detailed the UnresolvedDomainException.