You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by oz...@apache.org on 2004/09/20 10:07:29 UTC
cvs commit: jakarta-slide/webdavclient/connector/src/java/org/apache/webdav/connector WebDAVManagedConnection.java
ozeigermann 2004/09/20 01:07:29
Modified: webdavclient/connector/src/java/org/apache/webdav/connector
Tag: SLIDE_2_1_RELEASE_BRANCH
WebDAVManagedConnection.java
Log:
Took over fix for issue #31076 from HEAD branch into release
Revision Changes Path
No revision
No revision
1.2.2.1 +19 -7 jakarta-slide/webdavclient/connector/src/java/org/apache/webdav/connector/WebDAVManagedConnection.java
Index: WebDAVManagedConnection.java
===================================================================
RCS file: /home/cvs/jakarta-slide/webdavclient/connector/src/java/org/apache/webdav/connector/WebDAVManagedConnection.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- WebDAVManagedConnection.java 13 Jul 2004 14:13:16 -0000 1.2
+++ WebDAVManagedConnection.java 20 Sep 2004 08:07:29 -0000 1.2.2.1
@@ -76,11 +76,10 @@
public void close() {
ConnectionEvent event = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ event.setConnectionHandle(connection);
for (Iterator it = listeners.iterator(); it.hasNext();) {
((ConnectionEventListener) it.next()).connectionClosed(event);
}
- connection.invalidate();
- connection = null;
}
/**
@@ -123,7 +122,20 @@
// physical connection back to the pool. As I have
// no idea how to recycle a WebdavResource a have to
// fully destroy it (Olli Z.)
- destroy();
+
+ if (connection != null) {
+ connection.invalidate();
+ connection = null;
+ }
+
+ name = null;
+ xares = null;
+ tx = null;
+ try {
+ webdavResource.close();
+ } catch (IOException e) {
+ throw new ResourceException(e);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org