Author: agilliland
Date: Fri Jun 15 14:10:01 2007
New Revision: 547785
URL: http://svn.apache.org/viewvc?view=rev&rev=547785
Log:
fix null pointer caused when someone tries to use the url model to get a
resource url without passing in a value.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java?view=diff&rev=547785&r1=547784&r2=547785
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java
Fri Jun 15 14:10:01 2007
@@ -25,6 +25,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogTheme;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -325,7 +326,7 @@
String filePath,
boolean absolute) {
- if(weblog == null) {
+ if(weblog == null || StringUtils.isEmpty(filePath)) {
return null;
}