commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsi...@apache.org
Subject cvs commit: jakarta-commons/discovery/src/java/org/apache/commons/discovery/strategy DefaultLoadStrategy.java
Date Thu, 22 Aug 2002 14:55:16 GMT
rsitze      2002/08/22 07:55:15

  Modified:    discovery/src/java/org/apache/commons/discovery/base
                        ImplClass.java
               discovery/src/java/org/apache/commons/discovery/strategy
                        DefaultLoadStrategy.java
  Log:
  Tests failed... this fixes them.
  
  Revision  Changes    Path
  1.5       +5 -3      jakarta-commons/discovery/src/java/org/apache/commons/discovery/base/ImplClass.java
  
  Index: ImplClass.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/base/ImplClass.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ImplClass.java	22 Aug 2002 14:23:27 -0000	1.4
  +++ ImplClass.java	22 Aug 2002 14:55:15 -0000	1.5
  @@ -76,12 +76,12 @@
   
       private final String implName;
   
  -    private Class spiClass;
  +    private final Class spiClass;
       
       private Class implClass;
       
  -    private Class  paramClasses[] = null;
  -    private Object params[] = null;
  +    private final Class  paramClasses[];
  +    private final Object params[];
   
   
       /**
  @@ -101,6 +101,7 @@
                 Class constructorParamClasses[],
                 Object constructorParams[])
       {
  +        this.spiClass = spiClass;
           this.implName = implName;
           this.implClass = null;
           this.paramClasses = constructorParamClasses;
  @@ -124,6 +125,7 @@
                 Class constructorParamClasses[],
                 Object constructorParams[])
       {
  +        this.spiClass = spiClass;
           this.implName = (implClass != null) ? implClass.getName() : null;
           this.implClass = implClass;
           this.paramClasses = constructorParamClasses;
  
  
  
  1.7       +2 -2      jakarta-commons/discovery/src/java/org/apache/commons/discovery/strategy/DefaultLoadStrategy.java
  
  Index: DefaultLoadStrategy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/strategy/DefaultLoadStrategy.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultLoadStrategy.java	22 Aug 2002 14:23:27 -0000	1.6
  +++ DefaultLoadStrategy.java	22 Aug 2002 14:55:15 -0000	1.7
  @@ -225,12 +225,12 @@
                           ? null
                           : ClassLoaderUtils.getResourceAsStream(packageName,
                                     env.getGroupContext() + "." + propertiesFileName,
  -                                  appLoaders);
  +                                  getAppLoaders());
           
                   if (stream == null)
                       stream = ClassLoaderUtils.getResourceAsStream(packageName,
                                                                     propertiesFileName,
  -                                                                  appLoaders);
  +                                                                  getAppLoaders());
       
                   if (stream != null) {
                       properties = new Properties();
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message