From 363e08df228c86151cfda45377d7ad912731f435 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Sun, 9 Oct 2011 07:55:14 +0000
Subject: [PATCH] Revert "Auto-unwrap SessionFactoryBuilder-created proxies"

This reverts commit 7903d6489f9c98532826324b0ba79cafbc618d78.

Issue: SPR-8492
---
 .../HibernateSessionFactoryConfigurationTests.java           | 2 --
 .../orm/hibernate3/SessionFactoryBuilderSupport.java         | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/orm/hibernate3/HibernateSessionFactoryConfigurationTests.java b/org.springframework.integration-tests/src/test/java/org/springframework/orm/hibernate3/HibernateSessionFactoryConfigurationTests.java
index 0c17a80b2d..3f9df777ad 100644
--- a/org.springframework.integration-tests/src/test/java/org/springframework/orm/hibernate3/HibernateSessionFactoryConfigurationTests.java
+++ b/org.springframework.integration-tests/src/test/java/org/springframework/orm/hibernate3/HibernateSessionFactoryConfigurationTests.java
@@ -42,7 +42,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
-import org.springframework.core.InfrastructureProxy;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
@@ -138,7 +137,6 @@ public class HibernateSessionFactoryConfigurationTests {
 		SessionFactory sessionFactory = ctx.getBean(SessionFactory.class);
 		assertThat(sessionFactory, instanceOf(DisposableBean.class));
 		assertThat(sessionFactory, instanceOf(SessionFactoryImplementor.class));
-		assertThat(sessionFactory, instanceOf(InfrastructureProxy.class));
 		assertThat(sessionFactory.toString(), startsWith("DisposableBean proxy for SessionFactory"));
 		ctx.close();
 		assertTrue("SessionFactory was not closed as expected", sessionFactory.isClosed());
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryBuilderSupport.java b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryBuilderSupport.java
index 3a9f6a0a3f..140f9bd8ce 100644
--- a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryBuilderSupport.java
+++ b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryBuilderSupport.java
@@ -52,7 +52,6 @@ import org.hibernate.transaction.JTATransactionFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.InfrastructureProxy;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.dao.DataAccessException;
@@ -567,7 +566,6 @@ public abstract class SessionFactoryBuilderSupport<This extends SessionFactoryBu
 			new Class<?>[] {
 				SessionFactory.class,
 				SessionFactoryImplementor.class,
-				InfrastructureProxy.class,
 				DisposableBean.class
 			},
 			new InvocationHandler() {
@@ -575,9 +573,6 @@ public abstract class SessionFactoryBuilderSupport<This extends SessionFactoryBu
 					if (ReflectionUtils.isToStringMethod(method)) {
 						return String.format("DisposableBean proxy for SessionFactory [%s]", rawSf.toString());
 					}
-					if (method.equals(InfrastructureProxy.class.getMethod("getWrappedObject"))) {
-						return rawSf;
-					}
 					if (method.equals(DisposableBean.class.getMethod("destroy"))) {
 						closeHibernateSessionFactory(SessionFactoryBuilderSupport.this, rawSf);
 						rawSf.close();