mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
Merged revisions 22084-22085 via svnmerge from
https://www.dev.java.net/svn/hudson/branches/rc ........ r22084 | kohsuke | 2009-09-23 17:35:53 -0700 (Wed, 23 Sep 2009) | 1 line getLastBuild() can return null. ........ r22085 | kohsuke | 2009-09-23 18:01:05 -0700 (Wed, 23 Sep 2009) | 1 line fixing a test failure. ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22086 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
2685d07269
commit
27041170d3
2 files changed
+10
-4
No files matched your search
@@ -692,9 +692,13 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
|
||||
* Check the location of the POM, alternate settings file, etc - any file.
|
||||
*/
|
||||
public FormValidation doCheckFileInWorkspace(@QueryParameter String value) throws IOException, ServletException {
|
||||
FilePath ws = getLastBuild().getModuleRoot();
|
||||
if(ws==null) return FormValidation.ok();
|
||||
return ws.validateRelativePath(value,true,true);
|
||||
MavenModuleSetBuild lb = getLastBuild();
|
||||
if (lb!=null) {
|
||||
FilePath ws = lb.getModuleRoot();
|
||||
if(ws!=null)
|
||||
return ws.validateRelativePath(value,true,true);
|
||||
}
|
||||
return FormValidation.ok();
|
||||
}
|
||||
|
||||
public TopLevelItemDescriptor getDescriptor() {
|
||||
|
||||
Reference in new issue
Block a user