Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Two minor changes #291

Merged
merged 2 commits into from
Dec 21, 2016
Merged

Two minor changes #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
766ab91
Use cause message when initializing an SSHRuntimeException from a Thr…
Dec 21, 2016
9e3b9f7
Obtain the sshj.properties resource from the ClassLoader that loaded …
Dec 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/schmizz/sshj/DefaultConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public DefaultConfig() {
private String readVersionFromProperties() {
try {
Properties properties = new Properties();
properties.load(Thread.currentThread().getContextClassLoader().getResourceAsStream("sshj.properties"));
properties.load(DefaultConfig.class.getClassLoader().getResourceAsStream("sshj.properties"));
String property = properties.getProperty("sshj.version");
return "SSHJ_" + property.replace('-', '_'); // '-' is a disallowed character, see RFC-4253#section-4.2
} catch (IOException e) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/schmizz/sshj/common/SSHRuntimeException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public SSHRuntimeException(String message, Throwable cause) {
}

public SSHRuntimeException(Throwable cause) {
this(null, cause);
this(cause.getMessage(), cause);
}

}