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: 60cb2266e014
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 304342c8f807
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 24, 2017

  1. Update to jcodings 1.0.20 for UTF32BE/LE length fix.

    @headius
    headius committed Jul 24, 2017
    Copy the full SHA
    3c21a91 View commit details

  2. Reflectively try to restart agent, since not all JDKs have this.

    @headius
    headius committed Jul 24, 2017
    Copy the full SHA
    304342c View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 core/pom.rb
  2. +1 −1 core/pom.xml
  3. +1 −1 core/src/main/java/org/jruby/management/BeanManagerImpl.java
2 changes: 1 addition & 1 deletion core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@

jar 'org.jruby.joni:joni:2.1.12-SNAPSHOT'
jar 'org.jruby.extras:bytelist:1.0.15'
jar 'org.jruby.jcodings:jcodings:1.0.18'
jar 'org.jruby.jcodings:jcodings:1.0.20'
jar 'org.jruby:dirgra:0.3'

jar 'com.headius:invokebinder:1.8-SNAPSHOT'
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -183,7 +183,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
<version>1.0.18</version>
<version>1.0.20</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/management/BeanManagerImpl.java
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ public boolean tryShutdownAgent() {

public boolean tryRestartAgent() {
try {
sun.management.Agent.startAgent();
Class.forName("sun.management.Agent").getDeclaredMethod("startAgent").invoke(null);
return true;
} catch (Exception e) {
return false;