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

Missed changes during resolving conflicts.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-06-02 22:58:00 +00:00
parent f660ff4c3f
commit 7d7f7edae9
6 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -2478,7 +2478,7 @@ public class NodesImpl implements Nodes
}
// Create a new file.
Node fileNode = createNewFile(parentNodeRef, fileName, nodeTypeQName, content, properties, assocTypeQName, parameters);
final Node fileNode = createNewFile(parentNodeRef, fileName, nodeTypeQName, content, properties, assocTypeQName, parameters);
// RA-1052
try
@@ -2845,3 +2845,4 @@ public class NodesImpl implements Nodes
}
}
}

1
source/java/org/alfresco/rest/api/impl/RenditionsImpl.java
View File

@@ -465,3 +465,4 @@ public class RenditionsImpl implements Renditions, ResourceLoaderAware
return contentData.getMimetype();
}
}