You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jmeter.apache.org by sebb <se...@gmail.com> on 2015/03/01 23:27:44 UTC
Re: svn commit: r1663096 - /jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java
On 1 March 2015 at 13:35, <pm...@apache.org> wrote:
> Author: pmouawad
> Date: Sun Mar 1 13:35:40 2015
> New Revision: 1663096
>
> URL: http://svn.apache.org/r1663096
> Log:
> Ensure close always occurs
>
> Modified:
> jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java
>
> Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java?rev=1663096&r1=1663095&r2=1663096&view=diff
> ==============================================================================
> --- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java (original)
> +++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStreamPoolFactory.java Sun Mar 1 13:35:40 2015
> @@ -25,6 +25,7 @@ import org.apache.commons.pool2.BaseKeye
> import org.apache.commons.pool2.KeyedPooledObjectFactory;
> import org.apache.commons.pool2.PooledObject;
> import org.apache.commons.pool2.impl.DefaultPooledObject;
> +import org.apache.jorphan.util.JOrphanUtils;
>
> /**
> * Pool Factory of {@link SocketOutputStream}
> @@ -51,8 +52,10 @@ public class SocketOutputStreamPoolFacto
> public void destroyObject(SocketConnectionInfos socketConnectionInfos, PooledObject<SocketOutputStream> socketOutputStream) throws Exception {
> super.destroyObject(socketConnectionInfos, socketOutputStream);
> SocketOutputStream outputStream = socketOutputStream.getObject();
> - outputStream.close();
> - outputStream.getSocket().close();
> + JOrphanUtils.closeQuietly(outputStream);
> + if(outputStream.getSocket() != null) {
Redundant null check as closeQuietly checks its parameter for null.
> + JOrphanUtils.closeQuietly(outputStream.getSocket());
> + }
> }
>
> /**
>
>