Merge branch '3.1.x' into 3.2.x

jameskleeh · jameskleeh · commit 79b1a2372023 · 2016-11-22T11:19:09.000-05:00
diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ApplicationContextCommandFactory.groovy b/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ApplicationContextCommandFactory.groovy
@@ -15,6 +15,7 @@
  */
 package org.grails.cli.profile.commands.factory
 
+import grails.build.logging.GrailsConsole
 import grails.util.Named
 import org.grails.cli.gradle.commands.GradleTaskCommandAdapter
 import org.grails.cli.profile.Command
@@ -40,6 +41,7 @@ class ApplicationContextCommandFactory implements CommandFactory {
 
             return commands.collect() { Named named -> new GradleTaskCommandAdapter(profile, named) }
         } catch (Throwable e) {
+            GrailsConsole.instance.error("Error occurred loading commands: $e.message", e)
             return []
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.grails.cli.profile.commands.factory`
`17`	`17`
	`18`	`+import grails.build.logging.GrailsConsole`
`18`	`19`	`import grails.util.Named`
`19`	`20`	`import org.grails.cli.gradle.commands.GradleTaskCommandAdapter`
`20`	`21`	`import org.grails.cli.profile.Command`
`@@ -40,6 +41,7 @@ class ApplicationContextCommandFactory implements CommandFactory {`
`40`	`41`
`41`	`42`	`return commands.collect() { Named named -> new GradleTaskCommandAdapter(profile, named) }`
`42`	`43`	`} catch (Throwable e) {`
	`44`	`+ GrailsConsole.instance.error("Error occurred loading commands: $e.message", e)`
`43`	`45`	`return []`
`44`	`46`	`}`
`45`	`47`	`}`