Merge "Fix NPE & other issues"

diff --combined ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/scheduler/SchedulerRestInterface.java
index 6a581c1,afcb7ab..0f6f3ce
--- 1/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/scheduler/SchedulerRestInterface.java
--- 2/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/scheduler/SchedulerRestInterface.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/scheduler/SchedulerRestInterface.java
@@@ -41,6 -41,7 +41,6 @@@ import java.util.Collections
  import java.util.Date;
  
  import javax.security.auth.login.CredentialException;
 -import javax.ws.rs.client.Entity;
  import javax.ws.rs.core.MediaType;
  import javax.ws.rs.core.MultivaluedHashMap;
  
@@@ -151,9 -152,6 +151,6 @@@ public class SchedulerRestInterface imp
                                
                logger.debug(EELFLoggerDelegate.debugLogger, "Client Initialized");
                
-               
-               
- 
        }
  
        @SuppressWarnings("unchecked")
@@@ -178,7 -176,7 +175,7 @@@
                        if (cres.getEntity() != null) {
                                try {
                                        String str = (cres).readEntity(String.class);
-                                       if (t.getClass().getName().equals(String.class.getName())) {
+                                       if (t.getClass().isAssignableFrom(String.class)) {
                                                t = (T) str;
  
                                        } else {
@@@ -233,7 -231,7 +230,7 @@@
  
                                try {
                                        String str = (cres).readEntity(String.class);
-                                       if (t.getClass().getName().equals(String.class.getName())) {
+                                       if (t.getClass().isAssignableFrom(String.class)) {
                                                t = (T) str;
  
                                        } else {