From d488fbb9d39bbd799fa8748224464458567bc845 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 7 Jun 2023 15:25:27 +0900
Subject: [PATCH] =?UTF-8?q?jdk=201.8=20->=2017,=20@Component("...")=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                | 6 +++---
 src/main/java/cokr/xit/base/menu/Menu.java             | 2 ++
 src/main/java/cokr/xit/base/menu/web/MenuInjector.java | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2c53a93..7f59dbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		
@@ -120,8 +120,8 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
                         <encoding>UTF-8</encoding>
                     </configuration>
                 </plugin>
diff --git a/src/main/java/cokr/xit/base/menu/Menu.java b/src/main/java/cokr/xit/base/menu/Menu.java
index e355a93..dd69cf3 100644
--- a/src/main/java/cokr/xit/base/menu/Menu.java
+++ b/src/main/java/cokr/xit/base/menu/Menu.java
@@ -211,6 +211,8 @@ public class Menu extends AbstractEntity {
 	 * @return DataObject
 	 */
 	public DataObject toDataObject(List<String> urls) {
+		if (action == null)
+			action = "";
 		boolean include = urls.contains(action) || urls.equals(UserInfo.ALL_ACTIONS);
 		if (!include && Assert.isEmpty(children)) return null;
 
diff --git a/src/main/java/cokr/xit/base/menu/web/MenuInjector.java b/src/main/java/cokr/xit/base/menu/web/MenuInjector.java
index d684b27..b69a305 100644
--- a/src/main/java/cokr/xit/base/menu/web/MenuInjector.java
+++ b/src/main/java/cokr/xit/base/menu/web/MenuInjector.java
@@ -62,6 +62,8 @@ public class MenuInjector extends RequestInterceptor {
 	private static final String[] STOP = {"login", "error", "downloadView"};
 
 	private String getRespType(HttpServletRequest hreq, ModelAndView mav) {
+		if (mav == null)
+			return NONE;
 		String viewName = mav.getViewName();
 		for (String stop: STOP) {
 			if (viewName.contains(stop))