ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix mac null bug

Browse Source
This commit is contained in:
Looly 2020-09-04 17:51:10 +08:00
parent 2e6515ef06
commit 9d8f4d725c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@
* 【extra 】 新增方便引入SpringUtil的注解@EnableSpringUtil（pr#172@Gitee）
* 【poi 】 RowUtil增加插入和删除行（pr#1060@Github）
* 【extra 】 SpringUtil增加注册bean（pr#174@Gitee）
* 【core 】 修改NetUtil.getMacAddress避免空指针（issue#1057@Github）
### Bug修复#
* 【core 】 重新整理农历节假日，解决一个pr过来的玩笑导致的问题

8
hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java
View File

@ -507,9 +507,12 @@ public class NetUtil {
return null;
}
byte[] mac;
byte[] mac = null;
try {
mac = NetworkInterface.getByInetAddress(inetAddress).getHardwareAddress();
final NetworkInterface networkInterface = NetworkInterface.getByInetAddress(inetAddress);
if(null != networkInterface){
mac = networkInterface.getHardwareAddress();
}
} catch (SocketException e) {
throw new UtilException(e);
}
@ -526,6 +529,7 @@ public class NetUtil {
}
return sb.toString();
}
return null;
}