[jboss-cvs] JBoss Messaging SVN: r5235 - branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: gaohoward
Date: 2008-11-02 21:54:20 -0500 (Sun, 02 Nov 2008)
New Revision: 5235

Modified:
   branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
   branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroup.java
   branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroupMonitor.java
Log:
JBMESSAGING-1416


Modified: branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
===================================================================
--- branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/ChannelSupport.java	2008-10-31 21:07:58 UTC (rev 5234)
+++ branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/ChannelSupport.java	2008-11-03 02:54:20 UTC (rev 5235)
@@ -671,7 +671,10 @@
                      // an iterator (if we haven't already created it) to iterate through the refs
                      // in the channel. No delivery was really performed
 
-                     monitor.dropSend(ref);//leaving a 'hole'
+                     if (OrderingGroupMonitor.isOrderingGroupMessage(ref))
+                     {
+                        log.warn("Warning! Using message selectors with ordering group can cause unpredicatable results!");
+                     }
                      
                      if (iter == null)
                      {

Modified: branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroup.java
===================================================================
--- branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroup.java	2008-10-31 21:07:58 UTC (rev 5234)
+++ branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroup.java	2008-11-03 02:54:20 UTC (rev 5235)
@@ -157,27 +157,6 @@
       return result;
    }
 
-   /**
-    * @param ref
-    */
-   public void dropSend(MessageReference ref)
-   {
-      ReferenceHolder holder = sortedList.getFirst();
-      if (holder == null)
-      {
-         return;
-      }
-      if (holder.matchMessage(ref))
-      {
-         long count = holder.releaseRef();
-         if (count == 0)
-         {
-            sortedList.removeFirst();
-            refMap.remove(ref.getMessage().getMessageID());
-         }
-      }
-   }
-
    public void unmarkSending(MessageReference ref)
    {
       ReferenceHolder holder = sortedList.getFirst();

Modified: branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroupMonitor.java
===================================================================
--- branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroupMonitor.java	2008-10-31 21:07:58 UTC (rev 5234)
+++ branches/Branch_JBMESSAGING_1416/src/main/org/jboss/messaging/core/impl/OrderingGroupMonitor.java	2008-11-03 02:54:20 UTC (rev 5235)
@@ -168,26 +168,6 @@
    /**
     * reducing the refcount, if zero, remove it.
     */
-   public void dropSend(MessageReference ref)
-   {
-      String grpName = extractGroupName(ref);
-      if (grpName == null)
-      {
-         return;
-      }
-      synchronized (orderingGroups)
-      {
-         OrderingGroup group = orderingGroups.get(grpName);
-         if (group != null)
-         {
-            group.dropSend(ref);
-         }
-      }
-   }
-
-   /**
-    * reducing the refcount, if zero, remove it.
-    */
    public void unmarkSending(MessageReference ref)
    {
       String grpName = extractGroupName(ref);