diff options
author | chegar <none@none> | 2010-04-13 12:02:06 +0100 |
---|---|---|
committer | chegar <none@none> | 2010-04-13 12:02:06 +0100 |
commit | 07784b8dcba53505043dbde5f6ab67306b5dd88f (patch) | |
tree | e7476632a69f89433670df2794e9f659e20c7054 /src/share/classes/java/net/NetworkInterface.java | |
parent | c0fd5d35e2f2c86a9da3160bc4c4466c3fb53486 (diff) | |
download | jdk8u_jdk-07784b8dcba53505043dbde5f6ab67306b5dd88f.tar.gz |
6706251: api/java_net/NetworkInterface/index.html#misc: getDisplayName() returned non null but empty String
Reviewed-by: alanb, michaelm, andrew
Diffstat (limited to 'src/share/classes/java/net/NetworkInterface.java')
-rw-r--r-- | src/share/classes/java/net/NetworkInterface.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/share/classes/java/net/NetworkInterface.java b/src/share/classes/java/net/NetworkInterface.java index 07941b062f..eb33271398 100644 --- a/src/share/classes/java/net/NetworkInterface.java +++ b/src/share/classes/java/net/NetworkInterface.java @@ -221,11 +221,12 @@ public final class NetworkInterface { * A display name is a human readable String describing the network * device. * - * @return the display name of this network interface, - * or null if no display name is available. + * @return a non-empty string representing the display name of this network + * interface, or null if no display name is available. */ public String getDisplayName() { - return displayName; + /* strict TCK conformance */ + return "".equals(displayName) ? null : displayName; } /** |