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

Fix to transfer status since the "error" JSON property is optional.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-09-13 14:54:08 +00:00
parent 37a10a7816
commit e095ff3744
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java
View File

@@ -547,14 +547,19 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
int endPosition = statusObj.getInt("endPosition"); int endPosition = statusObj.getInt("endPosition");
String statusStr= statusObj.getString("status"); String statusStr= statusObj.getString("status");
TransferProgress p = new TransferProgress();
if(statusObj.has("error"))
{
JSONObject errorJSON = statusObj.getJSONObject("error"); JSONObject errorJSON = statusObj.getJSONObject("error");
Throwable throwable = rehydrateError(errorJSON); Throwable throwable = rehydrateError(errorJSON);
p.setError(throwable);
}
TransferProgress p = new TransferProgress();
p.setStatus(TransferProgress.Status.valueOf(statusStr)); p.setStatus(TransferProgress.Status.valueOf(statusStr));
p.setCurrentPosition(currentPosition); p.setCurrentPosition(currentPosition);
p.setEndPosition(endPosition); p.setEndPosition(endPosition);
p.setError(throwable);
return p; return p;
} }
catch (RuntimeException e) catch (RuntimeException e)