Merge pull request #5 from meonkeys/master

[FIXED JENKINS-11443] - E-mail address as Jabber ID config setting.
jenkinsci · Oct 23, 2011 · 3e3f929 · 3e3f929
2 parents 5958a1f + e88e473
commit 3e3f929
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/hudson/plugins/jabber/im/transport/JabberPublisher.java b/src/main/java/hudson/plugins/jabber/im/transport/JabberPublisher.java
@@ -65,7 +65,7 @@ protected String getPluginName() {
 	protected String getConfiguredIMId(User user) {
 	    // if set, user property override all other settings:
         JabberUserProperty jabberUserProperty = (JabberUserProperty) user.getProperties().get(JabberUserProperty.DESCRIPTOR);
-        if (jabberUserProperty != null) {
+        if (jabberUserProperty != null && jabberUserProperty.getJid() != null) {
             return jabberUserProperty.getJid();
         }