[jbossws-commits] JBossWS SVN: r3579 - trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2007-06-14 07:18:48 -0400 (Thu, 14 Jun 2007)
New Revision: 3579

Modified:
   trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java
Log:
Fix messageStream NPE

Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java	2007-06-14 10:41:15 UTC (rev 3578)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java	2007-06-14 11:18:48 UTC (rev 3579)
@@ -40,130 +40,137 @@
  */
 public class SunRIConsumerImpl extends WSContractConsumer
 {
-   private List<File> bindingFiles = null;
-   private File catalog = null;
-   private boolean generateSource = false;
-   private File outputDir = new File("output");
-   private File sourceDir = null;
-   private String targetPackage = null;
-   private PrintStream messageStream = null;
-   private String wsdlLocation = null;
-   private List<String> additionalCompilerClassPath = null;
+	private List<File> bindingFiles = null;
+	private File catalog = null;
+	private boolean generateSource = false;
+	private File outputDir = new File("output");
+	private File sourceDir = null;
+	private String targetPackage = null;
+	private PrintStream messageStream = null;
+	private String wsdlLocation = null;
+	private List<String> additionalCompilerClassPath = null;
 
-   @Override
-   public void setBindingFiles(List<File> bindingFiles) {
-      this.bindingFiles = bindingFiles;
-   }
+	@Override
+	public void setBindingFiles(List<File> bindingFiles) {
+		this.bindingFiles = bindingFiles;
+	}
 
-   @Override
-   public void setCatalog(File catalog) {
-      this.catalog = catalog;
-   }
+	@Override
+	public void setCatalog(File catalog) {
+		this.catalog = catalog;
+	}
 
-   @Override
-   public void setGenerateSource(boolean generateSource) {
-      this.generateSource = generateSource;
-   }
+	@Override
+	public void setGenerateSource(boolean generateSource) {
+		this.generateSource = generateSource;
+	}
 
-   @Override
-   public void setMessageStream(PrintStream messageStream) {
-      // TODO Auto-generated method stub
-      this.messageStream = messageStream;
-   }
+	@Override
+	public void setMessageStream(PrintStream messageStream) {
+		// TODO Auto-generated method stub
+		this.messageStream = messageStream;
+	}
 
-   @Override
-   public void setOutputDirectory(File directory) {
-      // TODO Auto-generated method stub
-      outputDir = directory;
-   }
+	@Override
+	public void setOutputDirectory(File directory) {
+		// TODO Auto-generated method stub
+		outputDir = directory;
+	}
 
-   @Override
-   public void setSourceDirectory(File directory) {
-      sourceDir = directory;
-   }
+	@Override
+	public void setSourceDirectory(File directory) {
+		sourceDir = directory;
+	}
 
-   @Override
-   public void setTargetPackage(String targetPackage) {
-      this.targetPackage = targetPackage;
-   }
+	@Override
+	public void setTargetPackage(String targetPackage) {
+		this.targetPackage = targetPackage;
+	}
 
-   @Override
-   public void setWsdlLocation(String wsdlLocation) {
-      this.wsdlLocation = wsdlLocation;
-   }
+	@Override
+	public void setWsdlLocation(String wsdlLocation) {
+		this.wsdlLocation = wsdlLocation;
+	}
 
-   public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) {
-      this.additionalCompilerClassPath = additionalCompilerClassPath;
-   }
+	public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) {
+		this.additionalCompilerClassPath = additionalCompilerClassPath;
+	}
 
-   @Override
-   public void consume(URL wsdl) {
-      List<String> args = new ArrayList<String>();
-      if (bindingFiles != null) {
-         for (File file : bindingFiles) {
-            args.add("-b");
-            args.add(file.getAbsolutePath());
+	@Override
+	public void consume(URL wsdl) {
+		List<String> args = new ArrayList<String>();
+		if (bindingFiles != null) {
+			for (File file : bindingFiles) {
+				args.add("-b");
+				args.add(file.getAbsolutePath());
 
-         }
-      }
+			}
+		}
 
-      if (catalog != null) {
-         args.add("-catalog");
-         args.add(catalog.getAbsolutePath());
-      }
+		if (catalog != null) {
+			args.add("-catalog");
+			args.add(catalog.getAbsolutePath());
+		}
 
-      if (generateSource) {
-         args.add("-keep");
-         if (sourceDir != null) {
-            if (!sourceDir.exists() && !sourceDir.mkdirs())
-               throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
+		if (generateSource) {
+			args.add("-keep");
+			if (sourceDir != null) {
+				if (!sourceDir.exists() && !sourceDir.mkdirs())
+					throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
 
-            args.add("-s");
-            args.add(sourceDir.getAbsolutePath());
-         }
-      }
+				args.add("-s");
+				args.add(sourceDir.getAbsolutePath());
+			}
+		}
 
-      if (targetPackage != null) {
-         args.add("-p");
-         args.add(targetPackage);
-      }
+		if (targetPackage != null) {
+			args.add("-p");
+			args.add(targetPackage);
+		}
 
-      if (wsdlLocation != null) {
-         args.add("-wsdllocation");
-         args.add(wsdlLocation);
-      }
+		if (wsdlLocation != null) {
+			args.add("-wsdllocation");
+			args.add(wsdlLocation);
+		}
 
-      PrintStream stream = messageStream;
-      if (stream != null) {
-         args.add("-verbose");
-      } else {
-         stream = new NullPrintStream();
-      }
+		PrintStream stream = messageStream;
+		if (stream != null) {
+			args.add("-verbose");
+		} else {
+			stream = new NullPrintStream();
+		}
 
-      if (!outputDir.exists() && !outputDir.mkdirs())
-         throw new IllegalStateException("Could not make directory: " + outputDir.getName());
+		if (!outputDir.exists() && !outputDir.mkdirs())
+			throw new IllegalStateException("Could not make directory: " + outputDir.getName());
 
-      // Always add the output directory and the wsdl location
-      args.add("-d");
-      args.add(outputDir.getAbsolutePath());
-      args.add(wsdl.toString());
+		// Always add the output directory and the wsdl location
+		args.add("-d");
+		args.add(outputDir.getAbsolutePath());
+		args.add(wsdl.toString());
 
-      try
-      {
-         // enforce woodstox
-         if(null == System.getProperty("javax.xml.stream.XMLInputFactory"))
-            System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory");
+		try
+		{
+			// enforce woodstox
+			if(null == System.getProperty("javax.xml.stream.XMLInputFactory"))
+				System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory");
 
-         WsimportTool compileTool = new WsimportTool(stream);
-         boolean success = compileTool.run(args.toArray(new String[0]));
+			WsimportTool compileTool = new WsimportTool(stream);
+			boolean success = compileTool.run(args.toArray(new String[0]));
 
-         if(!success) throw new IllegalStateException("WsImport invocation failed");
-      }
-      catch (Throwable t)
-      {
-         messageStream.println("Failed to invoke WsImport");
-         t.printStackTrace(messageStream);
-      }
+			if(!success) throw new IllegalStateException("WsImport invocation failed");
+		}
+		catch (Throwable t)
+		{
+			if (messageStream != null)
+			{
+				messageStream.println("Failed to invoke WsImport");
+				t.printStackTrace(messageStream);
+			}
+			else
+			{
+				t.printStackTrace();
+			}
+		}
 
-   }
+	}
 }