Author: alessio.soldano(a)jboss.com
Date: 2011-04-15 05:36:48 -0400 (Fri, 15 Apr 2011)
New Revision: 14120
Modified:
common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
Log:
[JBWS-3222] Minor refactoring
Modified: common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2011-04-15
09:34:06 UTC (rev 14119)
+++ common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2011-04-15
09:36:48 UTC (rev 14120)
@@ -68,7 +68,7 @@
*/
public class WSConsume
{
- private static final ClassLoader MODULES_LOADER;
+ private static final ClassLoader MODULES_LOADER =
SecurityActions.getModulesClassLoader();
private List<File> bindingFiles = new ArrayList<File>();
private File outputDir = new File("output");
private boolean generateSource;
@@ -84,11 +84,6 @@
private File sourceDir;
private String target;
- static
- {
- MODULES_LOADER = SecurityActions.getModulesClassLoader();
- }
-
public static final String PROGRAM_NAME =
SecurityActions.getSystemProperty("program.name", WSConsume.class.getName());
public static void main(String[] args)
Modified: common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2011-04-15
09:34:06 UTC (rev 14119)
+++ common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2011-04-15
09:36:48 UTC (rev 14120)
@@ -64,8 +64,8 @@
*/
public class WSProvide
{
- private static final ClassLoader DEFAULT_LOADER;
- private ClassLoader loader = DEFAULT_LOADER;
+ private static final ClassLoader MODULES_LOADER =
SecurityActions.getModulesClassLoader();
+ private ClassLoader loader = MODULES_LOADER != null ? MODULES_LOADER :
SecurityActions.getContextClassLoader();
private File outputDir = new File("output");
private boolean generateSource;
private boolean generateWsdl;
@@ -76,13 +76,6 @@
private File resourceDir;
private File sourceDir;
- static
- {
- final ClassLoader modulesLoader = SecurityActions.getModulesClassLoader();
- final ClassLoader contextLoader = SecurityActions.getContextClassLoader();
- DEFAULT_LOADER = modulesLoader != null ? modulesLoader : contextLoader;
- }
-
public static final String PROGRAM_NAME =
SecurityActions.getSystemProperty("program.name",
WSProvide.class.getSimpleName());
public static void main(String[] args)
Show replies by date