Merge pull request #103 from FederatedAI/develop

Develop
FederatedAI · Apr 20, 2021 · 649c68b · 649c68b
2 parents 3893aad + 900d7d8
commit 649c68b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...main/java/com/webank/ai/fate/serving/admin/services/provider/ValidateServiceProvider.java b/...main/java/com/webank/ai/fate/serving/admin/services/provider/ValidateServiceProvider.java
@@ -119,6 +119,9 @@ public Object inference(Context context, InboundPackage data) throws Exception {
         if (StringUtils.isNotBlank(serviceId)) {
             inferenceRequest.setServiceId(serviceId);
         }
+        if(params.get("applyId")!=null){
+            inferenceRequest.setApplyId(params.get("applyId").toString());
+        }
 
         for (Map.Entry<String, Object> entry : featureData.entrySet()) {
             inferenceRequest.getFeatureData().put(entry.getKey(), entry.getValue());

diff --git a/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/GrpcConnectionPool.java b/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/GrpcConnectionPool.java
@@ -219,12 +219,11 @@ public synchronized ManagedChannel createManagedChannel(String ip, int port, Net
             } else {
                 channelBuilder.usePlaintext();
             }
-
             return channelBuilder.build();
-        } catch (SSLException e) {
-            throw new SecurityException(e);
-        } catch (Exception e) {
-            e.printStackTrace();
+        }
+        catch (Exception e) {
+            logger.error("create channel error : " ,e);
+            //e.printStackTrace();
         }
         return null;
     }