Author: markt
Date: Wed Jan 4 14:05:06 2017
New Revision: 1777319
URL: http://svn.apache.org/viewvc?rev=1777319&view=rev
Log:
Back-port fix for IDE warning (also reduces diff to 7.0.x)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1777319&r1=1777318&r2=1777319&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed
Jan 4 14:05:06 2017
@@ -1802,7 +1802,9 @@ public class NioEndpoint extends Abstrac
cancelledKey(sk,SocketStatus.ERROR,false);
return false;
}
- sd.fchannel = new FileInputStream(f).getChannel();
+ @SuppressWarnings("resource") // Closed when channel is
closed
+ FileInputStream fis = new FileInputStream(f);
+ sd.fchannel = fis.getChannel();
}
//configure output channel
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
