From e095ff37449cab4e2de8b7c0af3e57ad5b038079 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Mon, 13 Sep 2010 14:54:08 +0000 Subject: [PATCH] Fix to transfer status since the "error" JSON property is optional. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/transfer/HttpClientTransmitterImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java b/source/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java index e3da5d49c9..6f62ca8a26 100644 --- a/source/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java +++ b/source/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java @@ -546,15 +546,20 @@ public class HttpClientTransmitterImpl implements TransferTransmitter int currentPosition = statusObj.getInt("currentPosition"); int endPosition = statusObj.getInt("endPosition"); String statusStr= statusObj.getString("status"); - - JSONObject errorJSON = statusObj.getJSONObject("error"); - Throwable throwable = rehydrateError(errorJSON); - + TransferProgress p = new TransferProgress(); + + if(statusObj.has("error")) + { + JSONObject errorJSON = statusObj.getJSONObject("error"); + Throwable throwable = rehydrateError(errorJSON); + p.setError(throwable); + } + p.setStatus(TransferProgress.Status.valueOf(statusStr)); p.setCurrentPosition(currentPosition); p.setEndPosition(endPosition); - p.setError(throwable); + return p; } catch (RuntimeException e)