[jboss-cvs] jboss-seam/src/main/org/jboss/seam/microcontainer ...

[Gavin King]

  User: gavin   
  Date: 06/11/08 02:09:17

  Modified:    src/main/org/jboss/seam/microcontainer 
                        HibernateFactory.java
  Log:
  JPA needs the jndi trick too
  
  Revision  Changes    Path
  1.11      +4 -4      jboss-seam/src/main/org/jboss/seam/microcontainer/HibernateFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernateFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/microcontainer/HibernateFactory.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- HibernateFactory.java	14 Oct 2006 18:21:44 -0000	1.10
  +++ HibernateFactory.java	8 Nov 2006 07:09:16 -0000	1.11
  @@ -1,4 +1,4 @@
  -//$Id: HibernateFactory.java,v 1.10 2006/10/14 18:21:44 gavin Exp $
  +//$Id: HibernateFactory.java,v 1.11 2006/11/08 07:09:16 gavin Exp $
   package org.jboss.seam.microcontainer;
   
   import java.io.File;
  @@ -67,11 +67,11 @@
            configuration.setProperties(cfgProperties);
         }
   
  -      if (Naming.getInitialContextProperties() != null)
  +      Hashtable<String, String> jndiProperties = Naming.getInitialContextProperties();
  +      if ( jndiProperties!=null )
         {
            // Prefix regular JNDI properties for Hibernate
  -         Hashtable<String, String> hash = Naming.getInitialContextProperties();
  -         for (Map.Entry<String, String> entry : hash.entrySet())
  +         for (Map.Entry<String, String> entry : jndiProperties.entrySet())
            {
               configuration.setProperty( Environment.JNDI_PREFIX + "." + entry.getKey(), entry.getValue() );
            }