Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 90881 invoked from network); 23 Dec 2007 23:50:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Dec 2007 23:50:03 -0000 Received: (qmail 59383 invoked by uid 500); 23 Dec 2007 23:49:52 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 59362 invoked by uid 500); 23 Dec 2007 23:49:52 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 59353 invoked by uid 99); 23 Dec 2007 23:49:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2007 15:49:52 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2007 23:49:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CF9CC1A9832; Sun, 23 Dec 2007 15:49:41 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r606640 - /cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaSecondaryTable.java Date: Sun, 23 Dec 2007 23:49:41 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071223234941.CF9CC1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Sun Dec 23 15:49:37 2007 New Revision: 606640 URL: http://svn.apache.org/viewvc?rev=606640&view=rev Log: minor cleanup - preventing empty string catalog and schema Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaSecondaryTable.java Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaSecondaryTable.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaSecondaryTable.java?rev=606640&r1=606639&r2=606640&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaSecondaryTable.java (original) +++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaSecondaryTable.java Sun Dec 23 15:49:37 2007 @@ -36,9 +36,17 @@ } public JpaSecondaryTable(SecondaryTable annotation) { - name = annotation.name(); - catalog = annotation.catalog(); - schema = annotation.schema(); + if (!"".equals(annotation.name())) { + name = annotation.name(); + } + + if (!"".equals(annotation.catalog())) { + catalog = annotation.catalog(); + } + + if (!"".equals(annotation.schema())) { + schema = annotation.schema(); + } getUniqueConstraints(); for (int i = 0; i < annotation.uniqueConstraints().length; i++) {