Author: dkulp Date: Fri Jun 29 14:54:54 2012 New Revision: 1355425 URL: http://svn.apache.org/viewvc?rev=1355425&view=rev Log: Merged revisions 1355414 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1355414 | dkulp | 2012-06-29 10:35:11 -0400 (Fri, 29 Jun 2012) | 11 lines Merged revisions 1355383 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1355383 | dkulp | 2012-06-29 09:47:39 -0400 (Fri, 29 Jun 2012) | 3 lines Remove some suppresswarning things that are still creating errors/warnging ........ ........ Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ChunkedUtil.java Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java?rev=1355425&r1=1355424&r2=1355425&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java (original) +++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java Fri Jun 29 14:54:54 2012 @@ -131,7 +131,6 @@ 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/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java?rev=1355425&r1=1355424&r2=1355425&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java Fri Jun 29 14:54:54 2012 @@ -55,7 +55,6 @@ public class StaxOutInterceptor extends addAfter(AttachmentOutInterceptor.class.getName()); } - @SuppressWarnings("resource") public void handleMessage(Message message) { OutputStream os = message.getContent(OutputStream.class); XMLStreamWriter writer = message.getContent(XMLStreamWriter.class); Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ChunkedUtil.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ChunkedUtil.java?rev=1355425&r1=1355424&r2=1355425&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ChunkedUtil.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ChunkedUtil.java Fri Jun 29 14:54:54 2012 @@ -78,7 +78,6 @@ 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 ) {
