inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge V2.0 to HEAD

Browse Source 
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:
Derek Hulley
2007-03-07 15:14:46 +00:00
parent 78d5d43e86
commit f17fd30824
5 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/admin/patch/hibernate/HibernatePatchDaoServiceImpl.java
View File

@@ -118,7 +118,8 @@ public class HibernatePatchDaoServiceImpl extends HibernateDaoSupport implements
{
AppliedPatch appliedPatch = iterator.next();
Date appliedOnDate = appliedPatch.getAppliedOnDate();
if (appliedOnDate != null && fromDate.compareTo(appliedOnDate) >= 0 || toDate.compareTo(appliedOnDate) <= 0)
if (appliedOnDate != null &&
(fromDate.compareTo(appliedOnDate) >= 0 || toDate.compareTo(appliedOnDate) <= 0))
{
// it is out of range
iterator.remove();