diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/aai/babel/BabelApplication.java | 2 | ||||
| -rw-r--r-- | src/main/resources/application.properties | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java index eae1a24..f1b3549 100644 --- a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java +++ b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java @@ -165,7 +165,7 @@ public class AAIMicroServiceAuthCore { } } catch (FileNotFoundException e) { throw new AAIAuthException("Auth policy file could not be found", e); - } catch (JsonProcessingException e) { + } catch (JsonProcessingException | NullPointerException e) { throw new AAIAuthException("Error processing Auth policy file ", e); } catch (IOException e) { throw new AAIAuthException("Error reading Auth policy file", e); diff --git a/src/main/java/org/onap/aai/babel/BabelApplication.java b/src/main/java/org/onap/aai/babel/BabelApplication.java index e524e6e..b3eaee4 100644 --- a/src/main/java/org/onap/aai/babel/BabelApplication.java +++ b/src/main/java/org/onap/aai/babel/BabelApplication.java @@ -26,7 +26,7 @@ import org.eclipse.jetty.util.security.Password; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ImportResource; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 187826a..9a7d699 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ server.port=9516 server.ssl.key-store=${CONFIG_HOME}/auth/tomcat_keystore server.ssl.client-auth=need -server.contextPath=/services/babel-service +server.servlet.context-path=/services/babel-service logging.config=${CONFIG_HOME}/logback.xml |