[Ubermq-commits] jms/src/com/ubermq/jms/server/journal DurableSubscriptionProxy.java,1.24,1.25 ISettingsRepository.java,1.1,1.2 IJournal.java,1.6,1.7

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

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

Modified Files:
	DurableSubscriptionProxy.java ISettingsRepository.java 
	IJournal.java 
Log Message:
bug fixes related to read/write initialization race conditions

Index: DurableSubscriptionProxy.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/server/journal/DurableSubscriptionProxy.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** DurableSubscriptionProxy.java	12 Jan 2004 19:24:25 -0000	1.24
--- DurableSubscriptionProxy.java	21 Jan 2004 02:05:23 -0000	1.25
***************
*** 4,11 ****
  import com.ubermq.jms.client.DeliveryMode;
  import com.ubermq.jms.server.*;
! import com.ubermq.jms.server.datagram.*;
  import com.ubermq.jms.server.journal.impl.*;
! import com.ubermq.jms.server.routing.*;
! import com.ubermq.jms.server.routing.impl.*;
  import com.ubermq.kernel.*;
  import com.ubermq.kernel.overflow.*;
--- 4,11 ----
  import com.ubermq.jms.client.DeliveryMode;
  import com.ubermq.jms.server.*;
! import com.ubermq.jms.common.datagram.*;
  import com.ubermq.jms.server.journal.impl.*;
! import com.ubermq.jms.common.routing.*;
! import com.ubermq.jms.common.routing.impl.*;
  import com.ubermq.kernel.*;
  import com.ubermq.kernel.overflow.*;
***************
*** 179,183 ****
                          catch(Throwable ise)
                          {
!                             com.ubermq.Utility.getLogger().error("", ise);
                          }
                      }
--- 179,183 ----
                          catch(Throwable ise)
                          {
!                             com.ubermq.util.Utility.getLogger().error("", ise);
                          }
                      }
***************
*** 236,240 ****
          catch (IOException e)
          {
!             com.ubermq.Utility.getLogger().error("", e);
              this.displayName = name;
          }
--- 236,240 ----
          catch (IOException e)
          {
!             com.ubermq.util.Utility.getLogger().error("", e);
              this.displayName = name;
          }
***************
*** 343,347 ****
      private void ack(MessageId id)
      {
!         com.ubermq.Utility.getLogger().debug("ack " + id );
          journal.ack(id);
      }
--- 343,347 ----
      private void ack(MessageId id)
      {
!         com.ubermq.util.Utility.getLogger().debug("ack " + id );
          journal.ack(id);
      }
***************
*** 353,357 ****
      public void process(IConnectionInfo conn, IDatagram read)
      {
!         com.ubermq.Utility.getLogger().debug("recovering " + read);
  
          if (read instanceof IMessageDatagram)
--- 353,357 ----
      public void process(IConnectionInfo conn, IDatagram read)
      {
!         com.ubermq.util.Utility.getLogger().debug("recovering " + read);
  
          if (read instanceof IMessageDatagram)
***************
*** 403,407 ****
          else
          {
!             com.ubermq.Utility.getLogger().debug("journaled message in disconnected mode");
          }
      }
--- 403,407 ----
          else
          {
!             com.ubermq.util.Utility.getLogger().debug("journaled message in disconnected mode");
          }
      }

Index: ISettingsRepository.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/server/journal/ISettingsRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ISettingsRepository.java	20 Sep 2002 20:59:32 -0000	1.1
--- ISettingsRepository.java	21 Jan 2004 02:05:23 -0000	1.2
***************
*** 1,6 ****
  package com.ubermq.jms.server.journal;
  
- import java.nio.*;
- 
  /**
   * An interface to a journaling mechanism
--- 1,4 ----

Index: IJournal.java
===================================================================
RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/server/journal/IJournal.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IJournal.java	18 Oct 2002 16:59:30 -0000	1.6
--- IJournal.java	21 Jan 2004 02:05:23 -0000	1.7
***************
*** 1,5 ****
  package com.ubermq.jms.server.journal;
  
! import com.ubermq.jms.server.datagram.MessageId;
  import com.ubermq.kernel.DatagramSink;
  import com.ubermq.kernel.IMessageProcessor;
--- 1,5 ----
  package com.ubermq.jms.server.journal;
  
! import com.ubermq.jms.common.datagram.MessageId;
  import com.ubermq.kernel.DatagramSink;
  import com.ubermq.kernel.IMessageProcessor;