[Ubermq-commits] jms/src/com/ubermq/jms/client/unicast FailoverConnectionDescriptor.java,1.6,1.7 PipeConnection.java,1.8,1.9 UnicastConnection.java,1.2,1.3 SSLClientSession.java,1.1,1.2

[<ji...@us...>]

Update of /cvsroot/ubermq/jms/src/com/ubermq/jms/client/unicast
In directory sc8-pr-cvs1:/tmp/cvs-serv28341/src/com/ubermq/jms/client/unicast

Modified Files:
	FailoverConnectionDescriptor.java PipeConnection.java 
	UnicastConnection.java SSLClientSession.java 
Log Message:
bug fixes related to read/write initialization race conditions

Index: FailoverConnectionDescriptor.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/unicast/FailoverConnectionDescriptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FailoverConnectionDescriptor.java	12 Jan 2004 19:24:25 -0000	1.6
--- FailoverConnectionDescriptor.java	21 Jan 2004 02:05:24 -0000	1.7
***************
*** 95,99 ****
          }
  
!         com.ubermq.Utility.getLogger().debug("parsed failover URL as " + connections);
  
          // return it. if there is only one URL, return a fail-fast URL.
--- 95,99 ----
          }
  
!         com.ubermq.util.Utility.getLogger().debug("parsed failover URL as " + connections);
  
          // return it. if there is only one URL, return a fail-fast URL.
***************
*** 132,136 ****
          // choose a descriptor
          InternetConnectionDescriptor icd = ((InternetConnectionDescriptor)selector.choose(connections));
!         com.ubermq.Utility.getLogger().debug("failover choosing " + icd);
  
          return icd.getAddress();
--- 132,136 ----
          // choose a descriptor
          InternetConnectionDescriptor icd = ((InternetConnectionDescriptor)selector.choose(connections));
!         com.ubermq.util.Utility.getLogger().debug("failover choosing " + icd);
  
          return icd.getAddress();

Index: PipeConnection.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/unicast/PipeConnection.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PipeConnection.java	24 Jan 2003 15:34:47 -0000	1.8
--- PipeConnection.java	21 Jan 2004 02:05:24 -0000	1.9
***************
*** 1,13 ****
  package com.ubermq.jms.client.unicast;
  
  import com.ubermq.jms.client.*;
  import com.ubermq.jms.client.impl.*;
! import com.ubermq.jms.server.datagram.*;
! 
! import com.ubermq.jms.client.proc.ClientProc;
! import com.ubermq.jms.server.MessageServer;
! import com.ubermq.jms.server.datagram.impl.DatagramFactory;
! import com.ubermq.kernel.IDatagramFactory;
! import java.io.IOException;
  
  /**
--- 1,11 ----
  package com.ubermq.jms.client.unicast;
  
+ import java.io.*;
+ 
  import com.ubermq.jms.client.*;
  import com.ubermq.jms.client.impl.*;
! import com.ubermq.jms.client.proc.*;
! import com.ubermq.jms.common.datagram.*;
! import com.ubermq.jms.common.datagram.impl.*;
  
  /**

Index: UnicastConnection.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/unicast/UnicastConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UnicastConnection.java	24 Jan 2003 15:34:48 -0000	1.2
--- UnicastConnection.java	21 Jan 2004 02:05:24 -0000	1.3
***************
*** 1,12 ****
  package com.ubermq.jms.client.unicast;
  
  import EDU.oswego.cs.dl.util.concurrent.*;
  import com.ubermq.jms.client.*;
  import com.ubermq.jms.client.impl.*;
  import com.ubermq.jms.client.proc.*;
! import com.ubermq.jms.server.datagram.*;
! import com.ubermq.jms.server.datagram.impl.*;
  import com.ubermq.kernel.*;
- import java.io.*;
  
  /**
--- 1,14 ----
  package com.ubermq.jms.client.unicast;
  
+ import java.io.*;
+ 
  import EDU.oswego.cs.dl.util.concurrent.*;
+ 
  import com.ubermq.jms.client.*;
  import com.ubermq.jms.client.impl.*;
  import com.ubermq.jms.client.proc.*;
! import com.ubermq.jms.common.datagram.*;
! import com.ubermq.jms.common.datagram.impl.*;
  import com.ubermq.kernel.*;
  
  /**

Index: SSLClientSession.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/unicast/SSLClientSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SSLClientSession.java	24 Jan 2003 15:34:48 -0000	1.1
--- SSLClientSession.java	21 Jan 2004 02:05:24 -0000	1.2
***************
*** 1,12 ****
  package com.ubermq.jms.client.unicast;
  
- import com.ubermq.jms.client.*;
- import com.ubermq.jms.client.impl.*;
- import com.ubermq.jms.server.ssl.*;
- import com.ubermq.kernel.*;
  import java.net.*;
  import java.nio.channels.*;
  import javax.net.ssl.*;
  
  /**
   * This client session extends the abstract base client session to make socket
--- 1,14 ----
  package com.ubermq.jms.client.unicast;
  
  import java.net.*;
  import java.nio.channels.*;
+ 
  import javax.net.ssl.*;
  
+ import com.ubermq.jms.client.*;
+ import com.ubermq.jms.client.impl.*;
+ import com.ubermq.jms.common.ssl.*;
+ import com.ubermq.kernel.*;
+ 
  /**
   * This client session extends the abstract base client session to make socket