jruby · Jun 29, 2016 · Jun 29, 2016 · Jun 29, 2016 · Jun 30, 2016
diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -433,7 +433,7 @@ private boolean checkStreamSyntax(Ruby runtime, InputStream in, String filename)
         } catch (RaiseException re) {
             if (re.getException().getMetaClass().getBaseName().equals("SyntaxError")) {
                 context.setErrorInfo($ex);
-                config.getError().println("SyntaxError in " + re.getException().message(runtime.getCurrentContext()));
+                config.getError().println("SyntaxError in " + re.getException().message(context));
                 return false;
             }
             throw re;

diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -1205,10 +1205,10 @@ private void init() {
         threadService.initMainThread();
 
         // Get the main threadcontext (gets constructed for us)
-        ThreadContext tc = getCurrentContext();
+        final ThreadContext context = getCurrentContext();
 
         // Construct the top-level execution frame and scope for the main thread
-        tc.prepareTopLevel(objectClass, topSelf);
+        context.prepareTopLevel(objectClass, topSelf);
 
         // Initialize all the core classes
         bootstrap();
@@ -1223,10 +1223,10 @@ private void init() {
 
         // Initialize the "dummy" class used as a marker
         dummyClass = new RubyClass(this, classClass);
-        dummyClass.freeze(tc);
+        dummyClass.freeze(context);
 
         // Create global constants and variables
-        RubyGlobal.createGlobals(tc, this);
+        RubyGlobal.createGlobals(context, this);
 
         // Prepare LoadService and load path
         getLoadService().init(config.getLoadPaths());
@@ -1270,7 +1270,7 @@ private void init() {
 
         if (is1_9()) {
             // everything booted, so SizedQueue should be available; set up root fiber
-            ThreadFiber.initRootFiber(tc);
+            ThreadFiber.initRootFiber(context);
         }
 
         if(config.isProfiling()) {
@@ -1292,7 +1292,7 @@ private void init() {
         // Require in all libraries specified on command line
         for (String scriptName : config.getRequiredLibraries()) {
             if (is1_9) {
-                topSelf.callMethod(getCurrentContext(), "require", RubyString.newString(this, scriptName));
+                topSelf.callMethod(context, "require", RubyString.newString(this, scriptName));
             } else {
                 loadService.require(scriptName);
             }
@@ -4110,19 +4110,20 @@ public ExecRecursiveParams() {}
 
     private void recursivePush(IRubyObject list, IRubyObject obj, IRubyObject paired_obj) {
         IRubyObject pair_list;
-        if(paired_obj == null) {
-            ((RubyHash)list).op_aset(getCurrentContext(), obj, getTrue());
-        } else if((pair_list = ((RubyHash)list).fastARef(obj)) == null) {
-            ((RubyHash)list).op_aset(getCurrentContext(), obj, paired_obj);
+        final ThreadContext context = getCurrentContext();
+        if (paired_obj == null) {
+            ((RubyHash) list).op_aset(context, obj, getTrue());
+        } else if ((pair_list = ((RubyHash)list).fastARef(obj)) == null) {
+            ((RubyHash) list).op_aset(context, obj, paired_obj);
         } else {
-            if(!(pair_list instanceof RubyHash)) {
+            if (!(pair_list instanceof RubyHash)) {
                 IRubyObject other_paired_obj = pair_list;
                 pair_list = RubyHash.newHash(this);
                 pair_list.setUntrusted(true);
-                ((RubyHash)pair_list).op_aset(getCurrentContext(), other_paired_obj, getTrue());
-                ((RubyHash)list).op_aset(getCurrentContext(), obj, pair_list);
+                ((RubyHash)pair_list).op_aset(context, other_paired_obj, getTrue());
+                ((RubyHash)list).op_aset(context, obj, pair_list);
             }
-            ((RubyHash)pair_list).op_aset(getCurrentContext(), paired_obj, getTrue());
+            ((RubyHash)pair_list).op_aset(context, paired_obj, getTrue());
         }
     }
 

diff --git a/core/src/main/java/org/jruby/RubyClassPathVariable.java b/core/src/main/java/org/jruby/RubyClassPathVariable.java
@@ -107,23 +107,25 @@ public IRubyObject size() {
 
     @JRubyMethod
     public IRubyObject each(Block block) {
-        URL[] urls = getRuntime().getJRubyClassLoader().getURLs();
-        ThreadContext ctx = getRuntime().getCurrentContext();
+        final ThreadContext context = getRuntime().getCurrentContext();
+        URL[] urls = context.runtime.getJRubyClassLoader().getURLs();
         for(int i=0,j=urls.length;i<j;i++) {
-            block.yield(ctx, getRuntime().newString(urls[i].toString()));
+            block.yield(context, context.runtime.newString(urls[i].toString()));
         }
-        return getRuntime().getNil();
+        return context.nil;
     }
 
     @Override
     @JRubyMethod
     public IRubyObject to_s() {
-        return callMethod(getRuntime().getCurrentContext(), "to_a").callMethod(getRuntime().getCurrentContext(), "to_s");
+        final ThreadContext context = getRuntime().getCurrentContext();
+        return callMethod(context, "to_a").callMethod(context, "to_s");
     }
 
     @Override
     @JRubyMethod(name = "inspect")
     public IRubyObject inspect() {
-        return callMethod(getRuntime().getCurrentContext(), "to_a").callMethod(getRuntime().getCurrentContext(), "inspect");
+        final ThreadContext context = getRuntime().getCurrentContext();
+        return callMethod(context, "to_a").callMethod(context, "inspect");
     }
 }// RubyClassPathVariable
diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -1311,11 +1311,11 @@ private static IRubyObject rbThrowInternal(ThreadContext context, IRubyObject ta
             message = "uncaught throw `" + tag + "'";
         }
         RubyThread currentThread = context.getThread();
-
+        
         if (currentThread == runtime.getThreadService().getMainThread()) {
             throw uncaught.uncaughtThrow(runtime, message, tag);
         } else {
-            message += " in thread 0x" + Integer.toHexString(RubyInteger.fix2int(currentThread.id()));
+            message += " in thread 0x" + Integer.toHexString(System.identityHashCode(currentThread.getNativeThread()));
             if (runtime.is1_9()) {
                 throw runtime.newArgumentError(message);
             } else {

diff --git a/core/src/main/java/org/jruby/util/cli/OutputStrings.java b/core/src/main/java/org/jruby/util/cli/OutputStrings.java
@@ -144,6 +144,6 @@ public static String getVersionString(CompatVersion compatVersion) {
     }
 
     public static String getCopyrightString() {
-        return "JRuby - Copyright (C) 2001-2013 The JRuby Community (and contribs)";
+        return "JRuby - Copyright (C) 2001-2016 The JRuby Community (and contribs)";
     }
 }