From e11c7587bad1ad019a4a0d62cecd7ae2063b5471 Mon Sep 17 00:00:00 2001
From: Kei Tsuji <ktsujister@gmail.com>
Date: Wed, 19 Oct 2016 22:23:50 +0900
Subject: [PATCH 1/2] handle exception

---
 lib/rs/src/codegen.rs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/rs/src/codegen.rs b/lib/rs/src/codegen.rs
index c86a382b..1dbb3cc0 100644
--- a/lib/rs/src/codegen.rs
+++ b/lib/rs/src/codegen.rs
@@ -174,6 +174,8 @@ macro_rules! service_client {
 macro_rules! service_client_methods {
     (methods = [$($iname:ident -> $oname:ident = $fname:ident.$mname:ident($($aname:ident: $aty:ty => $aid:expr,)*) -> $rty:ty => $enname:ident = [$($evname:ident($ename:ident: $ety:ty => $eid:expr),)*] ($rrty:ty),)*]) => {
         $(pub fn $mname(&mut self, $($aname: $aty,)*) -> $crate::Result<$rrty> {
+            #[allow(unused_imports)]
+            use $crate::protocol::Decode;
             static MNAME: &'static str = stringify!($mname);
 
             let mut args = $iname::default();
@@ -182,8 +184,21 @@ macro_rules! service_client_methods {
                                                  MNAME, $crate::protocol::MessageType::Call, &mut args, 0));
 
             let mut result = $oname::default();
-            try!($crate::protocol::helpers::receive(&mut self.protocol, &mut self.transport,
-                                                    MNAME, &mut result));
+            let (name, ty, id) = try!(self.protocol.read_message_begin(&mut self.transport));
+            if ty == $crate::protocol::MessageType::Exception {
+                // receive exception in ename, but use id to identify which one
+                // println!("name:{}, ty:{}, id:{}", name, ty, id);
+                match id + 1 {
+                    $( $eid => { let mut arg: $ety = Default::default();
+                                 try!(arg.decode(&mut self.protocol, &mut self.transport));
+                                 try!(self.protocol.read_message_end(&mut self.transport));
+                                 result.$ename = Some(arg); } ),*
+                    _ => return Err($crate::Error::from($crate::protocol::Error::ProtocolViolation))
+                }
+            } else {
+                try!($crate::protocol::helpers::receive_body(&mut self.protocol, &mut self.transport,
+                                                             MNAME, &mut result, &name, ty, id));
+            }
 
             let result = service_client_methods_translate_result!(
                 result, $enname = [$($evname($ename: $ety => $eid),)*]);

From 37f0af29d9142f9db9f4205111760c4dddf2372e Mon Sep 17 00:00:00 2001
From: Kei Tsuji <ktsujister@gmail.com>
Date: Wed, 19 Oct 2016 21:24:02 +0900
Subject: [PATCH 2/2] remove warning

---
 lib/rs/src/server/threaded.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rs/src/server/threaded.rs b/lib/rs/src/server/threaded.rs
index 041e2dff..9dae7bba 100644
--- a/lib/rs/src/server/threaded.rs
+++ b/lib/rs/src/server/threaded.rs
@@ -22,7 +22,7 @@ use std::thread;
 
 use transport::server::TransportServer;
 use transport::Transport;
-use protocol::{Protocol, ProtocolFactory};
+use protocol::ProtocolFactory;
 use processor::Processor;
 
 pub struct ThreadedServer<P, PF, TS> {
@@ -58,7 +58,7 @@ where P: Processor<PF::Protocol, TS::Transport> + Send + Sync + 'static,
 
         let (supervisor_tx, supervisor_rx) = mpsc::channel();
 
-        for _ in (0..threads) {
+        for _ in 0..threads {
             self.spawn_with_supervisor(supervisor_tx.clone());
         }