From 5520f44fff9c89af52d65ca81c81cadbcf228bf3 Mon Sep 17 00:00:00 2001
From: Brian Remedios <hooperbloob@users.sourceforge.net>
Date: Thu, 15 Sep 2011 09:18:54 +0000
Subject: [PATCH] NPE fix under Windows

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@7264 51baf565-9d33-0410-a72c-fc3788e3496d
---
 .../pmd/eclipse/ui/preferences/br/RuleUtil.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleUtil.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleUtil.java
index 6a866f3da7..d2862dffac 100755
--- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleUtil.java
+++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleUtil.java
@@ -112,18 +112,18 @@ public class RuleUtil {
 	}
 
     public static Set<Comparable<?>> uniqueItemsIn(Object item, RuleFieldAccessor getter) {
-    	
-        Set<Comparable<?>> values = null;
-        
+    	        
         if (item instanceof Rule) {
-        	values = new HashSet<Comparable<?>>(1);
+        	Set<Comparable<?>> values = new HashSet<Comparable<?>>(1);
         	values.add( getter.valueFor((Rule) item) );
+        	return values;
         }
         
         if (item instanceof RuleCollection) {
-        	values = getter.uniqueValuesFor((RuleCollection)item);
+        	return getter.uniqueValuesFor((RuleCollection)item);
         }
-        return values;
+
+        return Collections.emptySet();
     }
 	
 	/**