[openejb-scm] openejb/modules/core/src/java/org/openejb/client JNDIContext.java JNDIRequest.java

[dblevins]

dblevins    2004/09/24 20:33:41

  Modified:    modules/core/src/java/org/openejb/client JNDIContext.java
                        JNDIRequest.java
  Log:

  No need to specify a zero length string for clientModuleId.
  Serializing null is one byte as it's treated specially, whereas a zero
  length string is still serialized as five bytes.
  
  Revision  Changes    Path
  1.5       +4 -4      
openejb/modules/core/src/java/org/openejb/client/JNDIContext.java
  
  Index: JNDIContext.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/JNDIContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JNDIContext.java  24 Sep 2004 07:18:55 -0000      1.4
  +++ JNDIContext.java  25 Sep 2004 00:33:41 -0000      1.5
  @@ -44,13 +44,13 @@
    */
   package org.openejb.client;
   
  -import javax.naming.*;
  -import javax.naming.spi.InitialContextFactory;
   import java.io.Serializable;
   import java.net.InetAddress;
   import java.net.URL;
   import java.net.UnknownHostException;
   import java.util.Hashtable;
  +import javax.naming.*;
  +import javax.naming.spi.InitialContextFactory;
   /**
    * JNDI client
    * 
  @@ -230,7 +230,7 @@
           else if ( name.equals("") ) return new JNDIContext(this);
           else if ( !name.startsWith("/") ) name = tail+name;
   
  -        JNDIRequest req = new JNDIRequest(JNDIRequest.JNDI_LOOKUP, "", name);
  +        JNDIRequest req = new JNDIRequest(JNDIRequest.JNDI_LOOKUP, name);
   
           JNDIResponse res = null;
           try{
  
  
  
  1.5       +5 -2      
openejb/modules/core/src/java/org/openejb/client/JNDIRequest.java
  
  Index: JNDIRequest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/JNDIRequest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JNDIRequest.java  24 Sep 2004 22:21:14 -0000      1.4
  +++ JNDIRequest.java  25 Sep 2004 00:33:41 -0000      1.5
  @@ -61,8 +61,11 @@
       public JNDIRequest() {
       }
       
  +    public JNDIRequest(int requestMethod, String requestString) {
  +        this(requestMethod,null,requestString);
  +    }
  +
       public JNDIRequest(int requestMethod, String clientModuleID, String 
requestString) {
  -        assert clientModuleID != null;
           assert requestString != null;
           this.requestMethod = requestMethod;
           this.clientModuleID = clientModuleID;