You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/01/28 23:31:14 UTC
git commit: updated refs/heads/4.3 to 85868d8
Updated Branches:
refs/heads/4.3 220a2a1a0 -> 85868d81f
findbugs: null check for gateway and netmask instead of gateway twice(cherry picked from commit d30ddf6d59732fa30855811e7fe0aa639ee3849a)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/85868d81
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/85868d81
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/85868d81
Branch: refs/heads/4.3
Commit: 85868d81fb70c9805c95f8b58bf86d23c3a3ff01
Parents: 220a2a1
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Jan 26 15:11:56 2014 +0100
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Tue Jan 28 14:23:03 2014 -0800
----------------------------------------------------------------------
.../src/com/cloud/configuration/ConfigurationManagerImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85868d81/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 99f2c19..d2e5aaa 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -36,6 +36,8 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -83,7 +85,6 @@ import org.apache.cloudstack.region.dao.RegionDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.log4j.Logger;
import com.cloud.alert.AlertManager;
import com.cloud.api.ApiDBUtils;
@@ -2754,7 +2755,7 @@ ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, Co
}
}
return NetUtils.supersetOrSubset.neitherSubetNorSuperset;
- } else if (newVlanGateway == null || newVlanGateway == null) {
+ } else if (newVlanGateway == null || newVlanNetmask == null) {
throw new InvalidParameterValueException(
"either both netmask and gateway should be passed or both should me omited.");
} else {