directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r371265 - in /directory/sandbox/trustin/mina-spi/core/src: main/java/org/apache/mina/common/ main/java/org/apache/mina/common/support/ main/java/org/apache/mina/transport/socket/nio/ main/java/org/apache/mina/transport/vmpipe/ test/java/org...
Date Sun, 22 Jan 2006 11:20:04 GMT
Author: trustin
Date: Sun Jan 22 03:19:49 2006
New Revision: 371265

URL: http://svn.apache.org/viewcvs?rev=371265&view=rev
Log:
* Moved static methods in ExceptionMonitor to IoService
* ExceptionMonitor is now an interface

Modified:
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/IoService.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSession.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
    directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
    directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java
Sun Jan 22 03:19:49 2006
@@ -18,52 +18,17 @@
  */
 package org.apache.mina.common;
 
-import org.apache.mina.common.support.DefaultExceptionMonitor;
-
 /**
  * Monitors uncaught exceptions.  {@link #exceptionCaught(Throwable)} is
  * invoked when there are any uncaught exceptions.
- * <p>
- * You can monitor any uncaught exceptions by setting {@link ExceptionMonitor}
- * by calling {@link #setInstance(ExceptionMonitor)}.  The default
- * monitor logs all caught exceptions in <tt>WARN</tt> level using
- * SLF4J.
  * 
  * @author The Apache Directory Project (dev@directory.apache.org)
  * @version $Rev$, $Date$
- * 
- * @see DefaultExceptionMonitor
  */
-public abstract class ExceptionMonitor
+public interface ExceptionMonitor
 {
-    private static ExceptionMonitor instance = new DefaultExceptionMonitor();
-
-    /**
-     * Returns the current exception monitor.
-     */
-    public static ExceptionMonitor getInstance()
-    {
-        return instance;
-    }
-
-    /**
-     * Sets the uncaught exception monitor.  If <code>null</code> is specified,
-     * the default monitor will be set.
-     * 
-     * @param monitor A new instance of {@link DefaultExceptionMonitor} is set
-     *                if <tt>null</tt> is specified.
-     */
-    public static void setInstance( ExceptionMonitor monitor )
-    {
-        if( monitor == null )
-        {
-            monitor = new DefaultExceptionMonitor();
-        }
-        instance = monitor;
-    }
-
     /**
      * Invoked when there are any uncaught exceptions.
      */
     public abstract void exceptionCaught( Throwable cause );
-}
\ No newline at end of file
+}

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/IoService.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/IoService.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/IoService.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/IoService.java
Sun Jan 22 03:19:49 2006
@@ -27,6 +27,7 @@
 
 import org.apache.mina.common.IoServiceProvider.IoAcceptor;
 import org.apache.mina.common.IoServiceProvider.IoConnector;
+import org.apache.mina.common.support.DefaultExceptionMonitor;
 import org.apache.mina.common.support.discovery.tools.Service;
 import org.apache.mina.util.IdentityHashSet;
 
@@ -40,6 +41,7 @@
 public class IoService
 {
     private static final Map providers = new HashMap();
+    private static ExceptionMonitor exceptionMonitor = new DefaultExceptionMonitor();
 
     static
     {
@@ -428,6 +430,28 @@
         return new IoAddress( value );
     }
     
+    /**
+     * Returns the current exception monitor.
+     */
+    public static ExceptionMonitor getExceptionMonitor()
+    {
+        return exceptionMonitor;
+    }
+
+    /**
+     * Sets the uncaught exception monitor.  If <code>null</code> is specified,
+     * the default monitor will be set.  The default monitor uses SLF4J to log
+     * the exceptions.
+     */
+    public static void setExceptionMonitor( ExceptionMonitor monitor )
+    {
+        if( monitor == null )
+        {
+            monitor = new DefaultExceptionMonitor();
+        }
+        exceptionMonitor = monitor;
+    }
+
     private IoService()
     {
     }

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
Sun Jan 22 03:19:49 2006
@@ -30,8 +30,8 @@
 import org.apache.mina.common.IoFilterAdapter;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoFilterLifeCycleException;
-import org.apache.mina.common.IoSession;
 import org.apache.mina.common.IoService;
+import org.apache.mina.common.IoSession;
 import org.apache.mina.common.IoFilter.NextFilter;
 import org.apache.mina.common.IoFilter.WriteRequest;
 import org.apache.mina.util.ByteBufferUtil;

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
Sun Jan 22 03:19:49 2006
@@ -302,8 +302,8 @@
     }
 
     /**
-     * Signals the {@link IoSessionManager} that the {@link TrafficMask} of this
-     * session has been changed.
+     * Signals the provider that the {@link TrafficMask} of this session
+     * has been changed.
      */
     protected abstract void updateTrafficMask();
     

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java
Sun Jan 22 03:19:49 2006
@@ -24,15 +24,12 @@
 
 /**
  * A default {@link ExceptionMonitor} implementation that logs uncaught
- * exceptions using {@link Logger}.
- * <p>
- * All {@link IoSessionManager}s have this implementation as a default exception
- * monitor.
+ * exceptions using SLF4J {@link Logger}.
  * 
  * @author The Apache Directory Project (dev@directory.apache.org)
  * @version $Rev$, $Date$
  */
