java/code/src/com/redhat/rhn/domain/server/Server.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 994ec87d3caec3ff6fabb1e8c69c454edd5a90ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 27 10:48:09 2011 +0200
699753 - use the primary IP address from the rhnServerNetwork table
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java
b/java/code/src/com/redhat/rhn/domain/server/Server.java
index c923115..b1157d5 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -808,18 +808,16 @@ public class Server extends BaseDomainHelper implements Identifiable
{
* @return Returns the primary ip for this server
*/
public String getIpAddress() {
- // First search networkInterfaces because they are
- // better defined (name and ip address)
- NetworkInterface ni = findPrimaryNetworkInterface();
- if (ni != null) {
- log.debug("Found a NetworkInterface: " + ni.getIpaddr());
- return ni.getIpaddr();
- }
Network n = findPrimaryNetwork();
if (n != null) {
log.debug("Found a Network: " + n.getIpaddr());
return n.getIpaddr();
}
+ NetworkInterface ni = findPrimaryNetworkInterface();
+ if (ni != null) {
+ log.debug("Found a NetworkInterface: " + ni.getIpaddr());
+ return ni.getIpaddr();
+ }
return null;
}