Skip to content

Commit

Permalink
Merge pull request #56 from greycubesgav/develop
Browse files Browse the repository at this point in the history
This pull request updates both cryptomator dependancies to the latest version (as of Jun '23)
  • Loading branch information
tobihagemann authored Jul 24, 2023
2 parents 910874a + c94a1d8 commit cf85257
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<url>https://github.com/cryptomator/cli</url>

<properties>
<cryptofs.version>2.3.1</cryptofs.version>
<webdav-nio.version>1.2.6</webdav-nio.version>
<cryptofs.version>2.6.5</cryptofs.version>
<webdav-nio.version>2.0.3</webdav-nio.version>
<commons.cli.version>1.5.0</commons.cli.version>
<logback.version>1.2.9</logback.version>
<fuse-nio.version>1.3.3</fuse-nio.version>
Expand Down
19 changes: 12 additions & 7 deletions src/main/java/org/cryptomator/cli/frontend/WebDav.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package org.cryptomator.cli.frontend;

import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.nio.file.Path;
import java.util.ArrayList;

Expand All @@ -13,14 +16,16 @@ public class WebDav {
private static final Logger LOG = LoggerFactory.getLogger(WebDav.class);

private final WebDavServer server;
private ArrayList<WebDavServletController> servlets;
private ArrayList<WebDavServletController> servlets = new ArrayList<>();

public WebDav(String bindAddr, int port) {
servlets = new ArrayList<>();
server = WebDavServer.create();
server.bind(bindAddr, port);
server.start();
LOG.info("WebDAV server started: {}:{}", bindAddr, port);
try {
server = WebDavServer.create(new InetSocketAddress(InetAddress.getByName(bindAddr), port));
server.start();
LOG.info("WebDAV server started: {}:{}", bindAddr, port);
} catch (UnknownHostException e) {
throw new IllegalStateException("Error creating WebDavServer", e);
}
}

public void stop() {
Expand All @@ -35,4 +40,4 @@ public void addServlet(Path vaultRoot, String vaultName) {
servlets.add(servlet);
servlet.start();
}
}
}

0 comments on commit cf85257

Please sign in to comment.