Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dk131072
spring-framework
提交
150838bf
S
spring-framework
项目概览
dk131072
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
150838bf
编写于
3月 15, 2011
作者:
C
Chris Beams
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove TODOs related to profile logging
Issue: SPR-8031, SPR-7508, SPR-8057
上级
b50ac748
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
2 addition
and
7 deletion
+2
-7
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
...eans/factory/xml/DefaultBeanDefinitionDocumentReader.java
+1
-2
org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
...ork/context/annotation/AnnotatedBeanDefinitionReader.java
+0
-1
org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
...notation/ClassPathScanningCandidateComponentProvider.java
+0
-1
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
...ramework/context/annotation/ConfigurationClassParser.java
+1
-2
org.springframework.core/src/main/java/org/springframework/core/env/MutablePropertySources.java
.../org/springframework/core/env/MutablePropertySources.java
+0
-1
未找到文件。
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
浏览文件 @
150838bf
/*
* Copyright 2002-201
0
the original author or authors.
* Copyright 2002-201
1
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.
...
...
@@ -123,7 +123,6 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
Assert
.
state
(
this
.
environment
!=
null
,
"environment property must not be null"
);
String
[]
specifiedProfiles
=
StringUtils
.
tokenizeToStringArray
(
profileSpec
,
BeanDefinitionParserDelegate
.
MULTI_VALUE_ATTRIBUTE_DELIMITERS
);
if
(!
this
.
environment
.
acceptsProfiles
(
specifiedProfiles
))
{
// TODO SPR-7508: log that this bean is being rejected on profile mismatch
return
;
}
}
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
浏览文件 @
150838bf
...
...
@@ -116,7 +116,6 @@ public class AnnotatedBeanDefinitionReader {
if
(
ProfileHelper
.
isProfileAnnotationPresent
(
metadata
))
{
if
(!
this
.
environment
.
acceptsProfiles
(
ProfileHelper
.
getCandidateProfiles
(
metadata
)))
{
// TODO SPR-7508: log that this bean is being rejected on profile mismatch
return
;
}
}
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
浏览文件 @
150838bf
...
...
@@ -300,7 +300,6 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
if
(!
ProfileHelper
.
isProfileAnnotationPresent
(
metadata
))
{
return
true
;
}
// TODO SPR-7508: log that this bean is being rejected on profile mismatch
return
this
.
environment
.
acceptsProfiles
(
ProfileHelper
.
getCandidateProfiles
(
metadata
));
}
}
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
浏览文件 @
150838bf
/*
* Copyright 2002-201
0
the original author or authors.
* Copyright 2002-201
1
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.
...
...
@@ -104,7 +104,6 @@ class ConfigurationClassParser {
AnnotationMetadata
metadata
=
configClass
.
getMetadata
();
if
(
this
.
environment
!=
null
&&
ProfileHelper
.
isProfileAnnotationPresent
(
metadata
))
{
if
(!
this
.
environment
.
acceptsProfiles
(
ProfileHelper
.
getCandidateProfiles
(
metadata
)))
{
// TODO SPR-7508: log that this bean is being rejected on profile mismatch
return
;
}
}
...
...
org.springframework.core/src/main/java/org/springframework/core/env/MutablePropertySources.java
浏览文件 @
150838bf
...
...
@@ -160,7 +160,6 @@ public class MutablePropertySources implements PropertySources {
*/
protected
void
removeIfPresent
(
PropertySource
<?>
propertySource
)
{
if
(
this
.
propertySourceList
.
contains
(
propertySource
))
{
// TODO SPR-7508: add logging
this
.
propertySourceList
.
remove
(
propertySource
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录