mcconnell 2003/01/23 03:42:08
Modified: merlin/src/java/org/apache/avalon/merlin/block/impl
DefaultBlock.java
merlin/src/test/config james.xml
Log:
Added some extra error handling during dissassembly phase.
Revision Changes Path
1.4 +22 -2
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java
Index: DefaultBlock.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultBlock.java 19 Jan 2003 18:18:50 -0000 1.3
+++ DefaultBlock.java 23 Jan 2003 11:42:08 -0000 1.4
@@ -740,14 +740,34 @@
for( int i=0; i<m_shutdown.length; i++ )
{
Appliance appliance = m_shutdown[i];
- appliance.disassemble();
+ try
+ {
+ appliance.disassemble();
+ }
+ catch( Throwable e )
+ {
+ final String warning =
+ "ignoring dissassembly error from appliance: " + appliance
+ + " (" + e.toString() + ")";
+ getLogger().warn( warning );
+ }
}
Iterator iterator = m_blocks.iterator();
while( iterator.hasNext() )
{
Block block = (Block) iterator.next();
- block.disassemble();
+ try
+ {
+ block.disassemble();
+ }
+ catch( Throwable e )
+ {
+ final String warning =
+ "ignoring dissassembly error from block: " + block
+ + " (" + e.toString() + ")";
+ getLogger().warn( warning );
+ }
}
super.disassemble();
1.7 +2 -2 avalon-sandbox/merlin/src/test/config/james.xml
Index: james.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/src/test/config/james.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- james.xml 22 Jan 2003 14:19:27 -0000 1.6
+++ james.xml 23 Jan 2003 11:42:08 -0000 1.7
@@ -121,7 +121,7 @@
<configuration>
<repositories>
<repository
-
class="org.apache.avalon.cornerstone.blocks.masterstore.File_Persistent_Object_Repository">
+
class="org.apache.james.mailrepository.filepair.File_Persistent_Object_Repository">
<protocols>
<protocol>file</protocol>
</protocols>
@@ -135,7 +135,7 @@
</models>
</repository>
<repository
-
class="org.apache.avalon.cornerstone.blocks.masterstore.File_Persistent_Stream_Repository">
+
class="org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository">
<protocols>
<protocol>file</protocol>
</protocols>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
