Duplicate code stank:

public IState Find(StateAbbreviationQuery query)
{
	if (session.Transaction.IsActive)
	{
		var stateDto = session.CreateCriteria().Add(Restrictions.Eq("Key", query.Abbreviation)).UniqueResult();

		return locationFactory.Create(stateDto);
	}

	using (var tx = session.BeginTransaction())
	{
		var stateDto = session.CreateCriteria().Add(Restrictions.Eq("Key", query.Abbreviation)).UniqueResult();

		IState state = locationFactory.Create(session.Get(stateDto.StateId));
		tx.Commit();
		return state;
	}
}

I created a few extension methods to remove the duplication…

public static class SessionExtensions
{
	public static T Execute(this ISession session, Func f)
	{
		if (session.Transaction.IsActive)
			return f.Invoke();

		using (var tx = session.BeginTransaction())
		{
			var result = f.Invoke();
			tx.Commit();
			return result;
		}
	}

	public static void Execute(this ISession session, Action a)
	{
		if (session.Transaction.IsActive)
			a.Invoke();

		using (var tx = session.BeginTransaction())
		{
			a.Invoke();
			tx.Commit();
		}
	}
}

… And the resulting method:

public IState Find(StateAbbreviationQuery query)
{
	var stateDto = session.Execute(() => session
		.CreateCriteria()
		.Add(Restrictions.Eq("Key", query.Abbreviation))
		.UniqueResult());

	return locationFactory.Create(stateDto);
}

I will definitely get refined but, it is much cleaner. Thanks for the ideas.