This is an automated email from the ASF dual-hosted git repository. casion pushed a commit to branch dev-1.1.2 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 38da9caa0a4ee340af7d8dd0e7d4312e6d45dda7 Author: peacewong <[email protected]> AuthorDate: Fri Apr 29 14:31:20 2022 +0800 Add null judgment to the log --- .../linkis/cs/client/service/CSTableService.java | 35 ++++++++++++---------- .../cs/client/service/CSVariableService.java | 11 +++---- .../client/service/LinkisJobDataServiceImpl.java | 11 +++---- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java index 37e33e2ba..2924ac6d3 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java @@ -68,11 +68,12 @@ public class CSTableService implements TableService { contextID = ((CombinedNodeIDContextID) contextID).getLinkisHaWorkFlowContextID(); } CSTable csTable = searchService.getContextValue(contextID, contextKey, CSTable.class); - logger.info( - "contextID: {} and contextKey: {} succeed to get table tableName {}", - contextID.getContextId(), - contextKey.getKey(), - csTable.getName()); + if (null != csTable) + logger.info( + "contextID: {} and contextKey: {} succeed to get table tableName {}", + contextID.getContextId(), + contextKey.getKey(), + csTable.getName()); return csTable; } @@ -95,11 +96,12 @@ public class CSTableService implements TableService { searchService.searchUpstreamContext( contextID, nodeName, Integer.MAX_VALUE, CSTable.class); } - logger.info( - "contextID: {} and nodeName: {} succeed to get tables size {}", - contextID.getContextId(), - nodeName, - rsList.size()); + if (null != rsList) + logger.info( + "contextID: {} and nodeName: {} succeed to get tables size {}", + contextID.getContextId(), + nodeName, + rsList.size()); return rsList; } catch (ErrorException e) { logger.error("Deserialize contextID error. contextIDStr : " + contextIDStr); @@ -123,12 +125,13 @@ public class CSTableService implements TableService { ((CombinedNodeIDContextID) contextID).getLinkisHaWorkFlowContextID(); } csTable = searchService.searchContext(contextID, keyword, nodeName, CSTable.class); - logger.info( - "contextID: {} , nodeName: {}, keyword {} succeed to getUpstreamSuitableTable tableName {}", - contextID.getContextId(), - nodeName, - keyword, - csTable.getName()); + if (null != csTable) + logger.info( + "contextID: {} , nodeName: {}, keyword {} succeed to getUpstreamSuitableTable tableName {}", + contextID.getContextId(), + nodeName, + keyword, + csTable.getName()); } } catch (ErrorException e) { throw new CSErrorException( diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java index 2c770c8d0..e63a02ac0 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java @@ -61,11 +61,12 @@ public class CSVariableService implements VariableService { rsList = searchService.searchUpstreamContext( contextID, nodeName, Integer.MAX_VALUE, LinkisVariable.class); - logger.info( - "contextID: {} and nodeName: {} succeed to getUpstreamVariables size {}", - contextID.getContextId(), - nodeName, - rsList.size()); + if (null != rsList) + logger.info( + "contextID: {} and nodeName: {} succeed to getUpstreamVariables size {}", + contextID.getContextId(), + nodeName, + rsList.size()); } return rsList; } catch (Throwable e) { diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java index 59be85867..bca226125 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java @@ -67,11 +67,12 @@ public class LinkisJobDataServiceImpl implements LinkisJobDataService { ContextKey contextKey = SerializeHelper.deserializeContextKey(contextKeyStr); LinkisJobData jobData = searchService.getContextValue(contextID, contextKey, LinkisJobData.class); - logger.info( - "contextID: {} and contextKeyStr: {} succeed to getLinkisJobData {}", - contextID.getContextId(), - contextKeyStr, - jobData.getJobID()); + if (null != jobData) + logger.info( + "contextID: {} and contextKeyStr: {} succeed to getLinkisJobData {}", + contextID.getContextId(), + contextKeyStr, + jobData.getJobID()); return jobData; } catch (ErrorException e) { logger.error( --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
