mcconnell 2003/01/30 23:18:10
Modified: merlin/src/java/org/apache/avalon/merlin/block/impl
DefaultBlockLoader.java
merlin/src/java/org/apache/avalon/merlin/service
DefaultRegistry.java
Log:
Fixing bugs introduced by my last bug fix!
Revision Changes Path
1.5 +1 -2
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java
Index: DefaultBlockLoader.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultBlockLoader.java 30 Jan 2003 11:15:51 -0000 1.4
+++ DefaultBlockLoader.java 31 Jan 2003 07:18:10 -0000 1.5
@@ -266,7 +266,6 @@
m_registry = null;
m_system = null;
m_home = null;
- m_resolver.dispose();
m_resolver = null;
}
1.6 +2 -2
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/DefaultRegistry.java
Index: DefaultRegistry.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/DefaultRegistry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultRegistry.java 29 Jan 2003 17:50:27 -0000 1.5
+++ DefaultRegistry.java 31 Jan 2003 07:18:10 -0000 1.6
@@ -108,7 +108,7 @@
* management naming context hierachy.
*/
public DefaultRegistry( )
- throws NullPointerException, MalformedURLException
+ throws NullPointerException, ServiceException
{
this( "localhost" );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
