Fix Agent and CM Issues

[aaf/authz.git] / auth / auth-certman / src / main / java / org / onap / aaf / auth / cm / AAF_CM.java

diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java
index d7571ab..024d9f9 100644 (file)
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java
@@ -154,7 +154,11 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
                             CA ca = cons.newInstance(pinst);
                             certAuths.put(ca.getName(),ca);
                         } catch (InvocationTargetException e) {
-                            access.log(e, "Loading", segs[0]);
+                               if(e.getLocalizedMessage()==null) {
+                                       access.log((Exception)e.getTargetException(), "Loading", segs[0]);
+                               } else {
+                                       access.log(e, "Loading", segs[0]);
+                               }
                         }
                     }
                 }
@@ -243,7 +247,8 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
             new DirectRegistrar(access,locateDAO,port)
         };
     }
-
+    
+    @Override
     public void destroy() {
         Cache.stopTimer();
         locateDAO.close(env.newTransNoAvg());