Bail out of recursively-namespaced modules when calculating name.

Fixes #2314.
jruby · May 4, 2015 · 5305b14 · 5305b14
1 parent cb4e52e
commit 5305b14
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -483,6 +483,9 @@ private String calculateName() {
         // First, we count the parents
         int parentCount = 0;
         for (RubyModule p = getParent() ; p != null && p != objectClass ; p = p.getParent()) {
+            // Break out of cyclic namespaces like C::A = C2; C2::A = C (jruby/jruby#2314)
+            if (p == this) break;
+
             parentCount++;
         }
 
@@ -491,6 +494,9 @@ private String calculateName() {
         int i = parentCount - 1;
         int totalLength = name.length() + parentCount * 2; // name length + enough :: for all parents
         for (RubyModule p = getParent() ; p != null && p != objectClass ; p = p.getParent(), i--) {
+            // Break out of cyclic namespaces like C::A = C2; C2::A = C (jruby/jruby#2314)
+            if (p == this) break;
+
             String pName = p.getBaseName();
 
             // This is needed when the enclosing class or module is a singleton.