[hibernate-commits] Hibernate SVN: r20117 - in annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate: cfg/annotations and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-08-06 04:50:07 -0400 (Fri, 06 Aug 2010)
New Revision: 20117

Modified:
   annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/annotations/Tables.java
   annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/EntityBinder.java
Log:
JBPAPP-4716 ANN-555 fix breaks backward compatibility

Modified: annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/annotations/Tables.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/annotations/Tables.java	2010-08-05 15:52:56 UTC (rev 20116)
+++ annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/annotations/Tables.java	2010-08-06 08:50:07 UTC (rev 20117)
@@ -15,4 +15,7 @@
 @Retention(RUNTIME)
 public @interface Tables {
 	Table[] value();
+	//this methon was removed due to ANN-555, to keep the compatibility, add it back
+	@Deprecated
+	Table[] values() default {};
 }

Modified: annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/EntityBinder.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/EntityBinder.java	2010-08-05 15:52:56 UTC (rev 20116)
+++ annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/EntityBinder.java	2010-08-06 08:50:07 UTC (rev 20117)
@@ -549,6 +549,13 @@
 						break;
 					}
 				}
+				//JBPAPP-4716
+				for (org.hibernate.annotations.Table current : tables.values()) {
+					if ( tableName.equals( current.appliesTo() ) ) {
+						matchingTable = current;
+						break;
+					}
+				}
 			}
 		}
 		return matchingTable;
@@ -777,6 +784,10 @@
 		for (org.hibernate.annotations.Table table : tables.value()) {
 			processComplementaryTableDefinitions( table );
 		}
+		//JBPAPP-4716
+		for (org.hibernate.annotations.Table table : tables.values()) {
+			processComplementaryTableDefinitions( table );
+		}
 	}
 
 	public void setPropertyAnnotated(boolean propertyAnnotated) {