Author: alessio.soldano(a)jboss.com Date: 2009-02-25 13:09:33 -0500 (Wed, 25 Feb 2009) New Revision: 9397 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java Log: [JBWS-2555] Some further minor changes Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2009-02-25 18:08:50 UTC (rev 9396) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2009-02-25 18:09:33 UTC (rev 9397) @@ -36,7 +36,7 @@ private HandlerType handlerType; private List<UnifiedHandlerChainMetaData> handlerChains = new ArrayList<UnifiedHandlerChainMetaData>(); - public UnifiedHandlerChainsMetaData(HandlerType endpoint) + public UnifiedHandlerChainsMetaData(HandlerType handlerType) { this.handlerType = handlerType; } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2009-02-25 18:08:50 UTC (rev 9396) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2009-02-25 18:09:33 UTC (rev 9397) @@ -71,7 +71,7 @@ private File sourceDir = null; private String target = null; - public static String PROGRAM_NAME = System.getProperty("program.name", WSConsume.class.getName()); + public static final String PROGRAM_NAME = System.getProperty("program.name", WSConsume.class.getName()); public static void main(String[] args) { Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2009-02-25 18:08:50 UTC (rev 9396) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2009-02-25 18:09:33 UTC (rev 9397) @@ -67,7 +67,7 @@ private File resourceDir = null; private File sourceDir = null; - public static String PROGRAM_NAME = System.getProperty("program.name", WSProvide.class.getSimpleName()); + public static final String PROGRAM_NAME = System.getProperty("program.name", WSProvide.class.getSimpleName()); public static void main(String[] args) { Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2009-02-25 18:08:50 UTC (rev 9396) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2009-02-25 18:09:33 UTC (rev 9397) @@ -233,9 +233,10 @@ public Object run() { + InputStream inStream = null; try { - InputStream inStream = new FileInputStream(filename); + inStream = new FileInputStream(filename); Properties props = new Properties(); props.load(inStream); return props; @@ -244,6 +245,14 @@ { throw new SecurityException("Cannot load properties: " + filename, ex); } + finally + { + try + { + inStream.close(); + } + catch (Exception e) {} //ignore + } } } }