[Jboss-cvs] JBossAS SVN: r56493 - branches/JBoss_4_0_0_Case10829/naming/src/main/org/jnp/server

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-09-01 01:03:24 -0400 (Fri, 01 Sep 2006)
New Revision: 56493

Modified:
   branches/JBoss_4_0_0_Case10829/naming/src/main/org/jnp/server/NamingServer.java
Log:
Add some trace level logging to key methods

Modified: branches/JBoss_4_0_0_Case10829/naming/src/main/org/jnp/server/NamingServer.java
===================================================================
--- branches/JBoss_4_0_0_Case10829/naming/src/main/org/jnp/server/NamingServer.java	2006-09-01 05:02:49 UTC (rev 56492)
+++ branches/JBoss_4_0_0_Case10829/naming/src/main/org/jnp/server/NamingServer.java	2006-09-01 05:03:24 UTC (rev 56493)
@@ -7,11 +7,6 @@
  */
 package org.jnp.server;
 
-import java.io.ObjectStreamException;
-import java.io.NotSerializableException;
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-import java.rmi.server.RemoteObject;
 import java.util.Enumeration;
 import java.util.Collection;
 import java.util.Iterator;
@@ -23,16 +18,15 @@
 import javax.naming.NameClassPair;
 import javax.naming.Binding;
 import javax.naming.Reference;
-import javax.naming.NamingEnumeration;
 import javax.naming.InvalidNameException;
 import javax.naming.NamingException;
-import javax.naming.InvalidNameException;
 import javax.naming.NameNotFoundException;
 import javax.naming.NotContextException;
 import javax.naming.NameAlreadyBoundException;
 import javax.naming.CannotProceedException;
 import javax.naming.spi.ResolveResult;
 
+import org.jboss.logging.Logger;
 import org.jnp.interfaces.*;
 
 /**
@@ -45,10 +39,11 @@
 public class NamingServer
    implements Naming, java.io.Serializable
 {
+	private static Logger log = Logger.getLogger(NamingServer.class);
    // Constants -----------------------------------------------------
     
    // Attributes ----------------------------------------------------
-   
+   private boolean trace = log.isTraceEnabled();
    protected Hashtable table = new Hashtable();
    protected Name prefix;
    protected NamingParser parser = new NamingParser();
@@ -78,6 +73,8 @@
    public synchronized void bind(Name name, Object obj, String className)
       throws NamingException
    {
+	  if( trace )
+		  log.trace("bind, name: "+name+", obj: "+obj);
       if (name.isEmpty())
       {
          // Empty names are not allowed
@@ -139,6 +136,8 @@
    public synchronized void rebind(Name name, Object obj, String className)
       throws NamingException
    {
+	   if( trace )
+		   log.trace("rebind, name: "+name+", obj: "+obj);
       if (name.isEmpty())
       {
          // Empty names are not allowed
@@ -186,6 +185,8 @@
    public synchronized void unbind(Name name)
       throws NamingException
    {
+      if( trace )
+         log.trace("unbind, name: "+name);
       if (name.isEmpty())
       {
          // Empty names are not allowed
@@ -240,6 +241,8 @@
    public Object lookup(Name name)
       throws NamingException
    {
+      if( trace )
+         log.trace("lookup, name: "+name);
 		Object result;
       if (name.isEmpty())
       {
@@ -292,6 +295,8 @@
          }
       }
 		
+      if( trace )
+         log.trace("lookup, name: "+name+", result: "+result);
 		return result;
    }
    
@@ -348,10 +353,10 @@
       {
          Collection bindings = table.values();
          Collection newBindings = new Vector(bindings.size());
-         Iterator enum = bindings.iterator();
-         while (enum.hasNext())
+         Iterator iter = bindings.iterator();
+         while (iter.hasNext())
          {
-            Binding b = (Binding)enum.next();
+            Binding b = (Binding)iter.next();
             if (b.getObject() instanceof NamingServer)
             {
                Name n = (Name)prefix.clone();
@@ -398,6 +403,8 @@
        if( name.size() == 0 )
           throw new InvalidNameException("Cannot pass an empty name to createSubcontext");
 
+      if( trace )
+         log.trace("createSubcontext, name: "+name);
       NamingException ex = null;
       Context subCtx = null;
       if (name.size() > 1)