-public class DefaultExceptionMonitor extends ExceptionMonitor
+public class DefaultExceptionMonitor implements ExceptionMonitor
 {
     private static final Logger log = LoggerFactory.getLogger( DefaultExceptionMonitor.class
);
 

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
Sun Jan 22 03:19:49 2006
@@ -30,10 +30,10 @@
 import java.util.Set;
 
 import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.ExceptionMonitor;
 import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoService;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.common.IoFilter.WriteRequest;
 import org.apache.mina.common.IoServiceProvider.IoAcceptor;
@@ -173,7 +173,7 @@
         }
         catch( Throwable t )
         {
-            ExceptionMonitor.getInstance().exceptionCaught( t );
+            IoService.getExceptionMonitor().exceptionCaught( t );
         }
         
         return s;
@@ -256,7 +256,7 @@
                                 }
                                 catch( IOException e )
                                 {
-                                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                                    IoService.getExceptionMonitor().exceptionCaught( e );
                                 }
                                 finally
                                 {
@@ -269,7 +269,7 @@
                 }
                 catch( IOException e )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                    IoService.getExceptionMonitor().exceptionCaught( e );
 
                     try
                     {
@@ -314,7 +314,7 @@
             }
             catch( Throwable t )
             {
-                ExceptionMonitor.getInstance().exceptionCaught( t );
+                IoService.getExceptionMonitor().exceptionCaught( t );
             }
         }
     }
@@ -496,7 +496,7 @@
                     }
                     catch( Throwable e )
                     {
-                        ExceptionMonitor.getInstance().exceptionCaught( e );
+                        IoService.getExceptionMonitor().exceptionCaught( e );
                     }
                 }
             }
@@ -541,7 +541,7 @@
             }
             catch( Throwable t )
             {
-                ExceptionMonitor.getInstance().exceptionCaught( t );
+                IoService.getExceptionMonitor().exceptionCaught( t );
             }
             finally
             {

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
Sun Jan 22 03:19:49 2006
@@ -27,10 +27,10 @@
 
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.ExceptionMonitor;
 import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoService;
 import org.apache.mina.common.IoFilter.WriteRequest;
 import org.apache.mina.common.IoServiceProvider.IoConnector;
 import org.apache.mina.util.Queue;
@@ -92,7 +92,7 @@
                 }
                 catch( IOException e )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                    IoService.getExceptionMonitor().exceptionCaught( e );
                 }
             }
         }
@@ -113,7 +113,7 @@
                 }
                 catch( IOException e2 )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught( e2 );
+                    IoService.getExceptionMonitor().exceptionCaught( e2 );
                 }
 
                 return ConnectFuture.newFailedFuture( e );
@@ -294,7 +294,7 @@
                                 }
                                 catch( IOException e )
                                 {
-                                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                                    IoService.getExceptionMonitor().exceptionCaught( e );
                                 }
                                 finally
                                 {
@@ -307,7 +307,7 @@
                 }
                 catch( IOException e )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught(  e );
+                    IoService.getExceptionMonitor().exceptionCaught(  e );
 
                     try
                     {
@@ -517,7 +517,7 @@
                     }
                     catch (IOException e)
                     {
-                        ExceptionMonitor.getInstance().exceptionCaught( e );
+                        IoService.getExceptionMonitor().exceptionCaught( e );
                     }
                 }
             }
@@ -550,7 +550,7 @@
                 }
                 catch( IOException e )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                    IoService.getExceptionMonitor().exceptionCaught( e );
                 }
                 session.getCloseFuture().setClosed();
                 key.cancel();

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java
Sun Jan 22 03:19:49 2006
@@ -26,9 +26,9 @@
 import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoService;
 import org.apache.mina.common.IoServiceProvider;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoService;
 import org.apache.mina.common.IoFilter.WriteRequest;
 import org.apache.mina.common.support.BaseIoSession;
 import org.apache.mina.util.Queue;

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
Sun Jan 22 03:19:49 2006
@@ -34,11 +34,11 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.mina.common.ExceptionMonitor;
 import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.common.IoFuture;
 import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoService;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.common.IoServiceProvider.IoAcceptor;
 import org.apache.mina.util.ExceptionUtil;
@@ -282,7 +282,7 @@
                                 }
                                 catch( IOException e )
                                 {
-                                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                                    IoService.getExceptionMonitor().exceptionCaught( e );
                                 }
                                 finally
                                 {
@@ -295,7 +295,7 @@
                 }
                 catch( IOException e )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                    IoService.getExceptionMonitor().exceptionCaught( e );
 
                     try
                     {
@@ -346,7 +346,7 @@
                 }
                 catch( Throwable t )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught( t );
