cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl RepositorySourceFactory.java
Date Fri, 05 Mar 2004 14:29:27 GMT
unico       2004/03/05 06:29:27

  Modified:    src/blocks/repository/java/org/apache/cocoon/components/source/impl
                        RepositorySourceFactory.java
  Log:
  lazy initialize source descriptor due to circular dependency
  
  Revision  Changes    Path
  1.6       +44 -32    cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySourceFactory.java
  
  Index: RepositorySourceFactory.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySourceFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RepositorySourceFactory.java	5 Mar 2004 13:02:21 -0000	1.5
  +++ RepositorySourceFactory.java	5 Mar 2004 14:29:27 -0000	1.6
  @@ -47,6 +47,42 @@
       private SourceDescriptor m_descriptor;
       private String m_name;
       private boolean m_useEventCaching;
  +    private boolean m_isInitialized;
  +    
  +    public RepositorySourceFactory() {
  +    }
  +    
  +    private synchronized void lazyInitialize() throws IOException {
  +        if (m_isInitialized) {
  +            return;
  +        }
  +        if (m_resolver == null) {
  +            try {
  +                m_resolver = (SourceResolver) m_manager.lookup(SourceResolver.ROLE);
  +            }
  +            catch (ServiceException e) {
  +                throw new IOException("Resolver service is not available: " + e.toString());
  +            }
  +        }
  +        if (m_manager.hasService(SourceDescriptorManager.ROLE)) {
  +            try {
  +                m_descriptor = (SourceDescriptor) m_manager.lookup(SourceDescriptorManager.ROLE);
  +            }
  +            catch (ServiceException e) {
  +                // impossible
  +            }
  +        }
  +        else {
  +            m_descriptor = null;
  +            if (getLogger().isInfoEnabled()) {
  +                final String message =
  +                    "SourceDescriptor is not available. " +
  +                    "RepositorySource will not support " +
  +                    "source properties.";
  +                getLogger().info(message);
  +            }
  +        }
  +    }
       
       /**
        * Read the <code>name</code> attribute and the <code>use-event-caching</code>
  @@ -69,38 +105,18 @@
        */
       public void service(final ServiceManager manager) {
           m_manager = manager;
  -        if (manager.hasService(SourceDescriptorManager.ROLE)) {
  -            try {
  -                m_descriptor = (SourceDescriptor) manager.lookup(SourceDescriptorManager.ROLE);
  -            }
  -            catch (ServiceException e) {
  -                // impossible
  -            }
  -        }
  -        else {
  -            m_descriptor = null;
  -            if (getLogger().isInfoEnabled()) {
  -                final String message =
  -                    "SourceDescriptor is not available. " +
  -                    "RepositorySource will not support " +
  -                    "source properties.";
  -                getLogger().info(message);
  -            }
  -        }
       }
       
       public Source getSource(String location, Map parameters)
           throws IOException, MalformedURLException {
           
  -        // lazy initialization of resolver in order to avoid 
  -        // problems due to circular dependency
  -        if (m_resolver == null) {
  -            try {
  -                m_resolver = (SourceResolver) m_manager.lookup(SourceResolver.ROLE);
  -            }
  -            catch (ServiceException e) {
  -                throw new IOException("Resolver service is not available: " + e.toString());
  -            }
  +        if (getLogger().isDebugEnabled()) {
  +            getLogger().debug("Creating RepositorySource for " + location);
  +        }
  +        
  +        // lazy initialization due to circular dependency
  +        if (!m_isInitialized) {
  +            lazyInitialize();
           }
           
           // assert location.startsWith(m_name)
  @@ -111,12 +127,8 @@
               throw new SourceException(message);
           }
           
  -        if (getLogger().isDebugEnabled()) {
  -            getLogger().debug("Creating RepositorySource for " + location);
  -        }
  -        
           return new RepositorySource(
  -            m_name,    
  +            m_name,
               (ModifiableTraversableSource) source, 
               m_descriptor,
               getLogger(),
  
  
  

Mime
View raw message