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
37788d86
Commit
37788d86
authored
Apr 20, 2017
by
张乐
Committed by
GitHub
Apr 20, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #595 from nobodyiam/fix-coverity-bug
fix coverity bugs
parents
b928d82e
996fc516
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
NetworkInterfaceManager.java
...amework/foundation/internals/NetworkInterfaceManager.java
+4
-1
WebContextConfiguration.java
...work/apollo/portal/spi/ctrip/WebContextConfiguration.java
+1
-1
No files found.
apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NetworkInterfaceManager.java
View file @
37788d86
...
...
@@ -7,6 +7,7 @@ import java.net.SocketException;
import
java.net.UnknownHostException
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Enumeration
;
import
java.util.List
;
import
java.util.Objects
;
...
...
@@ -96,7 +97,9 @@ public enum NetworkInterfaceManager {
}
try
{
List
<
NetworkInterface
>
nis
=
Collections
.
list
(
NetworkInterface
.
getNetworkInterfaces
());
Enumeration
<
NetworkInterface
>
interfaces
=
NetworkInterface
.
getNetworkInterfaces
();
List
<
NetworkInterface
>
nis
=
interfaces
==
null
?
Collections
.<
NetworkInterface
>
emptyList
()
:
Collections
.
list
(
NetworkInterface
.
getNetworkInterfaces
());
List
<
InetAddress
>
addresses
=
new
ArrayList
<
InetAddress
>();
InetAddress
local
=
null
;
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ctrip/WebContextConfiguration.java
View file @
37788d86
...
...
@@ -33,7 +33,7 @@ public class WebContextConfiguration {
@Override
public
void
onStartup
(
ServletContext
servletContext
)
throws
ServletException
{
String
loggingServerIP
=
portalConfig
.
cloggingUrl
();
String
loggingServerPort
=
portalConfig
.
clogging
Url
();
String
loggingServerPort
=
portalConfig
.
clogging
Port
();
String
credisServiceUrl
=
portalConfig
.
credisServiceUrl
();
servletContext
.
setInitParameter
(
"loggingServerIP"
,
...
...
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