OF-1301: Don't fail on default FQDN calculation. (#760)

f2a95704 · Guus der Kinderen · akrherz · 07534897 · f2a95704
Commit f2a95704 authored Apr 10, 2017 by Guus der Kinderen Committed by akrherz Apr 10, 2017
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

XMPPServerInfoImpl.java ...ava/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java +9 -3

No files found.
--- a/src/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java
+++ b/src/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java
@@ -62,9 +62,15 @@ public class XMPPServerInfoImpl implements XMPPServerInfo {
    @Override
    public String getHostname()
    {
+        final String fqdn = JiveGlobals.getProperty( "xmpp.fqdn" );
+        if ( fqdn != null && !fqdn.trim().isEmpty() )
+        {
+            return fqdn.trim().toLowerCase();
+        }
        try
        {
-    	    return JiveGlobals.getProperty( "xmpp.fqdn",  InetAddress.getLocalHost().getCanonicalHostName() ).toLowerCase();
+            return InetAddress.getLocalHost().getCanonicalHostName().toLowerCase();
        }
        catch (UnknownHostException ex)
        {