Browse files

Second 1.2rc1 tag???

git-svn-id: http://svn.codehaus.org/jruby/tags/jruby-1_2RC1@9315 961051c9-f516-0410-bf72-c9f7e237a7b7
  • Loading branch information...
2 parents 26531bc + 93a30d1 commit c829fe662b0fc0a452438a2f44d5d5df1edbbbb2 @enebo enebo committed Feb 24, 2009
View
BIN build_lib/jffi.jar
Binary file not shown.
View
2 maven/jruby-complete/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.jruby.extras</groupId>
<artifactId>jffi</artifactId>
- <version>0.2</version>
+ <version>0.3</version>
<scope>provided</scope>
</dependency>
</dependencies>
View
2 maven/jruby/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.jruby.extras</groupId>
<artifactId>jffi</artifactId>
- <version>0.2</version>
+ <version>0.3</version>
<scope>provided</scope>
</dependency>
</dependencies>
View
1 src/org/jruby/Ruby.java
@@ -93,7 +93,6 @@
import org.jruby.internal.runtime.ThreadService;
import org.jruby.internal.runtime.ValueAccessor;
import org.jruby.javasupport.JavaSupport;
-//import org.jruby.management.BeanManager;
import org.jruby.management.ClassCache;
import org.jruby.management.Config;
import org.jruby.management.ParserStats;
View
2 src/org/jruby/compiler/JITCompiler.java
@@ -61,7 +61,7 @@
private AtomicLong largestCodeSize = new AtomicLong(0);
public JITCompiler(Ruby ruby) {
-// ruby.getBeanManager().register(this);
+ ruby.getBeanManager().register(this);
}
public DynamicMethod tryJIT(final DefaultMethod method, final ThreadContext context, final String name) {
View
2 src/org/jruby/ext/LateLoadingLibrary.java
@@ -56,7 +56,7 @@ public synchronized void load(Ruby runtime, boolean wrap) throws IOException {
} catch (RaiseException re) {
throw re;
} catch (Throwable e) {
- e.printStackTrace();
+ if (runtime.getDebug().isTrue()) e.printStackTrace();
throw runtime.newLoadError("library `" + libraryName + "' could not be loaded: " + e);
}
}
View
2 src/org/jruby/ext/ffi/jffi/JFFIInvoker.java
@@ -98,7 +98,7 @@ public IRubyObject invoke(ThreadContext context, IRubyObject[] args) {
@Override
public DynamicMethod createDynamicMethod(RubyModule module) {
DynamicMethod dm;
- if (false && convention == CallingConvention.DEFAULT
+ if (convention == CallingConvention.DEFAULT
&& FastIntMethodFactory.getFactory().isFastIntMethod(returnType, parameterTypes)) {
dm = FastIntMethodFactory.getFactory().createMethod(module,
function, returnType, parameterTypes);
View
9 src/org/jruby/management/BeanManager.java
@@ -1,16 +1,7 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package org.jruby.management;
import org.jruby.compiler.JITCompilerMBean;
-/**
- *
- * @author headius
- */
public interface BeanManager {
void register(JITCompilerMBean jitCompiler);

0 comments on commit c829fe6

Please sign in to comment.