avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/processor DependencyMap.java
Date Tue, 18 Mar 2003 12:42:35 GMT
donaldp     2003/03/18 04:42:34

  Modified:    src/java/org/apache/avalon/phoenix/containerkit/kernel/processor
                        DependencyMap.java
  Log:
  Make sure all dependencies occur before user
  
  Submitted By: TerryLaurenzo@amexbf.com (Terry Laurenzo)
  
  Revision  Changes    Path
  1.4       +11 -7     avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/processor/DependencyMap.java
  
  Index: DependencyMap.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/processor/DependencyMap.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DependencyMap.java	1 Mar 2003 08:39:15 -0000	1.3
  +++ DependencyMap.java	18 Mar 2003 12:42:34 -0000	1.4
  @@ -182,18 +182,22 @@
   
           for( int i = 0; i < descriptors.length; i++ )
           {
  -            final DependencyMetaData dependency =
  -                metaData.getDependency( descriptors[ i ].getKey() );
  +            final DependencyMetaData[] dependencySet =
  +                metaData.getDependencies( descriptors[ i ].getKey() );
   
               // added != null clause to catch cases where an optional
               // dependency exists and the dependecy has not been bound
               // to a provider
   
  -            if( dependency != null )
  +            for( int j = 0; j < dependencySet.length; j++ )
               {
  -                final ComponentProfile other =
  -                    getComponent( dependency.getProviderName(), store );
  -                visitcomponent( other, true, done, order, store );
  +                final DependencyMetaData dependency = dependencySet[ j ];
  +                if( dependency != null )
  +                {
  +                    final ComponentProfile other =
  +                        getComponent( dependency.getProviderName(), store );
  +                    visitcomponent( other, true, done, order, store );
  +                }
               }
           }
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message