Skip to content

Commit

Permalink
fix failing test
Browse files Browse the repository at this point in the history
  • Loading branch information
rainer oviir authored and rainer oviir committed Mar 5, 2016
1 parent bdef441 commit 72e80df
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/renderers/shared/reconciler/ReactCompositeComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -495,12 +495,15 @@ var ReactCompositeComponentMixin = {
* @private
*/
_processChildContext: function(currentContext) {
var Component = this._currentElement.type;
var inst = this._instance;
if (__DEV__) {
ReactInstrumentation.debugTool.onBeginProcessingChildContext();
}
var Component = this._currentElement.type;
var inst = this._instance;
var childContext = inst.getChildContext && inst.getChildContext();
if (__DEV__) {
ReactInstrumentation.debugTool.onEndProcessingChildContext();
}
if (childContext) {
invariant(
typeof Component.childContextTypes === 'object',
Expand All @@ -525,9 +528,6 @@ var ReactCompositeComponentMixin = {
}
return assign({}, currentContext, childContext);
}
if (__DEV__) {
ReactInstrumentation.debugTool.onEndProcessingChildContext();
}
return currentContext;
},

Expand Down

0 comments on commit 72e80df

Please sign in to comment.