From 639e1bd35231a8f71e7acc95fedaf13ace9b65a9 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Tue, 11 Jan 2011 15:14:13 -0800
Subject: [PATCH] LayoutLib: misc fix.

Change-Id: I0e2eff376d8f8e7682c28ef771b886d5fab5ff65
---
 .../bridge/src/com/android/layoutlib/bridge/Bridge.java       | 2 +-
 .../src/com/android/layoutlib/bridge/BridgeRenderSession.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
index 7a95c09988664..a71737543af7d 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
@@ -322,7 +322,7 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge {
                 t2 = t.getCause();
             }
             return new BridgeRenderSession(null,
-                    ERROR_UNKNOWN.createResult(t2.getMessage(), t2));
+                    ERROR_UNKNOWN.createResult(t2.getMessage(), t));
         }
     }
 
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java
index 6ebc56c72a716..4c4eedb85c9c9 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java
@@ -170,7 +170,9 @@ public class BridgeRenderSession extends RenderSession {
 
     /*package*/ BridgeRenderSession(RenderSessionImpl scene, Result lastResult) {
         mSession = scene;
-        mSession.setScene(this);
+        if (scene != null) {
+            mSession.setScene(this);
+        }
         mLastResult = lastResult;
     }
 }