lib/sunspot/solr/server.rb in sunspot_solr-2.2.2 vs lib/sunspot/solr/server.rb in sunspot_solr-2.2.3

@@ -17,11 +17,11 @@
         File.join(File.dirname(__FILE__), '..', '..', '..', 'solr', 'bin', 'solr')
       )
 
       LOG_LEVELS = Set['SEVERE', 'WARNING', 'INFO', 'CONFIG', 'FINE', 'FINER', 'FINEST']
 
-      attr_accessor :min_memory, :max_memory, :bind_address, :port, :log_file
+      attr_accessor :memory, :bind_address, :port, :log_file
 
       attr_writer :pid_dir, :pid_file, :solr_home, :solr_executable
 
       def initialize(*args)
         ensure_java_installed
@@ -90,11 +90,10 @@
       #
       def run
         bootstrap
 
         command = %w[./solr start -f]
-        command << "-Xms#{min_memory}" if min_memory
-        command << "-Xmx#{max_memory}" if max_memory
+        command << "-m" << "#{memory}" if memory
         command << "-p" << "#{port}" if port
         command << "-h" << "#{bind_address}" if bind_address
         command << "-s" << "#{solr_home}" if solr_home
 
         exec_in_solr_executable_directory(command)