diff options
| -rw-r--r-- | org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestGitServer.java | 12 | ||||
| -rw-r--r-- | org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestGitServer.java b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestGitServer.java index 1862b07603..250a13876a 100644 --- a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestGitServer.java +++ b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestGitServer.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.Map; import org.apache.sshd.common.NamedResource; +import org.apache.sshd.common.PropertyResolver; import org.apache.sshd.common.PropertyResolverUtils; import org.apache.sshd.common.SshConstants; import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; @@ -349,14 +349,14 @@ public class SshTestGitServer { } /** - * Retrieves the server's property map. This is a live map; changing it - * affects the server. + * Retrieves the server's {@link PropertyResolver}, giving access to server + * properties. * - * @return a live map of the server's properties + * @return the {@link PropertyResolver} * @since 5.9 */ - public Map<String, Object> getProperties() { - return server.getProperties(); + public PropertyResolver getPropertyResolver() { + return server; } /** diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java index a58ee2e992..f27af6e196 100644 --- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshTest.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import org.apache.sshd.client.config.hosts.KnownHostEntry; +import org.apache.sshd.common.PropertyResolverUtils; import org.apache.sshd.server.ServerFactoryManager; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.TransportException; @@ -189,8 +190,8 @@ public class ApacheSshTest extends SshTestBase { */ @Test public void testCloneAndFetchWithSessionLimit() throws Exception { - server.getProperties().put(ServerFactoryManager.MAX_CONCURRENT_SESSIONS, - Integer.valueOf(2)); + PropertyResolverUtils.updateProperty(server.getPropertyResolver(), + ServerFactoryManager.MAX_CONCURRENT_SESSIONS, 2); File localClone = cloneWith("ssh://localhost/doesntmatter", defaultCloneDir, null, // "Host localhost", // |