Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java (815 => 816)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java 2007-11-29 15:57:22 UTC (rev 815)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java 2007-11-29 16:04:20 UTC (rev 816)
@@ -45,10 +45,11 @@
import org.jruby.RubyModule;
import org.jruby.RubyNumeric;
import org.jruby.RubyObject;
+import org.jruby.RubyObjectAdapter;
import org.jruby.RubyString;
import org.jruby.exceptions.RaiseException;
+import org.jruby.javasupport.JavaEmbedUtils;
import org.jruby.runtime.Block;
-import org.jruby.runtime.CallType;
import org.jruby.runtime.CallbackFactory;
import org.jruby.runtime.ObjectAllocator;
import org.jruby.runtime.ThreadContext;
@@ -63,6 +64,8 @@
return new SSLSocket(runtime, klass);
}
};
+
+ private static RubyObjectAdapter api = JavaEmbedUtils.newObjectAdapter();
public static void createSSLSocket(Ruby runtime, RubyModule mSSL) {
RubyClass cSSLSocket = mSSL.defineClassUnder("SSLSocket",runtime.getObject(),SSLSOCKET_ALLOCATOR);
@@ -113,18 +116,18 @@
public IRubyObject _initialize(IRubyObject[] args, Block unusedBlock) throws Exception {
IRubyObject io, ctx;
- ThreadContext tc = getRuntime().getCurrentContext();
- if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2) == 1) {
- ctx = ((RubyModule)(getRuntime().getModule("OpenSSL").getConstant("SSL"))).getClass("SSLContext").callMethod(tc,"new");
+ if (org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2) == 1) {
+ RubyClass sslContext = ((RubyModule) (getRuntime().getModule("OpenSSL").getConstant("SSL"))).getClass("SSLContext");
+ ctx = api.callMethod(sslContext,"new");
} else {
ctx = args[1];
}
io = args[0];
- callMethod(tc,"io=",io);
+ api.callMethod(this,"io=",io);
c = (SocketChannel)(((RubyIO)io).getChannel());
- callMethod(tc,"context=",ctx);
- callMethod(tc,"sync_close=",getRuntime().getFalse());
- return callMethod(tc,getMetaClass().getSuperClass(),"initialize",args,CallType.SUPER, Block.NULL_BLOCK);
+ api.callMethod(this,"context=",ctx);
+ api.callMethod(this,"sync_close=",getRuntime().getFalse());
+ return api.callSuper(this, args);
}
private void ossl_ssl_setup() throws Exception {
@@ -455,9 +458,9 @@
}
public IRubyObject peer_cert() throws Exception {
- java.security.cert.Certificate[] c = engine.getSession().getPeerCertificates();
- if(c.length > 0) {
- return X509Cert.wrap(getRuntime(),c[0]);
+ java.security.cert.Certificate[] cert = engine.getSession().getPeerCertificates();
+ if (cert.length > 0) {
+ return X509Cert.wrap(getRuntime(),cert[0]);
}
return getRuntime().getNil();
}
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Name.java (815 => 816)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Name.java 2007-11-29 15:57:22 UTC (rev 815)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Name.java 2007-11-29 16:04:20 UTC (rev 816)
@@ -306,7 +306,7 @@
return getRuntime().newString(sb.toString());
}
- public IRubyObject to_a() {
+ public RubyArray to_a() {
List entries = new ArrayList();
Map lookup = ASN1.getSymLookup(getRuntime());
Iterator oiter = oids.iterator();
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Store.java (815 => 816)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Store.java 2007-11-29 15:57:22 UTC (rev 815)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Store.java 2007-11-29 16:04:20 UTC (rev 816)
@@ -180,7 +180,7 @@
IRubyObject proc, result;
X509StoreCtx ctx = (X509StoreCtx)cStoreContext.callMethod(getRuntime().getCurrentContext(),"new",new IRubyObject[]{this,cert,chain});
if (block.isGiven()) {
- proc = getRuntime().newProc(false, block);
+ proc = getRuntime().newProc(Block.Type.PROC, block);
} else {
proc = getInstanceVariable("@verify_callback");
}
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/X509StoreCtx.java (815 => 816)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/X509StoreCtx.java 2007-11-29 15:57:22 UTC (rev 815)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/X509StoreCtx.java 2007-11-29 16:04:20 UTC (rev 816)
@@ -36,12 +36,14 @@
import org.jruby.RubyClass;
import org.jruby.RubyModule;
import org.jruby.RubyObject;
+import org.jruby.RubyObjectAdapter;
import org.jruby.RubyString;
import org.jruby.RubyTime;
import org.jruby.exceptions.RaiseException;
import org.jruby.ext.openssl.x509store.X509AuxCertificate;
import org.jruby.ext.openssl.x509store.X509_STORE;
import org.jruby.ext.openssl.x509store.X509_STORE_CTX;
+import org.jruby.javasupport.JavaEmbedUtils;
import org.jruby.runtime.Block;
import org.jruby.runtime.CallbackFactory;
import org.jruby.runtime.ObjectAllocator;
@@ -56,6 +58,8 @@
return new X509StoreCtx(runtime, klass);
}
};
+
+ private static RubyObjectAdapter api = JavaEmbedUtils.newObjectAdapter();
public static void createX509StoreCtx(Ruby runtime, RubyModule mX509) {
RubyClass cX509StoreContext = mX509.defineClassUnder("StoreContext",runtime.getObject(),X509STORECTX_ALLOCATOR);
@@ -119,12 +123,12 @@
if(ctx.init(x509st,x509,x509s) != 1) {
raise(null);
}
- IRubyObject t = store.getInstanceVariable("@time");
+ IRubyObject t = api.getInstanceVariable(store,"@time");
if(!t.isNil()) {
set_time(t);
}
- setInstanceVariable("@verify_callback",store.getInstanceVariable("@verify_callback"));
- setInstanceVariable("@cert",cert);
+ api.setInstanceVariable(this, "@verify_callback", api.getInstanceVariable(store, "@verify_callback"));
+ api.setInstanceVariable(this, "@cert", cert);
return this;
}
