Index: /jboss/projects/seam/performance/trunk/wiki/svn/trunk/src/main/org/jboss/seam/util/Naming.java
===================================================================
--- /jboss/projects/seam/performance/trunk/wiki/svn/trunk/src/main/org/jboss/seam/util/Naming.java	(revision 9017)
+++ /jboss/projects/seam/performance/trunk/wiki/svn/trunk/src/main/org/jboss/seam/util/Naming.java	(working copy)
@@ -19,11 +19,11 @@
    
     private static final LogProvider log = Logging.getLogProvider(Naming.class);
     private static Hashtable initialContextProperties;
+    private static boolean simpleConstructor;
 
-    public static InitialContext getInitialContext(Hashtable<String, String> props) throws NamingException 
+    public static InitialContext getInitialContext() throws NamingException 
     {
-       
-        if (props==null)
+        if (Naming.initialContextProperties==null)
         {
             throw new IllegalStateException("JNDI properties not initialized, Seam was not started correctly");
         }
@@ -30,13 +30,13 @@
 
         if (log.isDebugEnabled())
         {
-            log.debug("JNDI InitialContext properties:" + props);
+            log.debug("JNDI InitialContext properties:" + Naming.initialContextProperties);
         }
         
         try {
-            return props.size()==0 ?
+            return simpleConstructor ?
                     new InitialContext() :
-                    new InitialContext(props);
+                    new InitialContext(Naming.initialContextProperties);
         }
         catch (NamingException e) {
             log.debug("Could not obtain initial context", e);
@@ -45,16 +45,19 @@
         
     }
     
-    public static InitialContext getInitialContext() throws NamingException 
-    {
-       return getInitialContext(initialContextProperties);
-    }
-
     private Naming() {}
     
     public static void setInitialContextProperties(Hashtable initialContextProperties) 
-    {
+    {  
+       //set the property
        Naming.initialContextProperties = initialContextProperties;
+       
+       //if not properties are set then we can use a simplied constructor above
+       if (initialContextProperties==null && 
+           initialContextProperties.size() == 0)
+       {
+          Naming.simpleConstructor = true;
+       }
     }
 
     public static Hashtable getInitialContextProperties()