Merge from origin

2 files changed, 9 insertions, 9 deletions

diff --git a/src/rpc-server/commands/trex_rpc_cmd_general.cpp b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
index 66999144..084e154a 100644
--- a/src/rpc-server/commands/trex_rpc_cmd_general.cpp
+++ b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
@@ -243,7 +243,7 @@ TrexRpcCmdAcquire::_run(const Json::Value &params, Json::Value &result) {
 
     try {
         port->acquire(new_owner, session_id, force);
-    } catch (const TrexRpcException &ex) {
+    } catch (const TrexException &ex) {
         generate_execute_err(result, ex.what());
     }
 
@@ -265,7 +265,7 @@ TrexRpcCmdRelease::_run(const Json::Value &params, Json::Value &result) {
 
     try {
         port->release();
-    } catch (const TrexRpcException &ex) {
+    } catch (const TrexException &ex) {
         generate_execute_err(result, ex.what());
     }
 
@@ -287,7 +287,7 @@ TrexRpcCmdGetPortStats::_run(const Json::Value &params, Json::Value &result) {
 
     try {
         port->encode_stats(result["result"]);
-    } catch (const TrexRpcException &ex) {
+    } catch (const TrexException &ex) {
         generate_execute_err(result, ex.what());
     }
 
diff --git a/src/rpc-server/commands/trex_rpc_cmd_stream.cpp b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp
index 69e5dd18..8c07bc46 100644
--- a/src/rpc-server/commands/trex_rpc_cmd_stream.cpp
+++ b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp
@@ -116,7 +116,7 @@ TrexRpcCmdAddStream::_run(const Json::Value &params, Json::Value &result) {
 
     try {
         port->add_stream(stream);
-    } catch (const TrexRpcException &ex) {
+    } catch (const TrexException &ex) {
         generate_execute_err(result, ex.what());
     }
 
@@ -350,7 +350,7 @@ TrexRpcCmdRemoveStream::_run(const Json::Value &params, Json::Value &result) {
 
     try {
         port->remove_stream(stream);
-    } catch (const TrexRpcException &ex) {
+    } catch (const TrexException &ex) {
         generate_execute_err(result, ex.what());
     }
     
@@ -374,7 +374,7 @@ TrexRpcCmdRemoveAllStreams::_run(const Json::Value &params, Json::Value &result)
 
     try {
         port->remove_and_delete_all_streams();
-    } catch (const TrexRpcException &ex) {
+    } catch (const TrexException &ex) {
         generate_execute_err(result, ex.what());
     }
 
@@ -493,7 +493,7 @@ TrexRpcCmdStopTraffic::_run(const Json::Value &params, Json::Value &result) {
 
     try {
         port->stop_traffic();
-    } catch (const TrexRpcException &ex) {
+    } catch (const TrexException &ex) {
         generate_execute_err(result, ex.what());
     }
 
@@ -550,7 +550,7 @@ TrexRpcCmdPauseTraffic::_run(const Json::Value &params, Json::Value &result) {
 
      try {
         port->pause_traffic();
-    } catch (const TrexRpcException &ex) {
+    } catch (const TrexException &ex) {
         generate_execute_err(result, ex.what());
     }
 
@@ -571,7 +571,7 @@ TrexRpcCmdResumeTraffic::_run(const Json::Value &params, Json::Value &result) {
 
      try {
         port->resume_traffic();
-    } catch (const TrexRpcException &ex) {
+    } catch (const TrexException &ex) {
         generate_execute_err(result, ex.what());
     }