cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/4] git commit: updated refs/heads/master to c9857ca
Date Thu, 30 Jul 2015 17:14:10 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f5db82173 -> c9857cae2


CLOUDSTACK-8656: filling empty catch block with info messages
 using regexp "catch\s*\(\s*(Exception|Throwable)\s*\w*\)\s*\{\s*\}"

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

Branch: refs/heads/master
Commit: 85e002b2309ebf46f5c5ab1054488e0b1c17957d
Parents: f5db821
Author: Daan Hoogland <daan.hoogland@gmail.com>
Authored: Tue Jul 21 13:10:15 2015 +0200
Committer: Daan Hoogland <daan.hoogland@gmail.com>
Committed: Thu Jul 30 15:51:52 2015 +0200

----------------------------------------------------------------------
 .../cloud/storage/template/OVAProcessor.java    |  3 +-
 .../cloud/storage/template/VmdkProcessor.java   |  3 +-
 .../manager/ClusteredAgentManagerImpl.java      |  2 +
 .../entity/api/db/dao/EngineHostDaoImpl.java    |  3 +
 .../com/cloud/storage/dao/SnapshotDaoImpl.java  | 10 +--
 .../client/ClientTransportProvider.java         |  9 ++-
 .../framework/jobs/dao/VmWorkJobDaoImpl.java    | 21 ++++--
 .../simulator/dao/MockConfigurationDaoImpl.java | 24 +++----
 .../manager/VmwareStorageManagerImpl.java       |  8 ++-
 .../network/resource/NetscalerResource.java     |  3 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java | 68 ++++++++++----------
 ...olidFireSharedPrimaryDataStoreLifeCycle.java | 20 ++++--
 .../storage/datastore/util/SolidFireUtil.java   | 38 ++++++-----
 .../security/SecurityGroupManagerImpl.java      | 10 +--
 .../main/java/streamer/InputStreamSource.java   |  7 ++
 .../main/java/streamer/OutputStreamSink.java    |  7 ++
 .../main/java/streamer/SocketWrapperImpl.java   | 39 +++++++----
 .../main/java/streamer/apr/AprSocketSink.java   |  4 ++
 .../main/java/streamer/apr/AprSocketSource.java |  4 ++
 .../java/streamer/apr/AprSocketWrapperImpl.java |  8 +++
 .../java/streamer/bco/BcoSocketWrapperImpl.java | 10 +++
 .../main/java/streamer/debug/MockServer.java    | 11 +++-
 .../consoleproxy/ConsoleProxyGCThread.java      |  4 +-
 .../com/cloud/consoleproxy/vnc/VncClient.java   | 16 +++--
 .../test/stress/StressTestDirectAttach.java     |  2 +
 .../cloud/test/stress/TestClientWithAPI.java    |  2 +
 .../src/com/cloud/test/ui/AddAndDeleteAISO.java |  6 ++
 .../cloud/test/ui/AddAndDeleteATemplate.java    |  6 ++
 test/src/com/cloud/test/ui/UIScenarioTest.java  |  4 ++
 .../com/cloud/test/utils/IpSqlGenerator.java    |  3 +-
 .../com/cloud/test/utils/SqlDataGenerator.java  |  3 +-
 test/src/com/cloud/test/utils/TestClient.java   |  2 +
 utils/src/com/cloud/utils/crypt/RSAHelper.java  |  4 ++
 .../com/cloud/utils/time/InaccurateClock.java   |  5 +-
 .../com/cloud/hypervisor/vmware/mo/TaskMO.java  |  5 ++
 .../hypervisor/vmware/util/VmwareClient.java    | 33 ++++++----
 .../hypervisor/vmware/util/VmwareHelper.java    |  3 +-
 37 files changed, 277 insertions(+), 133 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/core/src/com/cloud/storage/template/OVAProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/OVAProcessor.java b/core/src/com/cloud/storage/template/OVAProcessor.java
index 78825ce..3d7f7a2 100644
--- a/core/src/com/cloud/storage/template/OVAProcessor.java
+++ b/core/src/com/cloud/storage/template/OVAProcessor.java
@@ -91,7 +91,8 @@ public class OVAProcessor extends AdapterBase implements Processor {
             long size = getTemplateVirtualSize(file.getParent(), file.getName());
             return size;
         } catch (Exception e) {
-
+            s_logger.info("[ignored]"
+                    + "failed to get virtual template size for ova: " + e.getLocalizedMessage());
         }
         return file.length();
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/core/src/com/cloud/storage/template/VmdkProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java
index 929157e..3d399f5 100644
--- a/core/src/com/cloud/storage/template/VmdkProcessor.java
+++ b/core/src/com/cloud/storage/template/VmdkProcessor.java
@@ -77,7 +77,8 @@ public class VmdkProcessor extends AdapterBase implements Processor {
             long size = getTemplateVirtualSize(file.getParent(), file.getName());
             return size;
         } catch (Exception e) {
-
+            s_logger.info("[ignored]"
+                    + "failed to get template virtual size for vmdk: " + e.getLocalizedMessage());
         }
         return file.length();
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index ba82938..d11612d 100644
--- a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -483,6 +483,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
                 try {
                     prevCh.close();
                 } catch (Exception e) {
+                    s_logger.info("[ignored]"
+                            + "failed to get close resource for previous channel Socket: " + e.getLocalizedMessage());
                 }
             }
             if (ch == null || ch == prevCh) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
index fd68c54..3a45976 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
@@ -611,7 +611,10 @@ public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implem
                 l.add(info);
             }
         } catch (SQLException e) {
+            s_logger.error("sql exception while getting running hosts: " + e.getLocalizedMessage());
         } catch (Throwable e) {
+            s_logger.info("[ignored]"
+                    + "caught something while getting running hosts: " + e.getLocalizedMessage());
         }
         return l;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java
index 84a92d7..ccca944 100644
--- a/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java
@@ -41,12 +41,12 @@ import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.GenericSearchBuilder;
-import com.cloud.utils.db.UpdateBuilder;
 import com.cloud.utils.db.JoinBuilder.JoinType;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Func;
 import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.db.UpdateBuilder;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.dao.VMInstanceDao;
 
@@ -208,6 +208,8 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
                 return rs.getLong(1);
             }
         } catch (Exception ex) {
+            s_logger.info("[ignored]"
+                    + "caught something while getting sec. host id: " + ex.getLocalizedMessage());
         }
         return null;
     }
