From df7594460a49a7d5395d131e75791cd604b7cdf9 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 30 Apr 2014 16:15:52 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    68142:
 Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)       67640:
 MNT-11096: Merged DEV to V4.2-BUG-FIX (4.2.3)          67391: MNT-11096:
 org.alfresco.error.AlfrescoRuntimeException Session timeout out of range (0 -
 3600)             - Do sessionTimeout validation in the CIFSConfigBean setter

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68426 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../filesys/AbstractServerConfigurationBean.java |  2 +-
 .../alfresco/filesys/config/CIFSConfigBean.java  | 16 ++++++++++++++++
 .../filesys/config/ServerConfigurationBean.java  |  3 +--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java b/source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
index 39871651a4..3dd26fbc24 100644
--- a/source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
+++ b/source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
@@ -130,7 +130,7 @@ public abstract class AbstractServerConfigurationBean extends ServerConfiguratio
 	
   // Maximum session timeout
   
-  protected static final int MaxSessionTimeout    = 60 * 60;  // 1 hour
+  public static final int MaxSessionTimeout    = 60 * 60;  // 1 hour
     
   // Disk interface to use for shared filesystems
   
diff --git a/source/java/org/alfresco/filesys/config/CIFSConfigBean.java b/source/java/org/alfresco/filesys/config/CIFSConfigBean.java
index 9424a620be..5a4d85a2a0 100644
--- a/source/java/org/alfresco/filesys/config/CIFSConfigBean.java
+++ b/source/java/org/alfresco/filesys/config/CIFSConfigBean.java
@@ -18,9 +18,12 @@
  */
 package org.alfresco.filesys.config;
 
+import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.jlan.server.auth.ICifsAuthenticator;
 import org.alfresco.jlan.smb.server.VirtualCircuitList;
 
+import static org.alfresco.filesys.AbstractServerConfigurationBean.MaxSessionTimeout;
+
 // TODO: Auto-generated Javadoc
 /**
  * The Class CIFSConfigBean.
@@ -520,9 +523,22 @@ public class CIFSConfigBean
      */
     public void setSessionTimeout(Integer sessionTimeout)
     {
+        validateSessionTimeout(sessionTimeout);
         this.sessionTimeout = sessionTimeout;
     }
 
+    /**
+     * Validates the session timeout.
+     * 
+     * @param sessionTimeout
+     *            the session timeout to validate
+     */
+    public void validateSessionTimeout(Integer sessionTimeout)
+    {
+        if (sessionTimeout < 0 || sessionTimeout > MaxSessionTimeout)
+            throw new AlfrescoRuntimeException("Session timeout out of range (0 - " + MaxSessionTimeout + ")");
+    }
+
     /**
      * Set the maximum virtual circuits per session
      * 
diff --git a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
index 019a311974..934920e8b5 100644
--- a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
+++ b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
@@ -1123,8 +1123,7 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean imp
 
                 // Validate the session timeout value
 
-                if (tmo < 0 || tmo > MaxSessionTimeout)
-                    throw new AlfrescoRuntimeException("Session timeout out of range (0 - " + MaxSessionTimeout + ")");
+                cifsConfigBean.validateSessionTimeout(tmo);
 
                 // Convert the session timeout to milliseconds