1 files changed, 50 insertions, 49 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/CommitManager.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/CommitManager.java
index e802e58f27..f366ae214f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/CommitManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/CommitManager.java
@@ -20,8 +20,6 @@
 
 package org.openecomp.sdc.common.transaction.mngr;
 
-import java.util.List;
-
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.common.config.EcompErrorName;
 import org.openecomp.sdc.common.transaction.api.ICommitHandler;
@@ -31,57 +29,60 @@ import org.openecomp.sdc.common.transaction.api.TransactionUtils.LogMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 public class CommitManager {
-	private List<ICommitHandler> commitHandlers;
-	private Integer transactionId;
-	private String userId, actionType;
-	private static Logger log = LoggerFactory.getLogger(CommitManager.class.getName());
 
-	CommitManager(Integer transactionId, String userId, String actionType, List<ICommitHandler> commitHandlers) {
-		this.commitHandlers = commitHandlers;
-		this.transactionId = transactionId;
-		this.userId = userId;
-		this.actionType = actionType;
+    // TODO test using slf4j-test and make this final
+    private static Logger log = LoggerFactory.getLogger(CommitManager.class);
+    private List<ICommitHandler> commitHandlers;
+    private Integer transactionId;
+    private String userId, actionType;
+
+    CommitManager(Integer transactionId, String userId, String actionType, List<ICommitHandler> commitHandlers) {
+        this.commitHandlers = commitHandlers;
+        this.transactionId = transactionId;
+        this.userId = userId;
+        this.actionType = actionType;
 
-	}
+    }
 
-	public DBActionCodeEnum transactionCommit() {
-		log.debug(LogMessages.COMMIT_ACTION_ALL_DB, transactionId, userId, actionType);
-		DBActionCodeEnum commitResult = DBActionCodeEnum.SUCCESS;
-		ICommitHandler lastHandler = null;
-		try {
-			for (ICommitHandler handler : commitHandlers) {
-				lastHandler = handler;
-				log.debug(LogMessages.COMMIT_ACTION_SPECIFIC_DB, transactionId, handler.getDBType().name(), userId, actionType);
-				DBActionCodeEnum commitCode = handler.doCommit();
-				if (commitCode == DBActionCodeEnum.FAIL_GENERAL) {
-					BeEcompErrorManager.getInstance().processEcompError(EcompErrorName.BeSystemError, "transactionCommit on DB " + handler.getDBType().name());
-					BeEcompErrorManager.getInstance().logBeSystemError("transactionCommit on DB " + handler.getDBType().name());
-					log.debug("Commit failed for SdncTransactionID:{} on DB:{}", transactionId, handler.getDBType().name());
-					commitResult = DBActionCodeEnum.FAIL_GENERAL;
-					break;
-				}
-				log.debug("Commit succeeded for SdncTransactionID:{} on DB:{}", transactionId, handler.getDBType().name());
-			}
-		} catch (Exception e) {
-			BeEcompErrorManager.getInstance().processEcompError(EcompErrorName.BeSystemError, "transactionCommit - on DB " + getDBName(lastHandler));
-			BeEcompErrorManager.getInstance().logBeSystemError("transactionCommit - on DB " + getDBName(lastHandler));
-			log.debug("Commit failed for SdncTransactionID:{} on DB:{}, Exception message:{}", transactionId, getDBName(lastHandler), e.getMessage(), e);
-			log.info(TransactionUtils.TRANSACTION_MARKER, "Commit failed for SdncTransactionID:{} on DB:{}", transactionId, getDBName(lastHandler));
-			commitResult = DBActionCodeEnum.FAIL_GENERAL;
-		}
-		return commitResult;
-	}
+    public DBActionCodeEnum transactionCommit() {
+        log.debug(LogMessages.COMMIT_ACTION_ALL_DB, transactionId, userId, actionType);
+        DBActionCodeEnum commitResult = DBActionCodeEnum.SUCCESS;
+        ICommitHandler lastHandler = null;
+        try {
+            for (ICommitHandler handler : commitHandlers) {
+                lastHandler = handler;
+                log.debug(LogMessages.COMMIT_ACTION_SPECIFIC_DB, transactionId, handler.getDBType().name(), userId, actionType);
+                DBActionCodeEnum commitCode = handler.doCommit();
+                if (commitCode == DBActionCodeEnum.FAIL_GENERAL) {
+                    BeEcompErrorManager.getInstance().logBeSystemError("transactionCommit on DB " + handler.getDBType().name());
+                    log.debug("Commit failed for SdncTransactionID:{} on DB:{}", transactionId, handler.getDBType().name());
+                    commitResult = DBActionCodeEnum.FAIL_GENERAL;
+                    break;
+                }
+                log.debug("Commit succeeded for SdncTransactionID:{} on DB:{}", transactionId, handler.getDBType().name());
+            }
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeSystemError("transactionCommit - on DB " + getDBName(lastHandler));
+            log.debug("Commit failed for SdncTransactionID:{} on DB:{}, Exception message:{}", transactionId, getDBName(lastHandler), e.getMessage(), e);
+            log.info(TransactionUtils.TRANSACTION_MARKER, "Commit failed for SdncTransactionID:{} on DB:{}", transactionId, getDBName(lastHandler));
+            commitResult = DBActionCodeEnum.FAIL_GENERAL;
+        }
+        return commitResult;
+    }
 
-	private String getDBName(ICommitHandler lastHandler) {
-		String dbName = "Unknown";
-		if (lastHandler != null) {
-			dbName = lastHandler.getDBType().name();
-		}
-		return dbName;
-	}
+    private String getDBName(ICommitHandler lastHandler) {
+        String dbName = "Unknown";
+        if (lastHandler != null) {
+            dbName = lastHandler.getDBType().name();
+        }
+        return dbName;
+    }
 
-	static void setLog(Logger log) {
-		CommitManager.log = log;
-	}
+    // TODO test using slf4j-test and remove this
+    static void setLog(Logger log) {
+        CommitManager.log = log;
+    }
 }