Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@<zookeeper.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1529013 - in /zookeeper/trunk: CHANGES.txt
 src/contrib/zkpython/src/c/zookeeper.c
Date: Thu, 03 Oct 2013 21:48:29 -0000
To: commits@zookeeper.apache.org
From: fpj@apache.org
Message-Id: <20131003214829.6F0C72388980@eris.apache.org>

Author: fpj
Date: Thu Oct  3 21:48:28 2013
New Revision: 1529013

URL: http://svn.apache.org/r1529013
Log:
ZOOKEEPER-732. Improper translation of error into Python exception (Andrei Savu, Lei Zhang, fpj via fpj)


Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/contrib/zkpython/src/c/zookeeper.c

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1529013&r1=1529012&r2=1529013&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Oct  3 21:48:28 2013
@@ -368,9 +368,13 @@ BUGFIXES:
 
   ZOOKEEPER-1713. wrong time calculation in zkfuse.cc (german via fpj)
  
-  ZOOKEEPER-1379. 'printwatches, redo, history and connect '. client commands always print usage. This is not necessary (edward via fpj)
-
-  ZOOKEEPER-1670. zookeeper should set a default value for SERVER_JVMFLAGS and CLIENT_JVMFLAGS so that memory usage is controlled (Arpit Gupta via fpj)
+  ZOOKEEPER-1379. 'printwatches, redo, history and
+  connect '. client commands always print usage. This
+  is not necessary (edward via fpj)
+
+  ZOOKEEPER-1670. zookeeper should set a default value
+  for SERVER_JVMFLAGS and CLIENT_JVMFLAGS so that memory
+  usage is controlled (Arpit Gupta via fpj)
 
   ZOOKEEPER-1448. Node+Quota creation in transaction log can crash leader startup (Botond Hejj via fpj)
   
@@ -381,13 +385,18 @@ BUGFIXES:
   ZOOKEEPER-1751. ClientCnxn#run could miss the second ping or connection get
   dropped before a ping. (Jeffrey Zhong via mahadev)
 
-  ZOOKEEPER-1657. Increased CPU usage by unnecessary SASL checks (Philip K. Warren via fpj)
+  ZOOKEEPER-1657. Increased CPU usage by unnecessary SASL
+   checks (Philip K. Warren via fpj)
 
   ZOOKEEPER-1753. ClientCnxn is not properly releasing the resources, 
                   which are used to ping RwServer (Rakesh R via fpj)
 
-  ZOOKEEPER-1096. Leader communication should listen on specified IP, not wildcard address (Jared Cantwell, German Blanco via fpj)
-  ZOOKEEPER-87. Follower does not shut itself down if its too far behind the leader. (German Blanco via fpj)
+  ZOOKEEPER-1096. Leader communication should listen on 
+  specified IP, not wildcard address (Jared Cantwell, 
+  German Blanco via fpj)
+
+  ZOOKEEPER-87. Follower does not shut itself down if its
+   too far behind the leader. (German Blanco via fpj)
 
   ZOOKEEPER-1696. Fail to run zookeeper client on Weblogic application server.
   (Jeffrey Zhong via mahadev)
@@ -409,6 +418,9 @@ BUGFIXES:
   ZOOKEEPER-1773. incorrect reference to jline version/lib in docs
   (Manikumar Reddy via phunt)
 
+  ZOOKEEPER-732. Improper translation of error into Python exception
+  (Andrei Savu, Lei Zhang, fpj via fpj)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/contrib/zkpython/src/c/zookeeper.c
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkpython/src/c/zookeeper.c?rev=1529013&r1=1529012&r2=1529013&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zkpython/src/c/zookeeper.c (original)
+++ zookeeper/trunk/src/contrib/zkpython/src/c/zookeeper.c Thu Oct  3 21:48:28 2013
@@ -52,6 +52,8 @@ PyObject *err_to_exception(int errcode) 
   switch (errcode) {
   case ZSYSTEMERROR:
     return SystemErrorException;
+  case ZINVALIDSTATE:
+    return InvalidStateException;
   case ZRUNTIMEINCONSISTENCY:
     return RuntimeInconsistencyException;
   case ZDATAINCONSISTENCY:
@@ -66,8 +68,6 @@ PyObject *err_to_exception(int errcode) 
     return OperationTimeoutException;
   case ZBADARGUMENTS:
     return BadArgumentsException;
-  case ZINVALIDSTATE:
-    return InvalidStateException;
   case ZAPIERROR:
     return ApiErrorException;
   case ZNONODE:
@@ -92,6 +92,10 @@ PyObject *err_to_exception(int errcode) 
     return InvalidCallbackException;
   case ZSESSIONMOVED:
     return SessionMovedException;
+  case ZCLOSING:
+    return ClosingException;
+  case ZNOTHING:
+    return NothingException;
   case ZOK:
   default:
     return NULL;