resolve dump bug when resubscribe

luleigreat · luleigreat · commit 4576f7bd3590 · 2019-10-09T13:49:27.000+08:00
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/manager/EventManager.java b/chainsql/src/main/java/com/peersafe/chainsql/manager/EventManager.java
@@ -62,10 +62,13 @@ public void init(Connection connection) {
 	 * Resubscribe automatically after reconnected.
 	 */
 	public void reSubscribe(){
-		int ownerLen = this.connection.address.length();
 		for(String key : mapTableCache.keySet()){
-			String name = key.substring(0,key.length() - ownerLen);
-			String owner = key.substring(key.length() - ownerLen);
+			String[] keys = key.split(";");
+			if(keys.length != 2){
+				continue;
+			}
+			String name = keys[0];
+			String owner = keys[1];
 			
 	 		JSONObject messageTx = new JSONObject();
 			messageTx.put("command", "subscribe");
@@ -101,7 +104,7 @@ private void onChainsqlSubRet() {
 			@Override
 			public void called(JSONObject args) {
 				if(args.has("owner") && args.has("tablename")) {
-					String key = args.getString("tablename") + args.getString("owner");
+					String key = args.getString("tablename") + ";" + args.getString("owner");
 					makeCallback(key,args.getJSONObject("result"));
 				}
 				if(args.has("transaction")) {
@@ -138,7 +141,7 @@ public void called(JSONObject args) {
 			onChainsqlSubRet();
 			this.onSubRet = true;
 		}
-		this.mapTableCache.put(name + owner,cb);
+		this.mapTableCache.put(name +";" + owner,cb);
 	}
 
 	/**
@@ -226,7 +229,7 @@ public void unsubscribeTable(String name, String owner,Callback<JSONObject> cb)
 		messageTx.put("tablename", name);
 		this.connection.client.subscriptions.addMessage(messageTx);
 	
-		String key = name + owner;
+		String key = name +";" + owner;
 
 		JSONObject obj = new JSONObject();
 		if(this.mapTableCache.containsKey(key)) {
