svn commit: r1038805 - /buildr/trunk/lib/buildr/core/jrebel.rb

[djspiewak]

Author: djspiewak
Date: Wed Nov 24 20:39:06 2010
New Revision: 1038805

URL: http://svn.apache.org/viewvc?rev=1038805&view=rev
Log:
Fixed regressions in JRebel refactoring

Modified:
    buildr/trunk/lib/buildr/core/jrebel.rb

Modified: buildr/trunk/lib/buildr/core/jrebel.rb
URL: 
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/jrebel.rb?rev=1038805&r1=1038804&r2=1038805&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/jrebel.rb (original)
+++ buildr/trunk/lib/buildr/core/jrebel.rb Wed Nov 24 20:39:06 2010
@@ -20,11 +20,13 @@ module Buildr
         @jrebel_home = ENV['REBEL_HOME'] || ENV['JREBEL'] || ENV['JREBEL_HOME']
       end
 
-      (@rebel_home && File.exists?(@rebel_home)) ? @jrebel_home : nil
+      (@jrebel_home && File.exists?(@jrebel_home)) ? @jrebel_home : nil
     end
 
     def rebel_jar
-      @rebel_home ? File.join(@jrebel_home, 'jrebel.jar') : nil
+      if jrebel_home
+        File.directory?(jrebel_home) ? File.join(jrebel_home, 'jrebel.jar') : 
jrebel_home
+      end
     end
 
     def jrebel_args