YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by DengXinFei
Commit 46ce795099cbcc263027778a3bd38ff58b53d399 2 parents 5c526163 ed690665

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

# Conflicts:
#	server/src/main/java/com/yoho/unions/server/restapi/ActivateUnionRest.java
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -84,8 +84,8 @@ public class ActivateUnionRest { @@ -84,8 +84,8 @@ public class ActivateUnionRest {
84 } 84 }
85 String clientType = vo.getClient_type(); 85 String clientType = vo.getClient_type();
86 log.info("addMonitor user-agent={}", agent); 86 log.info("addMonitor user-agent={}", agent);
87 - String[] arr = agent.split(";");  
88 - if (StringUtils.isEmpty(vo.getTd()) && StringUtils.isNotEmpty(agent) && ClientTypeEnum.IOS.getName().equalsIgnoreCase(clientType)) { 87 + String[] arr = (null == agent)? null : agent.split(";");
  88 + if (StringUtils.isEmpty(vo.getTd()) && StringUtils.isNotEmpty(agent) && ClientTypeEnum.IOS.getName().equalsIgnoreCase(clientType) && (null != arr)) {
89 for (String str : arr) { 89 for (String str : arr) {
90 if (str.indexOf("OS/iOS") >= 0) { 90 if (str.indexOf("OS/iOS") >= 0) {
91 String version = str.substring(str.indexOf("OS/iOS") + 6); 91 String version = str.substring(str.indexOf("OS/iOS") + 6);