From cbbb8ce91528e81d19d6eb150e9f2f61f0f098d2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 21 May 2014 08:44:33 -0400
Subject: [PATCH] Merge branch 'ticket/81' into develop
---
src/main/java/com/gitblit/transport/ssh/SshDaemon.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
index 6956c12..4d64cfb 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
@@ -50,8 +50,6 @@
* Manager for the ssh transport. Roughly analogous to the
* {@link com.gitblit.transport.git.GitDaemon} class.
*
- * @author Eric Myhre
- *
*/
public class SshDaemon {
@@ -214,8 +212,8 @@
Files.touch(file);
try {
JnaUtils.setFilemode(file, JnaUtils.S_IRUSR | JnaUtils.S_IWUSR);
- } catch (UnsupportedOperationException e) {
- // Windows
+ } catch (UnsatisfiedLinkError | UnsupportedOperationException e) {
+ // Unexpected/Unsupported OS or Architecture
}
FileOutputStream os = new FileOutputStream(file);
--
Gitblit v1.9.1