Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f41b6d9e3874
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6a454ef5fadf
Choose a head ref
1 contributor

Commits on Apr 14, 2015

  1. make AbstractLocalContextProvider internals final + add constructors … 

    …for overriders
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    883a9e1 View commit details

  2. fix, dry and simplify the internals or various local-context-provider… 

    … impls :

- share the logic of obtaining a global runtime
- when global runtime is used make sure we always return the correct instance config!
- introduce & use LocalContext's internal getRuntime for lazy runtime initialization
- support contructors for all providers without the lazy argument
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    e9d7308 View commit details

  3. cleanup SingletonLocalContextProvider for the outside world 

    correctly synchronize local context setup/teardown (on our class)!
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    e55e808 View commit details

  4. fine to make the LocalContext instance final - it does not do any (ru… 

    …ntime) initialization
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    f1b60d8 View commit details

  5. re-use LocalContext's fields instead of introducing static ones in si… 

    …ngleton provider impl
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    aeaa154 View commit details

  6. unused imports

    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    275d875 View commit details

  7. better safe than sorry - synchronize LocalContext's field getters

    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    ef5854f View commit details

  8. final name field and cleanup method internals + add a bunch of packag… 

    …e level helpers
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    c1668dd View commit details

  9. cleanup (internal) guts for variable impls - use a VALID_NAME final f… 

    …ield pattern
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    cab825c View commit details

  10. [embed] cleanup predefined global variable name checking

    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    2ae146b View commit details

  11. revisit BiVariableMap internals to avoid NPEs in 'advanced' usage + a… 

    …lign as Map impl
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    d4892f5 View commit details

  12. add an updateVariable helper + do more cleanup - some comment on impl… 

    … weirdness
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    b59efb5 View commit details

  13. implement a toString method for the BiVariableMap and some more test … 

    …code
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    c2106e1 View commit details

  14. dry out ClassVariable some

    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    5724239 View commit details

  15. Constant's initialized field is never read

    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    56a067d View commit details

  16. extract checking whether variable sharing is enabled into a helper + … 

    …fields can go final
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    c453ff5 View commit details

  17. fix Map clear bug when ARGV's value is kept incorrectly + print var v… 

    …alues on toString
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    f63f00b View commit details

  18. make sure ARGV is internally set as an Argv instance (as intended) no… 

    …t a Constant !
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    f393116 View commit details

  19. assert correct ARGV behavior with javax.script embed engine

    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    ac78d46 View commit details

  20. make ScriptingContainer's fields final

    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    383215c View commit details

  21. add a test to verify we're not pre-initializing runtime when asked fo… 

    …r instance config
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    1a51f27 View commit details

  22. only wrap raise exceptions (from ruby) + cleanup not thrown checked e… 

    …xceptions
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    9a9fa60 View commit details

  23. review JRuby's ScriptEngineManager + ServiceFinder helper internals

    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    7dbc742 View commit details

  24. adding a test to reproduce another (NPE) BiVariableMap bug - but all … 

    …seems well
    @kares
    kares committed Apr 14, 2015
    Copy the full SHA
    6a454ef View commit details
Showing with 1,433 additions and 1,071 deletions.
  1. +67 −66 core/src/main/java/org/jruby/embed/ScriptingContainer.java
  2. +52 −13 core/src/main/java/org/jruby/embed/internal/AbstractLocalContextProvider.java
  3. +224 −181 core/src/main/java/org/jruby/embed/internal/BiVariableMap.java
  4. +19 −16 core/src/main/java/org/jruby/embed/internal/ConcurrentLocalContextProvider.java
  5. +33 −21 core/src/main/java/org/jruby/embed/internal/EmbedEvalUnitImpl.java
  6. +1 −4 core/src/main/java/org/jruby/embed/internal/EmbedRubyInterfaceAdapterImpl.java
  7. +54 −32 core/src/main/java/org/jruby/embed/internal/LocalContext.java
  8. +24 −26 core/src/main/java/org/jruby/embed/internal/SingleThreadLocalContextProvider.java
  9. +61 −50 core/src/main/java/org/jruby/embed/internal/SingletonLocalContextProvider.java
  10. +17 −6 core/src/main/java/org/jruby/embed/internal/ThreadSafeLocalContextProvider.java
  11. +1 −1 core/src/main/java/org/jruby/embed/jsr223/JRubyEngine.java
  12. +22 −27 core/src/main/java/org/jruby/embed/jsr223/JRubyScriptEngineManager.java
  13. +45 −48 core/src/main/java/org/jruby/embed/jsr223/ServiceFinder.java
  14. +42 −43 core/src/main/java/org/jruby/embed/variable/AbstractVariable.java
  15. +61 −59 core/src/main/java/org/jruby/embed/variable/Argv.java
  16. +32 −41 core/src/main/java/org/jruby/embed/variable/ClassVariable.java
  17. +68 −79 core/src/main/java/org/jruby/embed/variable/Constant.java
  18. +57 −65 core/src/main/java/org/jruby/embed/variable/GlobalVariable.java
  19. +16 −8 core/src/main/java/org/jruby/embed/variable/InstanceVariable.java
  20. +32 −38 core/src/main/java/org/jruby/embed/variable/LocalGlobalVariable.java
  21. +18 −13 core/src/main/java/org/jruby/embed/variable/PersistentLocalVariable.java
  22. +8 −4 core/src/main/java/org/jruby/embed/variable/TransientLocalVariable.java
  23. +26 −40 core/src/main/java/org/jruby/embed/variable/VariableInterceptor.java
  24. +193 −77 core/src/test/java/org/jruby/embed/internal/BiVariableMapTest.java
  25. +39 −1 core/src/test/java/org/jruby/embed/internal/ConcurrentLocalContextProviderTest.java
  26. +139 −0 core/src/test/java/org/jruby/embed/internal/SingletonLocalContextProviderTest.java
  27. +39 −37 core/src/test/java/org/jruby/embed/jsr223/JRubyEngineFactoryTest.java
  28. +43 −75 core/src/test/java/org/jruby/embed/jsr223/JRubyEngineTest.java
Loading