From eea4bae6749fc583503369a0052633fd917d0d38 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Fri, 4 Mar 2016 12:17:21 -0800
Subject: [PATCH] Make _initRootBundle more robust

Rather than catching every exception, we now handle the one specific case where
we legitimately cannot create the root bundle.

Fixes #900
---
 packages/flutter/lib/src/services/asset_bundle.dart | 11 ++++-------
 packages/flutter/lib/src/services/print.dart        |  6 +-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/packages/flutter/lib/src/services/asset_bundle.dart b/packages/flutter/lib/src/services/asset_bundle.dart
index 0569939ae8..2b82857a7a 100644
--- a/packages/flutter/lib/src/services/asset_bundle.dart
+++ b/packages/flutter/lib/src/services/asset_bundle.dart
@@ -96,14 +96,11 @@ class MojoAssetBundle extends CachingAssetBundle {
 }
 
 AssetBundle _initRootBundle() {
-  try {
-    AssetBundleProxy bundle = new AssetBundleProxy.fromHandle(
-      new core.MojoHandle(ui.takeRootBundleHandle())
-    );
-    return new MojoAssetBundle(bundle);
-  } catch (e) {
+  int h = ui.takeRootBundleHandle();
+  if (h == core.MojoHandle.INVALID)
     return null;
-  }
+  core.MojoHandle handle = new core.MojoHandle(h);
+  return new MojoAssetBundle(new AssetBundleProxy.fromHandle(handle));
 }
 
 final AssetBundle rootBundle = _initRootBundle();
diff --git a/packages/flutter/lib/src/services/print.dart b/packages/flutter/lib/src/services/print.dart
index 86dc01f386..4d594a6e01 100644
--- a/packages/flutter/lib/src/services/print.dart
+++ b/packages/flutter/lib/src/services/print.dart
@@ -46,9 +46,5 @@ void _debugPrintTask() {
 }
 
 void debugPrintStack() {
-  try {
-    throw new Exception();
-  } catch (e, stack) {
-    debugPrint(stack.toString());
-  }
+  debugPrint(StackTrace.current.toString());
 }