Author: epbernard Date: 2007-06-28 11:46:14 -0400 (Thu, 28 Jun 2007) New Revision: 11716 Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/Search.java trunk/HibernateExt/search/src/java/org/hibernate/search/jpa/Search.java Log: HSEARCH-91 do no wrap FullText* more than once Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/Search.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/Search.java 2007-06-28 15:37:54 UTC (rev 11715) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/Search.java 2007-06-28 15:46:14 UTC (rev 11716) @@ -14,6 +14,11 @@ } public static FullTextSession createFullTextSession(Session session) { - return new FullTextSessionImpl(session); + if (session instanceof FullTextSessionImpl) { + return (FullTextSession) session; + } + else { + return new FullTextSessionImpl(session); + } } } \ No newline at end of file Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/jpa/Search.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/jpa/Search.java 2007-06-28 15:37:54 UTC (rev 11715) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/jpa/Search.java 2007-06-28 15:46:14 UTC (rev 11716) @@ -19,6 +19,11 @@ * The underlying EM implementation has to be Hibernate EntityManager */ public static FullTextEntityManager createFullTextEntityManager(EntityManager em) { - return new FullTextEntityManagerImpl(em); + if ( em instanceof FullTextEntityManagerImpl ) { + return (FullTextEntityManager) em; + } + else { + return new FullTextEntityManagerImpl(em); + } } } \ No newline at end of file