Fix NPE

undertow-io · Jun 8, 2015 · 9cf5182 · 9cf5182
1 parent d40709c
commit 9cf5182
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/servlet/src/main/java/io/undertow/servlet/api/DeploymentInfo.java b/servlet/src/main/java/io/undertow/servlet/api/DeploymentInfo.java
@@ -585,10 +585,13 @@ public DeploymentInfo setAsyncExecutor(final Executor asyncExecutor) {
     }
 
     public File getTempDir() {
+        if(tempDir == null) {
+            return null;
+        }
         return tempDir.toFile();
     }
 
-    public Path getTempDirPath() {
+    public Path getTempPath() {
         return tempDir;
     }
 

diff --git a/servlet/src/main/java/io/undertow/servlet/core/ManagedServlet.java b/servlet/src/main/java/io/undertow/servlet/core/ManagedServlet.java
@@ -89,14 +89,14 @@ public void setupMultipart(ServletContextImpl servletContext) {
             }
             final Path tempDir;
             if(config.getLocation() == null || config.getLocation().isEmpty()) {
-                tempDir = servletContext.getDeployment().getDeploymentInfo().getTempDirPath();
+                tempDir = servletContext.getDeployment().getDeploymentInfo().getTempPath();
             } else {
                 String location = config.getLocation();
                 Path locFile = Paths.get(location);
                 if(locFile.isAbsolute()) {
                     tempDir = locFile;
                 } else {
-                    tempDir = servletContext.getDeployment().getDeploymentInfo().getTempDirPath().resolve(location);
+                    tempDir = servletContext.getDeployment().getDeploymentInfo().getTempPath().resolve(location);
                 }
             }
 

diff --git a/servlet/src/main/java/io/undertow/servlet/spec/PartImpl.java b/servlet/src/main/java/io/undertow/servlet/spec/PartImpl.java
@@ -98,7 +98,7 @@ public void write(final String fileName) throws IOException {
         Path target = Paths.get(fileName);
         if(!target.isAbsolute()) {
             if(config.getLocation().isEmpty()) {
-                target = servletContext.getDeployment().getDeploymentInfo().getTempDirPath().resolve(fileName);
+                target = servletContext.getDeployment().getDeploymentInfo().getTempPath().resolve(fileName);
             } else {
                 target = Paths.get(config.getLocation(), fileName);
             }