From 3cfc16ebfb926a4eb510e45b7e54b1e8c152f1d3 Mon Sep 17 00:00:00 2001
From: Bradley Priest <bradleypriest@gmail.com>
Date: Tue, 14 Aug 2012 10:47:19 +0800
Subject: [PATCH] Check that a controller inherits from Ember.Object before
 instantiating it to the router.

---
 packages/ember-application/lib/system/application.js        | 5 ++++-
 packages/ember-application/tests/system/application_test.js | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js
index c1c879a1f1f..34064aa5b26 100644
--- a/packages/ember-application/lib/system/application.js
+++ b/packages/ember-application/lib/system/application.js
@@ -219,7 +219,10 @@ Ember.Application.registerInjection({
     if (!/^[A-Z].*Controller$/.test(property)) { return; }
 
     var name = property.charAt(0).toLowerCase() + property.substr(1),
-        controller = app[property].create();
+        controllerClass = app[property], controller;
+
+    if(!Ember.Object.detect(controllerClass)){ return; }
+    controller = app[property].create();
 
     router.set(name, controller);
 
diff --git a/packages/ember-application/tests/system/application_test.js b/packages/ember-application/tests/system/application_test.js
index ad33269f92c..5816fa6ca14 100644
--- a/packages/ember-application/tests/system/application_test.js
+++ b/packages/ember-application/tests/system/application_test.js
@@ -103,6 +103,7 @@ test("initialize controllers into a state manager", function() {
   app.BarController = Ember.ArrayController.extend();
   app.Foo = Ember.Object.create();
   app.fooController = Ember.Object.create();
+  app.BazController = {};
 
   var stateManager = Ember.Object.create();
 
@@ -111,6 +112,7 @@ test("initialize controllers into a state manager", function() {
   ok(get(stateManager, 'fooController') instanceof app.FooController, "fooController was assigned");
   ok(get(stateManager, 'barController') instanceof app.BarController, "barController was assigned");
   ok(get(stateManager, 'foo') === undefined, "foo was not assigned");
+  ok(get(stateManager, 'bazController') === undefined, "bazController was not assigned");
 
   equal(get(stateManager, 'fooController.target'), stateManager, "the state manager is assigned");
   equal(get(stateManager, 'barController.target'), stateManager, "the state manager is assigned");