Correct return of error xml on GET

danchang · May 20, 2012 · f133a8a · f133a8a
1 parent de45b69
commit f133a8a
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdAgentGroupsResource.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdAgentGroupsResource.java
@@ -130,7 +130,7 @@ public Representation represent(Variant variant) throws ResourceException {
                 agentGroupRestInfo = createAgentGroupRestInfo(idInt);
             }
             catch (Exception exception) {
-                OpenAcdUtilities.setResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Agent Group failed", exception.getLocalizedMessage());
+                return OpenAcdUtilities.getResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Agent Group failed", exception.getLocalizedMessage());
             }
 
             return new OpenAcdAgentGroupRepresentation(variant.getMediaType(), agentGroupRestInfo);

diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdAgentsResource.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdAgentsResource.java
@@ -140,7 +140,7 @@ public Representation represent(Variant variant) throws ResourceException {
                 agentRestInfo = createAgentRestInfo(idInt);
             }
             catch (Exception exception) {
-                OpenAcdUtilities.setResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Agent failed", exception.getLocalizedMessage());
+                return OpenAcdUtilities.getResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Agent failed", exception.getLocalizedMessage());
             }
 
             return new OpenAcdAgentRepresentation(variant.getMediaType(), agentRestInfo);

diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdClientsResource.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdClientsResource.java
@@ -124,7 +124,7 @@ public Representation represent(Variant variant) throws ResourceException {
                 clientRestInfo = createClientRestInfo(idInt);
             }
             catch (Exception exception) {
-                OpenAcdUtilities.setResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Client failed", exception.getLocalizedMessage());
+                return OpenAcdUtilities.getResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Client failed", exception.getLocalizedMessage());
             }
 
             return new OpenAcdClientRepresentation(variant.getMediaType(), clientRestInfo);

diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdLinesResource.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdLinesResource.java
@@ -134,7 +134,7 @@ public Representation represent(Variant variant) throws ResourceException {
                 lineRestInfo = createLineRestInfo(idInt);
             }
             catch (Exception exception) {
-                OpenAcdUtilities.setResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Line failed", exception.getLocalizedMessage());
+                return OpenAcdUtilities.getResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Line failed", exception.getLocalizedMessage());
             }
 
             return new OpenAcdLineRepresentation(variant.getMediaType(), lineRestInfo);

diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdQueueGroupsResource.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdQueueGroupsResource.java
@@ -129,7 +129,7 @@ public Representation represent(Variant variant) throws ResourceException {
                 queueGroupRestInfo = createQueueGroupRestInfo(idInt);
             }
             catch (Exception exception) {
-                OpenAcdUtilities.setResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Queue Group failed", exception.getLocalizedMessage());
+                return OpenAcdUtilities.getResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Queue Group failed", exception.getLocalizedMessage());
             }
 
             return new OpenAcdQueueGroupRepresentation(variant.getMediaType(), queueGroupRestInfo);

diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdReleaseCodesResource.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdReleaseCodesResource.java
@@ -126,7 +126,7 @@ public Representation represent(Variant variant) throws ResourceException {
                 releaseCodeRestInfo = createReleaseCodeRestInfo(idInt);
             }
             catch (Exception exception) {
-                OpenAcdUtilities.setResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Release Code failed", exception.getLocalizedMessage());
+                return OpenAcdUtilities.getResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Release Code failed", exception.getLocalizedMessage());
             }
 
             return new OpenAcdReleaseCodeRepresentation(variant.getMediaType(), releaseCodeRestInfo);

diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdSettingsResource.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdSettingsResource.java
@@ -97,7 +97,7 @@ public Representation represent(Variant variant) throws ResourceException {
                 settingRestInfo = createSettingRestInfo(idInt);
             }
             catch (Exception exception) {
-                OpenAcdUtilities.setResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Settings failed", exception.getLocalizedMessage());
+                return OpenAcdUtilities.getResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Settings failed", exception.getLocalizedMessage());
             }
 
             return new OpenAcdSettingRepresentation(variant.getMediaType(), settingRestInfo);

diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdSkillGroupsResource.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdSkillGroupsResource.java
@@ -127,7 +127,7 @@ public Representation represent(Variant variant) throws ResourceException {
                 skillGroupRestInfo = createSkillGroupRestInfo(idInt);
             }
             catch (Exception exception) {
-                OpenAcdUtilities.setResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Skill Group failed", exception.getLocalizedMessage());
+                return OpenAcdUtilities.getResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Skill Group failed", exception.getLocalizedMessage());
             }
 
             return new OpenAcdSkillGroupRepresentation(variant.getMediaType(), skillGroupRestInfo);

diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdSkillsResource.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/OpenAcdSkillsResource.java
@@ -124,7 +124,7 @@ public Representation represent(Variant variant) throws ResourceException {
                 skillRestInfo = createSkillRestInfo(idInt);
             }
             catch (Exception exception) {
-                OpenAcdUtilities.setResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Skills failed", exception.getLocalizedMessage());
+                return OpenAcdUtilities.getResponseError(getResponse(), OpenAcdUtilities.ResponseCode.ERROR_READ_FAILED, "Read Skills failed", exception.getLocalizedMessage());
             }
 
             return new OpenAcdSkillRepresentation(variant.getMediaType(), skillRestInfo);