Title: [946] trunk/jopenssl: Fix JRUBY-1888: enable test_pair tests
- Revision
- 946
- Author
- nicksieger
- Date
- 2008-03-17 17:23:03 -0400 (Mon, 17 Mar 2008)
Log Message
Fix JRUBY-1888: enable test_pair tests
Modified Paths
Diff
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java (945 => 946)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java 2008-03-17 12:03:29 UTC (rev 945)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java 2008-03-17 21:23:03 UTC (rev 946)
@@ -390,7 +390,13 @@
// System.err.println("WARNING: unimplemented method called: SSLSocket#sysread");
org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2);
int len = RubyNumeric.fix2int(args[0]);
- IRubyObject str = args.length == 2 ? args[1] : getRuntime().newString("");
+ IRubyObject str = getRuntime().getNil();
+ if (args.length == 2) {
+ str = args[1];
+ }
+ if (str.isNil()) {
+ str = getRuntime().newString("");
+ }
if(len == 0) {
return str;
}
Modified: trunk/jopenssl/test/test_openssl.rb (945 => 946)
--- trunk/jopenssl/test/test_openssl.rb 2008-03-17 12:03:29 UTC (rev 945)
+++ trunk/jopenssl/test/test_openssl.rb 2008-03-17 21:23:03 UTC (rev 946)
@@ -6,13 +6,13 @@
require 'openssl/test_digest'
require 'openssl/test_hmac'
require 'openssl/test_ns_spki'
- # require 'openssl/test_pair'
+ require 'openssl/test_pair'
require 'openssl/test_pkey_rsa'
require 'openssl/test_ssl'
require 'openssl/test_x509cert'
require 'openssl/test_x509crl'
+ require 'openssl/test_x509ext'
require 'openssl/test_x509name'
- require 'openssl/test_x509ext'
require 'openssl/test_x509req'
require 'openssl/test_x509store'
rescue Exception => e
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
