Merge branch '1.2.x'

9aa445bf · Andy Wilkinson · af1afeaf · f8fdcc13 · 9aa445bf
Commit 9aa445bf authored Jun 24, 2015 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

TomcatEmbeddedServletContainerFactory.java ...mbedded/tomcat/TomcatEmbeddedServletContainerFactory.java +2 -1

No files found.
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
@@ -402,7 +402,8 @@ public class TomcatEmbeddedServletContainerFactory extends
 		}
 		catch (IOException ex) {
 			throw new EmbeddedServletContainerException(
-					"Unable to create Tomcat tempdir", ex);
+					"Unable to create Tomcat tempdir. java.io.tmpdir is set to "
+							+ System.getProperty("java.io.tmpdir"), ex);
 		}
 	}