You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/01/27 00:55:25 UTC
git commit: updated refs/heads/4.3-forward to 9495c68
Updated Branches:
refs/heads/4.3-forward 9772693dc -> 9495c68c1
findbugs: removed obfuscating fields
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9495c68c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9495c68c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9495c68c
Branch: refs/heads/4.3-forward
Commit: 9495c68c1378e379880433d45ec43bfda75ec3f9
Parents: 9772693
Author: Daan Hoogland <da...@onecht.net>
Authored: Mon Jan 27 00:55:19 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jan 27 00:55:19 2014 +0100
----------------------------------------------------------------------
.../src/com/cloud/network/ExternalIpAddressAllocator.java | 9 ++++-----
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 1 -
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9495c68c/server/src/com/cloud/network/ExternalIpAddressAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/ExternalIpAddressAllocator.java b/server/src/com/cloud/network/ExternalIpAddressAllocator.java
index ac8f64e..2cce15e 100644
--- a/server/src/com/cloud/network/ExternalIpAddressAllocator.java
+++ b/server/src/com/cloud/network/ExternalIpAddressAllocator.java
@@ -40,7 +40,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Local(value=IpAddrAllocator.class)
public class ExternalIpAddressAllocator extends AdapterBase implements IpAddrAllocator{
private static final Logger s_logger = Logger.getLogger(ExternalIpAddressAllocator.class);
- String _name;
@Inject ConfigurationDao _configDao = null;
@Inject IPAddressDao _ipAddressDao = null;
@Inject VlanDao _vlanDao;
@@ -50,10 +49,10 @@ public class ExternalIpAddressAllocator extends AdapterBase implements IpAddrAll
@Override
public IpAddr getPrivateIpAddress(String macAddr, long dcId, long podId) {
- if (_externalIpAllocatorUrl == null || this._externalIpAllocatorUrl.equalsIgnoreCase("")) {
+ if (_externalIpAllocatorUrl == null || _externalIpAllocatorUrl.equalsIgnoreCase("")) {
return new IpAddr();
}
- String urlString = this._externalIpAllocatorUrl + "?command=getIpAddr&mac=" + macAddr + "&dc=" + dcId + "&pod=" + podId;
+ String urlString = _externalIpAllocatorUrl + "?command=getIpAddr&mac=" + macAddr + "&dc=" + dcId + "&pod=" + podId;
s_logger.debug("getIP:" + urlString);
BufferedReader in = null;
@@ -99,11 +98,11 @@ public class ExternalIpAddressAllocator extends AdapterBase implements IpAddrAll
@Override
public boolean releasePrivateIpAddress(String ip, long dcId, long podId) {
/*TODO: call API to release the ip address from external DHCP server*/
- if (_externalIpAllocatorUrl == null || this._externalIpAllocatorUrl.equalsIgnoreCase("")) {
+ if (_externalIpAllocatorUrl == null || _externalIpAllocatorUrl.equalsIgnoreCase("")) {
return false;
}
- String urlString = this._externalIpAllocatorUrl + "?command=releaseIpAddr&ip=" + ip + "&dc=" + dcId + "&pod=" + podId;
+ String urlString = _externalIpAllocatorUrl + "?command=releaseIpAddr&ip=" + ip + "&dc=" + dcId + "&pod=" + podId;
s_logger.debug("releaseIP:" + urlString);
BufferedReader in = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9495c68c/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index e273e1a..5ae09fd 100644
--- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -105,7 +105,6 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana
public static final String VM_WORK_JOB_HANDLER = VMSnapshotManagerImpl.class.getSimpleName();
- String _name;
@Inject
VMInstanceDao _vmInstanceDao;
@Inject VMSnapshotDao _vmSnapshotDao;