[openejb-scm] openejb/modules/core/src/java/org/openejb GenericEJBContainer.java

[maguro]

maguro      2004/08/11 23:20:47

  Modified:    modules/core/src/java/org/openejb GenericEJBContainer.java
  Log:

  No reason to continuously append the URL package prefixes with the same prefix.
  
  Revision  Changes    Path
  1.18      +6 -4      
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
  
  Index: GenericEJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- GenericEJBContainer.java  30 Jul 2004 19:03:43 -0000      1.17
  +++ GenericEJBContainer.java  12 Aug 2004 03:20:47 -0000      1.18
  @@ -315,8 +315,11 @@
           String str = System.getProperty(javax.naming.Context.URL_PKG_PREFIXES);
           if (str == null)
               str = ":org.apache.geronimo.naming";
  -        else
  -            str = str + ":org.apache.geronimo.naming";
  +        else {
  +            if (str.indexOf(":org.apache.geronimo.naming") < 0) {
  +                str = str + ":org.apache.geronimo.naming";
  +            }
  +        }
           System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, str);
       }
   
  @@ -349,7 +352,6 @@
                       policyConfiguration.addToRole(role, (Permissions) 
securityConfiguration.getRolePolicies().get(role));
                   }
   
  -                //            ((JettyXMLConfiguration) 
this.getConfiguration()).configure(policyConfiguration, securityConfig);
                   policyConfiguration.commit();
               } catch (ClassNotFoundException e) {
                   // do nothing