[jboss-cvs] jboss-jms/src/main/org/jboss/messaging/core/plugin ...

[Timothy Fox]

  User: timfox  
  Date: 06/07/27 15:01:56

  Modified:    src/main/org/jboss/messaging/core/plugin 
                        JDBCPersistenceManager.java
  Log:
  Mainly http://jira.jboss.com/jira/browse/JBMESSAGING-434 plus a few other bits and pieces
  
  Revision  Changes    Path
  1.32      +4 -24     jboss-jms/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JDBCPersistenceManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- JDBCPersistenceManager.java	17 Jul 2006 17:14:48 -0000	1.31
  +++ JDBCPersistenceManager.java	27 Jul 2006 19:01:56 -0000	1.32
  @@ -149,9 +149,6 @@
         
      protected String updateReliableRefsNotLoaded = "UPDATE JMS_MESSAGE_REFERENCE SET LOADED='N' WHERE CHANNELID=?";
      
  -   //FIXME Must have channel mapper table maintained here too since have cross dependency
  -   protected String deleteNonDurableSubs = "DELETE FROM JMS_MESSAGE_REFERENCE WHERE CHANNELID NOT IN (SELECT ID FROM JMS_CHANNEL_MAPPING)";
  -   
      //JMS_MESSAGE
      
      protected String createMessage = "CREATE TABLE JMS_MESSAGE (MESSAGEID BIGINT, RELIABLE CHAR(1), "
  @@ -234,13 +231,11 @@
      
      protected Map channelMultipliers;
      
  -   protected boolean deleteSubs;
  -
      // Constructors --------------------------------------------------
      
      public JDBCPersistenceManager() throws Exception
      {
  -      this(null, null, null, true);
  +      this(null, null, null);
      }
      
      /**
  @@ -249,7 +244,7 @@
       */
      public JDBCPersistenceManager(DataSource ds, TransactionManager tm) throws Exception
      {
  -      this(ds, tm, null, false);
  +      this(ds, tm, null);
      }
   
      /**
  @@ -257,14 +252,13 @@
       * injected as dependencies.
       */
      public JDBCPersistenceManager(DataSource ds, TransactionManager tm,
  -                                 ChannelMapper cm, boolean deleteSubs) throws Exception
  +                                 ChannelMapper cm) throws Exception
      {
         this.ds = ds;
         this.tm = tm;
         this.cm = cm;
         sqlProperties = new Properties();
         channelMultipliers = new ConcurrentReaderHashMap();
  -      this.deleteSubs = deleteSubs;
      }
   
      // ServiceMBeanSupport overrides ---------------------------------
  @@ -2424,8 +2418,6 @@
         updateReliableRefsNotLoaded = sqlProperties.getProperty("UPDATE_RELIABLE_REFS_NOT_LOADED", updateReliableRefsNotLoaded);
         selectMinOrdering = sqlProperties.getProperty("SELECT_MIN_ORDERING", selectMinOrdering);
         
  -      deleteNonDurableSubs = sqlProperties.getProperty("DELETE_NON_DURABLE", deleteNonDurableSubs);
  - 
         //Message
         createMessage = sqlProperties.getProperty("CREATE_MESSAGE", createMessage);
         loadMessages = sqlProperties.getProperty("LOAD_MESSAGES", loadMessages);
  @@ -2521,18 +2513,6 @@
            
            ps = null;
                      
  -         if (deleteSubs)
  -         {            
  -            ps = conn.prepareStatement(deleteNonDurableSubs);
  -            
  -            rows = ps.executeUpdate();
  -            
  -            if (trace)
  -            {
  -               log.trace(JDBCUtil.statementToString(deleteNonDurableSubs)
  -                     + " deleted " + rows + " rows");
  -            }          
  -         }
         }
         catch (Exception e)
         {