mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merge V2.0 to HEAD
5234: LicenseService shutdown 5256: AR-1273 workaround 5289: AWC-1142 5294: WCM-360 5296: Potential NPE in patches dao git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -185,6 +185,10 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean implements Desc
|
||||
@Override
|
||||
protected void onShutdown(ApplicationEvent event)
|
||||
{
|
||||
if (this.licenseService != null)
|
||||
{
|
||||
this.licenseService.shutdown();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -396,6 +400,10 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean implements Desc
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
public void shutdown()
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user