Skip to content
This repository was archived by the owner on Dec 23, 2017. It is now read-only.

Commit 05ec651

Browse files
author
Jochen Schalanda
committed
Merge branch 'master' into issue-4
2 parents 104143e + eb24152 commit 05ec651

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<groupId>org.graylog.plugins</groupId>
1616
<artifactId>usage-statistics</artifactId>
17-
<version>1.0.6</version>
17+
<version>1.0.7-SNAPSHOT</version>
1818
<packaging>jar</packaging>
1919

2020
<name>Graylog Usage Statistics Plugin</name>

src/main/java/org/graylog/plugins/usagestatistics/UsageStatsMetaData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.Set;
2525

2626
public class UsageStatsMetaData implements PluginMetaData {
27-
public static final Version VERSION = new Version(1, 0, 6);
27+
public static final Version VERSION = new Version(1, 0, 7);
2828

2929
@Override
3030
public String getUniqueId() {

src/main/java/org/graylog/plugins/usagestatistics/dto/MacAddress.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ public abstract class MacAddress {
3030
private static final Pattern PATTERN = Pattern.compile("[0-9a-f]{2}([:-][0-9a-f]{2}){5}", Pattern.CASE_INSENSITIVE);
3131

3232
public static MacAddress create(String macAddress) {
33+
if(macAddress == null || macAddress.isEmpty()) {
34+
return EMPTY;
35+
}
3336
checkArgument(PATTERN.matcher(macAddress).matches());
3437

3538
return new AutoValue_MacAddress(macAddress.substring(0, 8));

0 commit comments

Comments
 (0)