You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/12/24 00:49:41 UTC

svn commit: r606640 - /cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/map/JpaSecondaryTable.java

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++) {