From 33620affc7b8fcd4257ddeaeae7e6bfb599e8db8 Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Mon, 27 Oct 2014 22:02:36 +0300
Subject: [PATCH] idea.java.redist not null.

---
 .../com/intellij/openapi/updateSettings/impl/UpdateChecker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
index 14366fc46aa7..a846fd4fe87d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
@@ -760,7 +760,7 @@ public final class UpdateChecker {
     String toBuildNumber = newVersion.getNumber().asStringWithoutProductCode();
     String jdkMacRedist = System.getProperty("idea.java.redist");
     String bundledJdk = "";
-    if (jdkMacRedist.lastIndexOf("jdk-bundled") >= 0 ){
+    if (jdkMacRedist != null && jdkMacRedist.lastIndexOf("jdk-bundled") >= 0 ){
       bundledJdk = "jdk-bundled".equals(jdkMacRedist) ? "-jdk-bundled" : "-custom-jdk-bundled";
     }