+                    IoService.getExceptionMonitor().exceptionCaught( t );
                 }
                 finally
                 {
@@ -439,7 +439,7 @@
                     }
                     catch( IOException e )
                     {
-                        ExceptionMonitor.getInstance().exceptionCaught( e );
+                        IoService.getExceptionMonitor().exceptionCaught( e );
                     }
                 }
             }
@@ -491,7 +491,7 @@
             }
             catch( IOException e )
             {
-                ExceptionMonitor.getInstance().exceptionCaught( e );
+                IoService.getExceptionMonitor().exceptionCaught( e );
             }
             finally
             {

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
Sun Jan 22 03:19:49 2006
@@ -31,10 +31,10 @@
 import java.util.Set;
 
 import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.ExceptionMonitor;
 import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoService;
 import org.apache.mina.common.IoServiceProvider.IoConnector;
 import org.apache.mina.util.ExceptionUtil;
 import org.apache.mina.util.Queue;
@@ -107,7 +107,7 @@
                 }
                 catch( IOException e )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                    IoService.getExceptionMonitor().exceptionCaught( e );
                 }
             }
         }
@@ -132,7 +132,7 @@
                 }
                 catch( IOException e2 )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught( e2 );
+                    IoService.getExceptionMonitor().exceptionCaught( e2 );
                 }
 
                 return ConnectFuture.newFailedFuture( e );
@@ -264,7 +264,7 @@
                     }
                     catch( IOException e )
                     {
-                        ExceptionMonitor.getInstance().exceptionCaught( e );
+                        IoService.getExceptionMonitor().exceptionCaught( e );
                     }
                 }
             }
@@ -350,7 +350,7 @@
                                 }
                                 catch( IOException e )
                                 {
-                                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                                    IoService.getExceptionMonitor().exceptionCaught( e );
                                 }
                                 finally
                                 {
@@ -363,7 +363,7 @@
                 }
                 catch( IOException e )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                    IoService.getExceptionMonitor().exceptionCaught( e );
 
                     try
                     {

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
Sun Jan 22 03:19:49 2006
@@ -26,8 +26,8 @@
 import java.util.Set;
 
 import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.ExceptionMonitor;
 import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoService;
 import org.apache.mina.common.WriteTimeoutException;
 import org.apache.mina.common.IoFilter.WriteRequest;
 import org.apache.mina.util.Queue;
@@ -585,7 +585,7 @@
             } 
             catch ( NumberFormatException e )
             {
-                ExceptionMonitor.getInstance().exceptionCaught( e );
+                IoService.getExceptionMonitor().exceptionCaught( e );
             }
             processors = Math.max( processors, 1 );
             
@@ -645,7 +645,7 @@
                                 }
                                 catch( IOException e )
                                 {
-                                    ExceptionMonitor.getInstance().exceptionCaught( e );
+                                    IoService.getExceptionMonitor().exceptionCaught( e );
                                 }
                                 finally
                                 {
@@ -658,7 +658,7 @@
                 }
                 catch( Throwable t )
                 {
-                    ExceptionMonitor.getInstance().exceptionCaught( t );
+                    IoService.getExceptionMonitor().exceptionCaught( t );
 
                     try
                     {

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSession.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSession.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSession.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSession.java
Sun Jan 22 03:19:49 2006
@@ -27,9 +27,9 @@
 import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoService;
 import org.apache.mina.common.IoServiceProvider;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoService;
 import org.apache.mina.common.IoFilter.WriteRequest;
 import org.apache.mina.common.support.BaseIoSession;
 import org.apache.mina.util.Queue;

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
Sun Jan 22 03:19:49 2006
@@ -22,14 +22,13 @@
 import java.util.Set;
 
 import org.apache.mina.common.CloseFuture;
-import org.apache.mina.common.ExceptionMonitor;
 import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoService;
 import org.apache.mina.common.IoServiceProvider;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoService;
 import org.apache.mina.common.IoFilter.WriteRequest;
 import org.apache.mina.common.support.BaseIoSession;
 import org.apache.mina.filter.codec.ProtocolDecoder;
@@ -80,7 +79,7 @@
         }
         catch( Throwable t )
         {
-            ExceptionMonitor.getInstance().exceptionCaught( t );
+            IoService.getExceptionMonitor().exceptionCaught( t );
             IOException e = new IOException( "Failed to initialize remote session." );
             e.initCause( t );
             throw e;

Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
Sun Jan 22 03:19:49 2006
@@ -31,8 +31,8 @@
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
 import org.apache.mina.common.IoService;
+import org.apache.mina.common.IoSession;
 import org.apache.mina.common.IoFilter.NextFilter;
 import org.apache.mina.common.IoFilter.WriteRequest;
 import org.apache.mina.util.AvailablePortFinder;

Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java?rev=371265&r1=371264&r2=371265&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
Sun Jan 22 03:19:49 2006
@@ -24,8 +24,8 @@
 import org.apache.mina.common.ConnectFuture;
 import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
 import org.apache.mina.common.IoService;
+import org.apache.mina.common.IoSession;
 import org.apache.mina.util.AvailablePortFinder;
 
 /**



Mime
View raw message