You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/10/16 12:54:13 UTC
svn commit: r1532714 -
/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java
Author: rhuijben
Date: Wed Oct 16 10:54:13 2013
New Revision: 1532714
URL: http://svn.apache.org/r1532714
Log:
* subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java
(TunnelChannel.close): Make sure we don't try to close an apr handle twice
in an attempt to unbreak the javahl tests on Windows.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java?rev=1532714&r1=1532713&r2=1532714&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java Wed Oct 16 10:54:13 2013
@@ -44,8 +44,10 @@ abstract class TunnelChannel implements
public void close() throws IOException
{
- nativeClose(nativeChannel);
- nativeChannel = 0;
+ /* Avoid closing twice on error: explicit and via gc */
+ long channel = this.nativeChannel;
+ this.nativeChannel = 0;
+ nativeClose(channel);
}
private native static void nativeClose(long nativeChannel)