Skip to content

Commit

Permalink
Fixing squid: S1166 Exception handlers should preserve the original e…
Browse files Browse the repository at this point in the history
…xception
  • Loading branch information
devFozgul committed Jun 22, 2016
1 parent 4cb165f commit f832a07
Showing 1 changed file with 16 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand All @@ -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();
}
}
Expand All @@ -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;
}
}
Expand All @@ -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();
}
}
Expand All @@ -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;
}
}
Expand All @@ -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();
}
}
Expand All @@ -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();
}
}
Expand All @@ -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;
}
}
Expand All @@ -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);
}
}
Expand All @@ -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);
}
}
Expand All @@ -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();
}
}
Expand Down

0 comments on commit f832a07

Please sign in to comment.