mcconnell 2002/12/16 21:02:25
Modified: assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal
DefaultDisposalService.java
ExtendedDisposalService.java
Log:
Enhanced logging messages.
Revision Changes Path
1.3 +2 -4
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal/DefaultDisposalService.java
Index: DefaultDisposalService.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal/DefaultDisposalService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultDisposalService.java 30 Nov 2002 18:12:06 -0000 1.2
+++ DefaultDisposalService.java 17 Dec 2002 05:02:25 -0000 1.3
@@ -85,9 +85,7 @@
{
if( getLogger().isDebugEnabled() )
{
- final String message =
- "Appliance disposal: "
- + appliance.getProfile().getName();
+ final String message = "disposal " + appliance;
getLogger().debug( message );
}
try
1.5 +3 -3
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal/ExtendedDisposalService.java
Index: ExtendedDisposalService.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal/ExtendedDisposalService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExtendedDisposalService.java 30 Nov 2002 18:12:06 -0000 1.4
+++ ExtendedDisposalService.java 17 Dec 2002 05:02:25 -0000 1.5
@@ -144,8 +144,7 @@
{
if( getLogger().isDebugEnabled() )
{
- final String message =
- "[" + appliance.getProfile().getName() + "] disposal";
+ final String message = "disposal " + appliance;
getLogger().debug( message );
}
((Disposable)object).dispose();
@@ -213,6 +212,7 @@
try
{
handler.destroy( object, context );
+ provider.release( handler );
}
catch( Throwable e )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
