Skip to Content.
Sympa Menu

notify-dpml - r946 - trunk/main/transit/core/src/main/net/dpml/transit

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: carelparadis AT mail.berlios.de
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r946 - trunk/main/transit/core/src/main/net/dpml/transit
  • Date: Sun, 22 Jan 2006 21:08:17 +0100

Author: carelparadis
Date: 2006-01-22 21:08:12 +0100 (Sun, 22 Jan 2006)
New Revision: 946

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultModel.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
Log:
Fix problems about disposal of DefaultTransitModel.

Modified: trunk/main/transit/core/src/main/net/dpml/transit/DefaultModel.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/DefaultModel.java
2006-01-22 05:34:08 UTC (rev 945)
+++ trunk/main/transit/core/src/main/net/dpml/transit/DefaultModel.java
2006-01-22 20:08:12 UTC (rev 946)
@@ -229,7 +229,11 @@

void dispose()
{
- m_continue = false;
+ synchronized( EVENT_QUEUE )
+ {
+ m_continue = false;
+ EVENT_QUEUE.notify();
+ }
}

private Logger getLogger()
@@ -247,10 +251,14 @@
{
try
{
- while( m_continue && EVENT_QUEUE.isEmpty() )
+ while( m_continue && EVENT_QUEUE.isEmpty() )
{
EVENT_QUEUE.wait();
}
+ if ( !m_continue )
+ {
+ break;
+ }
Object object = EVENT_QUEUE.remove( 0 );
try
{

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
2006-01-22 05:34:08 UTC (rev 945)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
2006-01-22 20:08:12 UTC (rev 946)
@@ -152,7 +152,7 @@
/**
* Creation of a new TransitModel using a supplied configuration
* and logging channel. The implementation will construct a proxy
- * model, layout registry model, cache modle, content registry model,
+ * model, layout registry model, cache model, content registry model,
* and repository codebase model using the supplied configuration.
*
* @param logger the assigned loging channel
@@ -238,6 +238,8 @@
getLogger().warn( "Remote error during disposal.", e );
}
}
+
+ super.dispose();
}

private DefaultProxyModel createProxyModel( final TransitDirective
directive )




  • r946 - trunk/main/transit/core/src/main/net/dpml/transit, carelparadis, 01/22/2006

Archive powered by MHonArc 2.6.24.

Top of Page