[jbossws-commits] JBossWS SVN: r17094 - in common-tools/trunk/src/main/java/org/jboss/ws/tools: cmd and 1 other directory.
Author: richard.opalka(a)jboss.com
Date: 2012-12-17 08:21:38 -0500 (Mon, 17 Dec 2012)
New Revision: 17094
Modified:
common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSProvideTask.java
common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java
common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSProvide.java
Log:
[JBWS-3573] fixing some violations
Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSProvideTask.java
===================================================================
--- common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSProvideTask.java 2012-12-17
13:19:50 UTC (rev 17093)
+++ common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSProvideTask.java 2012-12-17
13:21:38 UTC (rev 17094)
@@ -225,13 +225,16 @@
ClassLoader prevCL = SecurityActions.getContextClassLoader();
ClassLoader antLoader = SecurityActions.getClassLoader(this.getClass());
SecurityActions.setContextClassLoader(antLoader);
+ PrintStream ps = null;
try
{
WSContractProvider gen = WSContractProvider.newInstance(
getClasspathLoader(antLoader)
- );
- if (verbose)
- gen.setMessageStream(new PrintStream(new LogOutputStream(this,
Project.MSG_INFO)));
+ );
+ if (verbose) {
+ ps = new PrintStream(new LogOutputStream(this, Project.MSG_INFO));
+ gen.setMessageStream(ps);
+ }
gen.setGenerateSource(keep);
gen.setGenerateWsdl(genwsdl);
gen.setExtension(extension);
@@ -254,6 +257,9 @@
}
finally
{
+ if (ps != null) {
+ ps.close();
+ }
SecurityActions.setContextClassLoader(prevCL);
}
}
Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java
===================================================================
--- common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2012-12-17
13:19:50 UTC (rev 17093)
+++ common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2012-12-17
13:21:38 UTC (rev 17094)
@@ -232,16 +232,17 @@
if (sourceDir != null)
consumer.setSourceDirectory(sourceDir);
+ boolean cleanPS = false;
+ PrintStream ps = System.out;
if (! quiet)
{
- PrintStream ps;
if (Log4JUtil.isLog4jConfigurationAvailable())
{
ps = new PrintStream(new
Log4jOutputStream(Logger.getLogger("WSConsume"), Level.INFO));
+ cleanPS = true;
}
else
{
- ps = System.out;
ps.println("Could not find log4j.xml configuration, logging to
console.\n");
}
consumer.setMessageStream(ps);
@@ -293,7 +294,10 @@
{
t.printStackTrace(System.err);
}
-
+ } finally {
+ if (cleanPS) {
+ ps.close();
+ }
}
return 1;
Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSProvide.java
===================================================================
--- common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSProvide.java 2012-12-17
13:19:50 UTC (rev 17093)
+++ common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSProvide.java 2012-12-17
13:21:38 UTC (rev 17094)
@@ -25,6 +25,7 @@
import gnu.getopt.LongOpt;
import java.io.File;
+import java.io.IOException;
import java.io.PrintStream;
import java.net.MalformedURLException;
import java.net.URL;
@@ -195,16 +196,17 @@
if (sourceDir != null)
gen.setSourceDirectory(sourceDir);
+ boolean cleanPS = false;
+ PrintStream ps = System.out;
if (! quiet)
{
- PrintStream ps;
if (Log4JUtil.isLog4jConfigurationAvailable())
{
ps = new PrintStream(new
Log4jOutputStream(Logger.getLogger("WSProvide"), Level.INFO));
+ cleanPS = true;
}
else
{
- ps = System.out;
ps.println("Could not find log4j.xml configuration, logging to
console.\n");
}
gen.setMessageStream(ps);
@@ -229,7 +231,10 @@
{
t.printStackTrace(System.err);
}
-
+ } finally {
+ if (cleanPS) {
+ ps.close();
+ }
}
return 1;