From: sage <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Mon, 13 Jun 2005 15:47:39 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.1~2076
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1ba05c9b7f4dcc6e60db4a5bee6f9b4913465cd;p=ceph.git

*** empty log message ***


git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@305 29311d96-e01e-0410-9327-a35deaab8ce9
---

diff --git a/ceph/include/buffer.h b/ceph/include/buffer.h
index 877c16e7194..cabfa9baf44 100644
--- a/ceph/include/buffer.h
+++ b/ceph/include/buffer.h
@@ -159,7 +159,7 @@ class bufferptr {
   }
 
   ~bufferptr() {
-	if (_buffer->_put() == 0) 
+	if (_buffer && _buffer->_put() == 0) 
 	  delete _buffer;
   }
 
diff --git a/ceph/include/bufferlist.h b/ceph/include/bufferlist.h
index 3fd4e921997..35512395968 100644
--- a/ceph/include/bufferlist.h
+++ b/ceph/include/bufferlist.h
@@ -17,13 +17,12 @@ class bufferlist {
  public:
   // cons/des
   ~bufferlist() {
-	clear();
   }
 
   // sort-of-like-assignment-op
   void claim(bufferlist& bl) {
 	// free my buffers
-	clear();                    
+	_buffers.clear();                    
 	claim_append(bl);
   }
   void claim_append(bufferlist& bl) {
@@ -162,7 +161,7 @@ class bufferlist {
 
 
   void substr_of(bufferlist& other, int off, int len) {
-	clear();
+	_buffers.clear();
 
 	// skip off
 	list<bufferptr>::iterator curbuf = other._buffers.begin();