Using a dedicated flag to indicate if the API-ManagerAdapter is initialized

Author: Chris Wiechmann

modules/apim-adapter/src/main/java/com/axway/apim/adapter/APIManagerAdapter.java

@@ -75,6 +75,8 @@ public class APIManagerAdapter {
 
 	public static String apiManagerVersion = null;
 
+	public static boolean initialized = false;
+	
 	public static ObjectMapper mapper = new ObjectMapper();
 
 	private static Map<String, ClientApplication> clientCredentialToAppMap = new HashMap<String, ClientApplication>();
@@ -138,6 +140,7 @@ public static synchronized APIManagerAdapter getInstance() throws AppException {
 				LOG.info("Successfully connected to MOCKED API-Manager (" + getApiManagerVersion() + ")");
 			}
 		}
+		APIManagerAdapter.initialized = true;
 		return APIManagerAdapter.instance;
 	}
 
@@ -151,8 +154,9 @@ public static synchronized void deleteInstance() throws AppException {
 			APIManagerAdapter.instance.logoutFromAPIManager(false); // Logout potentially logged in OrgAdmin
 			APIManagerAdapter.instance.logoutFromAPIManager(true); // Logout potentially logged in Admin
 			APIManagerAdapter.instance = null;
-			APIManagerAdapter.apiManagerVersion = null;
 		}
+		APIManagerAdapter.apiManagerVersion = null;
+		APIManagerAdapter.initialized = false;
 	}
 
 	private APIManagerAdapter() throws AppException {

modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/jackson/OrganizationDeserializer.java

@@ -40,7 +40,7 @@ public Organization deserialize(JsonParser jp, DeserializationContext ctxt)
 			// Deserialization depends on the direction
 			if("organizationId".equals(jp.currentName())) {
 				// APIManagerAdapter is not yet initialized
-				if(APIManagerAdapter.apiManagerVersion==null) {
+				if(!APIManagerAdapter.initialized) {
 					organization = new Organization();
 					organization.setId(node.asText());
 					return organization;