Merge branch 'master' of git.yoho.cn:yoho30/yohobuy-union

# Conflicts:
#	server/src/main/java/com/yoho/unions/server/restapi/ActivateUnionRest.java

@@ -84,8 +84,8 @@ public class ActivateUnionRest {
 		}
 		String clientType = vo.getClient_type();
 		log.info("addMonitor user-agent={}", agent);
-		String[] arr = agent.split(";");
-		if (StringUtils.isEmpty(vo.getTd()) && StringUtils.isNotEmpty(agent) && ClientTypeEnum.IOS.getName().equalsIgnoreCase(clientType)) {
+		String[] arr = (null == agent)? null : agent.split(";");
+		if (StringUtils.isEmpty(vo.getTd()) && StringUtils.isNotEmpty(agent) && ClientTypeEnum.IOS.getName().equalsIgnoreCase(clientType) && (null != arr)) {
 			for (String str : arr) {
 				if (str.indexOf("OS/iOS") >= 0) {
 					String version = str.substring(str.indexOf("OS/iOS") + 6);