Merge remote-tracking branch 'origin/jruby-1_7'

enebo · Jan 1, 2014 · 141eaf9 · 141eaf9
2 parents 3cb3621 + 0a1a6f3
commit 141eaf9
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/opto/FailoverSwitchPointInvalidator.java b/core/src/main/java/org/jruby/runtime/opto/FailoverSwitchPointInvalidator.java
@@ -50,6 +50,7 @@ public synchronized void invalidate() {
 
         // if we have failed too many times, set it to DUMMY and leave it
         if (failures > maxFailures) {
+            SwitchPoint.invalidateAll(new SwitchPoint[]{switchPoint});
             switchPoint = DUMMY;
             return;
         }