Merge branch '5.1.x'

This commit is contained in:
Juergen Hoeller
2019-02-07 16:01:14 +01:00
10 changed files with 196 additions and 82 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -411,6 +411,11 @@ class StubWebApplicationContext implements WebApplicationContext {
throw new UnsupportedOperationException("Dependency resolution not supported");
}
@Override
public Object resolveBeanByName(String name, DependencyDescriptor descriptor) throws BeansException {
throw new UnsupportedOperationException("Dependency resolution not supported");
}
@Override
@Nullable
public Object resolveDependency(DependencyDescriptor descriptor, @Nullable String requestingBeanName) {