Skip to content

Commit 6f17ff5

Browse files
committed
Merge branch '3.3.x'
Closes gh-41449
2 parents 0a3e799 + ecbbe6a commit 6f17ff5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BootstrapContext.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ public interface BootstrapContext {
3535

3636
/**
3737
* Return an instance from the context if the type has been registered. The instance
38-
* will be created it if it hasn't been accessed previously.
38+
* will be created if it hasn't been accessed previously.
3939
* @param <T> the instance type
4040
* @param type the instance type
4141
* @return the instance managed by the context
@@ -45,7 +45,7 @@ public interface BootstrapContext {
4545

4646
/**
4747
* Return an instance from the context if the type has been registered. The instance
48-
* will be created it if it hasn't been accessed previously.
48+
* will be created if it hasn't been accessed previously.
4949
* @param <T> the instance type
5050
* @param type the instance type
5151
* @param other the instance to use if the type has not been registered
@@ -55,7 +55,7 @@ public interface BootstrapContext {
5555

5656
/**
5757
* Return an instance from the context if the type has been registered. The instance
58-
* will be created it if it hasn't been accessed previously.
58+
* will be created if it hasn't been accessed previously.
5959
* @param <T> the instance type
6060
* @param type the instance type
6161
* @param other a supplier for the instance to use if the type has not been registered
@@ -65,7 +65,7 @@ public interface BootstrapContext {
6565

6666
/**
6767
* Return an instance from the context if the type has been registered. The instance
68-
* will be created it if it hasn't been accessed previously.
68+
* will be created if it hasn't been accessed previously.
6969
* @param <T> the instance type
7070
* @param <X> the exception to throw if the type is not registered
7171
* @param type the instance type

0 commit comments

Comments
 (0)