Upgrade libthrift java library from 0.12.0 to 0.13.0

ervin7mk · Apr 25, 2021 · ea9298f · ea9298f
1 parent e39c213
commit ea9298f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/lib/java/httpclient-4.5.6.jar b/lib/java/httpclient-4.5.6.jar
diff --git a/lib/java/httpcore-4.4.10.jar b/lib/java/httpcore-4.4.10.jar
diff --git a/lib/java/libthrift-0.12.0.jar b/lib/java/libthrift-0.12.0.jar
diff --git a/lib/java/libthrift-0.13.0.jar b/lib/java/libthrift-0.13.0.jar
diff --git a/plugins/search/common/src/cc/search/common/ipc/IPCProcessor.java b/plugins/search/common/src/cc/search/common/ipc/IPCProcessor.java
@@ -84,17 +84,18 @@ public void serve() {
       return;
     }
 
-    boolean cont = _continueServing;
-    while (cont) {
-      try {
-        cont = _continueServing && _processor.process(_inProtocol, _outProtocol);
-      } catch (TTransportException ex) {
-        _log.log(Level.SEVERE, "Client died!", ex);
-        return;
-      } catch (TException ex) {
-        _log.log(Level.SEVERE, "Something went wrong!", ex);
+    try {
+      while (_continueServing) {
+        _processor.process(_inProtocol, _outProtocol);
       }
+    } catch (TTransportException ex) {
+      _log.log(Level.SEVERE, "Client died!", ex);
+    } catch (TException ex) {
+      _log.log(Level.SEVERE, "Something went wrong!", ex);
+    } catch (Exception x) {
+      _log.log(Level.SEVERE, "Error occurred during processing of message.", x);
     }
+    close();
   }
 
   /**
@@ -117,7 +118,12 @@ private String getFileNameFromFd(int fd_) {
 
   @Override
   public void close() {
-    _inTransport.close();
-    _outTransport.close();
+    stopServe();
+    if (_inTransport != null) {
+      _inTransport.close();
+    }
+    if (_outTransport != null) {
+      _outTransport.close();
+    }
   }
 }