[jboss-cvs] JBoss Messaging SVN: r6622 - in trunk/src/main/org/jboss/messaging/core: messagecounter and 1 other directories.

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

Author: jmesnil
Date: 2009-04-29 07:38:59 -0400 (Wed, 29 Apr 2009)
New Revision: 6622

Modified:
   trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java
   trunk/src/main/org/jboss/messaging/core/messagecounter/MessageCounter.java
   trunk/src/main/org/jboss/messaging/core/messagecounter/impl/MessageCounterHelper.java
Log:
JBMESSAGING-1489: use long type to store MessageCounter count

Modified: trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java	2009-04-29 10:04:43 UTC (rev 6621)
+++ trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java	2009-04-29 11:38:59 UTC (rev 6622)
@@ -24,6 +24,7 @@
 
 import static javax.management.openmbean.SimpleType.BOOLEAN;
 import static javax.management.openmbean.SimpleType.INTEGER;
+import static javax.management.openmbean.SimpleType.LONG;
 import static javax.management.openmbean.SimpleType.STRING;
 
 import java.text.DateFormat;
@@ -82,7 +83,7 @@
    {
       try
       {
-         TYPES = new OpenType[] { STRING, STRING, BOOLEAN, INTEGER, INTEGER, INTEGER, INTEGER, STRING, STRING };
+         TYPES = new OpenType[] { STRING, STRING, BOOLEAN, LONG, LONG, INTEGER, INTEGER, STRING, STRING };
          TYPE = new CompositeType(MESSAGE_TYPE_NAME,
                                   "Information for a MessageCounter",
                                   ITEM_NAMES,
@@ -104,9 +105,9 @@
 
    private final boolean durable;
 
-   private final int count;
+   private final long count;
 
-   private final int countDelta;
+   private final long countDelta;
 
    private final int depth;
 
@@ -139,8 +140,8 @@
       String name = (String)data.get("name");
       String subscription = (String)data.get("subscription");
       boolean durable = (Boolean)data.get("durable");
-      int count = (Integer)data.get("count");
-      int countDelta = (Integer)data.get("countDelta");
+      long count = (Long)data.get("count");
+      long countDelta = (Long)data.get("countDelta");
       int depth = (Integer)data.get("depth");
       int depthDelta = (Integer)data.get("depthDelta");
       String lastAddTimestamp = (String)data.get("lastAddTimestamp");
@@ -162,8 +163,8 @@
    public MessageCounterInfo(final String name,
                              final String subscription,
                              final boolean durable,
-                             final int count,
-                             final int countDelta,
+                             final long count,
+                             final long countDelta,
                              final int depth,
                              final int depthDelta,
                              final String lastAddTimestamp,
@@ -219,12 +220,12 @@
       return durable;
    }
 
-   public int getCount()
+   public long getCount()
    {
       return count;
    }
 
-   public int getCountDelta()
+   public long getCountDelta()
    {
       return countDelta;
    }

Modified: trunk/src/main/org/jboss/messaging/core/messagecounter/MessageCounter.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/messagecounter/MessageCounter.java	2009-04-29 10:04:43 UTC (rev 6621)
+++ trunk/src/main/org/jboss/messaging/core/messagecounter/MessageCounter.java	2009-04-29 11:38:59 UTC (rev 6622)
@@ -62,9 +62,9 @@
    private QueueControlMBean destQueue;
 
    // counter
-   private int countTotal;
+   private long countTotal;
 
-   private int countTotalLast;
+   private long countTotalLast;
 
    private int depthLast;
 
@@ -162,7 +162,7 @@
     * Gets the total message count since startup or
     * last counter reset
     */
-   public int getCount()
+   public long getCount()
    {
       return countTotal;
    }
@@ -170,9 +170,9 @@
    /**
     * Gets the message count delta since last method call
     */
-   public int getCountDelta()
+   public long getCountDelta()
    {
-      int delta = countTotal - countTotalLast;
+      long delta = countTotal - countTotalLast;
 
       countTotalLast = countTotal;
 

Modified: trunk/src/main/org/jboss/messaging/core/messagecounter/impl/MessageCounterHelper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/messagecounter/impl/MessageCounterHelper.java	2009-04-29 10:04:43 UTC (rev 6621)
+++ trunk/src/main/org/jboss/messaging/core/messagecounter/impl/MessageCounterHelper.java	2009-04-29 11:38:59 UTC (rev 6622)
@@ -201,13 +201,13 @@
       return ret;
    }
    
-   private static String prettify(int value)
+   private static String prettify(long value)
    {
       if (value == 0)
       {
          return "-";
       }
-      return Integer.toString(value);
+      return Long.toString(value);
    }
    
    private static String asDate(long time)