cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [30/50] [abbrv] git commit: updated refs/heads/reporter to 3e1816d
Date Mon, 27 Jul 2015 08:43:18 GMT
CLOUDSTACK-7539: coverity regression dead local store

Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>

This closes #610


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

Branch: refs/heads/reporter
Commit: 8875d7ae15e05cc2c9110e98354520011fc32d08
Parents: ab7c9e4
Author: Daan Hoogland <daan.hoogland@gmail.com>
Authored: Mon Jul 20 15:14:51 2015 +0200
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Wed Jul 22 18:12:52 2015 +0200

----------------------------------------------------------------------
 .../storage/cache/manager/StorageCacheManagerImpl.java       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8875d7ae/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
b/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
index 48e8af6..eca841e 100644
--- a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
+++ b/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
@@ -20,10 +20,10 @@ package org.apache.cloudstack.storage.cache.manager;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.util.Date;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -41,8 +41,8 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
-import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.State;
 import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event;
+import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.State;
 import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
 import org.apache.cloudstack.engine.subsystem.api.storage.StorageCacheManager;
 import org.apache.cloudstack.framework.async.AsyncCallFuture;
@@ -52,6 +52,7 @@ import org.apache.cloudstack.storage.cache.allocator.StorageCacheAllocator;
 import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
 
+import com.cloud.agent.api.to.DataObjectType;
 import com.cloud.configuration.Config;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.utils.NumbersUtil;
@@ -62,8 +63,6 @@ import com.cloud.utils.db.QueryBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-import com.cloud.agent.api.to.DataObjectType;
-
 public class StorageCacheManagerImpl implements StorageCacheManager, Manager {
     private static final Logger s_logger = Logger.getLogger(StorageCacheManagerImpl.class);
     @Inject
@@ -227,7 +226,6 @@ public class StorageCacheManagerImpl implements StorageCacheManager, Manager
{
         final Object lock;
         final DataObjectType type = data.getType();
         final String typeName;
-        final DataStoreRole role = store.getRole();
         final long storeId = store.getId();
         final long dataId = data.getId();
 


Mime
View raw message