[Fb-contrib-commit] SF.net SVN: fb-contrib: [819] trunk/fb-contrib/src/com/mebigfatguy/ fbcontrib/detect/SuspiciousJDKVersionUse.java

[<dbr...@us...>]

Revision: 819
          http://svn.sourceforge.net/fb-contrib/?rev=819&view=rev
Author:   dbrosius
Date:     2007-02-01 21:15:46 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
guard against npes

Modified Paths:
--------------
    trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousJDKVersionUse.java

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousJDKVersionUse.java
===================================================================
--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousJDKVersionUse.java	2007-02-02 05:14:33 UTC (rev 818)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SuspiciousJDKVersionUse.java	2007-02-02 05:15:46 UTC (rev 819)
@@ -231,19 +231,21 @@
 			}
 		}
 		
-		File[] possibleJdks = jdksRoot.listFiles();
-		for (File possibleJdk : possibleJdks) {
-			Pattern verPat = Pattern.compile(versionStr);
-			Matcher m = verPat.matcher(possibleJdk.getName());
-			if (m.find()) {
-				File wantedRtJar = new File(possibleJdk, "lib/rt.jar");
-				if (!wantedRtJar.exists()) {
-					wantedRtJar = new File(possibleJdk, "jre/lib/rt.jar");
-					if (!wantedRtJar.exists())
-						return null;
+		if (jdksRoot != null) {
+			File[] possibleJdks = jdksRoot.listFiles();
+			for (File possibleJdk : possibleJdks) {
+				Pattern verPat = Pattern.compile(versionStr);
+				Matcher m = verPat.matcher(possibleJdk.getName());
+				if (m.find()) {
+					File wantedRtJar = new File(possibleJdk, "lib/rt.jar");
+					if (!wantedRtJar.exists()) {
+						wantedRtJar = new File(possibleJdk, "jre/lib/rt.jar");
+						if (!wantedRtJar.exists())
+							return null;
+					}
+					versionPaths.put(versionStr, wantedRtJar);
+					return wantedRtJar;
 				}
-				versionPaths.put(versionStr, wantedRtJar);
-				return wantedRtJar;
 			}
 		}
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.