mcconnell 2003/12/20 15:59:14
Modified: merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools
MerlinBean.java
Log:
Ad a null test so that if the deployment path is null - we fall back to defaults
derived from properties.
Revision Changes Path
1.12 +5 -2
avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
Index: MerlinBean.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MerlinBean.java 20 Dec 2003 22:29:59 -0000 1.11
+++ MerlinBean.java 20 Dec 2003 23:59:14 -0000 1.12
@@ -189,7 +189,10 @@
File repository = getMavenRepositoryDirectory();
criteria.put( "merlin.repository", repository );
criteria.put( "merlin.server", "false" );
- criteria.put( "merlin.deployment", m_deployment );
+ if( m_deployment != null )
+ {
+ criteria.put( "merlin.deployment", m_deployment );
+ }
if( null != m_debug ) criteria.put( "merlin.debug", m_debug );
if( null != m_info ) criteria.put( "merlin.info", m_info );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
