hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 07:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into DS-2784-jersey2

Browse Source 
Conflicts:
	dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java
This commit is contained in:
aleksanderkotbury
2015-12-11 19:28:09 +01:00
parent 47f1bdb517 ccfec39bb5
commit cc4dd7063f
208 changed files with 2363 additions and 1849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java
View File

@@ -165,8 +165,6 @@ public class BitstreamResource extends Resource
{
context = createContext(getUser(headers));
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.READ);
List<org.dspace.authorize.ResourcePolicy> resourcePolicies = authorizeService.getPolicies(context, dspaceBitstream);
//TODO why isn't the above used...
policies = new Bitstream(dspaceBitstream, servletContext, "policies", context).getPolicies();
context.complete();