Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #4173 Avoid NPE generating name of tmp dir in WebInfConfiguration 

Signed-off-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
Jan Bartel 2019-11-04 17:53:05 +11:00
parent 9cede68b35
commit e9a8497936
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
View File

@ -779,22 +779,25 @@ public class WebInfConfiguration extends AbstractConfiguration
resource = context.newResource(context.getWar());
}
String tmp = URIUtil.decodePath(resource.getURI().getPath());
String tmp = getResourceBasePath(resource);
if (tmp.endsWith("/"))
tmp = tmp.substring(0, tmp.length() - 1);
if (tmp.endsWith("!"))
tmp = tmp.substring(0, tmp.length() - 1);
//get just the last part which is the filename
int i = tmp.lastIndexOf("/");
canonicalName.append(tmp.substring(i + 1));
if (i > -1 && tmp.length() > 1)
{
canonicalName.append(tmp.substring(i + 1));
}
canonicalName.append("-");
}
catch (Exception e)
catch (IOException e)
{
LOG.warn("Can't generate resourceBase as part of webapp tmp dir name: " + e);
LOG.debug(e);
LOG.warn("Can't get resource for resourceBase", e);
LOG.debug(e);
}
//Context name
canonicalName.append(context.getContextPath());
@ -810,6 +813,29 @@ public class WebInfConfiguration extends AbstractConfiguration
return StringUtil.sanitizeFileSystemName(canonicalName.toString());
}
private static String getResourceBasePath(Resource resource)
{
String tmp = "";
try
{
tmp = URIUtil.decodePath(resource.getURI().getPath());
}
catch (Exception e)
{
try
{
tmp = URIUtil.decodePath(resource.getURI().toURL().getPath());
}
catch (Exception x)
{
LOG.warn("Can't get path for resource", x);
LOG.debug(e);
}
}
return tmp;
}
protected List<Resource> findClassDirs(WebAppContext context)
throws Exception