Author: dkulp
Date: Tue Jun 26 20:05:20 2012
New Revision: 1354199
URL: http://svn.apache.org/viewvc?rev=1354199&view=rev
Log:
Fix some warnings that the new Juno Eclipse release flags
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ParamReader.java
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
cxf/trunk/api/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
cxf/trunk/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ChunkedUtil.java
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ParamReader.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ParamReader.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ParamReader.java
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ParamReader.java Tue
Jun 26 20:05:20 2012
@@ -131,6 +131,7 @@ public class ParamReader extends ClassRe
try {
// get a parameter reader
+ @SuppressWarnings("resource")
ParamReader pr = new ParamReader(c);
// get the parameter names
return pr.getParameterNames(method);
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
Tue Jun 26 20:05:20 2012
@@ -105,6 +105,7 @@ public final class SSLUtils {
DataInputStream dis = new DataInputStream(fis);
byte[] bytes = new byte[dis.available()];
dis.readFully(bytes);
+ dis.close();
ByteArrayInputStream bin = new ByteArrayInputStream(bytes);
if (keyStorePassword != null) {
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
(original)
+++
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
Tue Jun 26 20:05:20 2012
@@ -59,6 +59,7 @@ public class StaxOutInterceptor extends
addAfter(AttachmentOutInterceptor.class.getName());
}
+ @SuppressWarnings("resource")
public void handleMessage(Message message) {
OutputStream os = message.getContent(OutputStream.class);
XMLStreamWriter xwriter = message.getContent(XMLStreamWriter.class);
Modified:
cxf/trunk/api/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/api/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
(original)
+++
cxf/trunk/api/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
Tue Jun 26 20:05:20 2012
@@ -341,6 +341,7 @@ public class AttachmentDeserializerTest
assertEquals(10, m.read(new byte[1000]));
assertEquals(-1, m.read(new byte[1000]));
assertEquals(-1, m.read(new byte[1000]));
+ m.close();
}
@Test
Modified:
cxf/trunk/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
(original)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
Tue Jun 26 20:05:20 2012
@@ -36,6 +36,7 @@ public class CachedOutputStreamTest exte
cos.resetOut(out, true);
String test = out.toString();
assertEquals("The test stream content isn't same ", test , result);
+ cos.close();
}
@Test
Modified:
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
(original)
+++
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
Tue Jun 26 20:05:20 2012
@@ -40,6 +40,7 @@ public final class ForkOnceWSDL2Java {
while (line != null) {
int i = Integer.parseInt(line);
if (i == -1) {
+ reader.close();
return;
}
String wargs[] = new String[i];
@@ -51,5 +52,6 @@ public final class ForkOnceWSDL2Java {
line = reader.readLine();
}
+ reader.close();
}
}
Modified:
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
(original)
+++
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
Tue Jun 26 20:05:20 2012
@@ -40,6 +40,7 @@ public final class ForkOnceWSDL2Javascri
while (line != null) {
int i = Integer.parseInt(line);
if (i == -1) {
+ reader.close();
return;
}
String wargs[] = new String[i];
@@ -51,5 +52,6 @@ public final class ForkOnceWSDL2Javascri
line = reader.readLine();
}
+ reader.close();
}
}
Modified:
cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
(original)
+++
cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
Tue Jun 26 20:05:20 2012
@@ -38,6 +38,7 @@ public final class ForkOnceCodeGenerator
while (line != null) {
int i = Integer.parseInt(line);
if (i == -1) {
+ reader.close();
return;
}
String wargs[] = new String[i];
@@ -49,5 +50,6 @@ public final class ForkOnceCodeGenerator
line = reader.readLine();
}
+ reader.close();
}
}
Modified:
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
(original)
+++
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
Tue Jun 26 20:05:20 2012
@@ -536,6 +536,7 @@ public final class CorbaUtils {
java.io.BufferedReader reader = new java.io.BufferedReader(new
java.io.FileReader(file));
String ior = reader.readLine();
if (ior == null) {
+ reader.close();
throw new RuntimeException("Invalid object reference found in
file " + url);
}
result = orb.string_to_object(ior.trim());
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
Tue Jun 26 20:05:20 2012
@@ -333,7 +333,9 @@ public class JAXRSClientFactoryBean exte
protected ConduitSelector getConduitSelector(Endpoint ep) {
ConduitSelector cs = getConduitSelector();
- cs = cs == null ? new UpfrontConduitSelector() : cs;
+ if (cs == null) {
+ cs = new UpfrontConduitSelector();
+ }
cs.setEndpoint(ep);
return cs;
}
Modified:
cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
(original)
+++
cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
Tue Jun 26 20:05:20 2012
@@ -84,6 +84,7 @@ public class ProviderFactory {
}
sb.append(line).append("\n");
}
+ bufrd.close();
String scriptStr = sb.toString();
Context cx = ContextFactory.getGlobal().enterContext();
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ChunkedUtil.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ChunkedUtil.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ChunkedUtil.java
(original)
+++
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ChunkedUtil.java
Tue Jun 26 20:05:20 2012
@@ -78,6 +78,7 @@ final class ChunkedUtil {
* @param connection the given HttpURLConnection
* @return an input stream containing the response content if non-empty
*/
+ @SuppressWarnings("resource")
private static InputStream getNonEmptyContent(
HttpURLConnection connection
) {
Modified:
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
(original)
+++
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
Tue Jun 26 20:05:20 2012
@@ -125,6 +125,7 @@ public class CertConstraintsTest extends
DataInputStream dis = new DataInputStream(fis);
byte[] bytes = new byte[dis.available()];
dis.readFully(bytes);
+ dis.close();
ByteArrayInputStream bin = new ByteArrayInputStream(bytes);
store.load(bin, keystorePassword.toCharArray());
for (java.util.Enumeration<String> aliases = store.aliases();
aliases.hasMoreElements();) {
Modified:
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
(original)
+++
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Tue Jun 26 20:05:20 2012
@@ -327,7 +327,7 @@ public class ServerLauncher {
}
}
}
-
+ ps.close();
} catch (IOException ex) {
if (!ex.getMessage().contains("Stream closed")) {
ex.printStackTrace();
Modified:
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
(original)
+++
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
Tue Jun 26 20:05:20 2012
@@ -505,6 +505,7 @@ public class IDLToWSDLProcessor extends
FileReader fileReader = new FileReader(addrFile);
BufferedReader bufferedReader = new
BufferedReader(fileReader);
addr = bufferedReader.readLine();
+ bufferedReader.close();
} catch (Exception ex) {
throw new ToolException(ex.getMessage(), ex);
}
@@ -635,6 +636,7 @@ public class IDLToWSDLProcessor extends
while (token != null) {
int pos = token.indexOf("=");
if (pos == -1) {
+ reader.close();
throw new RuntimeException("Mapping of idl modules
to namespaces "
+ "is not specified
correctly in the file "
+ mapping + "."
@@ -645,6 +647,7 @@ public class IDLToWSDLProcessor extends
map.put(token.substring(0, pos), token.substring(pos +
1));
token = reader.readLine();
}
+ reader.close();
} catch (Exception ex) {
throw new RuntimeException("Incorrect properties file for
mns mapping - " + mapping
+ ". Cause: " +
ex.getMessage());
Modified:
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
(original)
+++
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
Tue Jun 26 20:05:20 2012
@@ -345,6 +345,7 @@ public class WSDLToCorbaBinding {
FileReader fileReader = new FileReader(addrFile);
BufferedReader bufferedReader = new
BufferedReader(fileReader);
addr = bufferedReader.readLine();
+ bufferedReader.close();
} catch (Exception ex) {
throw new ToolException(ex.getMessage(), ex);
}
Modified:
cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
(original)
+++
cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
Tue Jun 26 20:05:20 2012
@@ -49,6 +49,7 @@ public class XSDToWSDLProcessorTest
sb.append(chars, 0, readLen);
size = size + readLen;
}
+ fileReader.close();
String serviceString = new String(sb);
assertTrue(serviceString.indexOf("<wsdl:types>") >= 0);
assertTrue(serviceString.indexOf("<schema targetNamespace=\"http:/"
@@ -78,6 +79,7 @@ public class XSDToWSDLProcessorTest
sb.append(chars, 0, readLen);
size = size + readLen;
}
+ fileReader.close();
String serviceString = new String(sb);
assertTrue(serviceString.indexOf("<wsdl:types>") >= 0);
assertTrue(serviceString.indexOf("<schema targetNamespace=\"http:/"
Modified:
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=1354199&r1=1354198&r2=1354199&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Tue Jun 26 20:05:20 2012
@@ -225,6 +225,7 @@ public class CodeGenBugTest extends Abst
byte[] buffer = new byte[(int)file.length()];
filebuffer.read(buffer);
String content = IOUtils.newStringFromBytes(buffer);
+ filebuffer.close();
assertTrue("wsdl location should be url style in build.xml",
content.indexOf("param1=\"file:") > -1);
}
@@ -425,6 +426,7 @@ public class CodeGenBugTest extends Abst
}
size = fin.read(buffer);
}
+ fin.close();
assertTrue("Service QName in client is not correct", index > -1);
}
