From 44b56a20a5c0f320049efc884dc2e936472a7cc0 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 27 Feb 2006 13:43:39 +0000
Subject: [PATCH] Fixed NullPointerException occuring under Linux when CIFS not
 configured

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2496 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../filesys/server/config/ServerConfiguration.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java b/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
index 63204e6871..f977a12ebf 100644
--- a/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
+++ b/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
@@ -2393,12 +2393,13 @@ public class ServerConfiguration implements ApplicationListener
                 // Get the NetBIOS name list from the browse master
 
                 NetBIOSNameList nbNameList = NetBIOSSession.FindNamesForAddress(nbName.getIPAddressString(0));
-                nbName = nbNameList.findName(NetBIOSName.MasterBrowser, false);
-
-                // Set the domain/workgroup name
-
-                if (nbName != null)
-                    domainName = nbName.getName();
+                if (nbNameList != null)
+                {
+                    nbName = nbNameList.findName(NetBIOSName.MasterBrowser, false);
+                    // Set the domain/workgroup name
+                    if (nbName != null)
+                        domainName = nbName.getName();
+                }
             }
             catch (IOException ex)
             {