From c3ddf67083b1c2c0d94d2babc0f289ad5dbc4a81 Mon Sep 17 00:00:00 2001 From: Dancovich Date: Mon, 21 Jan 2013 14:30:55 -0200 Subject: [PATCH] Alterada a forma de detecção se uma transação continua ativa, para levar em conta os status adicionais de uma UserTransaction. --- impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java | 34 +++++++++++++++++++++++++++++++++- impl/extension/jta/src/main/resources/demoiselle-jta-bundle.properties | 1 + impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java | 13 +++++++++++++ impl/extension/jta/src/test/resources/log4j.properties | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100755 impl/extension/jta/src/test/resources/log4j.properties diff --git a/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java b/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java index 37c2c1d..5e3e9ef 100644 --- a/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java +++ b/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java @@ -38,12 +38,17 @@ package br.gov.frameworkdemoiselle.transaction; import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L2_PRIORITY; +import javax.inject.Inject; import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.UserTransaction; +import org.slf4j.Logger; + +import br.gov.frameworkdemoiselle.annotation.Name; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.util.Beans; +import br.gov.frameworkdemoiselle.util.ResourceBundle; @Priority(EXTENSIONS_L2_PRIORITY) public class JTATransaction implements Transaction { @@ -51,6 +56,13 @@ public class JTATransaction implements Transaction { private static final long serialVersionUID = 1L; private UserTransaction delegate; + + @Inject + private Logger logger; + + @Inject + @Name("demoiselle-jta-bundle") + private ResourceBundle bundle; public UserTransaction getDelegate() { @@ -64,7 +76,27 @@ public class JTATransaction implements Transaction { @Override public boolean isActive() { try { - return getDelegate().getStatus() == Status.STATUS_ACTIVE || isMarkedRollback(); + final int delegateStatus = getDelegate().getStatus(); + + if (delegateStatus!=Status.STATUS_ACTIVE && delegateStatus!=Status.STATUS_NO_TRANSACTION){ + //Os status mais comuns do UserTransaction são: explicitamente ativa (STATUS_ACTIVE) ou explicitamente + //desativada (STATUS_NO_TRANSACTION). Qualquer outro status "intermediário" é registrado em log para análise posterior + String status; + switch(delegateStatus){ + case Status.STATUS_COMMITTED: status="COMMITTED"; break; + case Status.STATUS_COMMITTING: status="COMMITTING"; break; + case Status.STATUS_MARKED_ROLLBACK: status="MARKED_ROLLBACK"; break; + case Status.STATUS_PREPARED: status="PREPARED"; break; + case Status.STATUS_PREPARING: status="PREPARING"; break; + case Status.STATUS_ROLLEDBACK: status="ROLLEDBACK"; break; + case Status.STATUS_ROLLING_BACK: status="ROLLING_BACK"; break; + case Status.STATUS_UNKNOWN: status="UNKNOWN"; break; + default: status="UNKNOWN"; + } + logger.debug(bundle.getString("usertransaction-abnormal-status",status)); + } + + return delegateStatus != Status.STATUS_NO_TRANSACTION; } catch (SystemException cause) { throw new TransactionException(cause); diff --git a/impl/extension/jta/src/main/resources/demoiselle-jta-bundle.properties b/impl/extension/jta/src/main/resources/demoiselle-jta-bundle.properties index 3f1fa2e..0f37148 100644 --- a/impl/extension/jta/src/main/resources/demoiselle-jta-bundle.properties +++ b/impl/extension/jta/src/main/resources/demoiselle-jta-bundle.properties @@ -32,3 +32,4 @@ # "LICENCA.txt", junto com esse programa. Se não, acesse # ou escreva para a Fundação do Software Livre (FSF) Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. +usertransaction-abnormal-status=UserTransaction encontra-se em status anormal\: {0} \ No newline at end of file diff --git a/impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java b/impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java index a07558c..072d225 100644 --- a/impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java +++ b/impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java @@ -46,6 +46,8 @@ import static org.powermock.api.easymock.PowerMock.replayAll; import static org.powermock.api.easymock.PowerMock.verify; import static org.powermock.reflect.Whitebox.setInternalState; +import java.util.Locale; + import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; import javax.transaction.NotSupportedException; @@ -60,8 +62,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import br.gov.frameworkdemoiselle.util.Beans; +import br.gov.frameworkdemoiselle.util.ResourceBundle; @RunWith(PowerMockRunner.class) @PrepareForTest({ Beans.class }) @@ -70,14 +75,22 @@ public class JTATransactionTest { private UserTransaction userTransaction; private JTATransaction jtaTransaction; + + private Logger logger; + + private ResourceBundle bundle; @Before public void setUp() { userTransaction = createMock(UserTransaction.class); jtaTransaction = new JTATransaction(); + logger = LoggerFactory.getLogger(JTATransaction.class); + bundle = new ResourceBundle("demoiselle-jta-bundle",Locale.getDefault()); setInternalState(jtaTransaction, UserTransaction.class, userTransaction); + setInternalState(jtaTransaction, Logger.class, logger); + setInternalState(jtaTransaction, ResourceBundle.class, bundle); } @Test diff --git a/impl/extension/jta/src/test/resources/log4j.properties b/impl/extension/jta/src/test/resources/log4j.properties new file mode 100755 index 0000000..48a89ba --- /dev/null +++ b/impl/extension/jta/src/test/resources/log4j.properties @@ -0,0 +1,42 @@ +# Demoiselle Framework +# Copyright (C) 2010 SERPRO +# ---------------------------------------------------------------------------- +# This file is part of Demoiselle Framework. +# +# Demoiselle Framework is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License version 3 +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License version 3 +# along with this program; if not, see +# or write to the Free Software Foundation, Inc., 51 Franklin Street, +# Fifth Floor, Boston, MA 02110-1301, USA. +# ---------------------------------------------------------------------------- +# Este arquivo é parte do Framework Demoiselle. +# +# O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou +# modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação +# do Software Livre (FSF). +# +# Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA +# GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou +# APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português +# para maiores detalhes. +# +# Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título +# "LICENCA.txt", junto com esse programa. Se não, acesse +# ou escreva para a Fundação do Software Livre (FSF) Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + +log4j.rootCategory=INFO, stdout + +log4j.logger.br.gov.frameworkdemoiselle=TRACE + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%-5p [%c{1}] %m%n -- libgit2 0.21.2