[cloudsim] r255 committed - Fixed FindBugs warnings

[clou...@googlecode.com]

Revision: 255
Author: nikolay...@gmail.com
Date: Tue Oct 21 04:28:22 2014 UTC
Log: Fixed FindBugs warnings

https://code.google.com/p/cloudsim/source/detail?r=255

Modified:

/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/network/datacenter/NetDatacenterBroker.java

/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/network/datacenter/NetworkDatacenter.java

/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/network/datacenter/Switch.java

/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/util/MathUtil.java

/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/util/WorkloadFileReader.java

=======================================
---
/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/network/datacenter/NetDatacenterBroker.java
Thu Oct 3 11:07:50 2013 UTC
+++
/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/network/datacenter/NetDatacenterBroker.java
Tue Oct 21 04:28:22 2014 UTC
@@ -146,7 +146,7 @@
getCloudletList().addAll(list);
}

- public void setLinkDC(NetworkDatacenter alinkDC) {
+ public static void setLinkDC(NetworkDatacenter alinkDC) {
linkDC = alinkDC;
}

=======================================
---
/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/network/datacenter/NetworkDatacenter.java
Thu Oct 3 11:07:50 2013 UTC
+++
/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/network/datacenter/NetworkDatacenter.java
Tue Oct 21 04:28:22 2014 UTC
@@ -80,7 +80,7 @@
Switchlist = new HashMap<Integer, Switch>();
}

- public Map<Integer, Integer> VmToSwitchid;
+ public Map<Integer, Integer> VmToSwitchid = new HashMap<Integer,
Integer>();

public Map<Integer, Integer> HostToSwitchid;

=======================================
---
/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/network/datacenter/Switch.java
Thu Oct 3 11:07:50 2013 UTC
+++
/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/network/datacenter/Switch.java
Tue Oct 21 04:28:22 2014 UTC
@@ -9,6 +9,7 @@
package org.cloudbus.cloudsim.network.datacenter;

import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -64,13 +65,13 @@
// something is running on these hosts
public SortedMap<Double, List<NetworkVm>> fintimelistVM = new
TreeMap<Double, List<NetworkVm>>();

- public ArrayList<NetworkPacket> pktlist;
+ public ArrayList<NetworkPacket> pktlist = new ArrayList<NetworkPacket>();

public List<Vm> BagofTaskVm = new ArrayList<Vm>();

public double switching_delay;

- public Map<Integer, NetworkVm> Vmlist;
+ public Map<Integer, NetworkVm> Vmlist = new HashMap<Integer, NetworkVm>();

public Switch(String name, int level, NetworkDatacenter dc) {
super(name);
=======================================
---
/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/util/MathUtil.java
Thu May 2 04:44:08 2013 UTC
+++
/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/util/MathUtil.java
Tue Oct 21 04:28:22 2014 UTC
@@ -311,7 +311,7 @@

double[] estimates = tricubeBySquareRegression.regress()
.getParameterEstimates();
- if (estimates[0] == Double.NaN || estimates[1] == Double.NaN) {
+ if (Double.isNaN(estimates[0]) || Double.isNaN(estimates[1])) {
return tricubeRegression.regress().getParameterEstimates();
}
return estimates;
=======================================
---
/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/util/WorkloadFileReader.java
Wed Jan 11 03:28:54 2012 UTC
+++
/trunk/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/util/WorkloadFileReader.java
Tue Oct 21 04:28:22 2014 UTC
@@ -404,8 +404,9 @@

// read one line at the time
int line = 1;
- while (reader.ready()) {
- parseValue(reader.readLine(), line);
+ String readLine = null;
+ while (reader.ready() && (readLine = reader.readLine()) != null) {
+ parseValue(readLine, line);
line++;
}

@@ -435,9 +436,10 @@
reader = new BufferedReader(new InputStreamReader(new
GZIPInputStream(new FileInputStream(fl))));

// read one line at the time
- int line = 1;
- while (reader.ready()) {
- parseValue(reader.readLine(), line);
+ int line = 1;
+ String readLine = null;
+ while (reader.ready() && (readLine =
reader.readLine()) != null) {
+ parseValue(readLine, line);
line++;
}

@@ -475,9 +477,10 @@
reader = new BufferedReader(new
InputStreamReader(zipFile.getInputStream(zipEntry)));

// read one line at the time
- int line = 1;
- while (reader.ready()) {
- parseValue(reader.readLine(), line);
+ int line = 1;
+ String readLine = null;
+ while (reader.ready() && (readLine =
reader.readLine()) != null) {
+ parseValue(readLine, line);
line++;
}