Repository: cloudstack Updated Branches: refs/heads/master b693e61fe -> 0e79cd117
Minor changes to SolidFire automation-related code Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e79cd11 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e79cd11 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e79cd11 Branch: refs/heads/master Commit: 0e79cd1172e4340b957b0328354761e8a9305609 Parents: b693e61 Author: Mike Tutkowski <mike.tutkow...@solidfire.com> Authored: Thu Aug 28 23:14:42 2014 -0600 Committer: Mike Tutkowski <mike.tutkow...@solidfire.com> Committed: Thu Aug 28 23:14:42 2014 -0600 ---------------------------------------------------------------------- .../solidfire/ApiSolidFireServiceImpl.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e79cd11/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl.java ---------------------------------------------------------------------- diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl.java b/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl.java index 85e195c..a95272a 100644 --- a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl.java +++ b/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl.java @@ -24,7 +24,7 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.log4j.Logger; +// import org.apache.log4j.Logger; import org.apache.cloudstack.acl.APIChecker; import org.apache.cloudstack.storage.datastore.util.SolidFireUtil; import org.apache.cloudstack.api.command.user.solidfire.GetSolidFireAccountIdCmd; @@ -55,14 +55,11 @@ import com.cloud.utils.component.AdapterBase; @Component @Local(value = APIChecker.class) public class ApiSolidFireServiceImpl extends AdapterBase implements APIChecker, ApiSolidFireService { - private static final Logger s_logger = Logger.getLogger(ApiSolidFireServiceImpl.class); + // private static final Logger s_logger = Logger.getLogger(ApiSolidFireServiceImpl.class); - @Inject - private AccountDetailsDao _accountDetailsDao; - @Inject - private DataStoreProviderManager _dataStoreProviderMgr; - @Inject - private ClusterDetailsDao _clusterDetailsDao; + @Inject private AccountDetailsDao _accountDetailsDao; + @Inject private DataStoreProviderManager _dataStoreProviderMgr; + @Inject private ClusterDetailsDao _clusterDetailsDao; @Override public boolean configure(String name, Map<String, Object> params) throws ConfigurationException { @@ -91,7 +88,7 @@ public class ApiSolidFireServiceImpl extends AdapterBase implements APIChecker, primaryStoreDriver = (PrimaryDataStoreDriver)storeDriver; } } - catch(InvalidParameterValueException e) { + catch (InvalidParameterValueException e) { throw new InvalidParameterValueException("Invalid Storage Driver Type"); }
