Merge branch 'release/12.5.4'

Author: iitsoftware

pom.xml

@@ -7,7 +7,7 @@
 
   <groupId>com.swiftmq</groupId>
   <artifactId>swiftmq-client</artifactId>
-  <version>12.5.3</version>
+  <version>12.5.4</version>
 
   <name>SwiftMQ Client</name>
   <description>Client for SwiftMQ Messaging System with JMS, AMQP 1.0 and file transfer over JMS.</description>

src/main/java/com/swiftmq/mgmt/Entity.java

@@ -850,7 +850,7 @@ public void removeEntities() {
      */
     public void removeDynamicEntity(Object dynamicObject) {
         Entity entity = null;
-        lock.readLock().lock();
+        lock.writeLock().lock();
         try {
             for (Iterator iter = entities.entrySet().iterator(); iter.hasNext(); ) {
                 entity = (Entity) ((Map.Entry) iter.next()).getValue();
@@ -862,7 +862,7 @@ public void removeDynamicEntity(Object dynamicObject) {
                 }
             }
         } finally {
-            lock.readLock().unlock();
+            lock.writeLock().unlock();
         }
 
         if (entity != null)

src/main/java/com/swiftmq/swiftlet/queue/AbstractQueue.java

@@ -518,6 +518,15 @@ public int getProducedTotal() {
     public void resetCounters() {
     }
 
+    /**
+     * Returns the average queue latency and resets it
+     *
+     * @return average queue latency
+     */
+    public long getAndResetAverageLatency() {
+        return (0);
+    }
+
     public int getMonitorAlertThreshold() {
         return -1;
     }