modify the handler

cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java

@@ -140,9 +140,10 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 		String userIp = m_util.getRemoteIp(request);
 		String version = payload.getVersion();
 		boolean success = true;
+		IpInfo ipInfo = m_ipService.findByIp(userIp);
 
 		if (userIp != null) {
-			success = processVersions(payload, request, userIp, version);
+			success = processVersions(payload, request, ipInfo, version);
 		} else {
 			success = false;
 			Cat.logEvent("UnknownIp", "batch", Event.SUCCESS, null);
@@ -155,14 +156,13 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 			response.getWriter().write("ERROR");
 		}
 
-		logData(payload, userIp);
+		logData(payload, userIp, ipInfo);
 	}
 
-	private void logData(Payload payload, String userIp) {
+	private void logData(Payload payload, String userIp, IpInfo ipInfo) {
 		String dpid = payload.getDpid();
 		String content = payload.getContent();
 		String version = payload.getVersion();
-		IpInfo ipInfo = m_ipService.findByIp(userIp);
 
 		if (VERSION_THREE.equals(version) && StringUtils.isNotEmpty(content)) {
 			String[] records = content.split("\n");
@@ -316,13 +316,13 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 		}
 	}
 
-	private boolean processVersions(Payload payload, HttpServletRequest request, String userIp, String version) {
+	private boolean processVersions(Payload payload, HttpServletRequest request, IpInfo ipInfo, String version) {
 		boolean success = false;
 		Cat.logEvent("Version", "batch:" + version, Event.SUCCESS, version);
 		String content = parseContent(payload);
 
 		if (VERSION_TWO.equals(version)) {
-			Pair<Integer, Integer> infoPair = queryNetworkInfo(request, userIp);
+			Pair<Integer, Integer> infoPair = queryNetworkInfo(request, ipInfo);
 
 			if (infoPair != null) {
 				int cityId = infoPair.getKey();
@@ -332,7 +332,7 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 				success = true;
 			}
 		} else if (VERSION_THREE.equals(version)) {
-			Pair<Integer, Integer> infoPair = queryNetworkInfo(request, userIp);
+			Pair<Integer, Integer> infoPair = queryNetworkInfo(request, ipInfo);
 
 			if (infoPair != null) {
 				int cityId = infoPair.getKey();
@@ -371,9 +371,7 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 		return ids;
 	}
 
-	private Pair<Integer, Integer> queryNetworkInfo(HttpServletRequest request, String userIp) {
-		IpInfo ipInfo = m_ipService.findByIp(userIp);
-
+	private Pair<Integer, Integer> queryNetworkInfo(HttpServletRequest request, IpInfo ipInfo) {
 		if (ipInfo != null) {
 			String province = ipInfo.getSourceProvinceName();
 			String operatorStr = ipInfo.getCarrierName();