|
|
|
@ -41,6 +41,8 @@ public class ClassConflictConvertor implements ThrowableConverter {
|
|
|
|
|
*/ |
|
|
|
|
private static final Pattern JAR_NAME_PATTERN = Pattern.compile("([\\w+-\\.]*\\.jar)"); |
|
|
|
|
|
|
|
|
|
private static final String WEB_INF_STRING = "WEB-INF"; |
|
|
|
|
|
|
|
|
|
private final Map<Class<?>, ClassNameConverter> throwableMap = new HashMap<>(); |
|
|
|
|
|
|
|
|
|
public ClassConflictConvertor() { |
|
|
|
@ -103,7 +105,7 @@ public class ClassConflictConvertor implements ThrowableConverter {
|
|
|
|
|
if (matcher.find()) { |
|
|
|
|
String jar = matcher.group(); |
|
|
|
|
List<String> libPath = null; |
|
|
|
|
if (file.contains("WEB-INF")) { |
|
|
|
|
if (file.contains(WEB_INF_STRING)) { |
|
|
|
|
libPath = libMap.get(DetectorConstants.WEB_LIB_PATH); |
|
|
|
|
} else { |
|
|
|
|
libPath = libMap.get(DetectorConstants.FR_HOME_LIB); |
|
|
|
|