Unbreaking trunk due to erroneous commit

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@527961 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 19 insertions, 14 deletions

diff --git a/qpid/gentools/src/org/apache/qpid/gentools/Generator.java b/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
index ccf61bfbce..9dc816dc67 100644
--- a/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
@@ -274,20 +274,25 @@ public abstract class Generator implements LanguageConverter
                 versionTemplateFiles = versionTemplateDirectory.listFiles(_tmplFileFilter);
             }
 
-            for (File templateFile : templateFiles)
-            {
-                System.out.println(type.getName() + " template file(s):");
-                System.out.println("  " + templateFile.getCanonicalPath());
-                typeTemplates.add(new NamedTemplate(type.getName(), templateFile));
-            }
-
-
-            for (File versionTemplateFile : versionTemplateFiles)
-            {
-                System.out.println(type.getName() + " template file(s):");
-                System.out.println("  " + versionTemplateFile.getCanonicalPath());
-                versionSpecificTypeTemplates.add(new NamedTemplate(type.getName() + Utils.FILE_SEPARATOR + "version", versionTemplateFile));
-            }
+			if(templateFiles != null)
+			{
+	            for (File templateFile : templateFiles)
+	            {
+	                System.out.println(type.getName() + " template file(s):");
+	                System.out.println("  " + templateFile.getCanonicalPath());
+	                typeTemplates.add(new NamedTemplate(type.getName(), templateFile));
+	            }
+			}
+
+            if(versionTemplateFiles != null)
+			{
+				for (File versionTemplateFile : versionTemplateFiles)
+	            {
+	                System.out.println(type.getName() + " template file(s):");
+	                System.out.println("  " + versionTemplateFile.getCanonicalPath());
+	                versionSpecificTypeTemplates.add(new NamedTemplate(type.getName() + Utils.FILE_SEPARATOR + "version", versionTemplateFile));
+	            }
+			}
 
         }
     }