zhouhao 8 rokov pred
rodič
commit
ecd33e7b2a

+ 3 - 2
hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/src/main/java/org/hswebframework/web/counter/redis/RedissonCounterManager.java

@@ -5,6 +5,7 @@ import org.hswebframework.web.concurrent.counter.Counter;
 import org.hswebframework.web.concurrent.counter.CounterManager;
 import org.redisson.Redisson;
 import org.redisson.api.RAtomicLong;
+import org.redisson.api.RedissonClient;
 
 import java.util.Map;
 
@@ -13,9 +14,9 @@ import java.util.Map;
  */
 public class RedissonCounterManager extends AbstractCounterManager {
 
-    private Redisson redisson;
+    private RedissonClient redisson;
 
-    public RedissonCounterManager(Redisson redisson) {
+    public RedissonCounterManager(RedissonClient redisson) {
         this.redisson = redisson;
     }
 

+ 1 - 1
hsweb-message/hsweb-message-jms/src/main/java/org/hswebframework/web/message/jms/JmsMessageSubscribe.java

@@ -6,6 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jms.UncategorizedJmsException;
 import org.springframework.jms.core.JmsTemplate;
+import org.springframework.jms.core.SessionCallback;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,7 +59,6 @@ public class JmsMessageSubscribe<M extends Message> implements MessageSubscribe<
                     logger.error(e.getMessage(), e);
                     // running = false;
                 }
-
             }
         });
     }

+ 1 - 0
hsweb-message/hsweb-message-jms/src/main/java/org/hswebframework/web/message/jms/JmsMessager.java

@@ -1,5 +1,6 @@
 package org.hswebframework.web.message.jms;
 
+import org.apache.activemq.command.ActiveMQQueue;
 import org.hswebframework.web.message.*;
 import org.hswebframework.web.message.support.QueueMessageSubject;
 import org.hswebframework.web.message.support.TopicMessageSubject;

+ 2 - 1
hsweb-message/hsweb-message-memory/src/main/java/org/hswebframework/web/message/memory/MemoryPublish.java

@@ -44,7 +44,8 @@ public class MemoryPublish implements MessagePublish {
         queueConsumer.lock.readLock().lock();
         try {
             int size = queueConsumer.consumers.size();
-            queueConsumer.consumers.get(random.nextInt(size)).accept(message);
+            if (size > 0)
+                queueConsumer.consumers.get(random.nextInt(size)).accept(message);
         } finally {
             queueConsumer.lock.readLock().unlock();
         }