Browse Source

Lazy access of resolver as not in ServiceManager at construction

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271831 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
b5072a8c35
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java

+ 6
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java View File

@@ -47,7 +47,7 @@ public class DefaultTaskContext
private final TaskContext m_parent; private final TaskContext m_parent;
private final ServiceManager m_serviceManager; private final ServiceManager m_serviceManager;
private final Logger m_logger; private final Logger m_logger;
private final PropertyResolver m_propertyResolver;
private PropertyResolver m_propertyResolver;


/** /**
* Constructor that takes both parent context and a service directory. * Constructor that takes both parent context and a service directory.
@@ -60,7 +60,7 @@ public class DefaultTaskContext
m_parent = parent; m_parent = parent;
m_serviceManager = serviceManager; m_serviceManager = serviceManager;
m_logger = logger; m_logger = logger;
m_propertyResolver = (PropertyResolver)getService( PropertyResolver.class );
//m_propertyResolver = (PropertyResolver)getService( PropertyResolver.class );
} }


/** /**
@@ -150,6 +150,10 @@ public class DefaultTaskContext
{ {
try try
{ {
if( null == m_propertyResolver )
{
m_propertyResolver = (PropertyResolver)getService( PropertyResolver.class );
}
final Object object = final Object object =
m_propertyResolver.resolveProperties( value, this ); m_propertyResolver.resolveProperties( value, this );
if( null == object ) if( null == object )


Loading…
Cancel
Save