Version 0.6.15.1 .
svn merge -c 25785 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
git-svn-id: http://dart.googlecode.com/svn/trunk@25788 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/runtime/lib/mirrors.cc b/runtime/lib/mirrors.cc
index 176aecb..874915f 100644
--- a/runtime/lib/mirrors.cc
+++ b/runtime/lib/mirrors.cc
@@ -362,7 +362,13 @@
DEFINE_NATIVE_ENTRY(ClassMirror_library, 1) {
GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
const Class& klass = Class::Handle(ref.GetClassReferent());
- return CreateLibraryMirror(Library::Handle(klass.library()));
+ const Library& library = Library::Handle(klass.library());
+ // TODO(rmacnak): Revisit when we decide what to do about
+ // reflectClass(dynamic).
+ if (library.IsNull()) {
+ return Instance::null();
+ }
+ return CreateLibraryMirror(library);
}
diff --git a/tools/VERSION b/tools/VERSION
index 8a63454..bd1f182 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -1,4 +1,4 @@
MAJOR 0
MINOR 6
BUILD 15
-PATCH 0
+PATCH 1
