Merged 5.2.N (5.2.1) to HEAD (5.2)

125771 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125586 mward: ACE-5052: close spring application context in CIFSServerBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:11:30 +00:00
parent e6c5a70057
commit 4ca7800805

View File

@@ -203,11 +203,12 @@ public class CIFSServerBean extends AbstractLifecycleBean
out.println("CIFS Server Test");
out.println("----------------");
ClassPathXmlApplicationContext ctx = null;
try
{
// Create the configuration service in the same way that Spring creates it
ApplicationContext ctx = new ClassPathXmlApplicationContext("alfresco/application-context.xml");
ctx = new ClassPathXmlApplicationContext("alfresco/application-context.xml");
// Get the CIFS server bean
@@ -267,6 +268,13 @@ public class CIFSServerBean extends AbstractLifecycleBean
{
ex.printStackTrace();
}
finally
{
if (ctx != null)
{
ctx.close();
}
}
System.exit(1);
}