From 5ced3a65ddf82b6bb7825b92f9bd06ae274f87fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?=
 <lkd9125@naver.com>
Date: Mon, 13 Nov 2023 16:40:32 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EA=B3=84=20NPE=20=EB=B0=A9=EC=A7=80?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/MainStatisticsService.java        | 26 ++++++++++++++-----
 .../palnet/server/handler/SocketHandler.java  |  4 +--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java
index daeed3b7..3b68e89d 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java
@@ -120,7 +120,7 @@ public class MainStatisticsService {
 	 */
 	public List<FlightStcsValueModel> fltStatics(String cate, String date, String[] formatParam){
 
-		List<FlightStcsValueModel> resultList = null;
+		List<FlightStcsValueModel> resultList = new ArrayList<>();
 		
 		switch (cate) {
 			case "TIME":
@@ -135,6 +135,13 @@ public class MainStatisticsService {
 				resultList = cntrlQueryRepository.fltCountStcs(date, formatParam);
 
 				break;
+			default :
+
+				throw new CustomException(ErrorCode.NON_VALID_PARAMETER, cate, date);
+		}
+
+		for(FlightStcsValueModel node : resultList){
+			if(node.getName() == null || node.getName().equals("")) node.setName(" ");
 		}
 
 		return resultList;
@@ -148,7 +155,7 @@ public class MainStatisticsService {
 	 * @return
 	 */
 	public List<FlightStcsValueModel> fltTopStatics(String cate, String date, String[] formatParam){
-		List<FlightStcsValueModel> resultList = null;
+		List<FlightStcsValueModel> resultList = new ArrayList<>();
 
 		switch (cate) {
 			case "TIME":
@@ -163,10 +170,13 @@ public class MainStatisticsService {
 				resultList = cntrlQueryRepository.fltTopCountStcs(date, formatParam);
 
 				break;
+			default :
+
+				throw new CustomException(ErrorCode.NON_VALID_PARAMETER, cate, date);
 		}
 
 		for(FlightStcsValueModel node : resultList){
-			if(node.getName().equals("")) node.setName(" ");
+			if(node.getName() == null || node.getName().equals("")) node.setName(" ");
 		}
 
 		return resultList;
@@ -189,6 +199,10 @@ public class MainStatisticsService {
 			result.add(node);
 		}		
 
+		for(FlightStcsValueModel node : result){
+			if(node.getName() == null || node.getName().equals("")) node.setName(" ");
+		}
+
 		return result;
 	}
 
@@ -204,7 +218,7 @@ public class MainStatisticsService {
 		List<FlightStcsValueModel> resultList = ctrCntrlWarnLogQueryRepository.warnStcs(cate, date, formatParam);
 
 		for(FlightStcsValueModel node : resultList){
-			if(node.getName().equals("")) node.setName(" ");
+			if(node.getName() == null || node.getName().equals("")) node.setName(" ");
 		}
 
 		return resultList;
@@ -262,7 +276,7 @@ public class MainStatisticsService {
 		}
 
 		for(FlightStcsValueModel node : resultList){
-			if(node.getName().equals("")) node.setName(" ");
+			if(node.getName() == null || node.getName().equals("")) node.setName(" ");
 		}
 
 		return resultList;
@@ -291,7 +305,7 @@ public class MainStatisticsService {
 		}
 
 		for(FlightStcsValueModel node : resultList){
-			if(node.getName().equals("")) node.setName(" ");
+			if(node.getName() == null || node.getName().equals("")) node.setName(" ");
 		}
 
 		return resultList;
diff --git a/pav-server/src/main/java/com/palnet/server/handler/SocketHandler.java b/pav-server/src/main/java/com/palnet/server/handler/SocketHandler.java
index 94008552..01c76245 100644
--- a/pav-server/src/main/java/com/palnet/server/handler/SocketHandler.java
+++ b/pav-server/src/main/java/com/palnet/server/handler/SocketHandler.java
@@ -31,8 +31,8 @@ public class SocketHandler extends SimpleChannelInboundHandler<SocketPayload> {
     }
 
 	@Override
-	protected void channelRead0(ChannelHandlerContext ctx, SocketPayload payload){
-		
+	protected void channelRead0(ChannelHandlerContext ctx, SocketPayload payload){		
+
 		try {
 			
 			logger.debug("==================== [SocketHandler channelRead0 ] ==================== ");