[INLONG-11756][SDK] Add NPE check in MsgSender Factory class (#11757)

apache · Feb 13, 2025 · bbddce4 · bbddce4
1 parent dd9328c
commit bbddce4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/...dk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/MsgSenderMultiFactory.java b/...dk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/MsgSenderMultiFactory.java
@@ -68,16 +68,25 @@ public void removeClient(BaseSender msgSender) {
                 || msgSender.getSenderFactory() != this) {
             return;
         }
+        if (baseMsgSenderFactory == null) {
+            return;
+        }
         this.baseMsgSenderFactory.removeClient(msgSender);
     }
 
     @Override
     public int getMsgSenderCount() {
+        if (baseMsgSenderFactory == null) {
+            return SdkConsts.UNDEFINED_VALUE;
+        }
         return this.baseMsgSenderFactory.getMsgSenderCount();
     }
 
     @Override
     public PkgCacheQuota getFactoryPkgCacheQuota() {
+        if (baseMsgSenderFactory == null) {
+            return null;
+        }
         return baseMsgSenderFactory.getPkgCacheQuota();
     }
 

diff --git a/...k/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/MsgSenderSingleFactory.java b/...k/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/MsgSenderSingleFactory.java
@@ -85,16 +85,25 @@ public void removeClient(BaseSender msgSender) {
                 || msgSender.getSenderFactory() != this) {
             return;
         }
+        if (baseMsgSenderFactory == null) {
+            return;
+        }
         baseMsgSenderFactory.removeClient(msgSender);
     }
 
     @Override
     public int getMsgSenderCount() {
+        if (baseMsgSenderFactory == null) {
+            return SdkConsts.UNDEFINED_VALUE;
+        }
         return baseMsgSenderFactory.getMsgSenderCount();
     }
 
     @Override
     public PkgCacheQuota getFactoryPkgCacheQuota() {
+        if (baseMsgSenderFactory == null) {
+            return null;
+        }
         return baseMsgSenderFactory.getPkgCacheQuota();
     }
 

diff --git a/.../dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/metric/MetricDataHolder.java b/.../dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/metric/MetricDataHolder.java
@@ -468,7 +468,7 @@ private String buildMetricReportInfo(StringBuilder strBuff, long curTimeMs, Metr
                 .append("},\"c\":{\"aC\":").append(sender.getConfigure().getAliveConnections())
                 .append(",\"gBf\":").append(sender.isGenByFactory())
                 .append(",\"ifCc\":").append(sender.getFactoryPkgCntPermits())
-                .append(",\"ifCs\":").append(sender.getFactoryPkgCntPermits())
+                .append(",\"ifCs\":").append(sender.getFactoryPkgSizeKbPermits())
                 .append(",\"iCc\":").append(sender.getConfigure().getMaxInFlightReqCnt())
                 .append(",\"iCs\":").append(sender.getConfigure().getMaxInFlightSizeKb())
                 .append(",\"iRp\":").append(sender.getConfigure().getPaddingSize())