From 0c7dd0f74b0abcf110670d450eb69e62b54b90af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Tue, 1 May 2012 11:22:24 +0200
Subject: Fix(1): Set the correct response id when errors occur.

Fixes https://github.com/orbekk/protobuf-simple-rpc/issues/1.
---
 src/main/java/com/orbekk/protobuf/RequestDispatcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/orbekk/protobuf/RequestDispatcher.java b/src/main/java/com/orbekk/protobuf/RequestDispatcher.java
index b0a4600..6af6e5e 100644
--- a/src/main/java/com/orbekk/protobuf/RequestDispatcher.java
+++ b/src/main/java/com/orbekk/protobuf/RequestDispatcher.java
@@ -58,6 +58,7 @@ public class RequestDispatcher extends Thread {
         }
         
         public void internalRun() throws InterruptedException {
+            response.setRequestId(request.getRequestId());
             Service service = services.get(request.getFullServiceName());
             if (service == null) {
                 response.setError(Data.Response.RpcError.UNKNOWN_SERVICE);
@@ -90,7 +91,6 @@ public class RequestDispatcher extends Thread {
                         method.getFullName(),
                         requestMessage));
             }
-            response.setRequestId(request.getRequestId());
             service.callMethod(method, rpc, requestMessage, callback);
         }
         
-- 
cgit v1.2.3