[Ubermq-commits] jms/src/com/ubermq/jms/client UnicastTopicConnectionFactory.java,1.9,1.10 MulticastTopicConnectionFactory.java,1.6,1.7 PipeTopicConnectionFactory.java,1.3,1.4 IClientProcessor.java,1.10,1.11 SSLConnectionFactory.java,1.1,1.2 URLConnectionFactory.java,1.3,1.4 IAcknowledgeHandler.java,1.4,1.5 PipeConnectionFactory.java,1.6,1.7 UnicastConnectionFactory.java,1.3,1.4

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

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

Modified Files:
	UnicastTopicConnectionFactory.java 
	MulticastTopicConnectionFactory.java 
	PipeTopicConnectionFactory.java IClientProcessor.java 
	SSLConnectionFactory.java URLConnectionFactory.java 
	IAcknowledgeHandler.java PipeConnectionFactory.java 
	UnicastConnectionFactory.java 
Log Message:
bug fixes related to read/write initialization race conditions

Index: UnicastTopicConnectionFactory.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/UnicastTopicConnectionFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** UnicastTopicConnectionFactory.java	27 Mar 2003 15:19:40 -0000	1.9
--- UnicastTopicConnectionFactory.java	21 Jan 2004 02:05:26 -0000	1.10
***************
*** 31,35 ****
       * The method specification is ignored.<P>
       *
-      * @see com.ubermq.jms.server.MessageServer.DEFAULT_PORT
       * @see com.ubermq.jms.client.unicast.FailoverConnectionDescriptor
       * @param host a URL, or the name of the host to connect to.
--- 31,34 ----

Index: MulticastTopicConnectionFactory.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/MulticastTopicConnectionFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MulticastTopicConnectionFactory.java	12 Dec 2002 18:01:47 -0000	1.6
--- MulticastTopicConnectionFactory.java	21 Jan 2004 02:05:26 -0000	1.7
***************
*** 31,35 ****
      {
          this(uri.getHost(),
!                  (uri.getPort() > 0) ? uri.getPort() : com.ubermq.jms.server.MessageServer.DEFAULT_PORT);
      }
  
--- 31,35 ----
      {
          this(uri.getHost(),
!                  (uri.getPort() > 0) ? uri.getPort() : com.ubermq.jms.common.MessageConstants.DEFAULT_PORT);
      }
  

Index: PipeTopicConnectionFactory.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/PipeTopicConnectionFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PipeTopicConnectionFactory.java	12 Dec 2002 18:01:47 -0000	1.3
--- PipeTopicConnectionFactory.java	21 Jan 2004 02:05:26 -0000	1.4
***************
*** 1,7 ****
  package com.ubermq.jms.client;
  
! import com.ubermq.jms.client.unicast.PipeConnection;
! import com.ubermq.jms.server.MessageServer;
! import javax.jms.JMSException;
  
  /**
--- 1,5 ----
  package com.ubermq.jms.client;
  
! import com.ubermq.jms.client.unicast.*;
  
  /**
***************
*** 21,30 ****
      public static final long serialVersionUID = 1L;
  
!     /**
!      * @deprecated
!      */
!     public PipeTopicConnectionFactory(MessageServer s)
      {
!         super(s);
      }
  }
--- 19,25 ----
      public static final long serialVersionUID = 1L;
  
!     public PipeTopicConnectionFactory(PipeEndpoint pe)
      {
!         super(pe);
      }
  }

Index: IClientProcessor.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/IClientProcessor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** IClientProcessor.java	19 Dec 2002 22:36:21 -0000	1.10
--- IClientProcessor.java	21 Jan 2004 02:05:26 -0000	1.11
***************
*** 1,5 ****
  package com.ubermq.jms.client;
  
! import com.ubermq.jms.server.datagram.*;
  import com.ubermq.kernel.*;
  import java.io.*;
--- 1,5 ----
  package com.ubermq.jms.client;
  
! import com.ubermq.jms.common.datagram.*;
  import com.ubermq.kernel.*;
  import java.io.*;

Index: SSLConnectionFactory.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/SSLConnectionFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SSLConnectionFactory.java	24 Jan 2003 15:34:43 -0000	1.1
--- SSLConnectionFactory.java	21 Jan 2004 02:05:26 -0000	1.2
***************
*** 3,7 ****
  import com.ubermq.jms.client.impl.*;
  import com.ubermq.jms.client.unicast.*;
! import com.ubermq.jms.server.datagram.impl.*;
  import java.net.*;
  import javax.jms.*;
--- 3,7 ----
  import com.ubermq.jms.client.impl.*;
  import com.ubermq.jms.client.unicast.*;
! import com.ubermq.jms.common.datagram.impl.*;
  import java.net.*;
  import javax.jms.*;
***************
*** 26,30 ****
       * The method specification is ignored.<P>
       *
-      * @see com.ubermq.jms.server.MessageServer.DEFAULT_PORT
       * @see com.ubermq.jms.client.unicast.FailoverConnectionDescriptor
       * @param host a URL, or the name of the host to connect to.
