2 files changed, 7 insertions, 1 deletions
diff --git a/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java b/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java
index 8acb954e..db72d63d 100644
--- a/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java
+++ b/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSConsumer.java
@@ -30,6 +30,9 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.openecomp.aai.logging.ErrorLogHelper;
 import org.openecomp.aai.util.AAIConstants;
+import org.openecomp.aai.logging.LoggingContext;
+import org.openecomp.aai.logging.LoggingContext.LoggingField;
+import org.openecomp.aai.logging.LoggingContext.StatusCode;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -103,6 +106,9 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
 				LOGGER.info(eventName + "|" + aaiEvent);
 				if ("AAI-EVENT".equals(eventName)) {
 					this.sentWithHttp(this.httpClient, this.aaiEventUrl, aaiEvent);
+				} else {
+					LoggingContext.statusCode(StatusCode.ERROR);
+					LOGGER.error(eventName + "|Event Topic invalid.");
 				}
 			} catch (java.net.SocketException e) {
 				if (!e.getMessage().contains("Connection reset")) {
diff --git a/aai-core/src/main/java/org/openecomp/aai/logging/ErrorLogHelper.java b/aai-core/src/main/java/org/openecomp/aai/logging/ErrorLogHelper.java
index 919029a0..23e4f606 100644
--- a/aai-core/src/main/java/org/openecomp/aai/logging/ErrorLogHelper.java
+++ b/aai-core/src/main/java/org/openecomp/aai/logging/ErrorLogHelper.java
@@ -581,7 +581,7 @@ public class ErrorLogHelper {
 											.append(e.getMessage())
 											.toString();
 
-		LoggingContext.responseCode(errorObject.getErrorCodeString());
+		LoggingContext.responseCode(Integer.toString(errorObject.getHTTPResponseCode().getStatusCode()));
 		LoggingContext.responseDescription(errorMessage);
 		LoggingContext.statusCode(StatusCode.ERROR);