Repository: buildr
Updated Branches:
  refs/heads/master 301f229cc -> 6d474ca55


Avoid nil dereference bug in GWT addon when running GWT in a project that has 
no source directory.


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/6d474ca5
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/6d474ca5
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/6d474ca5

Branch: refs/heads/master
Commit: 6d474ca5523a722d90ded1447261e51b4805510f
Parents: 301f229
Author: Peter Donald <[email protected]>
Authored: Thu May 8 11:06:59 2014 +1000
Committer: Peter Donald <[email protected]>
Committed: Thu May 8 11:06:59 2014 +1000

----------------------------------------------------------------------
 CHANGELOG           | 2 ++
 addon/buildr/gwt.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/6d474ca5/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 2e652e1..3fc3c52 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 1.4.17 (Pending)
+* Fixed:  Avoid nil dereference bug in GWT addon when running GWT in
+          a project that has no source directory.
 
 1.4.16 (2014-05-03)
 * Added:  Add the ability to generate a html report when using the

http://git-wip-us.apache.org/repos/asf/buildr/blob/6d474ca5/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 7a3d76f..a1b60c0 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -113,7 +113,7 @@ module Buildr
 
         task = project.file(output_dir) do
           Buildr::GWT.gwtc_main(module_names,
-                                dependencies + artifacts,
+                                (dependencies + artifacts).flatten.compact,
                                 output_dir,
                                 unit_cache_dir,
                                 {:version => 
gwt_detect_version(dependencies)}.merge(options))

Reply via email to