apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-17 11:04:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/CID-1230585'

Browse Source
This commit is contained in:
Hugo Trippaers 2014-08-13 08:41:55 +02:00
commit ae4d49810e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/com/cloud/resource/ServerResourceBase.java
View File

@ -26,6 +26,7 @@ import java.net.SocketException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -100,9 +101,9 @@ public abstract class ServerResourceBase implements ServerResource {
final String nicName = nic.getName(); final String nicName = nic.getName();
// try { // try {
if (//!nic.isLoopback() && if (//!nic.isLoopback() &&
//nic.isUp() && //nic.isUp() &&
!nic.isVirtual() && !nicName.startsWith("vnif") && !nicName.startsWith("vnbr") && !nicName.startsWith("peth") && !nicName.startsWith("vif") && !nic.isVirtual() && !nicName.startsWith("vnif") && !nicName.startsWith("vnbr") && !nicName.startsWith("peth") && !nicName.startsWith("vif") &&
!nicName.startsWith("virbr") && !nicName.contains(":")) { !nicName.startsWith("virbr") && !nicName.contains(":")) {
final String[] info = NetUtils.getNicParams(nicName); final String[] info = NetUtils.getNicParams(nicName);
if (info != null && info[0] != null) { if (info != null && info[0] != null) {
_privateNic = nic; _privateNic = nic;
@ -237,16 +238,16 @@ public abstract class ServerResourceBase implements ServerResource {
protected List<String> getWarnings() { protected List<String> getWarnings() {
synchronized (_warnings) { synchronized (_warnings) {
final ArrayList<String> results = _warnings; final List<String> results = new LinkedList<String>(_warnings);
_warnings = new ArrayList<String>(); _warnings.clear();
return results; return results;
} }
} }
protected List<String> getErrors() { protected List<String> getErrors() {
synchronized (_errors) { synchronized (_errors) {
final ArrayList<String> result = _errors; final List<String> result = new LinkedList<String>(_errors);
_errors = new ArrayList<String>(); _errors.clear();
return result; return result;
} }
} }