summaryrefslogtreecommitdiffstats
path: root/base/silent
diff options
context:
space:
mode:
authorAbhishek Koneru <akoneru@redhat.com>2012-06-21 09:44:15 -0400
committerAde Lee <alee@redhat.com>2012-06-29 01:29:03 -0400
commiteb4b46f25ca8dec8ac79c26cfb02e8918000c88e (patch)
tree22223edf9099ac1a3e0c3914d383c373a92950b0 /base/silent
parent1eba8264adbe42115caac4db655d450a99791ceb (diff)
downloadpki-eb4b46f25ca8dec8ac79c26cfb02e8918000c88e.tar.gz
pki-eb4b46f25ca8dec8ac79c26cfb02e8918000c88e.tar.xz
pki-eb4b46f25ca8dec8ac79c26cfb02e8918000c88e.zip
Fixes for Forward Null Cases in Coverity for DogTag10
Addressed review coments.
Diffstat (limited to 'base/silent')
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/ComCrypto.java6
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/Con2Agent.java10
-rw-r--r--base/silent/src/com/netscape/pkisilent/http/HTTPClient.java1
3 files changed, 11 insertions, 6 deletions
diff --git a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
index 9b5cf7b52..48b364349 100644
--- a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
+++ b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
@@ -241,7 +241,8 @@ public class ComCrypto {
}
if (manager == null) {
- System.out.println("Manager object is null");
+ System.out.println("ComCrypto: importCert :Manager object is null");
+ throw new Exception("ComCrypto: importCert :Manager Object is null");
}
manager.importCertPackage(tmp.getBytes(), cn);
@@ -270,7 +271,8 @@ public class ComCrypto {
}
if (manager == null) {
- System.out.println("Manager object is null");
+ System.out.println("ComCrypto: importCACert :Manager object is null");
+ throw new Exception("ComCrypto: importCACert :Manager object is null");
}
manager.importCACertPackage(tmp.getBytes());
diff --git a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
index 16fc7c77a..3038a1679 100644
--- a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
+++ b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
@@ -238,10 +238,12 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback,
e.printStackTrace();
}
}
- if (socket.isClosed()) {
- System.out.println("Con2Agent.java : Socket is Closed");
- } else {
- System.out.println("Con2Agent.java : Socket not Closed");
+ if (socket != null) {
+ if (socket.isClosed()) {
+ System.out.println("Con2Agent.java : Socket is Closed");
+ } else {
+ System.out.println("Con2Agent.java : Socket not Closed");
+ }
}
}
return true;
diff --git a/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java b/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
index 71e5e8810..c98fe2193 100644
--- a/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
+++ b/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
@@ -658,6 +658,7 @@ public class HTTPClient implements SSLCertificateApprovalCallback {
// This should never happen -- an empty response
System.out.println("Unable to parse response header -- empty " +
"header");
+ throw new Exception("Unable to create response. Empty header.");
}
// If the status code was 100 (continue), then it was an intermediate header