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

Fixed critical issues reported by sonar (Empty If Stmt)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@63495 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-03-02 16:40:09 +00:00
parent 6df1a7bca4
commit 83f2f59bcb
3 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java
View File

@@ -102,11 +102,11 @@ public class CompleteEventAction extends RMActionExecuterAbstractBase
updateEventEligible(da); updateEventEligible(da);
} }
else // else
{ // {
// RM-695: Commenting error handling out. If the current disposition stage does not define the event being completed nothing should happen. // RM-695: Commenting error handling out. If the current disposition stage does not define the event being completed nothing should happen.
// throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_EVENT_NO_DISP_LC, eventName)); // throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_EVENT_NO_DISP_LC, eventName));
} // }
} }
} }
} }

20
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java
View File

@@ -352,6 +352,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
Map<String, List<String>> caveatMap = (Map<String, List<String>>)conEntry.getValue(); Map<String, List<String>> caveatMap = (Map<String, List<String>>)conEntry.getValue();
List<String> allowedValues = null; List<String> allowedValues = null;
@SuppressWarnings("unused")
boolean found = false; boolean found = false;
for (QName propertyName : props) for (QName propertyName : props)
@@ -382,10 +383,10 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
} }
} }
if (! found) //if (! found)
{ //{
//throw new AlfrescoRuntimeException("Constraint does not exist (or is not used): "+conStr); //throw new AlfrescoRuntimeException("Constraint does not exist (or is not used): "+conStr);
} //}
if (allowedValues != null) if (allowedValues != null)
{ {
@@ -922,11 +923,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
readLock.lock(); readLock.lock();
members = caveatConfig.get(listName); members = caveatConfig.get(listName);
if(members == null) if (members != null)
{
// list does not exist
}
else
{ {
try try
{ {
@@ -934,11 +931,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
writeLock.lock(); writeLock.lock();
// check again // check again
members = caveatConfig.get(listName); members = caveatConfig.get(listName);
if(members == null) if (members != null)
{
// list does not exist
}
else
{ {
// authorities contains authority, values[] // authorities contains authority, values[]
// pivot contains value, members[] // pivot contains value, members[]
@@ -964,7 +957,6 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon
readLock.lock(); readLock.lock();
writeLock.unlock(); writeLock.unlock();
} }
} }
} }
finally finally

8
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
View File

@@ -603,12 +603,8 @@ public class FilePlanServiceImpl extends ServiceBaseImpl
} }
// Prepend it to the path // Prepend it to the path
nodeRefPath.addFirst(nodeRef); nodeRefPath.addFirst(nodeRef);
// Are we at the root // Are we not at the root
if (isFilePlan(nodeRef) == true) if (isFilePlan(nodeRef) == false)
{
// We're done
}
else
{ {
ChildAssociationRef assocRef = nodeService.getPrimaryParent(nodeRef); ChildAssociationRef assocRef = nodeService.getPrimaryParent(nodeRef);
if (assocRef == null) if (assocRef == null)