From 23293f9a6344bed1fea99c02ae100abe9e3db7bc Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 16 Apr 2008 05:32:35 +0000 Subject: [PATCH] version can be null. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@8649 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/Functions.java | 2 +- core/src/main/java/hudson/maven/MavenModule.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index fc394d94f9..912673d728 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -715,7 +715,7 @@ public class Functions { * * @since 1.150 */ - public static Object defaulted(Object value, Object defaultValue) { + public static T defaulted(T value, T defaultValue) { return value!=null ? value : defaultValue; } diff --git a/core/src/main/java/hudson/maven/MavenModule.java b/core/src/main/java/hudson/maven/MavenModule.java index 2deb74ef77..7d3d07d8c2 100644 --- a/core/src/main/java/hudson/maven/MavenModule.java +++ b/core/src/main/java/hudson/maven/MavenModule.java @@ -4,6 +4,7 @@ import hudson.CopyOnWrite; import hudson.FilePath; import hudson.StructuredForm; import hudson.Util; +import hudson.Functions; import hudson.maven.reporters.MavenMailer; import hudson.model.AbstractProject; import hudson.model.Action; @@ -243,7 +244,7 @@ public final class MavenModule extends AbstractMavenProject