@@ -276,7 +278,7 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
 
     @Override
     public List<SnapshotVO> listByInstanceId(long instanceId, Snapshot.State... status) {
-        SearchCriteria<SnapshotVO> sc = this.InstanceIdSearch.create();
+        SearchCriteria<SnapshotVO> sc = InstanceIdSearch.create();
 
         if (status != null && status.length != 0) {
             sc.setParameters("status", (Object[])status);
@@ -289,7 +291,7 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
 
     @Override
     public List<SnapshotVO> listByStatus(long volumeId, Snapshot.State... status) {
-        SearchCriteria<SnapshotVO> sc = this.StatusSearch.create();
+        SearchCriteria<SnapshotVO> sc = StatusSearch.create();
         sc.setParameters("volumeId", volumeId);
         sc.setParameters("status", (Object[])status);
         return listBy(sc, null);
@@ -311,7 +313,7 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
 
     @Override
     public List<SnapshotVO> listAllByStatus(Snapshot.State... status) {
-        SearchCriteria<SnapshotVO> sc = this.StatusSearch.create();
+        SearchCriteria<SnapshotVO> sc = StatusSearch.create();
         sc.setParameters("status", (Object[])status);
         return listBy(sc, null);
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java
index b406564..ae28f90 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java
@@ -23,6 +23,8 @@ import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.framework.serializer.MessageSerializer;
 import org.apache.cloudstack.framework.transport.TransportEndpoint;
 import org.apache.cloudstack.framework.transport.TransportEndpointSite;
@@ -32,10 +34,11 @@ import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 
 public class ClientTransportProvider implements TransportProvider {
+    final static Logger s_logger = Logger.getLogger(ClientTransportProvider.class);
     public static final int DEFAULT_WORKER_POOL_SIZE = 5;
 
-    private Map<Integer, ClientTransportEndpointSite> _endpointSites = new HashMap<Integer, ClientTransportEndpointSite>();
-    private Map<String, ClientTransportEndpointSite> _attachedMap = new HashMap<String, ClientTransportEndpointSite>();
+    private final Map<Integer, ClientTransportEndpointSite> _endpointSites = new HashMap<Integer, ClientTransportEndpointSite>();
+    private final Map<String, ClientTransportEndpointSite> _attachedMap = new HashMap<String, ClientTransportEndpointSite>();
 
     private MessageSerializer _messageSerializer;
 
@@ -69,6 +72,8 @@ public class ClientTransportProvider implements TransportProvider {
                 try {
                     _connection.connect(_serverAddress, _serverPort);
                 } catch (Throwable e) {
+                    s_logger.info("[ignored]"
+                            + "error during ipc client initialization: " + e.getLocalizedMessage());
                 }
             }
         });

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java
index d38de0e..e81ab1e 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java
@@ -20,6 +20,7 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
@@ -166,25 +167,35 @@ public class VmWorkJobDaoImpl extends GenericDaoBase<VmWorkJobVO, Long> implemen
             public void doInTransactionWithoutResult(TransactionStatus status) {
                 TransactionLegacy txn = TransactionLegacy.currentTxn();
 
-                PreparedStatement pstmt = null;
-                try {
-                    pstmt = txn.prepareAutoCloseStatement(
+                try (
+                        PreparedStatement pstmt = txn
+                                .prepareAutoCloseStatement(
                             "DELETE FROM vm_work_job WHERE id IN (SELECT id FROM async_job WHERE (job_dispatcher='VmWorkJobPlaceHolder' OR job_dispatcher='VmWorkJobDispatcher') AND job_init_msid=?)");
+                ) {
                     pstmt.setLong(1, msid);
 
                     pstmt.execute();
                 } catch (SQLException e) {
+                    s_logger.info("[ignored]"
+                            + "SQL failed to delete vm work job: " + e.getLocalizedMessage());
                 } catch (Throwable e) {
+                    s_logger.info("[ignored]"
+                            + "caught an error during delete vm work job: " + e.getLocalizedMessage());
                 }
 
-                try {
-                    pstmt = txn.prepareAutoCloseStatement(
+                try (
+                        PreparedStatement pstmt = txn.prepareAutoCloseStatement(
                             "DELETE FROM async_job WHERE (job_dispatcher='VmWorkJobPlaceHolder' OR job_dispatcher='VmWorkJobDispatcher') AND job_init_msid=?");
+                ) {
                     pstmt.setLong(1, msid);
 
                     pstmt.execute();
                 } catch (SQLException e) {
+                    s_logger.info("[ignored]"
+                            + "SQL failed to delete async job: " + e.getLocalizedMessage());
                 } catch (Throwable e) {
+                    s_logger.info("[ignored]"
+                            + "caught an error during delete async job: " + e.getLocalizedMessage());
                 }
             }
         });

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java
index 3141798..1196260 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java
@@ -22,6 +22,7 @@ import java.util.Formatter;
 
 import javax.ejb.Local;
 
+import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import com.cloud.simulator.MockConfigurationVO;
@@ -33,11 +34,12 @@ import com.cloud.utils.db.TransactionLegacy;
 @Component
 @Local(value = {MockConfigurationDao.class})
 public class MockConfigurationDaoImpl extends GenericDaoBase<MockConfigurationVO, Long> implements MockConfigurationDao {
-    private SearchBuilder<MockConfigurationVO> _searchByDcIdName;
-    private SearchBuilder<MockConfigurationVO> _searchByDcIDPodIdName;
-    private SearchBuilder<MockConfigurationVO> _searchByDcIDPodIdClusterIdName;
-    private SearchBuilder<MockConfigurationVO> _searchByDcIDPodIdClusterIdHostIdName;
-    private SearchBuilder<MockConfigurationVO> _searchByGlobalName;
+    final static Logger s_logger = Logger.getLogger(MockConfigurationDaoImpl.class);
+    private final SearchBuilder<MockConfigurationVO> _searchByDcIdName;
+    private final SearchBuilder<MockConfigurationVO> _searchByDcIDPodIdName;
+    private final SearchBuilder<MockConfigurationVO> _searchByDcIDPodIdClusterIdName;
+    private final SearchBuilder<MockConfigurationVO> _searchByDcIDPodIdClusterIdHostIdName;
+    private final SearchBuilder<MockConfigurationVO> _searchByGlobalName;
 
     public MockConfigurationDaoImpl() {
         _searchByGlobalName = createSearchBuilder();
@@ -131,16 +133,16 @@ public class MockConfigurationDaoImpl extends GenericDaoBase<MockConfigurationVO
         formatter.format(" and removed is NULL ORDER BY id ASC LIMIT 1 for update");
         formatter.close();
 
-        PreparedStatement pstmt = null;
-        try {
-            String sql = search.toString();
-            pstmt = txn.prepareAutoCloseStatement(sql);
-            ResultSet rs = pstmt.executeQuery();
+        String sql = search.toString();
+        try (
+                PreparedStatement pstmt = txn.prepareAutoCloseStatement(sql);
+                ResultSet rs = pstmt.executeQuery();) {
             if (rs.next()) {
                 return toEntityBean(rs, false);
             }
         } catch (Exception e) {
-
+            s_logger.info("[ignored]"
+                    + "error while executing dynamically build search: " + e.getLocalizedMessage());
         }
         return null;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index 316e6dc..4109ff2 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -1187,12 +1187,12 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
 
             if (vmMo == null) {
                 String msg = "Unable to find VM for CreateVMSnapshotCommand";
-                s_logger.debug(msg);
+                s_logger.info(msg);
 
                 return new CreateVMSnapshotAnswer(cmd, false, msg);
             } else {
                 if (vmMo.getSnapshotMor(vmSnapshotName) != null) {
-                    s_logger.debug("VM snapshot " + vmSnapshotName + " already exists");
+                    s_logger.info("VM snapshot " + vmSnapshotName + " already exists");
                 } else if (!vmMo.createSnapshot(vmSnapshotName, vmSnapshotDesc, snapshotMemory, quiescevm)) {
                     return new CreateVMSnapshotAnswer(cmd, false, "Unable to create snapshot due to esxi internal failed");
                 }
@@ -1212,6 +1212,8 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
                     vmMo.removeSnapshot(vmSnapshotName, false);
                 }
             } catch (Exception e1) {
+                s_logger.info("[ignored]"
+                        + "error during snapshot remove: " + e1.getLocalizedMessage());
             }
 
             return new CreateVMSnapshotAnswer(cmd, false, e.getMessage());
@@ -1309,6 +1311,8 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
             }
         }
         catch (Exception ex) {
+            s_logger.info("[ignored]"
+                    + "error getting managed object refference: " + ex.getLocalizedMessage());
         }
 
         // not managed storage, so use the standard way of getting a ManagedObjectReference for a datastore

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
index 1039754..eb119e7 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
@@ -1695,7 +1695,8 @@ public class NetscalerResource implements ServerResource {
                     return site;
                 }
             } catch (Exception e) {
-
+                s_logger.info("[ignored]"
+                        + "error getting site: " + e.getLocalizedMessage());
             }
             return null;
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index 04d21fd..633f5f5 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -16,32 +16,6 @@
 // under the License.
 package com.cloud.network.ovs;
 
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
-import com.cloud.agent.api.OvsCreateTunnelAnswer;
-import com.cloud.agent.api.OvsCreateTunnelCommand;
-import com.cloud.agent.api.OvsDestroyBridgeCommand;
-import com.cloud.agent.api.OvsDestroyTunnelCommand;
-import com.cloud.agent.api.OvsFetchInterfaceAnswer;
-import com.cloud.agent.api.OvsFetchInterfaceCommand;
-import com.cloud.agent.api.OvsSetupBridgeCommand;
-import com.cloud.agent.api.OvsVpcPhysicalTopologyConfigCommand;
-import com.cloud.agent.api.OvsVpcRoutingPolicyConfigCommand;
-import com.cloud.network.dao.NetworkDao;
-import com.cloud.network.dao.NetworkVO;
-import com.cloud.network.vpc.NetworkACLVO;
-import com.cloud.network.vpc.NetworkACLItemDao;
-import com.cloud.network.vpc.NetworkACLItemVO;
-import com.cloud.network.vpc.dao.VpcDao;
-import com.cloud.network.vpc.VpcManager;
-import com.cloud.network.vpc.VpcVO;
-import com.cloud.network.vpc.dao.NetworkACLDao;
-import com.cloud.utils.fsm.StateMachine2;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.dao.VMInstanceDao;
-import com.cloud.vm.Nic;
-import com.cloud.vm.NicVO;
-import com.cloud.vm.VirtualMachine;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -53,14 +27,25 @@ import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 import javax.persistence.EntityExistsException;
 
-import org.apache.cloudstack.framework.messagebus.MessageBus;
-import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
+import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
 
 import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.OvsCreateTunnelAnswer;
+import com.cloud.agent.api.OvsCreateTunnelCommand;
+import com.cloud.agent.api.OvsDestroyBridgeCommand;
+import com.cloud.agent.api.OvsDestroyTunnelCommand;
+import com.cloud.agent.api.OvsFetchInterfaceAnswer;
+import com.cloud.agent.api.OvsFetchInterfaceCommand;
+import com.cloud.agent.api.OvsSetupBridgeCommand;
+import com.cloud.agent.api.OvsVpcPhysicalTopologyConfigCommand;
+import com.cloud.agent.api.OvsVpcRoutingPolicyConfigCommand;
 import com.cloud.agent.manager.Commands;
 import com.cloud.configuration.Config;
 import com.cloud.exception.AgentUnavailableException;
@@ -73,24 +58,39 @@ import com.cloud.network.Network;
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetworkTrafficType;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
+import com.cloud.network.ovs.dao.OvsTunnel;
 import com.cloud.network.ovs.dao.OvsTunnelInterfaceDao;
 import com.cloud.network.ovs.dao.OvsTunnelInterfaceVO;
 import com.cloud.network.ovs.dao.OvsTunnelNetworkDao;
 import com.cloud.network.ovs.dao.OvsTunnelNetworkVO;
-import com.cloud.network.ovs.dao.OvsTunnel;
 import com.cloud.network.ovs.dao.VpcDistributedRouterSeqNoDao;
 import com.cloud.network.ovs.dao.VpcDistributedRouterSeqNoVO;
+import com.cloud.network.vpc.NetworkACLItemDao;
+import com.cloud.network.vpc.NetworkACLItemVO;
+import com.cloud.network.vpc.NetworkACLVO;
+import com.cloud.network.vpc.VpcManager;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.network.vpc.dao.NetworkACLDao;
+import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.DB;
-import com.cloud.utils.db.TransactionStatus;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionCallback;
-import com.cloud.utils.fsm.StateListener;
+import com.cloud.utils.db.TransactionStatus;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.fsm.StateListener;
+import com.cloud.utils.fsm.StateMachine2;
+import com.cloud.vm.Nic;
+import com.cloud.vm.NicVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.NicDao;
+import com.cloud.vm.dao.VMInstanceDao;
 
 @Component
 @Local(value = {OvsTunnelManager.class})
@@ -510,7 +510,8 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
                 Answer ans = _agentMgr.send(host.getId(), cmd);
                 handleDestroyBridgeAnswer(ans, host.getId(), nw.getId());
             } catch (Exception e) {
-
+                s_logger.info("[ignored]"
+                        + "exception while removing host from networks: " + e.getLocalizedMessage());
             }
         } else {
             List<Long> vmIds = _ovsNetworkToplogyGuru.getActiveVmsInNetworkOnHost(nw.getId(), host.getId(), true);
@@ -770,7 +771,8 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
                 try {
                     remoteIp = getGreEndpointIP(hostDetails, network);
                 } catch (Exception e) {
-
+                    s_logger.info("[ignored]"
+                            + "error getting GRE endpoint: " + e.getLocalizedMessage());
                 }
             }
             OvsVpcPhysicalTopologyConfigCommand.Host host = new OvsVpcPhysicalTopologyConfigCommand.Host(hostId, remoteIp);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFireSharedPrimaryDataStoreLifeCycle.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFireSharedPrimaryDataStoreLifeCycle.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFireSharedPrimaryDataStoreLifeCycle.java
index bc22ac7..d14a629 100644
--- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFireSharedPrimaryDataStoreLifeCycle.java
+++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFireSharedPrimaryDataStoreLifeCycle.java
@@ -20,9 +20,9 @@ package org.apache.cloudstack.storage.datastore.lifecycle;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import javax.inject.Inject;
 
@@ -43,9 +43,6 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.datastore.util.SolidFireUtil;
 import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
 
-import com.cloud.template.TemplateManager;
-import com.cloud.user.AccountDetailsDao;
-import com.cloud.user.AccountVO;
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.CreateStoragePoolCommand;
@@ -56,19 +53,22 @@ import com.cloud.dc.ClusterDetailsVO;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
-import com.cloud.host.dao.HostDao;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
+import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.resource.ResourceManager;
 import com.cloud.storage.Storage.StoragePoolType;
-import com.cloud.storage.dao.StoragePoolHostDao;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.StoragePoolAutomation;
 import com.cloud.storage.StoragePoolHostVO;
 import com.cloud.storage.VMTemplateStoragePoolVO;
+import com.cloud.storage.dao.StoragePoolHostDao;
+import com.cloud.template.TemplateManager;
 import com.cloud.user.Account;
+import com.cloud.user.AccountDetailsDao;
+import com.cloud.user.AccountVO;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.exception.CloudRuntimeException;
 
@@ -178,6 +178,8 @@ public class SolidFireSharedPrimaryDataStoreLifeCycle implements PrimaryDataStor
                 lMinIops = Long.parseLong(minIops);
             }
         } catch (Exception ex) {
+            s_logger.info("[ignored]"
+                    + "error getting minimals iops: " + ex.getLocalizedMessage());
         }
 
         try {
@@ -187,6 +189,8 @@ public class SolidFireSharedPrimaryDataStoreLifeCycle implements PrimaryDataStor
                 lMaxIops = Long.parseLong(maxIops);
             }
         } catch (Exception ex) {
+            s_logger.info("[ignored]"
+                    + "error getting maximal iops: " + ex.getLocalizedMessage());
         }
 
         try {
@@ -196,6 +200,8 @@ public class SolidFireSharedPrimaryDataStoreLifeCycle implements PrimaryDataStor
                 lBurstIops = Long.parseLong(burstIops);
             }
         } catch (Exception ex) {
+            s_logger.info("[ignored]"
+                    + "error getting iops bursts: " + ex.getLocalizedMessage());
         }
 
         if (lMinIops > lMaxIops) {
@@ -526,7 +532,7 @@ public class SolidFireSharedPrimaryDataStoreLifeCycle implements PrimaryDataStor
             if (answer != null && answer.getResult()) {
                 s_logger.info("Successfully deleted storage pool using Host ID " + host.getHostId());
 
-                HostVO hostVO = this._hostDao.findById(host.getHostId());
+                HostVO hostVO = _hostDao.findById(host.getHostId());
 
                 if (hostVO != null) {
                     clusterId = hostVO.getClusterId();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java
index 8ff4454..9c486db 100644
--- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java
+++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java
@@ -38,9 +38,6 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
@@ -53,12 +50,16 @@ import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.BasicClientConnectionManager;
-
-import org.apache.cloudstack.utils.security.SSLUtils;
+import org.apache.log4j.Logger;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
+import org.apache.cloudstack.utils.security.SSLUtils;
+
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterDetailsVO;
 import com.cloud.host.Host;
@@ -68,6 +69,7 @@ import com.cloud.user.AccountDetailsDao;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 public class SolidFireUtil {
+    private static final Logger s_logger = Logger.getLogger(SolidFireUtil.class);
     public static final String PROVIDER_NAME = "SolidFire";
     public static final String SHARED_PROVIDER_NAME = "SolidFireShared";
 
@@ -1272,7 +1274,7 @@ public class SolidFireUtil {
         }
 
         private static final class VolumeToDeleteParams {
-            private long volumeID;
+            private final long volumeID;
 
             private VolumeToDeleteParams(final long lVolumeId) {
                 volumeID = lVolumeId;
@@ -1291,7 +1293,7 @@ public class SolidFireUtil {
         }
 
         private static final class VolumeToPurgeParams {
-            private long volumeID;
+            private final long volumeID;
 
             private VolumeToPurgeParams(final long lVolumeId) {
                 volumeID = lVolumeId;
@@ -1309,8 +1311,8 @@ public class SolidFireUtil {
         }
 
         private static final class SnapshotToCreateParams {
-            private long volumeID;
-            private String name;
+            private final long volumeID;
+            private final String name;
 
             private SnapshotToCreateParams(final long lVolumeId, final String snapshotName) {
                 volumeID = lVolumeId;
@@ -1330,7 +1332,7 @@ public class SolidFireUtil {
         }
 
         private static final class SnapshotToDeleteParams {
-            private long snapshotID;
+            private final long snapshotID;
 
             private SnapshotToDeleteParams(final long lSnapshotId) {
                 snapshotID = lSnapshotId;
@@ -1348,8 +1350,8 @@ public class SolidFireUtil {
         }
 
         private static final class RollbackToInitiateParams {
-            private long volumeID;
-            private long snapshotID;
+            private final long volumeID;
+            private final long snapshotID;
 
             private RollbackToInitiateParams(final long lVolumeId, final long lSnapshotId) {
                 volumeID = lVolumeId;
@@ -1368,9 +1370,9 @@ public class SolidFireUtil {
         }
 
         private static final class CloneToCreateParams {
-            private long volumeID;
-            private long snapshotID;
-            private String name;
+            private final long volumeID;
+            private final long snapshotID;
+            private final String name;
 
             private CloneToCreateParams(final long lVolumeId, final long lSnapshotId, final String cloneName) {
                 volumeID = lVolumeId;
@@ -1456,7 +1458,7 @@ public class SolidFireUtil {
         }
 
         private static final class AccountToRemoveParams {
-            private long accountID;
+            private final long accountID;
 
             private AccountToRemoveParams(final long lAccountId) {
                 accountID = lAccountId;
@@ -1565,7 +1567,7 @@ public class SolidFireUtil {
         }
 
         private static final class VagToDeleteParams {
-            private long volumeAccessGroupID;
+            private final long volumeAccessGroupID;
 
             private VagToDeleteParams(final long lVagId) {
                 volumeAccessGroupID = lVagId;
@@ -1772,6 +1774,8 @@ public class SolidFireUtil {
                 try {
                     httpClient.getConnectionManager().shutdown();
                 } catch (Exception t) {
+                    s_logger.info("[ignored]"
+                            + "error shutting down http client: " + t.getLocalizedMessage());
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index 174106d..045c2e3 100644
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -40,7 +40,6 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.utils.fsm.StateMachine2;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.log4j.Logger;
 
@@ -107,6 +106,7 @@ import com.cloud.utils.db.TransactionCallbackWithException;
 import com.cloud.utils.db.TransactionStatus;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.StateListener;
+import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.Nic;
 import com.cloud.vm.NicProfile;
@@ -200,10 +200,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
             try {
                 work();
             } catch (Throwable th) {
-                try {
                     s_logger.error("Problem with SG work", th);
-                } catch (Throwable th2) {
-                }
             }
         }
     }
@@ -216,10 +213,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
                 cleanupUnfinishedWork();
                 //processScheduledWork();
             } catch (Throwable th) {
-                try {
-                    s_logger.error("Problem with SG Cleanup", th);
-                } catch (Throwable th2) {
-                }
+                s_logger.error("Problem with SG Cleanup", th);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java
index 0c8c97d..958e5e0 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java
@@ -20,12 +20,15 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.log4j.Logger;
+
 import streamer.debug.FakeSink;
 
 /**
  * Source element, which reads data from InputStream.
  */
 public class InputStreamSource extends BaseElement {
+    private static final Logger s_logger = Logger.getLogger(InputStreamSource.class);
 
     protected InputStream is;
     protected SocketWrapperImpl socketWrapper;
@@ -148,10 +151,14 @@ public class InputStreamSource extends BaseElement {
         try {
             is.close();
         } catch (IOException e) {
+            s_logger.info("[ignored]"
+                    + "io error on input stream: " + e.getLocalizedMessage());
         }
         try {
             sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "error sending an event to all pods: " + e.getLocalizedMessage());
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java
index e66899d..27ef614 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java
@@ -20,9 +20,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.apache.log4j.Logger;
+
 import streamer.debug.FakeSource;
 
 public class OutputStreamSink extends BaseElement {
+    private static final Logger s_logger = Logger.getLogger(OutputStreamSink.class);
 
     protected OutputStream os;
     protected SocketWrapperImpl socketWrapper;
@@ -110,10 +113,14 @@ public class OutputStreamSink extends BaseElement {
         try {
             os.close();
         } catch (IOException e) {
+            s_logger.info("[ignored]"
+                    + "io error on output: " + e.getLocalizedMessage());
         }
         try {
             sendEventToAllPads(Event.STREAM_CLOSE, Direction.IN);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "error sending output close event: " + e.getLocalizedMessage());
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java
index 4713173..3e05d45 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java
@@ -16,18 +16,9 @@
 // under the License.
 package streamer;
 
-import org.apache.cloudstack.utils.security.SSLUtils;
-import org.apache.cloudstack.utils.security.SecureSSLSocketFactory;
-import streamer.debug.MockServer;
-import streamer.debug.MockServer.Packet;
-import streamer.ssl.SSLState;
-import streamer.ssl.TrustAllX509TrustManager;
+import static streamer.debug.MockServer.Packet.PacketType.CLIENT;
+import static streamer.debug.MockServer.Packet.PacketType.SERVER;
 
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -35,10 +26,24 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.HashMap;
 
-import static streamer.debug.MockServer.Packet.PacketType.CLIENT;
-import static streamer.debug.MockServer.Packet.PacketType.SERVER;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.utils.security.SSLUtils;
+import org.apache.cloudstack.utils.security.SecureSSLSocketFactory;
+
+import streamer.debug.MockServer;
+import streamer.debug.MockServer.Packet;
+import streamer.ssl.SSLState;
+import streamer.ssl.TrustAllX509TrustManager;
 
 public class SocketWrapperImpl extends PipelineImpl implements SocketWrapper {
+    private static final Logger s_logger = Logger.getLogger(SocketWrapperImpl.class);
 
     protected InputStreamSource source;
     protected OutputStreamSink sink;
@@ -172,19 +177,27 @@ public class SocketWrapperImpl extends PipelineImpl implements SocketWrapper {
         try {
             handleEvent(Event.STREAM_CLOSE, Direction.IN);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "error sending input close event: " + e.getLocalizedMessage());
         }
         try {
             handleEvent(Event.STREAM_CLOSE, Direction.OUT);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "error sending output close event: " + e.getLocalizedMessage());
         }
         try {
             if (sslSocket != null)
                 sslSocket.close();
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "error closing ssl socket: " + e.getLocalizedMessage());
         }
         try {
             socket.close();
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "error closing socket: " + e.getLocalizedMessage());
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSink.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSink.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSink.java
index edfe8db..204ebb6 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSink.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSink.java
@@ -16,6 +16,7 @@
 // under the License.
 package streamer.apr;
 
+import org.apache.log4j.Logger;
 import org.apache.tomcat.jni.Socket;
 
 import streamer.BaseElement;
@@ -26,6 +27,7 @@ import streamer.Event;
 import streamer.Link;
 
 public class AprSocketSink extends BaseElement {
+    private static final Logger s_logger = Logger.getLogger(AprSocketSink.class);
 
     protected AprSocketWrapperImpl socketWrapper;
     protected Long socket;
@@ -117,6 +119,8 @@ public class AprSocketSink extends BaseElement {
         try {
             sendEventToAllPads(Event.STREAM_CLOSE, Direction.IN);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "failing sending sink event to all pads: " + e.getLocalizedMessage());
         }
         socketWrapper.shutdown();
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java
index 5d3d65b..3234576 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java
@@ -16,6 +16,7 @@
 // under the License.
 package streamer.apr;
 
+import org.apache.log4j.Logger;
 import org.apache.tomcat.jni.Socket;
 
 import streamer.BaseElement;
@@ -29,6 +30,7 @@ import streamer.Link;
  * Source element, which reads data from InputStream.
  */
 public class AprSocketSource extends BaseElement {
+    private static final Logger s_logger = Logger.getLogger(AprSocketSource.class);
 
     protected AprSocketWrapperImpl socketWrapper;
     protected Long socket;
@@ -162,6 +164,8 @@ public class AprSocketSource extends BaseElement {
         try {
             sendEventToAllPads(Event.STREAM_CLOSE, Direction.OUT);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "failing sending source event to all pads: " + e.getLocalizedMessage());
         }
         socketWrapper.shutdown();
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketWrapperImpl.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketWrapperImpl.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketWrapperImpl.java
index 2ee426b..e874140 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketWrapperImpl.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketWrapperImpl.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.HashMap;
 
+import org.apache.log4j.Logger;
 import org.apache.tomcat.jni.Address;
 import org.apache.tomcat.jni.Error;
 import org.apache.tomcat.jni.Library;
@@ -46,6 +47,7 @@ import streamer.ssl.SSLState;
 import sun.security.x509.X509CertImpl;
 
 public class AprSocketWrapperImpl extends PipelineImpl implements SocketWrapper {
+    private static final Logger s_logger = Logger.getLogger(AprSocketWrapperImpl.class);
 
     static {
         try {
@@ -198,10 +200,14 @@ public class AprSocketWrapperImpl extends PipelineImpl implements SocketWrapper
         try {
             handleEvent(Event.STREAM_CLOSE, Direction.IN);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "handling stream close event failed on input: " + e.getLocalizedMessage());
         }
         try {
             handleEvent(Event.STREAM_CLOSE, Direction.OUT);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "handling event close event failed on output: " + e.getLocalizedMessage());
         }
     }
 
@@ -216,6 +222,8 @@ public class AprSocketWrapperImpl extends PipelineImpl implements SocketWrapper
             // Socket.shutdown(socket, Socket.APR_SHUTDOWN_READWRITE);
             Pool.destroy(pool);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "failure during network cleanup: " + e.getLocalizedMessage());
         }
 
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java
index 67e2dbd..eb5d7d0 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java
@@ -22,6 +22,7 @@ import java.io.OutputStream;
 import java.security.SecureRandom;
 import java.security.Security;
 
+import org.apache.log4j.Logger;
 import org.bouncycastle.asn1.x509.X509CertificateStructure;
 import org.bouncycastle.crypto.tls.CertificateVerifyer;
 import org.bouncycastle.crypto.tls.TlsProtocolHandler;
@@ -34,6 +35,7 @@ import streamer.ssl.SSLState;
 
 @SuppressWarnings("deprecation")
 public class BcoSocketWrapperImpl extends SocketWrapperImpl {
+    private static final Logger s_logger = Logger.getLogger(BcoSocketWrapperImpl.class);
 
     static {
         Security.addProvider(new BouncyCastleProvider());
@@ -95,19 +97,27 @@ public class BcoSocketWrapperImpl extends SocketWrapperImpl {
         try {
             handleEvent(Event.STREAM_CLOSE, Direction.IN);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "failure handling close event for bso input stream: " + e.getLocalizedMessage());
         }
         try {
             handleEvent(Event.STREAM_CLOSE, Direction.OUT);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "failure handling close event for bso output stream: " + e.getLocalizedMessage());
         }
         try {
             if (bcoSslSocket != null)
                 bcoSslSocket.close();
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "failure handling close event for bso socket: " + e.getLocalizedMessage());
         }
         try {
             socket.close();
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "failure handling close event for socket: " + e.getLocalizedMessage());
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java
index 6b6acab..384ff5e 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java
@@ -27,11 +27,14 @@ import java.util.Arrays;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
+import org.apache.log4j.Logger;
+
 public class MockServer implements Runnable {
+    private static final Logger s_logger = Logger.getLogger(MockServer.class);
 
     private boolean shutdown = false;
     private ServerSocket serverSocket;
-    private Packet[] packets;
+    private final Packet[] packets;
     private Throwable exception;
     private boolean shutdowned;
 
@@ -131,14 +134,20 @@ public class MockServer implements Runnable {
                 try {
                     is.close();
                 } catch (Throwable e) {
+                    s_logger.info("[ignored]"
+                            + "in stream close failed: " + e.getLocalizedMessage());
                 }
                 try {
                     os.close();
                 } catch (Throwable e) {
+                    s_logger.info("[ignored]"
+                            + "out stream close failed: " + e.getLocalizedMessage());
                 }
                 try {
                     serverSocket.close();
                 } catch (Throwable e) {
+                    s_logger.info("[ignored]"
+                            + "server socket close failed: " + e.getLocalizedMessage());
                 }
             }
         } catch (Throwable e) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java
index 7b22d4b..b50fb94 100644
--- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java
+++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java
@@ -33,7 +33,7 @@ public class ConsoleProxyGCThread extends Thread {
 
     private final static int MAX_SESSION_IDLE_SECONDS = 180;
 
-    private Hashtable<String, ConsoleProxyClient> connMap;
+    private final Hashtable<String, ConsoleProxyClient> connMap;
     private long lastLogScan = 0;
 
     public ConsoleProxyGCThread(Hashtable<String, ConsoleProxyClient> connMap) {
@@ -54,6 +54,8 @@ public class ConsoleProxyGCThread extends Thread {
                     try {
                         file.delete();
                     } catch (Throwable e) {
+                        s_logger.info("[ignored]"
+                                + "failed to delete file: " + e.getLocalizedMessage());
                     }
                 }
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java b/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java
index f470855..e8b53a2 100644
--- a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java
+++ b/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java
@@ -45,7 +45,7 @@ public class VncClient {
     private DataInputStream is;
     private DataOutputStream os;
 
-    private VncScreenDescription screen = new VncScreenDescription();
+    private final VncScreenDescription screen = new VncScreenDescription();
 
     private VncClientPacketSender sender;
     private VncServerPacketReceiver receiver;
@@ -86,7 +86,7 @@ public class VncClient {
     }
 
     public VncClient(ConsoleProxyClientListener clientListener) {
-        this.noUI = true;
+        noUI = true;
         this.clientListener = clientListener;
     }
 
@@ -108,6 +108,8 @@ public class VncClient {
             try {
                 is.close();
             } catch (Throwable e) {
+                s_logger.info("[ignored]"
+                        + "failed to close resource for input: " + e.getLocalizedMessage());
             }
         }
 
@@ -115,6 +117,8 @@ public class VncClient {
             try {
                 os.close();
             } catch (Throwable e) {
+                s_logger.info("[ignored]"
+                        + "failed to get close resource for output: " + e.getLocalizedMessage());
             }
         }
 
@@ -122,6 +126,8 @@ public class VncClient {
             try {
                 socket.close();
             } catch (Throwable e) {
+                s_logger.info("[ignored]"
+                        + "failed to get close resource for socket: " + e.getLocalizedMessage());
             }
         }
     }
@@ -139,14 +145,14 @@ public class VncClient {
         }
 
         RawHTTP tunnel = new RawHTTP("CONNECT", host, port, path, session, useSSL);
-        this.socket = tunnel.connect();
+        socket = tunnel.connect();
         doConnect(sid);
     }
 
     public void connectTo(String host, int port, String password) throws UnknownHostException, IOException {
         // Connect to server
         s_logger.info("Connecting to VNC server " + host + ":" + port + "...");
-        this.socket = new Socket(host, port);
+        socket = new Socket(host, port);
         doConnect(password);
     }
 
@@ -187,7 +193,7 @@ public class VncClient {
                 frame.setVisible(false);
                 frame.dispose();
             }
-            this.shutdown();
+            shutdown();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/test/src/com/cloud/test/stress/StressTestDirectAttach.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/stress/StressTestDirectAttach.java b/test/src/com/cloud/test/stress/StressTestDirectAttach.java
index 7d0647a..463023c 100644
--- a/test/src/com/cloud/test/stress/StressTestDirectAttach.java
+++ b/test/src/com/cloud/test/stress/StressTestDirectAttach.java
@@ -262,6 +262,8 @@ public class StressTestDirectAttach {
                                     int stopResponseCode = executeStop(server, developerServer, username);
                                     s_logger.info("stop response code: " + stopResponseCode);
                                 } catch (Exception e1) {
+                                    s_logger.info("[ignored]"
+                                            + "error executing stop during stress test: " + e1.getLocalizedMessage());
                                 }
                             } finally {
                                 NDC.clear();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/test/src/com/cloud/test/stress/TestClientWithAPI.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/stress/TestClientWithAPI.java b/test/src/com/cloud/test/stress/TestClientWithAPI.java
index 420bda6..5487472 100644
--- a/test/src/com/cloud/test/stress/TestClientWithAPI.java
+++ b/test/src/com/cloud/test/stress/TestClientWithAPI.java
@@ -347,6 +347,8 @@ public class TestClientWithAPI {
                                     int stopResponseCode = executeStop(server, developerServer, username, true);
                                     s_logger.info("stop response code: " + stopResponseCode);
                                 } catch (Exception e1) {
+                                    s_logger.info("[ignored]"
+                                            + "error executing stop during api test: " + e1.getLocalizedMessage());
                                 }
                             } finally {
                                 NDC.clear();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/test/src/com/cloud/test/ui/AddAndDeleteAISO.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/ui/AddAndDeleteAISO.java b/test/src/com/cloud/test/ui/AddAndDeleteAISO.java
index 23f4b93..d97fed3 100644
--- a/test/src/com/cloud/test/ui/AddAndDeleteAISO.java
+++ b/test/src/com/cloud/test/ui/AddAndDeleteAISO.java
@@ -56,6 +56,8 @@ public class AddAndDeleteAISO extends AbstractSeleniumTestCase {
                     selenium.click("//div[" + i + "]/div/div[2]/span/span");
                 }
             } catch (Exception ex) {
+                s_logger.info("[ignored]"
+                        + "error during clicking test on iso: " + e.getLocalizedMessage());
             }
 
             for (int second = 0;; second++) {
@@ -65,6 +67,8 @@ public class AddAndDeleteAISO extends AbstractSeleniumTestCase {
                     if (selenium.isVisible("//div[@id='after_action_info_container_on_top']"))
                         break;
                 } catch (Exception e) {
+                    s_logger.info("[ignored]"
+                            + "error during visibility test of iso: " + e.getLocalizedMessage());
                 }
                 Thread.sleep(10000);
             }
@@ -101,6 +105,8 @@ public class AddAndDeleteAISO extends AbstractSeleniumTestCase {
                     if (selenium.isVisible("after_action_info_container_on_top"))
                         break;
                 } catch (Exception e) {
+                    s_logger.info("[ignored]"
+                            + "error checking visibility after test completion for iso: " + e.getLocalizedMessage());
                 }
                 Thread.sleep(1000);
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/test/src/com/cloud/test/ui/AddAndDeleteATemplate.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/ui/AddAndDeleteATemplate.java b/test/src/com/cloud/test/ui/AddAndDeleteATemplate.java
index 962a463..b0b7183 100644
--- a/test/src/com/cloud/test/ui/AddAndDeleteATemplate.java
+++ b/test/src/com/cloud/test/ui/AddAndDeleteATemplate.java
@@ -56,6 +56,8 @@ public class AddAndDeleteATemplate extends AbstractSeleniumTestCase {
                     selenium.click("//div[" + i + "]/div/div[2]/span/span");
                 }
             } catch (Exception ex) {
+                s_logger.info("[ignored]"
+                        + "error during clicking test on template: " + e.getLocalizedMessage());
             }
 
             for (int second = 0;; second++) {
@@ -65,6 +67,8 @@ public class AddAndDeleteATemplate extends AbstractSeleniumTestCase {
                     if (selenium.isVisible("//div[@id='after_action_info_container_on_top']"))
                         break;
                 } catch (Exception e) {
+                    s_logger.info("[ignored]"
+                            + "error during visibility test of template: " + e.getLocalizedMessage());
                 }
                 Thread.sleep(10000);
             }
@@ -101,6 +105,8 @@ public class AddAndDeleteATemplate extends AbstractSeleniumTestCase {
                     if (selenium.isVisible("after_action_info_container_on_top"))
                         break;
                 } catch (Exception e) {
+                    s_logger.info("[ignored]"
+                            + "error checking visibility after test completion for template: " + e.getLocalizedMessage());
                 }
                 Thread.sleep(1000);
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/test/src/com/cloud/test/ui/UIScenarioTest.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/ui/UIScenarioTest.java b/test/src/com/cloud/test/ui/UIScenarioTest.java
index cbf5341..8fde7e3 100644
--- a/test/src/com/cloud/test/ui/UIScenarioTest.java
+++ b/test/src/com/cloud/test/ui/UIScenarioTest.java
@@ -48,6 +48,8 @@ public class UIScenarioTest extends AbstractSeleniumTestCase {
                     if (selenium.isVisible("//div/p[@id='after_action_info']"))
                         break;
                 } catch (Exception e) {
+                    s_logger.info("[ignored]"
+                            + "error during visibility test after start vm: " + e.getLocalizedMessage());
                 }
                 Thread.sleep(10000);
             }
@@ -64,6 +66,8 @@ public class UIScenarioTest extends AbstractSeleniumTestCase {
                     if (selenium.isVisible("//div/p[@id='after_action_info']"))
                         break;
                 } catch (Exception e) {
+                    s_logger.info("[ignored]"
+                            + "error during visibility test after stop vm: " + e.getLocalizedMessage());
                 }
                 Thread.sleep(10000);
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/test/src/com/cloud/test/utils/IpSqlGenerator.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/utils/IpSqlGenerator.java b/test/src/com/cloud/test/utils/IpSqlGenerator.java
index 736f454..c37d08b 100644
--- a/test/src/com/cloud/test/utils/IpSqlGenerator.java
+++ b/test/src/com/cloud/test/utils/IpSqlGenerator.java
@@ -82,7 +82,8 @@ public class IpSqlGenerator {
                 out.close();
             }
         } catch (Exception e) {
-
+            s_logger.info("[ignored]"
+                    + "error during ip insert generator: " + e.getLocalizedMessage());
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/test/src/com/cloud/test/utils/SqlDataGenerator.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/utils/SqlDataGenerator.java b/test/src/com/cloud/test/utils/SqlDataGenerator.java
index 530ae3e..8b42b1f 100644
--- a/test/src/com/cloud/test/utils/SqlDataGenerator.java
+++ b/test/src/com/cloud/test/utils/SqlDataGenerator.java
@@ -42,7 +42,8 @@ public class SqlDataGenerator {
             out.flush();
             out.close();
         } catch (Exception e) {
-
+            s_logger.info("[ignored]"
+                    + "error during sql generation: " + e.getLocalizedMessage());
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/test/src/com/cloud/test/utils/TestClient.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/utils/TestClient.java b/test/src/com/cloud/test/utils/TestClient.java
index 0245022..a32a34b 100644
--- a/test/src/com/cloud/test/utils/TestClient.java
+++ b/test/src/com/cloud/test/utils/TestClient.java
@@ -197,6 +197,8 @@ public class TestClient {
                                     String url = server + "?email=" + username + "&password=" + username + "&command=stop";
                                     client.executeMethod(new GetMethod(url));
                                 } catch (Exception e1) {
+                                    s_logger.info("[ignored]"
+                                            + "error while executing last resort stop attampt: " + e1.getLocalizedMessage());
                                 }
                             } finally {
                                 NDC.clear();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/utils/src/com/cloud/utils/crypt/RSAHelper.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/crypt/RSAHelper.java b/utils/src/com/cloud/utils/crypt/RSAHelper.java
index 4960e9e..692ac22 100644
--- a/utils/src/com/cloud/utils/crypt/RSAHelper.java
+++ b/utils/src/com/cloud/utils/crypt/RSAHelper.java
@@ -34,9 +34,11 @@ import java.security.spec.RSAPublicKeySpec;
 import javax.crypto.Cipher;
 
 import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 public class RSAHelper {
+    final static Logger s_logger = Logger.getLogger(RSAHelper.class);
 
     static {
         BouncyCastleProvider provider = new BouncyCastleProvider();
@@ -79,6 +81,8 @@ public class RSAHelper {
             byte[] encrypted = cipher.doFinal(content.getBytes());
             returnString = Base64.encodeBase64String(encrypted);
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "error during public key encryption: " + e.getLocalizedMessage());
         }
 
         return returnString;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/utils/src/com/cloud/utils/time/InaccurateClock.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/time/InaccurateClock.java b/utils/src/com/cloud/utils/time/InaccurateClock.java
index 77582c1..2a22853 100644
--- a/utils/src/com/cloud/utils/time/InaccurateClock.java
+++ b/utils/src/com/cloud/utils/time/InaccurateClock.java
@@ -95,10 +95,7 @@ public class InaccurateClock extends StandardMBean implements InaccurateClockMBe
             try {
                 time = System.currentTimeMillis();
             } catch (Throwable th) {
-                try {
-                    s_logger.error("Unable to time", th);
-                } catch (Throwable th2) {
-                }
+                s_logger.error("Unable to time", th);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/vmware-base/src/com/cloud/hypervisor/vmware/mo/TaskMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/TaskMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/TaskMO.java
index 9317e33..65c6a6b 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/TaskMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/TaskMO.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.hypervisor.vmware.mo;
 
+import org.apache.log4j.Logger;
+
 import com.vmware.vim25.LocalizableMessage;
 import com.vmware.vim25.LocalizedMethodFault;
 import com.vmware.vim25.ManagedObjectReference;
@@ -25,6 +27,7 @@ import com.vmware.vim25.TaskInfoState;
 import com.cloud.hypervisor.vmware.util.VmwareContext;
 
 public class TaskMO extends BaseMO {
+    private static final Logger s_logger = Logger.getLogger(TaskMO.class);
     public TaskMO(VmwareContext context, ManagedObjectReference morTask) {
         super(context, morTask);
     }
@@ -68,6 +71,8 @@ public class TaskMO extends BaseMO {
                 }
             }
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "error retrieving failure info for task : " + e.getLocalizedMessage());
         }
 
         return sb.toString();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
index f3f7e0c..27d088a 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
@@ -16,6 +16,22 @@
 // under the License.
 package com.cloud.hypervisor.vmware.util;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSession;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+
+import org.apache.log4j.Logger;
+
 import com.vmware.vim25.DynamicProperty;
 import com.vmware.vim25.InvalidCollectorVersionFaultMsg;
 import com.vmware.vim25.InvalidPropertyFaultMsg;
@@ -38,22 +54,9 @@ import com.vmware.vim25.TraversalSpec;
 import com.vmware.vim25.UpdateSet;
 import com.vmware.vim25.VimPortType;
 import com.vmware.vim25.VimService;
+
 import org.apache.cloudstack.utils.security.SSLUtils;
 import org.apache.cloudstack.utils.security.SecureSSLSocketFactory;
-import org.apache.log4j.Logger;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSession;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
 
 /**
  * A wrapper class to handle Vmware vsphere connection and disconnection.
@@ -95,6 +98,8 @@ public class VmwareClient {
 
             vimService = new VimService();
         } catch (Exception e) {
+            s_logger.info("[ignored]"
+                    + "failed to trust all certificates blindly: " + e.getLocalizedMessage());
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e002b2/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
index 113786b..817ce26 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
@@ -653,7 +653,8 @@ public class VmwareHelper {
                 }
             }
         } catch (Exception ex) {
-
+            s_logger.info("[ignored]"
+                    + "failed toi get message for exception: " + e.getLocalizedMessage());
         }
 
         return ExceptionUtil.toString(e, printStack);


Mime
View raw message