Permalink
Switch branches/tags
Commits on Feb 22, 2012
  1. Bump for 1.6.7

    enebo committed Feb 22, 2012
  2. Regen x86_64-windows FFI types.conf

    Wayne Meissner committed with enebo Feb 22, 2012
  3. holy shmoly, why ?

    lopex committed with enebo Feb 22, 2012
Commits on Feb 21, 2012
  1. Ignore Binding's line when file is passed to eval

    Before this change eval("__LINE__", binding, "file") would return the
    current line of the binding; after this change it will return 1.
    
    Spec at jruby/rubyspec@88f3dff#L1R24
    
    Signed-off-by: Charles Oliver Nutter <headius@headius.com>
    ConradIrwin committed with headius Feb 20, 2012
Commits on Feb 20, 2012
  1. Fix JRUBY-928: Java arrays don't inherit from java.lang.Object in Rub…

    …ified Java class hierarchy
    
    * After JI has initialized, rewire ArrayJavaProxy superclass to be < (Enumerable) < java.lang.Object.
    
    Conflicts:
    
    	src/org/jruby/javasupport/Java.java
    headius committed Jul 14, 2011
  2. Refix JRUBY-6208: GzipWriter#write should honor writeEncoding, not re…

    …adEncoding
    
    Title says all.  The regression spec I added before wrongly used
    GzipReader#read() without size parameter.  GzipReader#read() uses the
    specified read encoding (it is Encoding.default_external if not
    specified) and it hides this bug.
    nahi committed Feb 20, 2012
Commits on Feb 19, 2012
  1. Add benchmark for multi-threaded Object.new.object_id

    Wayne Meissner committed with headius Feb 19, 2012
  2. Remove synchronization on getObjectIdAccessorForWrite() or getNativeH…

    …andleAccessorForWrite(), and defer it to allocateObjectIdAccessor and allocateNativeHandleAccesor, to eliminate contention on the RubyClass in the optimal case where the VariableAccessor has already been allocated.
    Wayne Meissner committed with headius Feb 19, 2012
  3. Raise the WaitWritable version of EAGAIN for write_nonblock.

    Conflicts:
    
    	src/org/jruby/RubyIO.java
    headius committed Feb 19, 2012
Commits on Feb 17, 2012
Commits on Feb 16, 2012
  1. Damn the torpedos...merge master's zlib to 1.6.

    Process followed:
    
    * Refactor RubyZlib into ext.zlib package
    * Copy ext.zlib package contents from master
    * Copy jzlib from master
    * Fix up project/build files
    * Fix up imports and 1.6 encoding calls
    * Move library from org.jruby.libraries to ext.zlib
    * Fix up test_zlib.rb from master
    * Fix up spec tags from master
    
    Represents a couple dozen commits from master relating to zlib
    fixes, jzlib integration, and encoding work.
    headius committed Feb 16, 2012
  2. Update to joni 1.1.7

    enebo committed Feb 16, 2012
  3. Update to jcoding 1.0.7

    enebo committed Feb 16, 2012
  4. Fix bad expectation in Module.new that module_exec passes self.

    Conflicts:
    
    	src/org/jruby/RubyModule.java
    headius committed Feb 16, 2012
  5. Fix JRUBY-6238

    Issues with eval - wrong arguments
    
    module_exec with no args was allowing self to be passed as the sole argument.
    headius committed Feb 16, 2012
Commits on Feb 15, 2012
  1. Partial fix for JRUBY-6442

    TCPSocket#write_nonblock blocks
    
    Only selectable Java channels can be set nonblocking, so this
    patch only improves situations for selectable channels. Others
    will still just do a blocking write, as before. This patch does at
    least get sockets and other selectables to actually do write_nonblock
    close to how it's supposed to be done.
    
    Better fix will come with 1.7 IO refactoring, though the non-
    selectable channels will still be an issue.
    headius committed Feb 15, 2012
  2. More undefined targets

    enebo committed Feb 15, 2012
  3. ci uses this target from ant

    enebo committed Feb 15, 2012
  4. Port GzipReader commits from master for JRUBY-6415.

    commit 773a155
    Author: Charles Oliver Nutter <headius@headius.com>
    Date:   Mon Jan 9 02:40:33 2012 -0600
    
        Actually set new bytelists to external encoding in GzipReader.
    
    commit 84e3e3f
    Author: Hiroshi Nakamura <nahi@ruby-lang.org>
    Date:   Wed Feb 1 13:37:00 2012 +0900
    
        Fix GzipReader encoding on 1.9 mode (produced encoding == null String)
    
        It's a fix for "-J-ea pointed out we were creating a bad ByteList with
        no encoding in 1.9 mode..." reported by Tom.
    
        The actual bug is from 1 line, that I forgot to set default
        externalEncoding to runtime.getDefaultExternalEncoding()
        But the problem is from name confusion.  Use proper names, readEncoding
        and writeEncoding for enc, enc2 in Ruby's IO subsystem.
    headius committed Feb 15, 2012
  5. Be green damn you

    enebo committed Feb 15, 2012
  6. Be green damn you

    enebo committed Feb 15, 2012
  7. Additional tweaks for JRUBY-6456

    * execRecursiveOuter is always outermost, so add finally logic there
    * Add explicit check for recursiveListOperation in execRecursive
    
    Conflicts:
    
    	src/org/jruby/Ruby.java
    headius committed Feb 15, 2012
  8. Fix JRUBY-6456

    ThreadLocal Leak in 1.9 Mode w/ Internal Recursive Map
    
    Our code was a direct port of MRI's, and they seem to have the
    same issue: no logic clears out the threadlocal map once the
    recursive walk is complete. I added an outermost method called
    recursiveListOperation that should always be used to wrap the
    execRecursive* calls.
    
    Conflicts:
    
    	src/org/jruby/Ruby.java
    headius committed Feb 15, 2012
  9. JRUBY-6416: JRuby 1.6.6(1.9-mode) freezing in Rails application witho…

    …ut any error, when manipulating a String with special characters
    enebo committed Feb 15, 2012