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

Fix 4 findbugs warnings in JuniperSrxResource Data should be read and written in UTF-8 to the SRX Buffers were being used for reading but not for writing, PrintWriter was auto-flushing and code was explicitly flushing again, causing unnecessary operation to be performed. 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This closes #399
This commit is contained in:
Rafael da Fonseca 2015-06-13 01:19:39 +02:00 committed by Rohit Yadav
parent 5fe06962ad
commit 34d097f349
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
View File

@ -20,7 +20,8 @@ import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.OutputStreamWriter;
import java.io.BufferedWriter;
import java.io.StringReader;
import java.net.Socket;
import java.net.SocketTimeoutException;
@ -83,9 +84,9 @@ public class JuniperSrxResource implements ServerResource {
private String _password;
private String _guid;
private String _objectNameWordSep;
private PrintWriter _toSrx;
private BufferedWriter _toSrx;
private BufferedReader _fromSrx;
private PrintWriter _UsagetoSrx;
private BufferedWriter _UsagetoSrx;
private BufferedReader _UsagefromSrx;
private Integer _numRetries;
private Integer _timeoutInSeconds;
@ -538,8 +539,8 @@ public class JuniperSrxResource implements ServerResource {
Socket s = new Socket(_ip, 3221);
s.setKeepAlive(true);
s.setSoTimeout(_timeoutInSeconds * 1000);
_toSrx = new PrintWriter(s.getOutputStream(), true);
_fromSrx = new BufferedReader(new InputStreamReader(s.getInputStream()));
_toSrx = new BufferedWriter(new OutputStreamWriter(s.getOutputStream(),"UTF-8"));
_fromSrx = new BufferedReader(new InputStreamReader(s.getInputStream(),"UTF-8"));
return true;
} catch (IOException e) {
s_logger.error(e);
@ -580,8 +581,8 @@ public class JuniperSrxResource implements ServerResource {
Socket s = new Socket(_ip, 3221);
s.setKeepAlive(true);
s.setSoTimeout(_timeoutInSeconds * 1000);
_UsagetoSrx = new PrintWriter(s.getOutputStream(), true);
_UsagefromSrx = new BufferedReader(new InputStreamReader(s.getInputStream()));
_UsagetoSrx = new BufferedWriter(new OutputStreamWriter(s.getOutputStream(),"UTF-8"));
_UsagefromSrx = new BufferedReader(new InputStreamReader(s.getInputStream(),"UTF-8"));
return usageLogin();
} catch (IOException e) {
s_logger.error(e);
@ -3383,7 +3384,7 @@ public class JuniperSrxResource implements ServerResource {
* XML API commands
*/
private String sendRequestPrim(PrintWriter sendStream, BufferedReader recvStream, String xmlRequest) throws ExecutionException {
private String sendRequestPrim(BufferedWriter sendStream, BufferedReader recvStream, String xmlRequest) throws ExecutionException {
if (!xmlRequest.contains("request-login")) {
s_logger.debug("Sending request: " + xmlRequest);
} else {