Author: thomas.heute(a)jboss.com
Date: 2007-08-28 06:08:36 -0400 (Tue, 28 Aug 2007)
New Revision: 8067
Modified:
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java
Log:
JBPORTAL-1648: Undeploying a portlet in an exploded form causes a NullPointerException
Modified:
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java 2007-08-28
10:00:04 UTC (rev 8066)
+++
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java 2007-08-28
10:08:36 UTC (rev 8067)
@@ -103,7 +103,15 @@
{
File f = new File(warURL.getFile());
f = new File(f, "WEB-INF");
- return f.toURL();
+ // this dir doesn't exist on exploded deployments and would miss the
trailing slash then [JBPORTAL-1648]
+ if(f.exists())
+ {
+ return f.toURL();
+ }
+ else
+ {
+ return new URL(warURL + "WEB-INF/");
+ }
}
else
{
Show replies by date