|
From: <hib...@li...> - 2006-03-24 19:20:08
|
Author: max...@jb...
Date: 2006-03-24 14:20:01 -0500 (Fri, 24 Mar 2006)
New Revision: 9682
Modified:
trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/ArtifactCollector.java
trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/HibernateConfigurationExporter.java
trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Basic.hbm.xml
Log:
NPe fix
Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/ArtifactCollector.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/ArtifactCollector.java 2006-03-24 18:10:04 UTC (rev 9681)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/ArtifactCollector.java 2006-03-24 19:20:01 UTC (rev 9682)
@@ -23,7 +23,7 @@
/**
* Called to inform that a file has been created by the exporter.
*/
- public void addFile(File file, String type) {
+ public void addFile(File file, String type) {
List existing = (List) files.get(type);
if(existing==null) {
existing = new ArrayList();
Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/HibernateConfigurationExporter.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/HibernateConfigurationExporter.java 2006-03-24 18:10:04 UTC (rev 9681)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/HibernateConfigurationExporter.java 2006-03-24 19:20:01 UTC (rev 9682)
@@ -64,12 +64,13 @@
file = new File(getOutputDirectory(), "hibernate.cfg.xml");
getTemplateHelper().ensureExistence(file);
pw = new PrintWriter(new FileWriter(file) );
+ getArtifactCollector().addFile(file, "cfg.xml");
}
else {
pw = new PrintWriter(output);
}
- getArtifactCollector().addFile(file, "cfg.xml");
+
pw.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<!DOCTYPE hibernate-configuration PUBLIC\r\n" +
" \"-//Hibernate/Hibernate Configuration DTD 3.0//EN\"\r\n" +
Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Basic.hbm.xml
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Basic.hbm.xml 2006-03-24 18:10:04 UTC (rev 9681)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Basic.hbm.xml 2006-03-24 19:20:01 UTC (rev 9682)
@@ -14,7 +14,7 @@
<id name="basicId"
length="10"
- type="string"
+
unsaved-value="null"
>
<generator class="org.hibernate.id.TableHiLoGenerator">
|