Removed more unused imports in Snapshots code

Alena Prokharchyk · Alena Prokharchyk · commit efab2f413bbd · 2012-09-27T11:12:53.000-07:00
Conflicts:

	server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -255,11 +255,11 @@ public PortForwardingRule createPortForwardingRule(PortForwardingRule rule, Long
             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");
                 }
             }
 
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
@@ -31,6 +31,7 @@
 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.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.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

Original file line number	Diff line number	Diff line change
`@@ -255,11 +255,11 @@ public PortForwardingRule createPortForwardingRule(PortForwardingRule rule, Long`
`255`	`255`	`if (validatePortRange) {`
`256`	`256`	`//source start port and source dest port should be the same. The same applies to dest ports`
`257`	`257`	`if (rule.getSourcePortStart().intValue() != rule.getDestinationPortStart()) {`
`258`		`- throw new InvalidParameterValueException("Private port start should be equal to public port start", null);`
	`258`	`+ throw new InvalidParameterValueException("Private port start should be equal to public port start");`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`if (rule.getSourcePortEnd().intValue() != rule.getDestinationPortEnd()) {`
`262`		`- throw new InvalidParameterValueException("Private port end should be equal to public port end", null);`
	`262`	`+ throw new InvalidParameterValueException("Private port end should be equal to public port end");`
`263`	`263`	`}`
`264`	`264`	`}`
`265`	`265`