From eb4b46f25ca8dec8ac79c26cfb02e8918000c88e Mon Sep 17 00:00:00 2001
From: Abhishek Koneru <akoneru@redhat.com>
Date: Thu, 21 Jun 2012 09:44:15 -0400
Subject: Fixes for Forward Null Cases in Coverity for DogTag10

Addressed review coments.
---
 base/silent/src/com/netscape/pkisilent/common/ComCrypto.java |  6 ++++--
 base/silent/src/com/netscape/pkisilent/common/Con2Agent.java | 10 ++++++----
 base/silent/src/com/netscape/pkisilent/http/HTTPClient.java  |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'base/silent/src/com')

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
-- 
cgit