hammant     2002/12/21 13:43:54

  Modified:    altrmi/src/java/org/apache/excalibur/altrmi/client
                        AltrmiConnectionListener.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl
                        DefaultConnectionListener.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/http
                        ClientHttpReadWriter.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi
                        RmiInvocationHandler.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream
                        StreamInvocationHandler.java
  Log:
  Connection listener can pass on details from cause of abend now.
  
  Revision  Changes    Path
  1.3       +4 -2      
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/AltrmiConnectionListener.java
  
  Index: AltrmiConnectionListener.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/AltrmiConnectionListener.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AltrmiConnectionListener.java     24 Apr 2002 12:42:56 -0000      1.2
  +++ AltrmiConnectionListener.java     21 Dec 2002 21:43:54 -0000      1.3
  @@ -9,6 +9,8 @@
   
   import org.apache.excalibur.altrmi.common.AltrmiRequest;
   
  +import java.io.IOException;
  +
   /**
    * Interface AltrmiConnectionListener
    *
  @@ -59,5 +61,5 @@
        * @param attempt
        *
        */
  -    void serviceAbend( int attempt );
  +    void serviceAbend( int attempt, IOException cause );
   }
  
  
  
  1.5       +21 -3     
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultConnectionListener.java
  
  Index: DefaultConnectionListener.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultConnectionListener.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultConnectionListener.java    23 Aug 2002 09:41:40 -0000      1.4
  +++ DefaultConnectionListener.java    21 Dec 2002 21:43:54 -0000      1.5
  @@ -11,6 +11,8 @@
   import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
   import org.apache.excalibur.altrmi.common.AltrmiRequest;
   
  +import java.io.IOException;
  +
   /**
    * Interface AltrmiConnectionListener
    *
  @@ -115,7 +117,7 @@
        * @param attempt
        *
        */
  -    public void serviceAbend( int attempt )
  +    public void serviceAbend( int attempt, IOException cause )
       {
   
           // Lets say that ten retries is too many.
  @@ -128,7 +130,23 @@
               }
               else
               {
  -                msg = "Too many retries on abended service";
  +                msg = "Too many retries on abended service. ";
  +                if (cause != null)
  +                {
  +                    msg = msg + "Possible cause of abend (exception=" + 
cause.getClass().getName() + "). ";
  +                    if (cause.getMessage() != null)
  +                    {
  +                        msg = msg + "Message= '" + cause.getMessage() + "'";
  +                    }
  +                    else
  +                    {
  +                        msg = msg + "No Message in exception.";
  +                    }
  +                }
  +                else
  +                {
  +                    msg = msg + "Unknown cause of abend.";
  +                }
               }
               throw new AltrmiInvocationException( msg );
           }
  
  
  
  1.4       +5 -3      
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/http/ClientHttpReadWriter.java
  
  Index: ClientHttpReadWriter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/http/ClientHttpReadWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClientHttpReadWriter.java 21 Dec 2002 19:34:43 -0000      1.3
  +++ ClientHttpReadWriter.java 21 Dec 2002 21:43:54 -0000      1.4
  @@ -42,7 +42,7 @@
               throws IOException, ClassNotFoundException
       {
           //URL url = new URL("http",m_host, m_port,"/mystuff/Dump/");
  -        HttpConnection connection = new HttpConnection(m_host, m_port);
  +//        HttpConnection connection = new HttpConnection(m_host, m_port);
   
           HttpClient client = new HttpClient();
           client.getHostConfiguration().setHost(m_host, m_port, "http");
  @@ -69,11 +69,13 @@
           }
           catch (IOException e)
           {
  -            e.printStackTrace();  //To change body of catch statement use 
Options | File Templates.
  +            System.err.println("IOException during posting of request " + 
e.getMessage());
  +            //e.printStackTrace();  //To change body of catch statement use 
Options | File Templates.
  +            throw e;
           }
   
   //        OutputStream out = connection
   //        ObjectOutputStream out
  -        return null;
  +        //return null;
       }
   }
  
  
  
  1.8       +2 -2      
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiInvocationHandler.java
  
  Index: RmiInvocationHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiInvocationHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- RmiInvocationHandler.java 28 Oct 2002 21:58:55 -0000      1.7
  +++ RmiInvocationHandler.java 21 Dec 2002 21:43:54 -0000      1.8
  @@ -192,7 +192,7 @@
   
                       while( !tryReconnect() )
                       {
  -                        mAltrmiConnectionListener.serviceAbend( 
retryConnectTries );
  +                        mAltrmiConnectionListener.serviceAbend( 
retryConnectTries, re );
   
                           retryConnectTries++;
                       }
  
  
  
  1.10      +2 -2      
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/StreamInvocationHandler.java
  
  Index: StreamInvocationHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/StreamInvocationHandler.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- StreamInvocationHandler.java      16 Dec 2002 01:00:01 -0000      1.9
  +++ StreamInvocationHandler.java      21 Dec 2002 21:43:54 -0000      1.10
  @@ -169,7 +169,7 @@
   
                               while( !tryReconnect() )
                               {
  -                                mAltrmiConnectionListener.serviceAbend( 
retryConnectTries );
  +                                mAltrmiConnectionListener.serviceAbend( 
retryConnectTries, ioe );
   
                                   retryConnectTries++;
                               }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to