From c8a8c2a3be4aa473affd565311916953db27ec9b Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Fri, 21 Aug 2015 11:03:37 +0000 Subject: Prefer RuleContext.getFragment over BuildConfiguration.getFragment. This improves the coverage of the legality check in RuleContext.getFragment. -- MOS_MIGRATED_REVID=101208822 --- src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java index 2f12d4a6fd..9ffaba58e7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java @@ -80,10 +80,10 @@ public final class CppModel { private FeatureConfiguration featureConfiguration; public CppModel(RuleContext ruleContext, CppSemantics semantics) { - this.ruleContext = ruleContext; + this.ruleContext = Preconditions.checkNotNull(ruleContext); this.semantics = semantics; configuration = ruleContext.getConfiguration(); - cppConfiguration = configuration.getFragment(CppConfiguration.class); + cppConfiguration = ruleContext.getFragment(CppConfiguration.class); } /** -- cgit v1.2.3