Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EE26519DED for ; Thu, 7 Apr 2016 12:31:27 +0000 (UTC) Received: (qmail 93624 invoked by uid 500); 7 Apr 2016 12:31:27 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 93562 invoked by uid 500); 7 Apr 2016 12:31:27 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 93551 invoked by uid 99); 7 Apr 2016 12:31:27 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Apr 2016 12:31:27 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 59ADB1A0422 for ; Thu, 7 Apr 2016 12:31:27 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.999 X-Spam-Level: X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id j-n8fvBAMAUa for ; Thu, 7 Apr 2016 12:31:26 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 0A50F5FBC9 for ; Thu, 7 Apr 2016 12:31:26 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 95723E0098 for ; Thu, 7 Apr 2016 12:31:24 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 4A18F3A0222 for ; Thu, 7 Apr 2016 12:31:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1738124 - /aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractJPATransactionTest.java Date: Thu, 07 Apr 2016 12:31:24 -0000 To: commits@aries.apache.org From: timothyjward@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160407123124.4A18F3A0222@svn01-us-west.apache.org> Author: timothyjward Date: Thu Apr 7 12:31:23 2016 New Revision: 1738124 URL: http://svn.apache.org/viewvc?rev=1738124&view=rev Log: [tx-control] Avoid teardown exception when using Hibernate Modified: aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractJPATransactionTest.java Modified: aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractJPATransactionTest.java URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractJPATransactionTest.java?rev=1738124&r1=1738123&r2=1738124&view=diff ============================================================================== --- aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractJPATransactionTest.java (original) +++ aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractJPATransactionTest.java Thu Apr 7 12:31:23 2016 @@ -30,6 +30,8 @@ import java.util.Dictionary; import java.util.Hashtable; import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaDelete; import org.apache.aries.itest.AbstractIntegrationTest; import org.apache.aries.tx.control.itests.entity.Message; @@ -119,9 +121,12 @@ public abstract class AbstractJPATransac try { txControl.required(() -> - em.createQuery( - em.getCriteriaBuilder().createCriteriaDelete(Message.class) - ).executeUpdate()); + { + CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaDelete delete = cb.createCriteriaDelete(Message.class); + delete.from(Message.class); + return em.createQuery(delete).executeUpdate(); + }); } catch (Exception e) { e.printStackTrace(); }