AJ-817: rename param from resubTimeout to resubscribeInterval

Author: HakukuMatata

src/com/xxdb/streaming/client/Daemon.java

@@ -165,7 +165,7 @@ public void run() {
                             dispatcher.activeCloseConnection(s);
                             for (String topic : dispatcher.getAllTopicsBySite(site)) {
                                 System.out.println("Daemon need reconnect: " + topic);
-                                // reconnect every info.resubscribeTimeout ms
+                                // reconnect every info.resubscribeInterval ms
                                 if (System.currentTimeMillis() - AbstractClient.lastExceptionTopicTimeMap.get(topic) <= AbstractClient.resubscribeInterval)
                                     continue;
 
@@ -175,7 +175,7 @@ public void run() {
                             Site s = dispatcher.getSiteByName(site);
                             dispatcher.activeCloseConnection(s);
                             for (String topic : dispatcher.getAllTopicsBySite(site)) {
-                                // reconnect every info.resubscribeTimeout ms
+                                // reconnect every info.resubscribeInterval ms
                                 if (System.currentTimeMillis() - AbstractClient.lastExceptionTopicTimeMap.get(topic) <= AbstractClient.resubscribeInterval)
                                     continue;
 

src/com/xxdb/streaming/client/PollingClient.java

@@ -89,12 +89,12 @@ public TopicPoller subscribe(String host, int port, String tableName, String act
         return topicPoller;
     }
 
-    public TopicPoller subscribe(String host, int port, String tableName, String actionName, long offset, boolean reconnect, Vector filter, StreamDeserializer deserializer, String userName, String passWord, boolean msgAsTable, List<String> backupSites, int resubscribeTimeout, boolean subOnce) throws IOException {
-        if (resubscribeTimeout < 0)
-            // resubscribeTimeout default: 100ms
-            resubscribeTimeout = 100;
+    public TopicPoller subscribe(String host, int port, String tableName, String actionName, long offset, boolean reconnect, Vector filter, StreamDeserializer deserializer, String userName, String passWord, boolean msgAsTable, List<String> backupSites, int resubscribeInterval, boolean subOnce) throws IOException {
+        if (resubscribeInterval < 0)
+            // resubscribeInterval default: 100ms
+            resubscribeInterval = 100;
 
-        BlockingQueue<List<IMessage>> queue = subscribeInternal(host, port, tableName, actionName, (MessageHandler) null, offset, reconnect, filter, deserializer, false, userName, passWord, msgAsTable, backupSites, resubscribeTimeout, subOnce);
+        BlockingQueue<List<IMessage>> queue = subscribeInternal(host, port, tableName, actionName, (MessageHandler) null, offset, reconnect, filter, deserializer, false, userName, passWord, msgAsTable, backupSites, resubscribeInterval, subOnce);
         topicPoller = new TopicPoller(queue);
         return topicPoller;
     }

src/com/xxdb/streaming/client/ThreadPooledClient.java

@@ -193,12 +193,12 @@ public void subscribe(String host, int port, String tableName, String actionName
         }
     }
 
-    public void subscribe(String host, int port, String tableName, String actionName, MessageHandler handler, long offset, boolean reconnect, Vector filter, StreamDeserializer deserializer, boolean allowExistTopic, String userName, String passWord, boolean msgAsTable, List<String> backupSites, int resubscribeTimeout, boolean subOnce) throws IOException {
-        if (resubscribeTimeout < 0)
-            // resubscribeTimeout default: 100ms
-            resubscribeTimeout = 100;
+    public void subscribe(String host, int port, String tableName, String actionName, MessageHandler handler, long offset, boolean reconnect, Vector filter, StreamDeserializer deserializer, boolean allowExistTopic, String userName, String passWord, boolean msgAsTable, List<String> backupSites, int resubscribeInterval, boolean subOnce) throws IOException {
+        if (resubscribeInterval < 0)
+            // resubscribeInterval default: 100ms
+            resubscribeInterval = 100;
 
-        BlockingQueue<List<IMessage>> queue = subscribeInternal(host, port, tableName, actionName, handler, offset, reconnect, filter, deserializer, allowExistTopic, userName, passWord, msgAsTable, backupSites, resubscribeTimeout, subOnce);
+        BlockingQueue<List<IMessage>> queue = subscribeInternal(host, port, tableName, actionName, handler, offset, reconnect, filter, deserializer, allowExistTopic, userName, passWord, msgAsTable, backupSites, resubscribeInterval, subOnce);
         String topicStr = host + ":" + port + "/" + tableName + "/" + actionName;
         synchronized (queueHandlers) {
             queueHandlers.put(tableNameToTrueTopic.get(topicStr), new QueueHandlerBinder(queue, handler));

src/com/xxdb/streaming/client/ThreadedClient.java

@@ -237,15 +237,15 @@ public void subscribe(String host, int port, String tableName, String actionName
         }
     }
 
-    public void subscribe(String host, int port, String tableName, String actionName, MessageHandler handler, long offset, boolean reconnect, Vector filter, StreamDeserializer deserializer, boolean allowExistTopic, int batchSize, int throttle, String userName, String password, List<String> backupSites, int resubscribeTimeout, boolean subOnce) throws IOException {
+    public void subscribe(String host, int port, String tableName, String actionName, MessageHandler handler, long offset, boolean reconnect, Vector filter, StreamDeserializer deserializer, boolean allowExistTopic, int batchSize, int throttle, String userName, String password, List<String> backupSites, int resubscribeInterval, boolean subOnce) throws IOException {
         if(batchSize<=0)
             throw new IllegalArgumentException("BatchSize must be greater than zero");
         if(throttle<0)
             throw new IllegalArgumentException("Throttle must be greater than or equal to zero");
-        if (resubscribeTimeout < 0)
-            // resubscribeTimeout default: 100ms
-            resubscribeTimeout = 100;
-        BlockingQueue<List<IMessage>> queue = subscribeInternal(host, port, tableName, actionName, handler, offset, reconnect, filter, deserializer, allowExistTopic, userName, password, false, backupSites, resubscribeTimeout, subOnce);
+        if (resubscribeInterval < 0)
+            // resubscribeInterval default: 100ms
+            resubscribeInterval = 100;
+        BlockingQueue<List<IMessage>> queue = subscribeInternal(host, port, tableName, actionName, handler, offset, reconnect, filter, deserializer, allowExistTopic, userName, password, false, backupSites, resubscribeInterval, subOnce);
         HandlerLopper handlerLopper = new HandlerLopper(queue, handler, batchSize, throttle == 0 ? -1 : throttle);
         handlerLopper.start();
         String topicStr = host + ":" + port + "/" + tableName + "/" + actionName;