ib 2004/07/30 06:20:48
Modified: webdavclient/clientlib/src/java/org/apache/webdav/lib
WebdavSession.java WebdavResource.java
Log:
Fix NPE when attempting to close a not existing connection.
Revision Changes Path
1.7 +8 -6
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/WebdavSession.java
Index: WebdavSession.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/WebdavSession.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebdavSession.java 30 Jul 2004 08:37:10 -0000 1.6
+++ WebdavSession.java 30 Jul 2004 13:20:48 -0000 1.7
@@ -208,9 +208,11 @@
*/
public void closeSession()
throws IOException {
- client.getHttpConnectionManager().getConnection(
- client.getHostConfiguration()).close();
- this.client = null;
+ if (client != null) {
+ client.getHttpConnectionManager().getConnection(
+ client.getHostConfiguration()).close();
+ client = null;
+ }
}
1.27 +6 -4
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/WebdavResource.java
Index: WebdavResource.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/WebdavResource.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- WebdavResource.java 30 Jul 2004 09:06:30 -0000 1.26
+++ WebdavResource.java 30 Jul 2004 13:20:48 -0000 1.27
@@ -1246,7 +1246,9 @@
*/
protected synchronized void setClient(HttpURL httpURL) throws IOException {
- if ((client == null) || ((client != null) && !isTheClient())) {
+ if (client == null) {
+ client = getSessionInstance(httpURL);
+ } else if (!isTheClient()) {
closeSession();
client = getSessionInstance(httpURL);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
