Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
apollo
Commits
d2f32587
Commit
d2f32587
authored
Jan 25, 2017
by
Jason Song
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix coverity defect
parent
4e129e70
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ApolloDataSourceProvider.java
...m/ctrip/framework/apollo/ds/ApolloDataSourceProvider.java
+1
-1
PlainTextConfigFile.java
...ctrip/framework/apollo/internals/PlainTextConfigFile.java
+1
-1
PropertiesConfigFile.java
...trip/framework/apollo/internals/PropertiesConfigFile.java
+1
-1
No files found.
apollo-client/src/main/java/com/ctrip/framework/apollo/ds/ApolloDataSourceProvider.java
View file @
d2f32587
...
...
@@ -46,7 +46,7 @@ public class ApolloDataSourceProvider implements DataSourceProvider, LogEnabled
String
appId
=
Foundation
.
app
().
getAppId
();
String
envType
=
Foundation
.
server
().
getEnvType
();
if
(
file
.
hasContent
())
{
if
(
file
!=
null
&&
file
.
hasContent
())
{
String
content
=
file
.
getContent
();
m_logger
.
info
(
String
.
format
(
"Found datasources.xml from Apollo(env=%s, app.id=%s)!"
,
envType
,
appId
));
...
...
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PlainTextConfigFile.java
View file @
d2f32587
...
...
@@ -12,7 +12,7 @@ public abstract class PlainTextConfigFile extends AbstractConfigFile {
@Override
public
String
getContent
()
{
if
(
m_configProperties
.
get
()
==
null
)
{
if
(
!
this
.
hasContent
()
)
{
return
null
;
}
return
m_configProperties
.
get
().
getProperty
(
ConfigConsts
.
CONFIG_FILE_CONTENT_KEY
);
...
...
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java
View file @
d2f32587
...
...
@@ -34,7 +34,7 @@ public class PropertiesConfigFile extends AbstractConfigFile {
}
String
doGetContent
()
{
if
(
m_configProperties
.
get
()
==
null
)
{
if
(
!
this
.
hasContent
()
)
{
return
null
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment