Author: gmazza
Date: Wed Jul 9 11:36:37 2014
New Revision: 1609108
URL: http://svn.apache.org/r1609108
Log:
ROL-1948 NPE check when roller.war never got expanded.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java?rev=1609108&r1=1609107&r2=1609108&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
Wed Jul 9 11:36:37 2014
@@ -176,13 +176,8 @@ public final class WebloggerStartup {
try {
mailProvider = new MailProvider();
} catch(StartupException ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Failed to setup mail provider, continuing
anyways.\n"
- + "Reason: " + ex.getMessage(), ex);
- } else {
- LOG.warn("Failed to setup mail provider, continuing anyways.\n"
- + "Reason: " + ex.getMessage());
- }
+ LOG.warn("Failed to setup mail provider, continuing anyways.\n"
+ + "Reason: " + ex.getMessage());
}
// now we need to deal with database install/upgrade logic
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java?rev=1609108&r1=1609107&r2=1609108&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java
Wed Jul 9 11:36:37 2014
@@ -104,6 +104,10 @@ public class RollerContext extends Conte
// get the *real* path to <context>/resources
String ctxPath = servletContext.getRealPath("/");
+ if (ctxPath == null) {
+ log.fatal("Roller requires an exploded WAR file to run.");
+ return;
+ }
if (!ctxPath.endsWith(File.separator)) {
ctxPath += File.separator + "resources";
} else {
