From 2396287753ac8e2ddfd4d5c3405c808ad14352e4 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Fri, 25 Nov 2011 15:49:22 +0400
Subject: [PATCH 1/3] fix DescriptionRendeder broken in
 9ef4790976206d26687a39e34cdc9d99ad93ac98

---
 .../src/org/jetbrains/jet/resolve/DescriptorRenderer.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
index 4eeb1635dc3..868e7ec4ae8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
@@ -73,7 +73,7 @@ public class DescriptorRenderer implements Renderer {
     }
 
     public String renderType(JetType type) {
-        if (type != null) {
+        if (type == null) {
             return escape("<?>");
         } else {
             return escape(type.toString());

From acaaa993c591eed82c833f0acb19e61e7680923e Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Fri, 25 Nov 2011 15:49:28 +0400
Subject: [PATCH 2/3] change DescriptionRenderer for null (internal error etc.)
 type

---
 .../src/org/jetbrains/jet/resolve/DescriptorRenderer.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
index 868e7ec4ae8..991c3ced6a9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
@@ -74,7 +74,7 @@ public class DescriptorRenderer implements Renderer {
 
     public String renderType(JetType type) {
         if (type == null) {
-            return escape("<?>");
+            return escape("[NULL]");
         } else {
             return escape(type.toString());
         }

From f3f256699bd02b0f75b7e3ec9e5ca607ba82e15a Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Fri, 25 Nov 2011 15:52:29 +0400
Subject: [PATCH 3/3] print java.vendor too

---
 bootstrap.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap.xml b/bootstrap.xml
index 52b29aca855..695ce5f2e03 100644
--- a/bootstrap.xml
+++ b/bootstrap.xml
@@ -10,6 +10,7 @@
     <echoprop prop="os.version"/>
     <echoprop prop="os.arch"/>
     <echoprop prop="java.home"/>
+    <echoprop prop="java.vendor"/>
     <echoprop prop="java.version"/>
     <echoprop prop="user.name"/>
     <echoprop prop="user.home"/>