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

REPO-2516 - MNT-17845: Added a null check on the noderef

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2017-06-25 15:05:22 +00:00
parent f10fa934f5
commit c9806ab898
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/repo/virtual/ref/Reference.java
View File

@@ -116,34 +116,36 @@ public class Reference
*/ */
public static final Reference fromNodeRef(NodeRef nodeRef) public static final Reference fromNodeRef(NodeRef nodeRef)
{ {
String id = nodeRef.getId(); if (nodeRef != null)
if (id.startsWith("" + VIRTUAL_TOKEN) && (id.length() > 1)) // belts-and-braces
{ {
char token = id.charAt(1); String id = nodeRef.getId();
Encoding encoding = Encodings.fromToken(token); if (id.startsWith("" + VIRTUAL_TOKEN) && (id.length() > 1)) // belts-and-braces
if (encoding != null)
{ {
try char token = id.charAt(1);
Encoding encoding = Encodings.fromToken(token);
if (encoding != null)
{ {
String referenceString = id.substring(2); try
if (!encoding.urlNative)
{ {
referenceString = new String(org.apache.commons.codec.binary.Base64.decodeBase64(referenceString)); String referenceString = id.substring(2);
if (!encoding.urlNative)
{
referenceString = new String(org.apache.commons.codec.binary.Base64.decodeBase64(referenceString));
}
Reference reference = encoding.parser.parse(referenceString);
return reference.propagateNodeRefMutations(nodeRef);
}
catch (ReferenceParseException rpe)
{
logger.debug("Parse exception:", rpe);
return null;
}
catch (ReferenceEncodingException ree)
{
logger.debug("Encoding exception:", ree);
return null;
} }
Reference reference = encoding.parser.parse(referenceString);
return reference.propagateNodeRefMutations(nodeRef);
} }
catch (ReferenceParseException rpe)
{
logger.debug("Parse exception:", rpe);
return null;
}
catch (ReferenceEncodingException ree)
{
logger.debug("Encoding exception:", ree);
return null;
}
} }
} }
return null; return null;