master: Merged from PDXostc

2 files changed, 7 insertions, 2 deletions

diff --git a/python/jsonrpclib/SimpleJSONRPCServer.py b/python/jsonrpclib/SimpleJSONRPCServer.py
index d76da73..96443d9 100644
--- a/python/jsonrpclib/SimpleJSONRPCServer.py
+++ b/python/jsonrpclib/SimpleJSONRPCServer.py
@@ -179,7 +179,11 @@ class SimpleJSONRPCRequestHandler(
         self.end_headers()
         self.wfile.write(response)
         self.wfile.flush()
-        self.connection.shutdown(1)
+        try:
+            self.connection.shutdown(1)
+        except:
+            return
+        return
 
 class SimpleJSONRPCServer(SocketServer.TCPServer, SimpleJSONRPCDispatcher):
 
diff --git a/python/rvilib.py b/python/rvilib.py
index 8d2551c..e00dff9 100644
--- a/python/rvilib.py
+++ b/python/rvilib.py
@@ -156,7 +156,8 @@ class RVI(SimpleJSONRPCServer):
     # Redefined shutdown method that first unregisters all services.
     #
     def shutdown(self):
-        for svc in self.registered_services.keys():
+        shutdown_list = self.registered_services.keys()
+        for svc in shutdown_list:
             self.unregister_service(svc)
 
         SimpleJSONRPCServer.shutdown(self)