[JENKINS-25515] workaround for VCard parsing problem

jenkinsci · Nov 10, 2014 · 87f188e · 87f188e
1 parent 9d9d911
commit 87f188e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/hudson/plugins/jabber/im/transport/JabberIMConnection.java b/src/main/java/hudson/plugins/jabber/im/transport/JabberIMConnection.java
@@ -566,12 +566,16 @@ private boolean vCardExists() throws XMPPException {
 
             // there was probably a 'real' problem
             throw e;
-        } catch (SmackException.NotConnectedException e) {
-            LOGGER.warning(ExceptionHelper.dump(e));
-        } catch (SmackException.NoResponseException e) {
+        } catch (SmackException.NotConnectedException | SmackException.NoResponseException e) {
             LOGGER.warning(ExceptionHelper.dump(e));
+            return false;
+        } catch (ClassCastException e) {
+        	// This seems to be a VCard parsing exception in Smack 4.0.x
+        	// See e.g. http://stackoverflow.com/questions/26752285/android-asmack-vcard-classcastexception-while-calling-vcard-loadconn
+        	LOGGER.warning(ExceptionHelper.dump(e));
+        	// Assume vcard exists, just couldn't be parsed by smack
+        	return true;
         }
-        return false;
     }
 
 	/**