cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject [33/50] git commit: updated refs/heads/marvin to df58f51
Date Wed, 29 Jan 2014 08:54:08 GMT
findbugs: removed obfuscating fields(cherry picked from commit
9495c68c1378e379880433d45ec43bfda75ec3f9)

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53777c95
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53777c95
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53777c95

Branch: refs/heads/marvin
Commit: 53777c9523aad0c4544811194f8fe44b7e9958d4
Parents: be21822
Author: Daan Hoogland <daan@onecht.net>
Authored: Tue Jan 28 17:42:17 2014 +0100
Committer: Daan Hoogland <dhoogland@schubergphilis.com>
Committed: Tue Jan 28 17:42:17 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/53777c95/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 2b84231..3cf3580 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
@@ -52,10 +51,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;
@@ -101,11 +100,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/53777c95/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 1e3926d..78652a2 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;


Mime
View raw message