Removed more unused imports in Snapshots code
Conflicts:
server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/efab2f41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/efab2f41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/efab2f41
Branch: refs/heads/master
Commit: efab2f413bbd2dc13178deeaffa749ab5b5a9c8a
Parents: c27b44e
Author: Alena Prokharchyk <[email protected]>
Authored: Tue Sep 25 15:05:38 2012 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Thu Sep 27 11:12:53 2012 -0700
----------------------------------------------------------------------
.../com/cloud/network/rules/RulesManagerImpl.java | 4 ++--
.../storage/snapshot/SnapshotSchedulerImpl.java | 9 ++-------
2 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/efab2f41/server/src/com/cloud/network/rules/RulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java
b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index 37cae90..2383366 100755
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -255,11 +255,11 @@ public class RulesManagerImpl implements RulesManager,
RulesService, Manager {
if (validatePortRange) {
//source start port and source dest port should be the same.
The same applies to dest ports
if (rule.getSourcePortStart().intValue() !=
rule.getDestinationPortStart()) {
- throw new InvalidParameterValueException("Private port
start should be equal to public port start", null);
+ throw new InvalidParameterValueException("Private port
start should be equal to public port start");
}
if (rule.getSourcePortEnd().intValue() !=
rule.getDestinationPortEnd()) {
- throw new InvalidParameterValueException("Private port end
should be equal to public port end", null);
+ throw new InvalidParameterValueException("Private port end
should be equal to public port end");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/efab2f41/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
index bfc636a..8c09994 100644
--- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
@@ -31,6 +31,7 @@ import org.apache.log4j.Logger;
import com.cloud.api.ApiDispatcher;
import com.cloud.api.ApiGsonHelper;
import com.cloud.api.commands.CreateSnapshotCmd;
+import com.cloud.user.Account;
import com.cloud.async.AsyncJobManager;
import com.cloud.async.AsyncJobResult;
import com.cloud.async.AsyncJobVO;
@@ -46,9 +47,7 @@ import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.storage.dao.SnapshotPolicyDao;
import com.cloud.storage.dao.SnapshotScheduleDao;
-import com.cloud.storage.dao.StoragePoolHostDao;
import com.cloud.storage.dao.VolumeDao;
-import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.utils.DateUtil;
import com.cloud.utils.DateUtil.IntervalType;
@@ -60,9 +59,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.SearchCriteria;
-/**
- *
- */
+
@Local(value={SnapshotScheduler.class})
public class SnapshotSchedulerImpl implements SnapshotScheduler {
private static final Logger s_logger =
Logger.getLogger(SnapshotSchedulerImpl.class);
@@ -73,8 +70,6 @@ public class SnapshotSchedulerImpl implements
SnapshotScheduler {
@Inject protected SnapshotScheduleDao _snapshotScheduleDao;
@Inject protected SnapshotPolicyDao _snapshotPolicyDao;
@Inject protected AsyncJobManager _asyncMgr;
- @Inject protected SnapshotManager _snapshotManager;
- @Inject protected StoragePoolHostDao _poolHostDao;
@Inject protected VolumeDao _volsDao;
private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 5;
// 5 seconds
