Merge branch '4.9'

alokhom · Dec 6, 2016 · 70c79ad · 70c79ad
2 parents 08a5ef7 + decb2e4
commit 70c79ad
Show file tree

Hide file tree

Showing 18 changed files with 1,423 additions and 1,533 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${cs.servlet.version}</version>
     </dependency>
     <dependency>

diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -2399,7 +2399,6 @@ private void migrateDatafromIsoIdInVolumesTable(Connection conn) {
                 //implies iso_id1 is not present, so do nothing.
             }
         } catch (SQLException e) {
-          s_logger.error("migrateDatafromIsoIdInVolumesTable:Exception:"+e.getMessage(),e);
             //implies iso_id1 is not present, so do nothing.
         }
     }

diff --git a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java
@@ -18,14 +18,7 @@
  */
 package org.apache.cloudstack.framework.server;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.security.SecureRandom;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.apache.log4j.Logger;
-
+import com.cloud.utils.concurrency.NamedThreadFactory;
 import org.apache.cloudstack.framework.serializer.MessageSerializer;
 import org.apache.cloudstack.framework.transport.TransportAddress;
 import org.apache.cloudstack.framework.transport.TransportDataPdu;
@@ -34,8 +27,15 @@
 import org.apache.cloudstack.framework.transport.TransportPdu;
 import org.apache.cloudstack.framework.transport.TransportProvider;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.log4j.Logger;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
-import com.cloud.utils.concurrency.NamedThreadFactory;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class ServerTransportProvider implements TransportProvider {
     private static final Logger s_logger = Logger.getLogger(ServerTransportProvider.class);
@@ -52,9 +52,16 @@ public class ServerTransportProvider implements TransportProvider {
 
     private MessageSerializer _messageSerializer;
 
+    static {
+        BouncyCastleProvider provider = new BouncyCastleProvider();
+        if (Security.getProvider(provider.getName()) == null) {
+            Security.addProvider(provider);
+        }
+    }
+
     public ServerTransportProvider() {
-       randomGenerator=new SecureRandom();
-       _nextEndpointId=randomGenerator.nextInt();
+        randomGenerator = new SecureRandom();
+        _nextEndpointId = randomGenerator.nextInt();
     }
 
     public String getNodeId() {

diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java
@@ -29,7 +29,7 @@ public class TransportAddress {
     private int _connectionId = LOCAL_SERVICE_CONNECTION;
     private String _endpointId;
     private int _magic;
-    private final SecureRandom randomGenerator=new SecureRandom();
+    private final SecureRandom randomGenerator = new SecureRandom();
 
     public TransportAddress(String nodeId, int connectionId, String endpointId) {
         assert (nodeId != null);

diff --git a/...k/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java b/...k/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java
@@ -30,6 +30,7 @@
 
 import javax.inject.Inject;
 
+import com.google.common.base.Strings;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
@@ -48,7 +49,7 @@ public class KeystoreManagerImpl extends ManagerBase implements KeystoreManager
 
     @Override
     public boolean validateCertificate(String certificate, String key, String domainSuffix) {
-        if (certificate == null || certificate.isEmpty() || key == null || key.isEmpty() || domainSuffix == null || domainSuffix.isEmpty()) {
+        if (Strings.isNullOrEmpty(certificate) || Strings.isNullOrEmpty(key) || Strings.isNullOrEmpty(domainSuffix)) {
             s_logger.error("Invalid parameter found in (certificate, key, domainSuffix) tuple for domain: " + domainSuffix);
             return false;
         }

diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>