notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r959 - trunk/main/transit/core/src/main/net/dpml/transit

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r959 - trunk/main/transit/core/src/main/net/dpml/transit
Date: Tue, 24 Jan 2006 10:30:30 +0100

Author: mcconnell
Date: 2006-01-24 10:30:29 +0100 (Tue, 24 Jan 2006)
New Revision: 959

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java

trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java

trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistryModel.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
Log:
housekeeping

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
2006-01-24 04:51:48 UTC (rev 958)
+++ trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
2006-01-24 09:30:29 UTC (rev 959)
@@ -21,6 +21,7 @@
import java.io.File;
import java.rmi.Remote;
import java.rmi.RemoteException;
+import java.rmi.NoSuchObjectException;
import java.rmi.server.UnicastRemoteObject;
import java.net.MalformedURLException;
import java.util.Arrays;
@@ -312,6 +313,10 @@
Remote remote = (Remote) object;
UnicastRemoteObject.unexportObject( remote, true );
}
+ catch( NoSuchObjectException e )
+ {
+ // ignore
+ }
catch( RemoteException re )
{
getLogger().warn( "Unexpected error during remote reference
removal.", re );

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
2006-01-24 04:51:48 UTC (rev 958)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
2006-01-24 09:30:29 UTC (rev 959)
@@ -20,6 +20,7 @@

import java.rmi.Remote;
import java.rmi.RemoteException;
+import java.rmi.NoSuchObjectException;
import java.rmi.server.UnicastRemoteObject;
import java.util.Collections;
import java.util.List;
@@ -112,6 +113,10 @@
Remote remote = (Remote) object;
UnicastRemoteObject.unexportObject( remote, true );
}
+ catch( NoSuchObjectException e )
+ {
+ // ignore
+ }
catch( RemoteException re )
{
getLogger().warn( "Unexpected error during remote reference
removal.", re );

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistryModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistryModel.java
2006-01-24 04:51:48 UTC (rev 958)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistryModel.java
2006-01-24 09:30:29 UTC (rev 959)
@@ -20,6 +20,7 @@

import java.rmi.Remote;
import java.rmi.RemoteException;
+import java.rmi.NoSuchObjectException;
import java.rmi.server.UnicastRemoteObject;
import java.util.List;
import java.util.LinkedList;
@@ -127,6 +128,10 @@
Remote remote = (Remote) object;
UnicastRemoteObject.unexportObject( remote, true );
}
+ catch( NoSuchObjectException e )
+ {
+ // ignore
+ }
catch( RemoteException re )
{
getLogger().warn( "Unexpected error during remote reference
removal.", re );

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-24 04:51:48 UTC (rev 958)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
2006-01-24 09:30:29 UTC (rev 959)
@@ -19,6 +19,7 @@
package net.dpml.transit;

import java.rmi.RemoteException;
+import java.rmi.NoSuchObjectException;
import java.rmi.server.UnicastRemoteObject;
import java.util.EventObject;
import java.beans.XMLDecoder;
@@ -294,6 +295,10 @@
{
UnicastRemoteObject.unexportObject( m_model, true );
}
+ catch( NoSuchObjectException e )
+ {
+ // ignore
+ }
catch( RemoteException e )
{
e.printStackTrace();
@@ -314,6 +319,10 @@
{
UnicastRemoteObject.unexportObject( m_proxy, true );
}
+ catch( NoSuchObjectException e )
+ {
+ // ignore
+ }
catch( RemoteException e )
{
getLogger().warn( "Remote error during proxy reference
removal.", e );
@@ -328,6 +337,10 @@
{
UnicastRemoteObject.unexportObject( m_cache, true );
}
+ catch( NoSuchObjectException e )
+ {
+ // ignore
+ }
catch( RemoteException e )
{
getLogger().warn( "Remote error during cache reference
removal.", e );

r959 - trunk/main/transit/core/src/main/net/dpml/transit, mcconnell at BerliOS, 01/24/2006