seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'che-22488' of github.com:eclipse-che/che-server into che-22488

pull/567/head
Igor 2023-09-20 12:13:55 +03:00
parent 7c9dd6272c 35237283ed
commit caa12725b6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wsmaster/che-core-api-factory-bitbucket/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketAuthorizingFileContentProvider.java
View File

@ -61,7 +61,7 @@ class BitbucketAuthorizingFileContentProvider extends AuthorizingFileContentProv
requestURL.substring(requestURL.indexOf(split[6]) + split[6].length() + 1),
token.getToken());
} catch (UnknownScmProviderException e) {
return fetchContentWithoutToken(requestURL, e);
return fetchContentWithoutToken(requestURL);
} catch (ScmCommunicationException e) {
return toIOException(fileURL, e);
} catch (ScmUnauthorizedException

6
wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java
View File

@ -92,7 +92,7 @@ public class AuthorizingFileContentProvider<T extends RemoteFactoryUrl>
return urlFetcher.fetch(requestURL, authorization);
}
} catch (UnknownScmProviderException e) {
return fetchContentWithoutToken(requestURL, e);
return fetchContentWithoutToken(requestURL);
} catch (ScmCommunicationException e) {
return toIOException(fileURL, e);
} catch (ScmUnauthorizedException
@ -102,7 +102,7 @@ public class AuthorizingFileContentProvider<T extends RemoteFactoryUrl>
}
}
protected String fetchContentWithoutToken(String requestURL, UnknownScmProviderException e)
protected String fetchContentWithoutToken(String requestURL)
throws DevfileException, IOException {
// we don't have any provider matching this SCM provider
// so try without secrets being configured
@ -123,7 +123,7 @@ public class AuthorizingFileContentProvider<T extends RemoteFactoryUrl>
}
}
throw new DevfileException(
String.format("%s: %s", e.getMessage(), exception.getMessage()), exception);
"Could not reach devfile at " + "`" + exception.getMessage() + "`", exception);
}
}