[hibernate-commits] Hibernate SVN: r12759 - in trunk/HibernateExt/annotations/src: test/org/hibernate/test/annotations and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2007-07-12 12:04:21 -0400 (Thu, 12 Jul 2007)
New Revision: 12759

Added:
   trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/
   trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/ConfigurationTest.java
   trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/orm.xml
   trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/package-info.java
Modified:
   trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java
Log:
ANN-608 Fix NPE in Ejb3OverriddenAnnotationReader initialization

Modified: trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java
===================================================================
--- trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java	2007-07-12 05:37:04 UTC (rev 12758)
+++ trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java	2007-07-12 16:04:21 UTC (rev 12759)
@@ -356,7 +356,8 @@
             }
 			else {
 				this.annotations = getJavaAnnotations();
-                for (Annotation ann : this.annotations) {
+				annotationsMap = new HashMap<Class, Annotation>( annotations.length + 5 );
+				for (Annotation ann : this.annotations) {
                     annotationsMap.put( ann.annotationType(), ann );
                 }
             }

Added: trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/ConfigurationTest.java
===================================================================
--- trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/ConfigurationTest.java	                        (rev 0)
+++ trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/ConfigurationTest.java	2007-07-12 16:04:21 UTC (rev 12759)
@@ -0,0 +1,21 @@
+//$Id$
+package org.hibernate.test.annotations.configuration;
+
+import junit.framework.TestCase;
+import org.hibernate.cfg.AnnotationConfiguration;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class ConfigurationTest extends TestCase {
+	public void testMixPackageAndResourceOrdering() throws Exception {
+		try {
+			AnnotationConfiguration config = new AnnotationConfiguration();
+			config.addResource( "org/hibernate/test/annotations/configuration/orm.xml" );
+			config.addPackage( "org.hibernate.test.annotations.configuration" );
+		}
+		catch( Exception e ) {
+			fail("Processing package first when ORM.xml is used should not fail");
+		}
+	}
+}

Added: trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/orm.xml
===================================================================
--- trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/orm.xml	                        (rev 0)
+++ trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/orm.xml	2007-07-12 16:04:21 UTC (rev 12759)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings
+    xmlns="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
+    version="1.0">
+</entity-mappings>

Added: trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/package-info.java
===================================================================
--- trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/package-info.java	                        (rev 0)
+++ trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/configuration/package-info.java	2007-07-12 16:04:21 UTC (rev 12759)
@@ -0,0 +1,4 @@
+ at GenericGenerator(name = "myGenerator", strategy = "sequence")
+package org.hibernate.test.annotations.configuration;
+
+import org.hibernate.annotations.GenericGenerator;