IDEA-136072 (better diagnostic)

diff --git a/platform/util/src/com/intellij/openapi/application/PathManager.java b/platform/util/src/com/intellij/openapi/application/PathManager.java
index 86c01bbba103298e35c6ee95b74bd9ec824867f6..6a6343c37a563153eeb6efd760b21d28977cf484 100644 (file)
--- a/platform/util/src/com/intellij/openapi/application/PathManager.java
+++ b/platform/util/src/com/intellij/openapi/application/PathManager.java
@@ -279,8 +279,7 @@ public class PathManager {
   @Nullable
   private static String extractRoot(URL resourceURL, String resourcePath) {
     if (!(StringUtil.startsWithChar(resourcePath, '/') || StringUtil.startsWithChar(resourcePath, '\\'))) {
-      //noinspection UseOfSystemOutOrSystemErr
-      System.err.println("precondition failed: " + resourcePath);
+      log("precondition failed: " + resourcePath);
       return null;
     }
 
@@ -302,8 +301,7 @@ public class PathManager {
     }
 
     if (resultPath == null) {
-      //noinspection UseOfSystemOutOrSystemErr
-      System.err.println("cannot extract: " + resourcePath + " from " + resourceURL);
+      log("cannot extract: " + resourcePath + " from " + resourceURL);
       return null;
     }
 
@@ -331,7 +329,13 @@ public class PathManager {
 
               Properties sysProperties = System.getProperties();
               for (String key : properties.keySet()) {
-                if (sysProperties.getProperty(key, null) == null) {  // do not override already defined properties
+                if (PROPERTY_HOME_PATH.equals(key) || PROPERTY_HOME.equals(key)) {
+                  log(propFile.getPath() + ": '" + PROPERTY_HOME_PATH + "' and '" + PROPERTY_HOME + "' properties cannot be redefined");
+                }
+                else if (sysProperties.getProperty(key, null) != null) {
+                  log(propFile.getPath() + ": '" + key + "' already defined");
+                }
+                else {
                   String value = substituteVars(properties.get(key));
                   sysProperties.setProperty(key, value);
                 }
@@ -342,8 +346,7 @@ public class PathManager {
             }
           }
           catch (IOException e) {
-            //noinspection UseOfSystemOutOrSystemErr
-            System.err.println("Problem reading from property file: " + propFile.getPath());
+            log("Problem reading from property file: " + propFile.getPath());
           }
         }
       }
@@ -391,8 +394,7 @@ public class PathManager {
       }
 
       if (value == null) {
-        //noinspection UseOfSystemOutOrSystemErr
-        System.err.println("Unknown property: " + key);
+        log("Unknown property: " + key);
         value = "";
       }
 
@@ -448,6 +450,11 @@ public class PathManager {
 
   // helpers
 
+  @SuppressWarnings("UseOfSystemOutOrSystemErr")
+  private static void log(String x) {
+    System.err.println(x);
+  }
+
   private static String getAbsolutePath(String path) {
     path = FileUtil.expandUserHome(path);
     return FileUtil.toCanonicalPath(new File(path).getAbsolutePath());