summaryrefslogtreecommitdiffstats
path: root/documentapi
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2017-05-22 12:42:10 +0200
committerGitHub <noreply@github.com>2017-05-22 12:42:10 +0200
commit327c64b72bd9b07b3ef539212260433d83e40888 (patch)
tree6cac72f70e9d4890e713d4c3c4f7aee71eb5c44f /documentapi
parent4ad1e94b3c3981250cf2ecc3952327726c717b57 (diff)
parent09be694323fbe1955c345e183d807d7c60e80c51 (diff)
Merge pull request #2449 from yahoo/freva/feed-metrics
Freva/feed metrics
Diffstat (limited to 'documentapi')
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java9
-rwxr-xr-xdocumentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java6
2 files changed, 2 insertions, 13 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
index 793e0ed73c0..9f20ca78d6e 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
@@ -198,15 +198,6 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession {
return errors.toString();
}
- static Set<Integer>
- getErrorCodes(Reply reply) {
- Set<Integer> errorCodes = new HashSet<>();
- for (int i = 0; i < reply.getNumErrors(); ++i) {
- errorCodes.add(reply.getError(i).getCode());
- }
- return errorCodes;
- }
-
private static Result.ResultType messageBusErrorToResultType(int messageBusError) {
switch (messageBusError) {
case ErrorCode.SEND_QUEUE_FULL: return Result.ResultType.TRANSIENT_ERROR;
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java
index 106791491f9..47eeb12b250 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java
@@ -167,8 +167,7 @@ public class MessageBusSyncSession implements MessageBusSession, SyncSession, Re
msg.setPriority(pri);
Reply reply = syncSend(msg);
if (reply.hasErrors()) {
- throw new DocumentAccessException(MessageBusAsyncSession.getErrorMessage(reply),
- MessageBusAsyncSession.getErrorCodes(reply));
+ throw new DocumentAccessException(MessageBusAsyncSession.getErrorMessage(reply), reply.getErrorCodes());
}
if (reply.getType() != DocumentProtocol.REPLY_UPDATEDOCUMENT) {
throw new DocumentAccessException("Received unknown response: " + reply);
@@ -218,8 +217,7 @@ public class MessageBusSyncSession implements MessageBusSession, SyncSession, Re
private void syncSendPutDocumentMessage(PutDocumentMessage putDocumentMessage) {
Reply reply = syncSend(putDocumentMessage);
if (reply.hasErrors()) {
- throw new DocumentAccessException(MessageBusAsyncSession.getErrorMessage(reply),
- MessageBusAsyncSession.getErrorCodes(reply));
+ throw new DocumentAccessException(MessageBusAsyncSession.getErrorMessage(reply), reply.getErrorCodes());
}
}
}