[FIXED JENKINS-10935]

jenkinsci · Sep 8, 2011 · ed19403 · ed19403
1 parent 88732ba
commit ed19403
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/src/main/java/hudson/views/AbstractEmailValuesProvider.java b/src/main/java/hudson/views/AbstractEmailValuesProvider.java
@@ -2,6 +2,7 @@
 
 import hudson.model.AbstractProject;
 import hudson.model.Descriptor;
+import hudson.model.Hudson;
 import hudson.model.TopLevelItem;
 import hudson.tasks.Publisher;
 import hudson.util.DescribableList;
@@ -12,7 +13,7 @@
 
 public abstract class AbstractEmailValuesProvider implements PluginHelperTestable {
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@SuppressWarnings("unchecked")
 	public List<String> getValues(TopLevelItem item) {
 		List<String> values = new ArrayList<String>();
 		if (item instanceof AbstractProject) {
@@ -28,6 +29,9 @@ public List<String> getValues(TopLevelItem item) {
 		return values;
 	}
 
-	protected abstract Descriptor<Publisher> getDescriptor();
+	@SuppressWarnings("unchecked")
+	protected Descriptor<Publisher> getDescriptor() {
+		return Hudson.getInstance().getDescriptor(getPluginTesterClass());
+	}
 	protected abstract String getValue(Publisher publisher);
 }
diff --git a/src/main/java/hudson/views/CoreEmailValuesProvider.java b/src/main/java/hudson/views/CoreEmailValuesProvider.java
@@ -1,15 +1,10 @@
 package hudson.views;
 
-import hudson.model.Descriptor;
 import hudson.tasks.Mailer;
 import hudson.tasks.Publisher;
 
 public class CoreEmailValuesProvider extends AbstractEmailValuesProvider {
 
-	@Override
-	protected Descriptor<Publisher> getDescriptor() {
-		return Mailer.descriptor();
-	}
 	@Override
 	protected String getValue(Publisher publisher) {
 		Mailer mailer = (Mailer) publisher;

diff --git a/src/main/java/hudson/views/EmailExtValuesProvider.java b/src/main/java/hudson/views/EmailExtValuesProvider.java
@@ -1,15 +1,10 @@
 package hudson.views;
 
-import hudson.model.Descriptor;
 import hudson.plugins.emailext.ExtendedEmailPublisher;
 import hudson.tasks.Publisher;
 
 public class EmailExtValuesProvider extends AbstractEmailValuesProvider {
 
-	@Override
-	protected Descriptor<Publisher> getDescriptor() {
-		return ExtendedEmailPublisher.DESCRIPTOR;
-	}
 	@Override
 	protected String getValue(Publisher publisher) {
 		ExtendedEmailPublisher mailer = (ExtendedEmailPublisher) publisher;

diff --git a/src/main/java/hudson/views/UserRelevanceFilter.java b/src/main/java/hudson/views/UserRelevanceFilter.java
@@ -70,7 +70,7 @@ protected boolean matches(TopLevelItem item) {
     @SuppressWarnings("unchecked")
 	@Override
     protected boolean runMatches(Run run) {
-		User user = Hudson.getInstance().getMe();
+		User user = getUser();
 		if (matchUserFullName) {
 			String userName = normalize(user.getFullName());
 			if (runMatches(userName, true, run)) {
@@ -85,6 +85,17 @@ protected boolean runMatches(Run run) {
 		}
 		return false;
     }
+    private User getUser() {
+    	try {
+    		return Hudson.getInstance().getMe();
+    	} catch (Exception e) {
+        	try {
+        		return Hudson.getInstance().getUser(Hudson.ANONYMOUS.getName());
+        	} catch (Exception e2) {
+            	return null;
+        	}
+    	}
+    }
     @SuppressWarnings("unchecked")
 	public boolean runMatches(String userName, boolean matchAgainstFullName, Run run) {
     	if (matchScmChanges) {
@@ -125,7 +136,7 @@ public String normalize(String userName) {
     }
 
 	public boolean matchesEmail(TopLevelItem item) {
-		User user = Hudson.getInstance().getMe();
+		User user = getUser();
 		if (matchUserFullName) {
 			String userName = normalize(user.getFullName());
 			if (matchesEmail(item, userName)) {