etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

utils: improve timeout to 60s, define generics properly 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d2471df0be)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-04-13 15:31:42 +05:30
parent 74e0a5f9ec
commit 48ef7e5f28
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/src/com/cloud/utils/nio/Link.java
View File

@ -466,7 +466,7 @@ public class Link {
ByteBuffer out_pkgBuf = ByteBuffer.allocate(sslSession.getPacketBufferSize() + 40);
ByteBuffer out_appBuf = ByteBuffer.allocate(sslSession.getApplicationBufferSize() + 40);
int count;
ch.socket().setSoTimeout(30 * 1000);
ch.socket().setSoTimeout(60 * 1000);
InputStream inStream = ch.socket().getInputStream();
// Use readCh to make sure the timeout on reading is working
ReadableByteChannel readCh = Channels.newChannel(inStream);

2
utils/src/org/apache/cloudstack/utils/security/SSLUtils.java
View File

@ -32,7 +32,7 @@ public class SSLUtils {
public static final Logger s_logger = Logger.getLogger(SSLUtils.class);
public static String[] getSupportedProtocols(String[] protocols) {
Set set = new HashSet();
Set<String> set = new HashSet<String>();
for (String s : protocols) {
if (s.equals("SSLv3") || s.equals("SSLv2Hello")) {
continue;