Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
fa7a1983
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fa7a1983
编写于
6月 21, 2019
作者:
D
daming
提交者:
wu-sheng
6月 21, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix ModuleProvider is repeated loading (#2923)
上级
980c019f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
5 addition
and
4 deletion
+5
-4
oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefine.java
...he/skywalking/oap/server/library/module/ModuleDefine.java
+2
-3
oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleManager.java
...e/skywalking/oap/server/library/module/ModuleManager.java
+3
-1
未找到文件。
oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefine.java
浏览文件 @
fa7a1983
...
@@ -58,9 +58,8 @@ public abstract class ModuleDefine implements ModuleProviderHolder {
...
@@ -58,9 +58,8 @@ public abstract class ModuleDefine implements ModuleProviderHolder {
* @param configuration of this module
* @param configuration of this module
* @throws ProviderNotFoundException when even don't find a single one providers.
* @throws ProviderNotFoundException when even don't find a single one providers.
*/
*/
void
prepare
(
ModuleManager
moduleManager
,
void
prepare
(
ModuleManager
moduleManager
,
ApplicationConfiguration
.
ModuleConfiguration
configuration
,
ApplicationConfiguration
.
ModuleConfiguration
configuration
)
throws
ProviderNotFoundException
,
ServiceNotProvidedException
,
ModuleConfigException
,
ModuleStartException
{
ServiceLoader
<
ModuleProvider
>
moduleProviderLoader
)
throws
ProviderNotFoundException
,
ServiceNotProvidedException
,
ModuleConfigException
,
ModuleStartException
{
ServiceLoader
<
ModuleProvider
>
moduleProviderLoader
=
ServiceLoader
.
load
(
ModuleProvider
.
class
);
boolean
providerExist
=
false
;
boolean
providerExist
=
false
;
for
(
ModuleProvider
provider
:
moduleProviderLoader
)
{
for
(
ModuleProvider
provider
:
moduleProviderLoader
)
{
if
(!
configuration
.
has
(
provider
.
name
()))
{
if
(!
configuration
.
has
(
provider
.
name
()))
{
...
...
oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleManager.java
浏览文件 @
fa7a1983
...
@@ -37,6 +37,8 @@ public class ModuleManager implements ModuleDefineHolder {
...
@@ -37,6 +37,8 @@ public class ModuleManager implements ModuleDefineHolder {
ApplicationConfiguration
applicationConfiguration
)
throws
ModuleNotFoundException
,
ProviderNotFoundException
,
ServiceNotProvidedException
,
CycleDependencyException
,
ModuleConfigException
,
ModuleStartException
{
ApplicationConfiguration
applicationConfiguration
)
throws
ModuleNotFoundException
,
ProviderNotFoundException
,
ServiceNotProvidedException
,
CycleDependencyException
,
ModuleConfigException
,
ModuleStartException
{
String
[]
moduleNames
=
applicationConfiguration
.
moduleList
();
String
[]
moduleNames
=
applicationConfiguration
.
moduleList
();
ServiceLoader
<
ModuleDefine
>
moduleServiceLoader
=
ServiceLoader
.
load
(
ModuleDefine
.
class
);
ServiceLoader
<
ModuleDefine
>
moduleServiceLoader
=
ServiceLoader
.
load
(
ModuleDefine
.
class
);
ServiceLoader
<
ModuleProvider
>
moduleProviderLoader
=
ServiceLoader
.
load
(
ModuleProvider
.
class
);
LinkedList
<
String
>
moduleList
=
new
LinkedList
<>(
Arrays
.
asList
(
moduleNames
));
LinkedList
<
String
>
moduleList
=
new
LinkedList
<>(
Arrays
.
asList
(
moduleNames
));
for
(
ModuleDefine
module
:
moduleServiceLoader
)
{
for
(
ModuleDefine
module
:
moduleServiceLoader
)
{
for
(
String
moduleName
:
moduleNames
)
{
for
(
String
moduleName
:
moduleNames
)
{
...
@@ -47,7 +49,7 @@ public class ModuleManager implements ModuleDefineHolder {
...
@@ -47,7 +49,7 @@ public class ModuleManager implements ModuleDefineHolder {
}
catch
(
InstantiationException
|
IllegalAccessException
e
)
{
}
catch
(
InstantiationException
|
IllegalAccessException
e
)
{
throw
new
ModuleNotFoundException
(
e
);
throw
new
ModuleNotFoundException
(
e
);
}
}
newInstance
.
prepare
(
this
,
applicationConfiguration
.
getModuleConfiguration
(
moduleName
));
newInstance
.
prepare
(
this
,
applicationConfiguration
.
getModuleConfiguration
(
moduleName
)
,
moduleProviderLoader
);
loadedModules
.
put
(
moduleName
,
newInstance
);
loadedModules
.
put
(
moduleName
,
newInstance
);
moduleList
.
remove
(
moduleName
);
moduleList
.
remove
(
moduleName
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录