svn commit: r1533864 - in /subversion/trunk/subversion/bindings/javahl/native: OperationContext.cpp org_apache_subversion_javahl_util_TunnelChannel.cpp

[br...@apache.org]

Author: brane
Date: Sun Oct 20 09:27:40 2013
New Revision: 1533864

URL: http://svn.apache.org/r1533864
Log:
Try to unbreak the JavaHL tests, again; this time with an
actually relevant change.

[in subversion/bindings/javahl/native]
* OperationContext.cpp
  (OperationContext::openTunnel): Remember the context object.

* org_apache_subversion_javahl_util_TunnelChannel.cpp
  (Java_org_apache_subversion_javahl_util_RequestChannel_nativeRead,
   Java_org_apache_subversion_javahl_util_ResponseChannel_nativeWrite):
    Do not throw exceptions for invalid file descriptors, since
    get_file_descriptor already does that.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp
    subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp

Modified: subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp?rev=1533864&r1=1533863&r2=1533864&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp Sun Oct 20 09:27:40 2013
@@ -572,6 +572,7 @@ OperationContext::openTunnel(apr_file_t 
           svn_error_wrap_apr(tc->status, _("Could not open tunnel streams")));
     }
 
+  *tunnel_context = tc;
   *request = tc->request_out;
   *response = tc->response_in;
 
@@ -613,7 +614,6 @@ OperationContext::openTunnel(apr_file_t 
                           jtunnel_name, juser, jhostname, jint(port)),
       SVN_ERR_BASE);
 
-  *tunnel_context = NULL;
   return SVN_NO_ERROR;
 }
 

Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp?rev=1533864&r1=1533863&r2=1533864&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp Sun Oct 20 09:27:40 2013
@@ -210,7 +210,6 @@ Java_org_apache_subversion_javahl_util_R
   apr_file_t* fd = get_file_descriptor(nativeChannel);
   if (fd)
     return ByteBufferProxy(dst, env).read(fd, env);
-  throw_IOException(_("Invalid native file hanlde"), 0);
   return -1;
 }
 
@@ -222,6 +221,5 @@ Java_org_apache_subversion_javahl_util_R
   apr_file_t* fd = get_file_descriptor(nativeChannel);
   if (fd)
     return ByteBufferProxy(src, env).write(fd, env);
-  throw_IOException(_("Invalid native file hanlde"), 0);
   return -1;
 }