Fixed move_files for use in JRuby (#28)

snowplow-archive · May 20, 2014 · c3881d8 · c3881d8
1 parent 9f6f4f6
commit c3881d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,7 @@
 Version 0.2.1 (2014-05-20)
 --------------------------
 Renamed lambda and alter_filename_lambda in rename_file (#27)
-Fixed move_files for use in JRuby (#28)                        - TODO
+Fixed move_files for use in JRuby (#28)
 
 Version 0.2.0 (2014-05-16)
 --------------------------

diff --git a/lib/sluice/storage/s3/s3.rb b/lib/sluice/storage/s3/s3.rb
@@ -466,7 +466,7 @@ def process_files(operation, s3, from_files_or_dir_or_loc, ignore=[], match_rege
                     if files_to_process.size == 0
                       # S3 batches 1000 files per request.
                       # We load up our array with the files to move
-                      files_to_process = s3.directories.get(from_loc.bucket, :prefix => from_loc.dir).files.all(marker_opts)
+                      files_to_process = s3.directories.get(from_loc.bucket, :prefix => from_loc.dir).files.all(marker_opts).to_a
                       # If we don't have any files after the S3 request, we're complete
                       if files_to_process.size == 0
                         complete = true