IMConnectionProvider.java: getAuthenticationHolder(): duplicate the s…

…anity-check to satisfy spotbugs

Signed-off-by: Jim Klimov <[email protected]>

src/main/java/hudson/plugins/im/IMConnectionProvider.java

@@ -114,9 +114,6 @@ private void tryReconnect() {
 
     // we need an additional level of indirection to the Authentication entity
     // to fix HUDSON-5978 and HUDSON-5233
-    @SuppressFBWarnings(
-        value = "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR",
-        justification = "IMConnectionProvider.descriptor is checked in wrapping getAuthenticationHolder()")
     public synchronized AuthenticationHolder getAuthenticationHolder() {
         if (descriptor == null || descriptor.getHudsonUserName() == null) {
             return null;
@@ -129,6 +126,12 @@ public Authentication getAuthentication() {
                     return authentication;
                 }
 
+                // New spotbugs UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR
+                // just can't be quiesced, so duplicating the sanity-check here
+                if (descriptor == null || descriptor.getHudsonUserName() == null) {
+                    return null;
+                }
+
                 User u = User.get(descriptor.getHudsonUserName());
 
                 return u.impersonate();