Merge pull request #12 from alphagov/fix-mongo-errors

Fix “undefined method `closed?' for nil:NilClass” errors This looks good and sounds like it will fix the error we're seeing, but it's very hard to actually test. An argument for it being the fix is that we only see the exception in panopticon and publisher is already using this version of the driver. Merging and hoping.
alphagov · Aug 8, 2012 · 417dad0 · 417dad0
2 parents 1640044 + 38a2984
commit 417dad0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -25,9 +25,9 @@ gem 'colorize', '~> 0.5.8'
 gem 'rummageable', "~> 0.3.0"
 
 gem "mongoid", "~> 2.4.2"
-gem "mongo", "1.5.2"
-gem "bson_ext", "1.5.2"
-gem "bson", "1.5.2"
+gem "mongo", "1.6.2"
+gem "bson_ext", "1.6.2"
+gem "bson", "1.6.2"
 gem 'lograge'
 
 if ENV['CONTENT_MODELS_DEV']

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -55,9 +55,9 @@ GEM
       mail (> 2.2.5)
       mime-types
       xml-simple
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
+    bson (1.6.2)
+    bson_ext (1.6.2)
+      bson (~> 1.6.2)
     builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -156,8 +156,8 @@ GEM
     minitest (2.10.0)
     mocha (0.10.1)
       metaclass (~> 0.0.1)
-    mongo (1.5.2)
-      bson (= 1.5.2)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
     mongoid (2.4.12)
       activemodel (~> 3.1)
       mongo (<= 1.6.2)
@@ -279,8 +279,8 @@ PLATFORMS
 DEPENDENCIES
   ansi
   aws-ses
-  bson (= 1.5.2)
-  bson_ext (= 1.5.2)
+  bson (= 1.6.2)
+  bson_ext (= 1.6.2)
   capybara-mechanize (~> 0.3.0.rc3)
   ci_reporter
   colorize (~> 0.5.8)
@@ -300,7 +300,7 @@ DEPENDENCIES
   lograge
   minitest
   mocha
-  mongo (= 1.5.2)
+  mongo (= 1.6.2)
   mongoid (~> 2.4.2)
   nokogiri
   null_logger