From f832a07e996d16dd3eeaaefdc9ae93acb7ab4365 Mon Sep 17 00:00:00 2001
From: Fevzi Ozgul <fevzi.ozgul@devfactory.com>
Date: Wed, 22 Jun 2016 16:05:35 +0300
Subject: [PATCH] Fixing squid: S1166 Exception handlers should preserve the
 original exception

---
 .../teamcity/TeamCityIdResolver.java            | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/TeamCityIdResolver.java b/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/TeamCityIdResolver.java
index e6bbd8d7..c1f24685 100644
--- a/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/TeamCityIdResolver.java
+++ b/tcslackbuildnotifier-core/src/main/java/slacknotifications/teamcity/TeamCityIdResolver.java
@@ -6,15 +6,20 @@
 import jetbrains.buildServer.serverSide.SProject;
 
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public final class TeamCityIdResolver {
-	
+
+	private static final Logger LOGGER = Logger.getLogger(TeamCityIdResolver.class.getName());
+
 	private TeamCityIdResolver(){}
 	
 	public static String getBuildTypeId(SBuildType buildType){
 		try {
 			return buildType.getExternalId();
 		} catch (NoSuchMethodError ex) {
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return buildType.getBuildTypeId();
 		}
 	}
@@ -23,6 +28,7 @@ public static String getExternalBuildId(SBuildType buildType){
 		try {
 			return buildType.getExternalId();
 		} catch (NoSuchMethodError ex) {
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return buildType.getBuildTypeId();
 		}
 	}
@@ -31,6 +37,7 @@ public static String getExternalBuildIdOrNull(SBuildType buildType){
 		try {
 			return buildType.getExternalId();
 		} catch (NoSuchMethodError ex) {
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return null;
 		}
 	}
@@ -39,6 +46,7 @@ public static String getInternalBuildId(SBuildType buildType){
 		try {
 			return buildType.getInternalId();
 		} catch (NoSuchMethodError ex) {
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return buildType.getBuildTypeId();
 		}
 	}
@@ -47,6 +55,7 @@ public static String getInternalBuildIdOrNull(SBuildType buildType){
 		try {
 			return buildType.getInternalId();
 		} catch (NoSuchMethodError ex) {
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return null;
 		}
 	}
@@ -55,6 +64,7 @@ public static String getProjectId(SProject project){
 		try {
 			return project.getExternalId();
 		} catch (NoSuchMethodError ex) {
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return project.getProjectId();
 		}
 	}
@@ -67,6 +77,7 @@ public static String getExternalProjectId(SProject project){
 		try {
 			return project.getExternalId();
 		} catch (NoSuchMethodError ex) {
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return project.getProjectId();
 		}
 	}
@@ -75,6 +86,7 @@ public static String getExternalProjectIdOrNull(SProject project){
 		try {
 			return project.getExternalId();
 		} catch (NoSuchMethodError ex) {
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return null;
 		}
 	}
@@ -90,6 +102,7 @@ public static SProject findProjectById(ProjectManager projectManager, String pro
 		try {
 			return projectManager.findProjectByExternalId(projectId);
 		} catch (NoSuchMethodError ex){
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return projectManager.findProjectById(projectId);
 		}
 	}
@@ -105,6 +118,7 @@ public static SBuildType findBuildTypeById(ProjectManager projectManager, String
 		try {
 			return projectManager.findBuildTypeByExternalId(buildTypeId);
 		} catch (NoSuchMethodError ex){
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return projectManager.findBuildTypeById(buildTypeId);
 		}
 	}
@@ -119,6 +133,7 @@ public static List<SBuildType> getOwnBuildTypes(SProject project) {
 		try {
 			return project.getOwnBuildTypes();
 		} catch (NoSuchMethodError ex){
+			LOGGER.log(Level.INFO,ex.getMessage(),ex);
 			return project.getBuildTypes();
 		}
 	}