Skip to content

Commit b2f7fbf

Browse files
committedMar 6, 2018
Workaround NativeThread not being able to grab a TC yet. We really want something here valid as a default name even if we explicitly add nil as explicit param to constructor.
1 parent cb48a21 commit b2f7fbf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed
 

Diff for: ‎core/src/main/java/org/jruby/internal/runtime/NativeThread.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class NativeThread implements ThreadLike {
4545
public NativeThread(RubyThread rubyThread, Thread nativeThread) {
4646
this.rubyThread = rubyThread;
4747
this.nativeThread = new WeakReference<>(nativeThread);
48-
this.rubyName = rubyThread.getContext().nil;
48+
this.rubyName = null;
4949
}
5050

5151
public void start() {
@@ -128,7 +128,7 @@ public void setRubyName(IRubyObject name) {
128128
@Override
129129
@Deprecated
130130
public String getRubyName() {
131-
return rubyName.asJavaString();
131+
return rubyName == null ? null : rubyName.asJavaString();
132132
}
133133

134134
@Override
@@ -138,7 +138,7 @@ public String getReportName() {
138138
Thread thread = getThread();
139139
if (thread != null) nativeName = thread.getName();
140140

141-
if (rubyName.isNil() || ((RubyString) rubyName).size() == 0) {
141+
if (rubyName == null || rubyName.isNil() || ((RubyString) rubyName).size() == 0) {
142142
return nativeName.equals("") ? "(unnamed)" : nativeName;
143143
}
144144

0 commit comments

Comments
 (0)