--- 26,29 ----
***************
*** 32,41 ****
      public SSLConnectionFactory(String url)
      {
!         this.icd = FailoverConnectionDescriptor.parseFailoverSpec(url, com.ubermq.jms.server.ssl.SSLProtocol.DEFAULT_PORT);
      }
  
      public SSLConnectionFactory(URI uri)
      {
!         this.icd = FailoverConnectionDescriptor.parseFailoverSpec(uri, com.ubermq.jms.server.ssl.SSLProtocol.DEFAULT_PORT);
      }
  
--- 31,40 ----
      public SSLConnectionFactory(String url)
      {
!         this.icd = FailoverConnectionDescriptor.parseFailoverSpec(url, com.ubermq.jms.common.MessageConstants.DEFAULT_SSL_PORT);
      }
  
      public SSLConnectionFactory(URI uri)
      {
!         this.icd = FailoverConnectionDescriptor.parseFailoverSpec(uri, com.ubermq.jms.common.MessageConstants.DEFAULT_SSL_PORT);
      }
  

Index: URLConnectionFactory.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/URLConnectionFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** URLConnectionFactory.java	12 Jan 2004 19:24:24 -0000	1.3
--- URLConnectionFactory.java	21 Jan 2004 02:05:26 -0000	1.4
***************
*** 2,5 ****
--- 2,7 ----
  
  import com.ubermq.*;
+ import com.ubermq.util.*;
+ 
  import java.io.*;
  import java.lang.reflect.*;
***************
*** 97,101 ****
          }
          catch (Exception e) {
!             com.ubermq.Utility.getLogger().error("", e);;
          }
  
--- 99,103 ----
          }
          catch (Exception e) {
!             com.ubermq.util.Utility.getLogger().error("", e);;
          }
  
***************
*** 201,205 ****
          }
          catch (Exception e) {
!             com.ubermq.Utility.getLogger().error("", e);;
  
              // this shouldn't happen - we should have verified
--- 203,207 ----
          }
          catch (Exception e) {
!             com.ubermq.util.Utility.getLogger().error("", e);;
  
              // this shouldn't happen - we should have verified

Index: IAcknowledgeHandler.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/IAcknowledgeHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IAcknowledgeHandler.java	30 Jan 2003 14:42:13 -0000	1.4
--- IAcknowledgeHandler.java	21 Jan 2004 02:05:26 -0000	1.5
***************
*** 1,5 ****
  package com.ubermq.jms.client;
  
! import com.ubermq.jms.server.datagram.*;
  import java.io.*;
  
--- 1,5 ----
  package com.ubermq.jms.client;
  
! import com.ubermq.jms.common.datagram.*;
  import java.io.*;
  

Index: PipeConnectionFactory.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/PipeConnectionFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PipeConnectionFactory.java	12 Jan 2004 19:24:24 -0000	1.6
--- PipeConnectionFactory.java	21 Jan 2004 02:05:26 -0000	1.7
***************
*** 30,34 ****
  		catch(Exception x)
  		{
! 			com.ubermq.Utility.getLogger().error("", x);;
  			throw new JMSException(x.getMessage());
  		}
--- 30,34 ----
  		catch(Exception x)
  		{
! 			com.ubermq.util.Utility.getLogger().error("", x);;
  			throw new JMSException(x.getMessage());
  		}

Index: UnicastConnectionFactory.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/UnicastConnectionFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UnicastConnectionFactory.java	24 Jan 2003 15:34:43 -0000	1.3
--- UnicastConnectionFactory.java	21 Jan 2004 02:05:26 -0000	1.4
***************
*** 28,32 ****
       * The method specification is ignored.<P>
       *
-      * @see com.ubermq.jms.server.MessageServer.DEFAULT_PORT
       * @see com.ubermq.jms.client.unicast.FailoverConnectionDescriptor
       * @param host a URL, or the name of the host to connect to.
--- 28,31 ----
***************
*** 34,43 ****
      public UnicastConnectionFactory(String url)
      {
!         this.icd = FailoverConnectionDescriptor.parseFailoverSpec(url, com.ubermq.jms.server.MessageServer.DEFAULT_PORT);
      }
  
      public UnicastConnectionFactory(URI uri)
      {
!         this.icd = FailoverConnectionDescriptor.parseFailoverSpec(uri, com.ubermq.jms.server.MessageServer.DEFAULT_PORT);
      }
  
--- 33,42 ----
      public UnicastConnectionFactory(String url)
      {
!         this.icd = FailoverConnectionDescriptor.parseFailoverSpec(url, com.ubermq.jms.common.MessageConstants.DEFAULT_PORT);
      }
  
      public UnicastConnectionFactory(URI uri)
      {
!         this.icd = FailoverConnectionDescriptor.parseFailoverSpec(uri, com.ubermq.jms.common.MessageConstants.DEFAULT_PORT);
      }