[openejb-scm] openejb1/modules/core/src/java/org/openejb/alt/assembler/classic Assembler.java

[dblevins]

dblevins    2005/08/26 17:06:05

  Modified:    modules/core/src/java/org/openejb/alt/assembler/classic
                        Assembler.java
  Log:

  Better code for setting the jndi url support in the system properties.
  
  Revision  Changes    Path
  1.4       +12 -7     
openejb1/modules/core/src/java/org/openejb/alt/assembler/classic/Assembler.java
  
  Index: Assembler.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/alt/assembler/classic/Assembler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Assembler.java    19 Jun 2005 22:40:27 -0000      1.3
  +++ Assembler.java    26 Aug 2005 21:06:05 -0000      1.4
  @@ -134,12 +134,17 @@
   
           
           /* Add IntraVM JNDI service /////////////////////*/
  -        String str = 
System.getProperty(javax.naming.Context.URL_PKG_PREFIXES);
  -        if(str==null)
  -            str = ":org.openejb.core.ivm.naming";
  -        else
  -            str = str+":org.openejb.core.ivm.naming";
  -        System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, str);
  +        Properties systemProperties = System.getProperties();
  +        synchronized(systemProperties){
  +            String str = 
systemProperties.getProperty(javax.naming.Context.URL_PKG_PREFIXES);
  +            String naming = "org.openejb.core.ivm.naming";
  +            if (str == null) {
  +                str = naming;
  +            } else if (str.indexOf(naming) == -1) {
  +                str = naming + ":" + str;
  +            }
  +            
systemProperties.setProperty(javax.naming.Context.URL_PKG_PREFIXES, str);
  +        }
           /*\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*/
       }