summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 13:53:29 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 13:53:29 +0000
commit2d5e2cc289b85b5df00ab32a171eb16e9055b7eb (patch)
tree2d6463c96043115cd42f3ac2d5494fcd77189b79
parentb3f1ffd79bc89349d33eb1fd2ed39fa34b4ad5ea (diff)
* test/openssl/utils.rb (start_server): check nil.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/openssl/utils.rb4
-rw-r--r--version.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index 655cd0b6d2..1c64c36285 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -321,8 +321,8 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
end
end
ensure
- stop_pipe_r.close if !stop_pipe_r.closed?
- stop_pipe_w.close if !stop_pipe_w.closed?
+ stop_pipe_r.close if stop_pipe_r && !stop_pipe_r.closed?
+ stop_pipe_w.close if stop_pipe_w && !stop_pipe_w.closed?
assert_join_threads(threads)
end
diff --git a/version.h b/version.h
index e8422a6fba..1d2827894e 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.9"
#define RUBY_RELEASE_DATE "2016-03-25"
-#define RUBY_PATCHLEVEL 483
+#define RUBY_PATCHLEVEL 484
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3