Changeset 711

Show
Ignore:
Timestamp:
06/20/08 16:37:38 (4 months ago)
Author:
francis
Message:

Changed a module name to avoid a conflict with a well-known alias.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/jeventmachine.rb

    r668 r711  
    4242        LoopbreakSignalled = 105 
    4343 
    44         class EM < com.rubyeventmachine.EmReactor 
     44        # This thunk class used to be called EM, but that caused conflicts with 
     45        # the alias "EM" for module EventMachine. (FC, 20Jun08) 
     46        class JEM < com.rubyeventmachine.EmReactor 
    4547                def eventCallback a1, a2, a3 
    4648                        s = String.from_java_bytes(a3.array[a3.position...a3.limit]) 
     
    4951        end 
    5052        def self.initialize_event_machine 
    51                 @em = EM.new 
     53                @em = JEM.new 
    5254        end 
    5355        def self.release_machine 
     
    103105                :java 
    104106        end 
     107 
     108        class Connection 
     109                def associate_callback_target sig 
     110                        # No-op for the time being 
     111                end 
     112        end 
    105113end 
    106114