From ba2aea4ef1a8d3ead424d295f5df7c19077dae07 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 13 Nov 2015 10:13:44 +0100 Subject: [PATCH] Polish contribution Closes gh-4456 --- .../boot/actuate/autoconfigure/ShellProperties.java | 8 ++++---- .../actuate/autoconfigure/CrshAutoConfigurationTests.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java index bf86cc59bae..6a2ec643323 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java @@ -244,14 +244,14 @@ public class ShellProperties { private Integer port = 2000; /** - * Number of milliseconds after which unused connections are closed. + * Number of milliseconds after user will be prompted to login again. */ - private Integer idleTimeout = 600000; + private Integer authTimeout = 600000; /** - * Number of milliseconds after user will be prompted to login again. + * Number of milliseconds after which unused connections are closed. */ - private Integer authTimeout = 600000; + private Integer idleTimeout = 600000; @Override protected void applyToCrshShellConfig(Properties config) { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java index ec9029040bb..c8b155282e7 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java @@ -137,13 +137,13 @@ public class CrshAutoConfigurationTests { MockEnvironment env = new MockEnvironment(); env.setProperty("shell.ssh.enabled", "true"); env.setProperty("shell.ssh.auth-timeout", "300000"); - env.setProperty("shell.ssh.idle-timeout", "300000"); + env.setProperty("shell.ssh.idle-timeout", "400000"); load(env); PluginLifeCycle lifeCycle = this.context.getBean(PluginLifeCycle.class); assertEquals("300000", lifeCycle.getConfig().getProperty("crash.ssh.auth_timeout")); - assertEquals("300000", lifeCycle.getConfig().getProperty("crash.ssh.idle_timeout")); + assertEquals("400000", lifeCycle.getConfig().getProperty("crash.ssh.idle_timeout")); } private void load(MockEnvironment env) {