jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/javax/xml/ws/spi/FactoryFinder.java

-:8c0b6bccfe47
+:0989ad8c0860
 /*
-* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * questions.
 */
 package javax.xml.ws.spi;
-import java.io.InputStream;
+import java.io.*;
-import java.io.File;
-import java.io.FileInputStream;
 import java.util.Properties;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import javax.xml.ws.WebServiceException;
 class FactoryFinder {
 /**
 throw new WebServiceException(x.toString(), x);
 }
 String serviceId = "META-INF/services/" + factoryId;
 // try to find services in CLASSPATH
-try {
+BufferedReader rd = null;
-InputStream is=null;
+try {
+InputStream is;
 if (classLoader == null) {
 is=ClassLoader.getSystemResourceAsStream(serviceId);
 } else {
 is=classLoader.getResourceAsStream(serviceId);
 }
 if( is!=null ) {
-BufferedReader rd =
+rd = new BufferedReader(new InputStreamReader(is, "UTF-8"));
-new BufferedReader(new InputStreamReader(is, "UTF-8"));
 String factoryClassName = rd.readLine();
-rd.close();
 if (factoryClassName != null &&
 ! "".equals(factoryClassName)) {
 return newInstance(factoryClassName, classLoader);
 }
 }
-} catch( Exception ex ) {
+} catch( Exception ignored) {
+} finally {
+close(rd);
 }
 // try to read from $java.home/lib/jaxws.properties
+FileInputStream inStream = null;
 try {
 String javah=System.getProperty( "java.home" );
 String configFile = javah + File.separator +
 "lib" + File.separator + "jaxws.properties";
 File f=new File( configFile );
 if( f.exists()) {
 Properties props=new Properties();
-props.load( new FileInputStream(f));
+inStream = new FileInputStream(f);
+props.load(inStream);
 String factoryClassName = props.getProperty(factoryId);
 return newInstance(factoryClassName, classLoader);
 }
-} catch(Exception ex ) {
+} catch(Exception ignored) {
-}
+} finally {
+close(inStream);
+}
 // Use the system property
 try {
 String systemProp =
 System.getProperty( factoryId );
 if( systemProp!=null) {
 return newInstance(systemProp, classLoader);
 }
-} catch (SecurityException se) {
+} catch (SecurityException ignored) {
 }
 if (fallbackClassName == null) {
 throw new WebServiceException(
 "Provider for " + factoryId + " cannot be found", null);
 }
 return newInstance(fallbackClassName, classLoader);
+}
+private static void close(Closeable closeable) {
+if (closeable != null) {
+try {
+closeable.close();
+} catch (IOException ignored) {
+}
+}
 }
 /**
 * Loads the class, provided that the calling thread has an access to the class being loaded.
 private static boolean isOsgi() {
 try {
 Class.forName(OSGI_SERVICE_LOADER_CLASS_NAME);
 return true;
-} catch (ClassNotFoundException cnfe) {
+} catch (ClassNotFoundException ignored) {
 }
 return false;
 }
 private static Object lookupUsingOSGiServiceLoader(String factoryId) {
 // Use reflection to avoid having any dependendcy on ServiceLoader class
 Class serviceClass = Class.forName(factoryId);
 Class[] args = new Class[]{serviceClass};
 Class target = Class.forName(OSGI_SERVICE_LOADER_CLASS_NAME);
 java.lang.reflect.Method m = target.getMethod("lookupProviderInstances", Class.class);
-java.util.Iterator iter = ((Iterable) m.invoke(null, args)).iterator();
+java.util.Iterator iter = ((Iterable) m.invoke(null, (Object[]) args)).iterator();
 return iter.hasNext() ? iter.next() : null;
-} catch (Exception e) {
+} catch (Exception ignored) {
 // log and continue
 return null;
 }
 }

Mercurial > jdk8-mips64-public > jaxws / file comparison

comparison: src/share/jaxws_classes/javax/xml/ws/spi/FactoryFinder.java

src/share/jaxws_classes/javax/xml/ws/spi/FactoryFinder.java