Skip to content

Commit 4ac122e

Browse files
Fix #10 "toString() on fresh SyslogMessageSenders causes NPE"
1 parent 2643b14 commit 4ac122e

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

src/main/java/com/cloudbees/syslog/sender/AbstractSyslogMessageSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void setDefaultSeverity(Severity defaultSeverity) {
136136

137137
@Override
138138
public String toString() {
139-
return "AbstractSyslogMessageSender{" +
139+
return getClass().getName() + "{" +
140140
"defaultAppName='" + defaultAppName + '\'' +
141141
", defaultFacility=" + defaultFacility +
142142
", defaultMessageHostname='" + defaultMessageHostname + '\'' +

src/main/java/com/cloudbees/syslog/sender/TcpSyslogMessageSender.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,10 @@ public void setSyslogServerPort(int syslogServerPort) {
202202
this.syslogServerPort = syslogServerPort;
203203
}
204204

205+
@Nullable
205206
public String getSyslogServerHostname() {
206-
return syslogServerHostnameReference.get().getHostName();
207+
InetAddress inetAddress = syslogServerHostnameReference.get();
208+
return inetAddress == null ? null : inetAddress.getHostName();
207209
}
208210

209211
public int getSyslogServerPort() {
@@ -240,7 +242,7 @@ public void setMaxRetryCount(int maxRetryCount) {
240242

241243
@Override
242244
public String toString() {
243-
return "TcpSyslogMessageSender{" +
245+
return getClass().getName() + "{" +
244246
"syslogServerHostname='" + this.getSyslogServerHostname() + '\'' +
245247
", syslogServerPort='" + this.getSyslogServerPort() + '\'' +
246248
", ssl=" + ssl +

src/main/java/com/cloudbees/syslog/sender/UdpSyslogMessageSender.java

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,29 @@ public void setSyslogServerPort(int syslogServerPort) {
120120
this.syslogServerPort = syslogServerPort;
121121
}
122122

123+
@Nullable
123124
public String getSyslogServerHostname() {
124-
return syslogServerHostnameReference.get().getHostName();
125+
InetAddress inetAddress = syslogServerHostnameReference.get();
126+
return inetAddress == null ? null : inetAddress.getHostName();
125127
}
126128

127129
public int getSyslogServerPort() {
128130
return syslogServerPort;
129131
}
132+
133+
@Override
134+
public String toString() {
135+
return getClass().getName() + "{" +
136+
"syslogServerHostname='" + this.getSyslogServerHostname() + '\'' +
137+
", syslogServerPort='" + this.getSyslogServerPort() + '\'' +
138+
", defaultAppName='" + defaultAppName + '\'' +
139+
", defaultFacility=" + defaultFacility +
140+
", defaultMessageHostname='" + defaultMessageHostname + '\'' +
141+
", defaultSeverity=" + defaultSeverity +
142+
", messageFormat=" + messageFormat +
143+
", sendCounter=" + sendCounter +
144+
", sendDurationInNanosCounter=" + sendDurationInNanosCounter +
145+
", sendErrorCounter=" + sendErrorCounter +
146+
'}';
147+
}
130148
}

0 commit comments

Comments
 (0)